Track elapsed time of the game.

[rrace.git] / src / motif.c

diff --git a/src/motif.c b/src/motif.c
index 9ae41009a129154d0245f1523512f51813ee95f1..12959f7664e3a6e02199816a323f3ed16927f1a2 100644 (file)
--- a/src/motif.c
+++ b/src/motif.c
@@ -25,7 +25,7 @@
 
 #include "help.h"
 #include "motif.h"
-#include "options.h"
+#include "motifopt.h"
 #include "game.h"
 
 #define PROGNAME "rrace"
@@ -33,13 +33,18 @@ static const char *progname = PROGNAME;
 static const struct option lopts[] = { LOPTS_INITIALIZER, {0} };
 
 static char * const default_resources[] = {
-       PROGNAME "*game.height: 371", // 365 + 2*shadowThickness
-       PROGNAME "*game.width: 498",
+       "*title: RRace",
+       "*game.height: 371", // 365 + 2*shadowThickness
+       "*game.width: 498",
 
-       PROGNAME "*game.XmFrame.shadowThickness: 3",
-       PROGNAME "*game.XmFrame.shadowType: shadow_in",
-       PROGNAME "*goalArea.leftOffset: 1",
-       PROGNAME "*gameCanvas.background: #202020",
+       "*game.XmFrame.shadowThickness: 3",
+       "*game.XmFrame.shadowType: shadow_in",
+       "*goalArea.leftOffset: 1",
+
+       "*gameNew.accelerator: Ctrl<Key>N",
+       "*gameNew.acceleratorText: Ctrl+N",
+       "*gameExit.accelerator: Ctrl<Key>Q",
+       "*gameExit.acceleratorText: Ctrl+Q",
 
        NULL
 };
@@ -62,6 +67,7 @@ static void print_usage(FILE *f)
 
 static void print_help(void)
 {
+       struct lopt_help help = {0};
        const struct option *opt;
 
        print_usage(stdout);
@@ -69,9 +75,6 @@ static void print_help(void)
        putchar('\n');
        puts("Options:");
        for (opt = lopts; opt->name; opt++) {
-               struct lopt_help help;
-               int w;
-
                if (!lopt_get_help(opt, &help))
                        continue;
                help_print_option(opt, help.arg, help.desc, 20);
@@ -99,9 +102,9 @@ static Widget early_setup(XtAppContext *app, int argc, char **argv)
                }
        }
 
-       shell = XtOpenApplication(app, PROGNAME, NULL, 0,
+       shell = XtOpenApplication(app, PACKAGE_TARNAME, NULL, 0,
                                  &argc, argv, (String *)default_resources,
-                                 sessionShellWidgetClass, NULL, 0);
+                                 sessionShellWidgetClass, NULL, 0);
 
        opterr = optind = 1;
        while ((opt = getopt_long_only(argc, argv, "", lopts, NULL)) != -1) {
@@ -122,21 +125,59 @@ static Widget early_setup(XtAppContext *app, int argc, char **argv)
        return shell;
 }
 
+static struct app_state state;
+
+static void proc_exit(Widget w, XEvent *e, String *argv, Cardinal *argc)
+{
+       XtAppSetExitFlag(XtWidgetToApplicationContext(w));
+}
+
+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_game(&state, -1);
+       x11_redraw_icon(&state, shell);
+
+       game_begin(&state.board);
+}
+
+static const XtActionsRec menu_actions[] = {
+       { "gameNew", proc_new_game },
+       { "gameExit", proc_exit }
+};
+
 static XtAppContext app_initialize(int argc, char **argv)
 {
-       static struct app_state state;
        XtAppContext app;
        Widget shell;
+       int i;
 
        if (argc > 0)
                progname = argv[0];
 
        shell = early_setup(&app, argc, argv);
+       XtAppAddActions(app, (void *)menu_actions, XtNumber(menu_actions));
        ui_initialize(&state, shell);
-       x11_initialize(&state, XtScreen(shell));
+       x11_initialize(&state, shell);
+
+       /* Begin with the game in winning state */
        game_reset(&state.board);
+       for (i = 0; i < 3; i++)
+               state.board.game[i] = state.board.goal[i] << GOAL_SHIFT;
+       game_finish(&state.board);
+
+       state.use_ewmh_icons = ewmh_probe_wm_icon(shell);
        XtRealizeWidget(shell);
 
+       x11_redraw_icon(&state, shell);
+
        return app;
 }