motif: Combine status details into a single flags member.

[rrace.git] / src / motif.h

diff --git a/src/motif.h b/src/motif.h
index 361abd98b12690807dff01e59e1166e794625e41..922f5c12459437e279cebd74aaf387eff3baf136 100644 (file)
--- a/src/motif.h
+++ b/src/motif.h
@@ -1,6 +1,6 @@
 /*
  * X11 GUI for slide puzzle game
- * Copyright © 2022 Nick Bowler
+ * Copyright © 2022-2023 Nick Bowler
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,29 +23,29 @@
 #include "colour.h"
 #include "game.h"
 
-struct app_state {
-       struct board board;
+/* If set, _NET_WM_ICON property will be added/updated to toplevel window. */
+#define FLAG_USE_EWMH_ICONS    1u
 
-       Widget game, goal, timer;
+/* If set, the goal will be displayed over the main play area. */
+#define FLAG_VIEW_GOAL_ON_GAME 2u
 
-       /* Current window width/height for resize handling. */
-       Dimension game_sz[2], goal_sz[2];
+/* If set, the Xt timer update process is currently installed. */
+#define FLAG_TIMER_RUNNING     4u
 
-       XtIntervalId timer_tick;
+struct app_state {
+       struct board board;
 
-       XtIntervalId render_tick;
-       XtWorkProcId render_proc;
-       uint_fast32_t render_game_mask;
-       uint_fast16_t render_goal_mask;
+       Widget game, goal;
+       struct xcounter *timer;
 
-       /* If true, the goal will be displayed over the main play area. */
-       int view_goal_on_game;
+       Pixmap icon_pixmap;
+       GC tile_gc;
 
-       /* Whether to set _NET_WM_ICON property on WMShell */
-       int use_ewmh_icons;
+       uint_least32_t render_game_mask;
+       uint_least16_t render_goal_mask;
+       uint_least16_t game_tile_sz, goal_tile_sz;
+       uint_least16_t flags;
 
-       GC tile_gc;
-       Pixmap icon_pixmap;
        uint_least32_t tile_colour[TILE_MAX-1][3];
 };