EXTRA_LIBRARIES += libmotifmain.a
libmotifmain_a_SOURCES = src/motif.c
-$(libmotifmain_a_OBJECTS): src/options.h
+$(libmotifmain_a_OBJECTS): src/motifopt.h
EXTRA_LIBRARIES += libmotifui.a
libmotifui_a_SOURCES = src/motif_ui.c
-$(libmotifui_a_OBJECTS): src/motifgui.h
+$(libmotifui_a_OBJECTS): src/motifgui.h src/motifstr.h
EXTRA_LIBRARIES += libglohelp.a
libglohelp_a_SOURCES = common/src/help.c
libglohelp_a_CFLAGS = -DHELP_GETOPT_LONG_ONLY
libglohelp_a_SHORTNAME = glo
-OPTFILES = src/options.opt
+OPTFILES = src/motifopt.opt
.opt.h:
$(AM_V_GEN) $(AWK) -f $(DX_BASEDIR)/scripts/gen-options.awk $< >$@.tmp
$(AM_V_at) mv -f $@.tmp $@
DISTCLEANFILES += $(OPTFILES:.opt=.h)
EXTRA_DIST += $(DX_BASEDIR)/scripts/gen-options.awk $(OPTFILES)
+STRFILES = src/motifstr.str
+.str.h:
+ $(AM_V_GEN) $(AWK) -f $(DX_BASEDIR)/scripts/gen-strtab.awk $< >$@.tmp
+ $(AM_V_at) mv -f $@.tmp $@
+$(STRFILES:.str=.h): $(DX_BASEDIR)/scripts/gen-strtab.awk
+DISTCLEANFILES += $(STRFILES:.str=.h)
+EXTRA_DIST += $(DX_BASEDIR)/scripts/gen-strtab.awk $(GUIFILES)
+
GUIFILES = src/motifgui.dat
.dat.h:
$(AM_V_GEN) $(AWK) -f $(DX_BASEDIR)/scripts/gen-tree.awk $< >$@.tmp
#include "help.h"
#include "motif.h"
-#include "options.h"
+#include "motifopt.h"
#include "game.h"
#define PROGNAME "rrace"
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: #202020",
+ "*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
};
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;
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);
#include <Xm/XmAll.h>
#include "motif.h"
+#include "motifstr.h"
#include "motifgui.h"
#define SPLIT_NUMERATOR 75
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)
{
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);
));
}
+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;
+ Widget w;
+
+ 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);
}
}
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);
}
MAINWIN
- main, main_OFFSET, &xmMainWindowWidgetClass
- game, game_OFFSET, &xmFormWidgetClass, game_configure
- gameArea, gameArea_OFFSET, &xmFrameWidgetClass
- gameCanvas, 0, &xmDrawingAreaWidgetClass
- goalArea, goalArea_OFFSET, &xmFrameWidgetClass
- goalCanvas, 0, &xmDrawingAreaWidgetClass
+ main, main_OFFSET, widgetMainWindow
+ menuBar, 0, widgetMenuBar
+ game, game_OFFSET, widgetForm
+ gameArea, gameArea_OFFSET, widgetFrame
+ gameCanvas, 0, widgetDrawingArea
+ goalArea, goalArea_OFFSET, widgetFrame
+ goalCanvas, 0, widgetDrawingArea
+
+MAINMENU
+ gameMenu, gameMenu_OFFSET, widgetCascadeButton, gameMenuLabel
+ gameNew, 0, widgetPushButton, gameNewLabel
+ gameExit, 0, widgetPushButton, gameExitLabel
+ helpMenu, helpMenu_OFFSET, widgetCascadeButton, helpMenuLabel
+ helpAbout, 0, widgetPushButton, helpAboutLabel
projects / rrace.git / commitdiff