motif: State structure cleanup

[rrace.git] / src / motif.h

diff --git a/src/motif.h b/src/motif.h
index 361abd98b12690807dff01e59e1166e794625e41..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];
 };