X-Git-Url: http://git.draconx.ca/gitweb/rrace.git/blobdiff_plain/366b1a5719699e7b6daf2c4ebafbebab78cb5128..ceb2df0fe41852ba3f5637dcd04217113b4259ba:/src/motif_ui.c diff --git a/src/motif_ui.c b/src/motif_ui.c index 40f4632..5941834 100644 --- a/src/motif_ui.c +++ b/src/motif_ui.c @@ -22,15 +22,9 @@ #include #include "motif.h" -#include "motifstr.h" #include "motifgui.h" - -#define SPLIT_NUMERATOR 75 -#define SPLIT_DENOMINATOR 100 - -#define MIN(a, b) ((a) < (b) ? (a) : (b)) - -static void game_configure(Widget w); +#include "xcounter.h" +#include "version.h" /* XXX generate this list? */ enum { @@ -43,7 +37,11 @@ enum { widgetMax, /* Pseudo-widgets */ - widgetMenuBar = widgetMax + widgetMenuBar = widgetMax, + widgetMessageDialog, + widgetScrolledText, + + widgetUnmanaged = 128 }; static WidgetClass * const widgets[widgetMax] = { @@ -66,78 +64,89 @@ static const struct ui_menuitem { uint_least16_t label; } mainmenu[] = { MAINMENU_INITIALIZER }; -static void -ResizeGameArea(Widget form, XEvent *e, String *args, Cardinal *num_args) +static char *timer_text(int_fast32_t ms, char *buf) { - Widget game = XtNameToWidget(form, &tree_strtab[gameArea]); - Widget goal = XtNameToWidget(form, &tree_strtab[goalArea]); - Dimension w, h, gamesz, gameborder, goalsz, goalborder; - int x, y, gap; - - XtVaGetValues(form, XmNwidth, &w, XmNheight, &h, (char *)NULL); - XtVaGetValues(game, XmNshadowThickness, &gameborder, (char *)NULL); - XtVaGetValues(goal, XmNshadowThickness, &goalborder, - XmNleftOffset, &gap, - (char *)NULL); + unsigned min, sec; - gamesz = MIN(h, w * SPLIT_NUMERATOR / SPLIT_DENOMINATOR); - gamesz = 5*( (gamesz - 2*gameborder)/5 ) + 2*gameborder; + sec = ms / 1000, ms %= 1000; + min = sec / 60, sec %= 60; + sprintf(buf, "Time: %u:%.2u.%.3u", min, sec, (unsigned)ms); - goalsz = MIN(gamesz*3/5, w - gamesz - gap); - goalsz = 3*( (goalsz - 2*goalborder)/3 ) + 2*goalborder; + return buf; +} - x = (w - gamesz - goalsz - gap) / 2; - if (x < 2) x = 0; +void ui_timer_update(struct app_state *state, int_fast32_t ms) +{ + char buf[100]; - y = (h - gamesz) / 2; - if (y < 3) y = 0; + if (ms < 0) { + xcounter_update(state->timer, "\n"); + return; + } - XtVaSetValues(game, XmNleftOffset, x, XmNtopOffset, y, (char *)NULL); - XtVaSetValues(game, XmNwidth, gamesz, XmNheight, gamesz, (char *)NULL); - XtVaSetValues(goal, XmNwidth, goalsz, XmNheight, goalsz, (char *)NULL); + xcounter_update(state->timer, timer_text(ms, buf)); } -static void game_configure(Widget form) +static void configure_mainwin(struct app_state *state, Widget form) { Widget gamearea = XtNameToWidget(form, &tree_strtab[gameArea]); Widget goalarea = XtNameToWidget(form, &tree_strtab[goalArea]); + Widget timer = XtNameToWidget(form, &tree_strtab[timeDisplay]); XtActionsRec resize_rec; + char xc_template[100]; - assert(gamearea && goalarea); - XtVaSetValues(form, XmNfractionBase, SPLIT_DENOMINATOR, (char *)NULL); + assert(gamearea && goalarea && timer); + state->game = XtNameToWidget(gamearea, &tree_strtab[gameCanvas]); XtVaSetValues(gamearea, XmNleftAttachment, XmATTACH_FORM, XmNtopAttachment, XmATTACH_FORM, (char *)NULL); + state->goal = XtNameToWidget(goalarea, &tree_strtab[goalCanvas]); XtVaSetValues(goalarea, XmNleftAttachment, XmATTACH_WIDGET, XmNleftWidget, gamearea, XmNtopAttachment, XmATTACH_OPPOSITE_WIDGET, XmNtopWidget, gamearea, (char *)NULL); - resize_rec.string = "ResizeGameArea"; - resize_rec.proc = ResizeGameArea; - XtAppAddActions(XtWidgetToApplicationContext(form), &resize_rec, 1); + XtVaSetValues(timer, XmNleftAttachment, XmATTACH_WIDGET, + XmNleftWidget, gamearea, + XmNtopAttachment, XmATTACH_WIDGET, + XmNtopWidget, goalarea, + XmNrightAttachment, XmATTACH_FORM, + (char *)NULL); + state->timer = xcounter_simple_init(timer, timer_text(0, xc_template)); + ui_timer_update(state, -1); + XtOverrideTranslations(form, XtParseTranslationTable( ": ResizeGameArea()\n" ": ResizeGameArea()\n" )); + + /* + * Performing the initial update of the layout seems to avoid + * some weird initial sizing problems on Motif 2.1 + */ + XtCallActionProc(form, "ResizeGameArea", 0, 0, 0); } 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; + unsigned type = item->widget_type & widgetUnmanaged-1; - if (item->widget_type == widgetMenuBar) + switch (type) { + case widgetMenuBar: return XmCreateMenuBar(parent, name, args, num_args); + case widgetMessageDialog: + return XmCreateMessageDialog(parent, name, args, num_args); + case widgetScrolledText: + return XmCreateScrolledText(parent, name, args, num_args); + } - assert(item->widget_type < widgetMax); - class = *widgets[item->widget_type]; - return XtCreateWidget(name, class, parent, args, num_args); + assert(type < widgetMax); + return XtCreateWidget(name, *widgets[type], parent, args, num_args); } static void @@ -151,7 +160,8 @@ construct_widgets(const struct ui_widget *root, Widget parent, unsigned i) if (item->subtree) construct_widgets(root, w, item->subtree); - XtManageChild(w); + if (!(item->widget_type & widgetUnmanaged)) + XtManageChild(w); } } @@ -206,41 +216,49 @@ construct_menu(const struct ui_menuitem *root, Widget parent, unsigned i) } } -static void game_resize(Widget w, void *data, void *cb_data) +/* Figure out which tiles intersect a rectangle. */ +static uint_fast32_t x11_expose_mask(XExposeEvent *e, int tile_sz) { - if (XtIsRealized(w)) - x11_redraw_game(data); + return board_rect( e->x/tile_sz, + e->y/tile_sz, + (e->x+e->width-1)/tile_sz, + (e->y+e->height-1)/tile_sz ); } -static void goal_resize(Widget w, void *data, void *cb_data) +static void resize(Widget w, void *data, void *cb_data) { - if (XtIsRealized(w)) - x11_redraw_goal(data); + struct app_state *state = data; + + x11_queue_render(data, -1, 1 << (w == state->game)); } -static void game_input(Widget w, void *data, void *cb_data) +static void expose(Widget w, void *data, void *cb_data) { XmDrawingAreaCallbackStruct *cbs = cb_data; - XButtonEvent *click = &cbs->event->xbutton; + XExposeEvent *e = &cbs->event->xexpose; struct app_state *state = data; - Dimension width, height; - unsigned x = -1, y = -1; - - switch (cbs->event->type) { - case ButtonPress: - XtVaGetValues(w, XmNwidth, &width, - XmNheight, &height, - (char *)NULL); - x = click->x / (width/5); - y = click->y / (width/5); + uint_fast32_t mask; + Dimension tile_sz; + + if (w == state->game) { + uint_least32_t *gp = state->board.game; + + /* + * Only draw exposed nonempty tiles; exposed areas are filled + * with the background automatically and thus exposed empty + * spaces don't need to be drawn again. + */ + tile_sz = state->game_tile_sz; + mask = gp[0] | gp[1] | gp[2]; + } else { + /* Goal area never has empty tiles. */ + tile_sz = state->goal_tile_sz; + mask = -1; } - if (x > 4 || y > 4) - return; - - if (game_do_move(&state->board, x, y) == 0) { - x11_redraw_game(state); - } + if (tile_sz) + mask &= x11_expose_mask(e, tile_sz); + x11_queue_render(state, mask, 1<<(w == state->game)); } void ui_initialize(struct app_state *state, Widget shell) @@ -255,14 +273,80 @@ void ui_initialize(struct app_state *state, Widget shell) help = XtNameToWidget(menubar, "helpMenu"); XtVaSetValues(menubar, XmNmenuHelpWidget, help, (char *)NULL); - game_configure(XtNameToWidget(shell, "*game")); + configure_mainwin(state, XtNameToWidget(shell, "*game")); + + XtVaGetValues(state->game, XmNwidth, &state->game_sz[0], + XmNheight, &state->game_sz[1], + (char *)NULL); + XtAddCallback(state->game, XmNresizeCallback, resize, state); + XtAddCallback(state->game, XmNexposeCallback, expose, state); - 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); + XtVaGetValues(state->game, XmNwidth, &state->goal_sz[0], + XmNheight, &state->goal_sz[1], + (char *)NULL); + XtAddCallback(state->goal, XmNresizeCallback, resize, state); + XtAddCallback(state->goal, XmNexposeCallback, expose, state); +} - state->goal = XtNameToWidget(shell, "*goalCanvas"); - XtAddCallback(state->goal, XmNresizeCallback, goal_resize, state); - XtAddCallback(state->goal, XmNexposeCallback, goal_resize, state); +static void dialog_close(Widget w, void *data, void *cb_data) +{ + XtDestroyWidget(w); +} + +/* + * Expands to an XtVaSetValues argument list to set the given resource with + * a typed string value, which is internally converted to the appropriate + * resource type. + * + * Note that str is expanded twice and thus should not have side effects. + */ +#define STRING_ARG(resource, str) \ + XtVaTypedArg, (resource), XtRString, (str), strlen((str))+1 + +void ui_show_about(struct app_state *state, Widget shell) +{ + static const struct ui_widget dialog[] = { ABOUTDIALOG_INITIALIZER }; + Widget w, l; + char *msg; + + construct_widgets(dialog, shell, 0); + + w = XtNameToWidget(shell, "*aboutDialog"); + XtUnmanageChild(XmMessageBoxGetChild(w, XmDIALOG_CANCEL_BUTTON)); + + XtAddCallback(w, XmNunmapCallback, dialog_close, NULL); + + XtVaSetValues(w, STRING_ARG(XmNokLabelString, "Close"), (char *)NULL); + + msg = version_format_head("rrace-motif"); + l = XmMessageBoxGetChild(w, XmDIALOG_MESSAGE_LABEL); + XtVaSetValues(l, XmNlabelType, XmSTRING, +#if HAVE_MOTIF_PIXMAP_AND_STRING + XmNlabelType, XmPIXMAP_AND_STRING, +#endif + XmNlabelPixmap, state->icon_pixmap, + STRING_ARG(XmNlabelString, msg), + (char *)NULL); + free(msg); + + l = XtNameToWidget(w, "*licenseBlurb"); + XmTextSetString(l, +"This program is free software: you can redistribute it and/or modify\n" +"it under the terms of the GNU General Public License as published by\n" +"the Free Software Foundation, either version 3 of the License, or\n" +"(at your option) any later version.\n\n" +"This program is distributed in the hope that it will be useful,\n" +"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" +"GNU General Public License for more details.\n\n" +"You should have received a copy of the GNU General Public License\n" +"along with this program. If not, see ."); + + XtVaSetValues(l, XmNeditMode, XmMULTI_LINE_EDIT, + XmNeditable, FALSE, + XmNresizeWidth, TRUE, + XmNrows, 5, + (char *)NULL); + + XtManageChild(w); }