Pull in gnulib for its portability features.

[rrace.git] / src / motif.c

diff --git a/src/motif.c b/src/motif.c
index 96d8e086666633428bb0d9c54aba5629c9b6f185..f9366f7f30b4e2ac1ca5539df03cace02c273f12 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",
+       "*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: #404040",
+       "*game.XmFrame.shadowThickness: 3",
+       "*game.XmFrame.shadowType: shadow_in",
+       "*goalArea.leftOffset: 1",
+       "*gameCanvas.background: #202020",
+
+       "*gameNew.accelerator: Ctrl<Key>N",
+       "*gameNew.acceleratorText: Ctrl+N",
+       "*gameExit.accelerator: Ctrl<Key>Q",
+       "*gameExit.acceleratorText: Ctrl+Q",
 
        NULL
 };
@@ -122,9 +127,27 @@ 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)
+{
+       game_reset(&state.board);
+       x11_redraw_goal(&state);
+       x11_redraw_game(&state);
+}
+
+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;
 
@@ -132,6 +155,7 @@ static XtAppContext app_initialize(int argc, char **argv)
                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));
        game_reset(&state.board);