Track elapsed time of the game.

[rrace.git] / src / motif.c

diff --git a/src/motif.c b/src/motif.c
index 2d4fe94d0b1f1e5e8683cf803725c156c7daf531..12959f7664e3a6e02199816a323f3ed16927f1a2 100644 (file)
--- a/src/motif.c
+++ b/src/motif.c
@@ -40,7 +40,6 @@ static char * const default_resources[] = {
        "*game.XmFrame.shadowThickness: 3",
        "*game.XmFrame.shadowType: shadow_in",
        "*goalArea.leftOffset: 1",
-       "*gameCanvas.background: #202020",
 
        "*gameNew.accelerator: Ctrl<Key>N",
        "*gameNew.acceleratorText: Ctrl+N",
@@ -68,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);
@@ -75,8 +75,6 @@ static void print_help(void)
        putchar('\n');
        puts("Options:");
        for (opt = lopts; opt->name; opt++) {
-               struct lopt_help help;
-
                if (!lopt_get_help(opt, &help))
                        continue;
                help_print_option(opt, help.arg, help.desc, 20);
@@ -104,7 +102,7 @@ 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);
 
@@ -142,9 +140,12 @@ static void proc_new_game(Widget w, XEvent *e, String *argv, Cardinal *argc)
                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[] = {
@@ -156,6 +157,7 @@ static XtAppContext app_initialize(int argc, char **argv)
 {
        XtAppContext app;
        Widget shell;
+       int i;
 
        if (argc > 0)
                progname = argv[0];
@@ -164,7 +166,13 @@ static XtAppContext app_initialize(int argc, char **argv)
        XtAppAddActions(app, (void *)menu_actions, XtNumber(menu_actions));
        ui_initialize(&state, 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);