motif: State structure cleanup

[rrace.git] / src / motif.h

diff --git a/src/motif.h b/src/motif.h
index 74893d15a2f2b4b07dc81d11ffb0260368968dac..b168c4e5708498e67a5af71e14f722f87d947627 100644 (file)
--- a/src/motif.h
+++ b/src/motif.h
@@ -20,58 +20,71 @@
 #define RRACE_MOTIF_H_
 
 #include <inttypes.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;
+       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);
+void x11_redraw_game(struct app_state *state, uint_fast32_t mask);
 
 /*
- * 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.
+ * 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.
  */
-
-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);
+void x11_redraw_goal(struct app_state *state, uint_fast32_t mask,
+                                              Widget icon_shell);
 
 /*
- * 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.
+ * 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 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.
+ * 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 *ewmh_icon_alloc(unsigned long **sizes);
+void x11_queue_render(struct app_state *state, uint_fast32_t mask, int mode);
 
-/*
- * Check if the root window indicates support for EWMH icons.  Returns 1 if
- * supported, or 0 otherwise.
- */
-int ewmh_probe_wm_icon(Widget shell);
+enum {
+       RENDER_MODE_GOAL = 1,
+       RENDER_MODE_GAME = 2,
+       RENDER_MODE_BOTH = 3
+};
 
 #endif