X-Git-Url: https://git.draconx.ca/gitweb/rrace.git/blobdiff_plain/568ff47f18d09158e4760ff793be9004e4d61a96..31d8eda9987703c64fc63f4ddb4088cf3be5b7cc:/src/motif_ui.c diff --git a/src/motif_ui.c b/src/motif_ui.c index 726e24f..718375c 100644 --- a/src/motif_ui.c +++ b/src/motif_ui.c @@ -22,8 +22,9 @@ #include #include "motif.h" -#include "motifstr.h" #include "motifgui.h" +#include "xcounter.h" +#include "version.h" #define SPLIT_NUMERATOR 75 #define SPLIT_DENOMINATOR 100 @@ -41,7 +42,11 @@ enum { widgetMax, /* Pseudo-widgets */ - widgetMenuBar = widgetMax + widgetMenuBar = widgetMax, + widgetMessageDialog, + widgetScrolledText, + + widgetUnmanaged = 128 }; static WidgetClass * const widgets[widgetMax] = { @@ -95,11 +100,35 @@ ResizeGameArea(Widget form, XEvent *e, String *args, Cardinal *num_args) XtVaSetValues(goal, XmNwidth, goalsz, XmNheight, goalsz, (char *)NULL); } +static char *timer_text(int_fast32_t ms, char *buf) +{ + unsigned min, sec; + + sec = ms / 1000, ms %= 1000; + min = sec / 60, sec %= 60; + sprintf(buf, "Time: %u:%.2u.%.3u", min, sec, (unsigned)ms); + + return buf; +} + +void ui_timer_update(struct app_state *state, int_fast32_t ms) +{ + char buf[100]; + + if (ms < 0) { + xcounter_simple_update(state->timer, "\n"); + return; + } + + xcounter_simple_update(state->timer, timer_text(ms, buf)); +} + static void configure_mainwin(struct app_state *state, Widget form) { Widget gamearea = XtNameToWidget(form, &tree_strtab[gameArea]); Widget goalarea = XtNameToWidget(form, &tree_strtab[goalArea]); XtActionsRec resize_rec; + char xc_template[100]; assert(gamearea && goalarea); XtVaSetValues(form, XmNfractionBase, SPLIT_DENOMINATOR, (char *)NULL); @@ -116,6 +145,17 @@ static void configure_mainwin(struct app_state *state, Widget form) XmNtopWidget, gamearea, (char *)NULL); + state->timer = XtNameToWidget(form, &tree_strtab[timeDisplay]); + XtVaSetValues(state->timer, XmNleftAttachment, XmATTACH_WIDGET, + XmNleftWidget, gamearea, + XmNtopAttachment, XmATTACH_WIDGET, + XmNtopWidget, goalarea, + XmNrightAttachment, XmATTACH_FORM, + (char *)NULL); + + xcounter_simple_setup(state->timer, timer_text(20000, xc_template)); + ui_timer_update(state, -1); + resize_rec.string = "ResizeGameArea"; resize_rec.proc = ResizeGameArea; XtAppAddActions(XtWidgetToApplicationContext(form), &resize_rec, 1); @@ -123,20 +163,31 @@ static void configure_mainwin(struct app_state *state, Widget form) ": ResizeGameArea()\n" ": ResizeGameArea()\n" )); + + /* + * Performing the initial update of the layout seems to avoid + * some weird problems on Motif 2.1 + */ + ResizeGameArea(form, 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; + 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 @@ -150,7 +201,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); } } @@ -205,18 +257,6 @@ construct_menu(const struct ui_menuitem *root, Widget parent, unsigned i) } } -static void game_resize(Widget w, void *data, void *cb_data) -{ - if (XtIsRealized(w)) - x11_redraw_game(data, -1); -} - -static void goal_resize(Widget w, void *data, void *cb_data) -{ - if (XtIsRealized(w)) - x11_redraw_goal(data, -1); -} - /* Figure out which tiles intersect a rectangle. */ static uint_fast32_t expose_mask(int rect_x, int rect_y, int rect_w, int rect_h, @@ -228,10 +268,22 @@ expose_mask(int rect_x, int rect_y, int rect_w, int rect_h, & board_left((rect_x + rect_w - 1) / tile_w); } +static void game_resize(Widget w, void *data, void *cb_data) +{ + x11_queue_render(data, -1, 0); +} + +static void goal_resize(Widget w, void *data, void *cb_data) +{ + x11_queue_render(data, 0, -1); +} + static void game_expose(Widget w, void *data, void *cb_data) { XmDrawingAreaCallbackStruct *cbs = cb_data; XExposeEvent *e = &cbs->event->xexpose; + struct app_state *state = data; + uint_least32_t *gp = state->board.game; Dimension width, height; uint_fast32_t mask; @@ -239,8 +291,14 @@ static void game_expose(Widget w, void *data, void *cb_data) if (!(width /= 5) || !(height /= 5)) return; - mask = expose_mask(e->x, e->y, e->width, e->height, width, height); - x11_redraw_game(data, mask); + /* + * 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. + */ + mask = gp[0] | gp[1] | gp[2]; + mask &= expose_mask(e->x, e->y, e->width, e->height, width, height); + x11_queue_render(state, mask, 0); } static void goal_expose(Widget w, void *data, void *cb_data) @@ -255,7 +313,7 @@ static void goal_expose(Widget w, void *data, void *cb_data) return; mask = expose_mask(e->x, e->y, e->width, e->height, width, height); - x11_redraw_goal(data, mask); + x11_queue_render(data, 0, mask); } void ui_initialize(struct app_state *state, Widget shell) @@ -271,8 +329,79 @@ void ui_initialize(struct app_state *state, Widget shell) XtVaSetValues(menubar, XmNmenuHelpWidget, help, (char *)NULL); 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, game_resize, state); XtAddCallback(state->game, XmNexposeCallback, game_expose, state); + + XtVaGetValues(state->game, XmNwidth, &state->goal_sz[0], + XmNheight, &state->goal_sz[1], + (char *)NULL); XtAddCallback(state->goal, XmNresizeCallback, goal_resize, state); XtAddCallback(state->goal, XmNexposeCallback, goal_expose, 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); +}