Clean up redundant/unused declarations.

[rrace.git] / src / motif_ui.c

diff --git a/src/motif_ui.c b/src/motif_ui.c
index fbef33b73334fad576410ed2911f3fff56871948..adbb3e501c3909ae162a7588525b26c8fa656459 100644 (file)
--- a/src/motif_ui.c
+++ b/src/motif_ui.c
@@ -22,6 +22,7 @@
 #include <Xm/XmAll.h>
 
 #include "motif.h"
+#include "motifstr.h"
 #include "motifgui.h"
 
 #define SPLIT_NUMERATOR    75
@@ -29,15 +30,40 @@
 
 #define MIN(a, b) ((a) < (b) ? (a) : (b))
 
-static void game_configure(Widget w);
+/* XXX generate this list? */
+enum {
+       widgetMainWindow,
+       widgetForm,
+       widgetFrame,
+       widgetDrawingArea,
+       widgetCascadeButton,
+       widgetPushButton,
+       widgetMax,
+
+       /* Pseudo-widgets */
+       widgetMenuBar = widgetMax
+};
+
+static WidgetClass * const widgets[widgetMax] = {
+       &xmMainWindowWidgetClass,
+       &xmFormWidgetClass,
+       &xmFrameWidgetClass,
+       &xmDrawingAreaWidgetClass,
+       &xmCascadeButtonWidgetClass,
+       &xmPushButtonWidgetClass
+};
 
 static const struct ui_widget {
        uint_least16_t name;
-       uint_least16_t subtree;
-       WidgetClass *class;
-       void (*configure)(Widget w);
+       uint_least8_t subtree;
+       uint_least8_t widget_type;
 } mainwin[] = { MAINWIN_INITIALIZER };
 
+static const struct ui_menuitem {
+       struct ui_widget w;
+       uint_least16_t label;
+} mainmenu[] = { MAINMENU_INITIALIZER };
+
 static void
 ResizeGameArea(Widget form, XEvent *e, String *args, Cardinal *num_args)
 {
@@ -78,9 +104,7 @@ static void game_configure(Widget form)
        assert(gamearea && goalarea);
        XtVaSetValues(form, XmNfractionBase, SPLIT_DENOMINATOR, (char *)NULL);
 
-       XtVaSetValues(gamearea, //XmNrightAttachment, XmATTACH_POSITION,
-                               //XmNrightPosition, SPLIT_NUMERATOR,
-                               XmNleftAttachment, XmATTACH_FORM,
+       XtVaSetValues(gamearea, XmNleftAttachment, XmATTACH_FORM,
                                XmNtopAttachment, XmATTACH_FORM,
                                (char *)NULL);
 
@@ -99,24 +123,82 @@ static void game_configure(Widget form)
        ));
 }
 
+static Widget create_widget(const struct ui_widget *item, Widget parent,
+                            ArgList args, Cardinal num_args)
+{
+       String name = (void *)&tree_strtab[item->name];
+       WidgetClass class;
+
+       if (item->widget_type == widgetMenuBar)
+               return XmCreateMenuBar(parent, name, args, num_args);
+
+       assert(item->widget_type < widgetMax);
+       class = *widgets[item->widget_type];
+       return XtCreateWidget(name, class, parent, args, num_args);
+}
+
 static void
 construct_widgets(const struct ui_widget *root, Widget parent, unsigned i)
 {
        const struct ui_widget *item;
 
        for (item = &root[i]; item->name; item++) {
-               Widget w;
+               Widget w = create_widget(item, parent, NULL, 0);
 
-               w = XtCreateWidget(&tree_strtab[item->name], *item->class,
-                                  parent, NULL, 0);
-               if (item->subtree) {
+               if (item->subtree)
                        construct_widgets(root, w, item->subtree);
-               }
 
-               if (item->configure) {
-                       item->configure(w);
+               XtManageChild(w);
+       }
+}
+
+static void menu_cb(Widget w, void *data, void *cb_data)
+{
+       XmRowColumnCallbackStruct *cbs = cb_data;
+       XtCallActionProc(cbs->widget, XtName(cbs->widget), cbs->event, NULL, 0);
+}
+
+static Widget create_pulldown(Widget parent)
+{
+       Widget w;
+
+       w = XmCreatePulldownMenu(parent, XtName(parent), NULL, 0);
+       XtVaSetValues(parent, XmNsubMenuId, w, (char *)NULL);
+       XtAddCallback(w, XmNentryCallback, menu_cb, NULL);
+
+       return w;
+}
+
+static void
+construct_menu(const struct ui_menuitem *root, Widget parent, unsigned i)
+{
+       const struct ui_menuitem *item;
+
+       for (item = &root[i]; item->w.name; item++) {
+               const char *label = &strtab[item->label];
+               unsigned n = 0;
+               Arg args[2];
+               XmString s;
+               Widget w;
+
+               if (XtClass(parent) == *widgets[widgetCascadeButton])
+                       parent = create_pulldown(parent);
+
+               if (label[0] && label[1] == '|') {
+                       XtSetArg(args[n], XmNmnemonic, label[0]); n++;
+                       label += 2;
                }
 
+               s = XmStringCreateLocalized((void *)label);
+               XtSetArg(args[n], XmNlabelString, s); n++;
+
+               w = create_widget(&item->w, parent, args, n);
+
+               XmStringFree(s);
+
+               if (item->w.subtree)
+                       construct_menu(root, w, item->w.subtree);
+
                XtManageChild(w);
        }
 }
@@ -154,21 +236,35 @@ static void game_input(Widget w, void *data, void *cb_data)
                return;
 
        if (game_do_move(&state->board, x, y) == 0) {
+               if (game_check_goal(&state->board)) {
+                       printf("You win!\n");
+                       game_finish(&state->board);
+               }
+
                x11_redraw_game(state);
        }
 }
 
 void ui_initialize(struct app_state *state, Widget shell)
 {
+       Widget menubar, help;
+
        construct_widgets(mainwin, shell, 0);
 
-       state->game = XtNameToWidget(shell, "*gameCanvas");
-       state->goal = XtNameToWidget(shell, "*goalCanvas");
+       menubar = XtNameToWidget(shell, "*menuBar");
+       construct_menu(mainmenu, menubar, 0);
 
+       help = XtNameToWidget(menubar, "helpMenu");
+       XtVaSetValues(menubar, XmNmenuHelpWidget, help, (char *)NULL);
+
+       game_configure(XtNameToWidget(shell, "*game"));
+
+       state->game = XtNameToWidget(shell, "*gameCanvas");
        XtAddCallback(state->game, XmNresizeCallback, game_resize, state);
        XtAddCallback(state->game, XmNexposeCallback, game_resize, state);
        XtAddCallback(state->game, XmNinputCallback,  game_input,  state);
 
+       state->goal = XtNameToWidget(shell, "*goalCanvas");
        XtAddCallback(state->goal, XmNresizeCallback, goal_resize, state);
        XtAddCallback(state->goal, XmNexposeCallback, goal_resize, state);
 }