X-Git-Url: http://git.draconx.ca/gitweb/rrace.git/blobdiff_plain/2529a9651d160ab3a17118d778f5e5584d040765..31d8eda9987703c64fc63f4ddb4088cf3be5b7cc:/src/motif.h

diff --git a/src/motif.h b/src/motif.h
index ae6631d..28e1b76 100644
--- a/src/motif.h
+++ b/src/motif.h
@@ -20,23 +20,45 @@
 #define RRACE_MOTIF_H_
 
 #include <inttypes.h>
-#include <X11/Intrinsic.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;
 
 	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 x11_redraw_goal(struct app_state *state);
-void x11_redraw_game(struct app_state *state);
+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, 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