motif: State structure cleanup

[rrace.git] / src / motif.h

diff --git a/src/motif.h b/src/motif.h
index 076f4f60cfd58da466a9e8b78b02cc3b45a8b3cc..b168c4e5708498e67a5af71e14f722f87d947627 100644 (file)
--- a/src/motif.h
+++ b/src/motif.h
@@ -26,26 +26,23 @@
 struct app_state {
        struct board board;
 
-       Widget game, goal, timer;
-
-       /* Current window width/height for resize handling. */
-       Dimension game_sz[2], goal_sz[2];
+       Widget game, goal;
+       struct xcounter *timer;
 
        XtIntervalId timer_tick;
+       Pixmap icon_pixmap;
+       GC tile_gc;
 
-       XtIntervalId render_tick;
-       XtWorkProcId render_proc;
-       uint_fast32_t render_game_mask;
-       uint_fast16_t render_goal_mask;
+       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. */
-       int view_goal_on_game;
+       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];
 };
 
@@ -55,9 +52,21 @@ 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);
 
+/*
+ * 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