Reimplement xcounter based on pre-rendered pixmpas.

[rrace.git] / src / motif.c

diff --git a/src/motif.c b/src/motif.c
index 94e959b113f5d835b2a151550379449f015f2946..fe030799984fc3442aa4b35917cbdb5039eba160 100644 (file)
--- a/src/motif.c
+++ b/src/motif.c
@@ -19,14 +19,19 @@
 #include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <locale.h>
 #include <getopt.h>
 
 #include <Xm/XmAll.h>
 
 #include "help.h"
 #include "motif.h"
+#include "ewmhicon.h"
 #include "motifopt.h"
 #include "game.h"
+#include "version.h"
+
+#define TIMER_UPDATE_MS 33
 
 #define PROGNAME "rrace"
 static const char *progname = PROGNAME;
@@ -46,13 +51,14 @@ static char * const default_resources[] = {
        "*gameExit.accelerator: Ctrl<Key>Q",
        "*gameExit.acceleratorText: Ctrl+Q",
 
+       "*aboutDialog*pixmapTextPadding: 10",
+
        NULL
 };
 
 static void print_version(void)
 {
-       printf("%s %s\n", PROGNAME, PACKAGE_VERSION);
-       printf("Copyright (C) 2022 Nick Bowler\n");
+       version_print_head("rrace-motif", stdout);
        puts("License GPLv3+: GNU GPL version 3 or any later version");
        puts("This is free software: you are free to change and redistribute it.");
        puts("There is NO WARRANTY, to the extent permitted by law.");
@@ -125,6 +131,23 @@ static Widget early_setup(XtAppContext *app, int argc, char **argv)
        return shell;
 }
 
+static void timer_tick(void *data, XtIntervalId *id)
+{
+       struct app_state *state = data;
+       XtAppContext app;
+
+       if (state->board.x > 4) {
+               /* Game is over */
+               state->timer_tick = 0;
+               return;
+       }
+
+       app = XtWidgetToApplicationContext(state->game);
+       ui_timer_update(state, game_elapsed(&state->board));
+       state->timer_tick = XtAppAddTimeOut(app, TIMER_UPDATE_MS,
+                                           timer_tick, state);
+}
+
 static void do_input_move(struct app_state *state, int x, int y)
 {
        uint_fast32_t mask;
@@ -134,15 +157,13 @@ static void do_input_move(struct app_state *state, int x, int y)
                        int_fast32_t ms = game_finish(&state->board);
                        unsigned min, sec;
 
-                       /* Negative time just means clock jumps and
-                        * display headaches. */
-                       if (ms < 0)
-                               ms = 0;
+                       ui_timer_update(state, ms);
 
                        sec = ms / 1000, ms %= 1000;
                        min = sec / 60, sec %= 60;
-                       printf("You won!  Time was %u:%.2u:%.3u\n",
+                       printf("You won!  Time was %u:%.2u.%.3u\n",
                               min, sec, (unsigned)ms);
+
                        mask |= ~GOAL_MASK;
                }
 
@@ -193,6 +214,16 @@ static void game_input(Widget w, void *data, void *cb_data)
 
 static struct app_state state;
 
+static Widget get_shell(Widget w)
+{
+       Widget shell;
+
+       for (shell = w; !XtIsWMShell(shell);)
+               shell = XtParent(shell);
+
+       return shell;
+}
+
 static void proc_exit(Widget w, XEvent *e, String *argv, Cardinal *argc)
 {
        XtAppSetExitFlag(XtWidgetToApplicationContext(w));
@@ -200,23 +231,29 @@ static void proc_exit(Widget w, XEvent *e, String *argv, Cardinal *argc)
 
 static void proc_new_game(Widget w, XEvent *e, String *argv, Cardinal *argc)
 {
-       Widget shell;
-
-       for (shell = w; !XtIsWMShell(shell);)
-               shell = XtParent(shell);
-
        game_reset(&state.board);
 
-       x11_redraw_goal(&state, -1);
+       x11_redraw_goal(&state, -1, get_shell(w));
        x11_redraw_game(&state, -1);
-       x11_redraw_icon(&state, shell);
+
+       if (!state.timer_tick) {
+               XtAppContext app = XtWidgetToApplicationContext(w);
+               state.timer_tick = XtAppAddTimeOut(app, TIMER_UPDATE_MS,
+                                                  timer_tick, &state);
+       }
 
        game_begin(&state.board);
 }
 
+static void proc_about(Widget w, XEvent *e, String *argv, Cardinal *argc)
+{
+       ui_show_about(&state, get_shell(w));
+}
+
 static const XtActionsRec menu_actions[] = {
        { "gameNew", proc_new_game },
-       { "gameExit", proc_exit }
+       { "gameExit", proc_exit },
+       { "helpAbout", proc_about }
 };
 
 static XtAppContext app_initialize(int argc, char **argv)
@@ -244,13 +281,14 @@ static XtAppContext app_initialize(int argc, char **argv)
        state.use_ewmh_icons = ewmh_probe_wm_icon(shell);
        XtRealizeWidget(shell);
 
-       x11_redraw_icon(&state, shell);
+       x11_redraw_goal(&state, 0, shell);
 
        return app;
 }
 
 int main(int argc, char **argv)
 {
+       setlocale(LC_ALL, "");
        XtAppMainLoop(app_initialize(argc, argv));
        return 0;
 }