X-Git-Url: https://git.draconx.ca/gitweb/rrace.git/blobdiff_plain/b39d19918b63b80d1f3b068d158fe43415b9d1b6..ca97af514870895e228df0443adc5a16be4d9a78:/src/motif.h

diff --git a/src/motif.h b/src/motif.h
index 90ca7af..b168c4e 100644
--- a/src/motif.h
+++ b/src/motif.h
@@ -20,26 +20,71 @@
 #define RRACE_MOTIF_H_
 
 #include <inttypes.h>
-#include "ewmhicon.h"
+#include "colour.h"
 #include "game.h"
 
 struct app_state {
 	struct board board;
 
 	Widget game, goal;
+	struct xcounter *timer;
+
+	XtIntervalId timer_tick;
+	Pixmap icon_pixmap;
+	GC tile_gc;
+
+	uint_least32_t render_game_mask;
+	uint_least16_t render_goal_mask;
+	uint_least16_t game_tile_sz, goal_tile_sz;
+
+	/* If true, the goal will be displayed over the main play area. */
+	uint_least8_t view_goal_on_game;
 
 	/* Whether to set _NET_WM_ICON property on WMShell */
-	int use_ewmh_icons;
+	uint_least8_t use_ewmh_icons;
 
-	GC tile_gc;
-	Pixmap icon_pixmap;
 	uint_least32_t tile_colour[TILE_MAX-1][3];
 };
 
 void ui_initialize(struct app_state *state, Widget shell);
-void x11_initialize(struct app_state *state, Screen *screen);
+void ui_show_about(struct app_state *state, Widget shell);
+void ui_timer_update(struct app_state *state, int_fast32_t elapsed);
+
+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);
 void x11_redraw_game(struct app_state *state, uint_fast32_t mask);
 
+/*
+ * Redraw goal tiles immediately.  The mask specifies which tiles will
+ * be redrawn, in the same bit arrangement as the board goal bitmaps.
+ * Tiles corresponding to set bits in mask are redrawn, and tiles
+ * corresponding to clear bits are not redrawn.
+ *
+ * Additionally, if icon_shell is non-null (with the caller passing the
+ * application shell widget), the program's icon pixmap is updated to
+ * match the current goal.
+ */
+void x11_redraw_goal(struct app_state *state, uint_fast32_t mask,
+                                              Widget icon_shell);
+
+/*
+ * Mark tiles for redraw.  The redraw is not performed immediately, but
+ * rather a background task is installed to perform the redraw at a later
+ * time.
+ *
+ * The mode parameter may be one of the following enumerated values:
+ *
+ *   * RENDER_MODE_GAME: mark game tiles for update.
+ *   * RENDER_MODE_GOAL: mark goal tiles for update.
+ *   * RENDER_MODE_BOTH: mark both game and goal tiles for update (probably
+ *                       only useful if mask has all bits set).
+ */
+void x11_queue_render(struct app_state *state, uint_fast32_t mask, int mode);
+
+enum {
+	RENDER_MODE_GOAL = 1,
+	RENDER_MODE_GAME = 2,
+	RENDER_MODE_BOTH = 3
+};
+
 #endif