X-Git-Url: https://git.draconx.ca/gitweb/rrace.git/blobdiff_plain/43a709ff25b9973a83327a06a6ecc94b09e7787b..31d8eda9987703c64fc63f4ddb4088cf3be5b7cc:/src/motif.h

diff --git a/src/motif.h b/src/motif.h
index 74893d1..28e1b76 100644
--- a/src/motif.h
+++ b/src/motif.h
@@ -20,14 +20,27 @@
 #define RRACE_MOTIF_H_
 
 #include <inttypes.h>
+#include "ewmhicon.h"
+#include "colour.h"
 #include "game.h"
 
-enum { COLOUR_PRIMARY, COLOUR_DARK, COLOUR_LIGHT, COLOUR_MAX };
-
 struct app_state {
 	struct board board;
 
-	Widget game, goal;
+	Widget game, goal, timer;
+
+	/* Current window width/height for resize handling. */
+	Dimension game_sz[2], goal_sz[2];
+
+	XtIntervalId timer_tick;
+
+	XtIntervalId render_tick;
+	XtWorkProcId render_proc;
+	uint_fast32_t render_game_mask;
+	uint_fast16_t render_goal_mask;
+
+	/* If true, the goal will be displayed over the main play area. */
+	int view_goal_on_game;
 
 	/* Whether to set _NET_WM_ICON property on WMShell */
 	int use_ewmh_icons;
@@ -38,40 +51,14 @@ struct app_state {
 };
 
 void ui_initialize(struct app_state *state, Widget shell);
-void x11_initialize(struct app_state *state, Screen *screen);
-void x11_redraw_icon(struct app_state *state, Widget shell);
-void x11_redraw_goal(struct app_state *state);
-void x11_redraw_game(struct app_state *state);
-
-/*
- * Helpers for drawing window icons in various sizes.  The tileXX functions
- * draw one (out of 9) tiles at a particular size using a particular colour
- * set.  Call for each tile position to draw a complete icon.
- */
+void ui_show_about(struct app_state *state, Widget shell);
+void ui_timer_update(struct app_state *state, int_fast32_t elapsed);
 
-enum { ICON_16x16, ICON_24x24, ICON_32x32, ICON_48x48, ICON_MAX };
-#define EWMH_ICON_NELEM (2+16*16 + 2+24*24 + 2+32*32 + 2+48*48)
-
-void ewmh_tile16(unsigned long *icon, const XColor *c, int tile_x, int tile_y);
-void ewmh_tile24(unsigned long *icon, const XColor *c, int tile_x, int tile_y);
-void ewmh_tile32(unsigned long *icon, const XColor *c, int tile_x, int tile_y);
-void ewmh_tile48(unsigned long *icon, const XColor *c, int tile_x, int tile_y);
-
-/*
- * Allocate storage for the EWMH _NET_WM_ICON array.  The sizes array is
- * populated with pointers to the beginning of each icon's pixel data.  For
- * example, sizes[ICON_24x24] points to the first pixel of the 24x24 image.
- *
- * The returned value can then be passed to XChangeProperty to set the icon,
- * (use EWMH_ICON_NELEM for the number of elements) and must be freed by the
- * caller.
- */
-void *ewmh_icon_alloc(unsigned long **sizes);
-
-/*
- * Check if the root window indicates support for EWMH icons.  Returns 1 if
- * supported, or 0 otherwise.
- */
-int ewmh_probe_wm_icon(Widget shell);
+void x11_initialize(struct app_state *state, Widget shell);
+void x11_redraw_icon(struct app_state *state, Widget shell);
+void x11_redraw_goal(struct app_state *state, uint_fast32_t mask);
+void x11_redraw_game(struct app_state *state, uint_fast32_t mask);
+void x11_queue_render(struct app_state *state, uint_fast32_t game_mask,
+                                               uint_fast16_t goal_mask);
 
 #endif