X-Git-Url: http://git.draconx.ca/gitweb/rrace.git/blobdiff_plain/4ba1a1949117408cf81132b4f168a4e7f0a79ac3..31d8eda9987703c64fc63f4ddb4088cf3be5b7cc:/src/motif_ui.c diff --git a/src/motif_ui.c b/src/motif_ui.c index a49dfec..718375c 100644 --- a/src/motif_ui.c +++ b/src/motif_ui.c @@ -22,9 +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 @@ -42,7 +42,11 @@ enum { widgetMax, /* Pseudo-widgets */ - widgetMenuBar = widgetMax + widgetMenuBar = widgetMax, + widgetMessageDialog, + widgetScrolledText, + + widgetUnmanaged = 128 }; static WidgetClass * const widgets[widgetMax] = { @@ -171,14 +175,19 @@ 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 @@ -192,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); } } @@ -258,61 +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); } -/* - * Calculate which tiles need to be redrawn after resizing. This is the - * tiles which (at the new size) are fully contained in the previous area. - * - * When shrinking, this is all tiles, but when enlarging, the generated - * expose events will trigger drawing of the new area. - */ -static uint_fast32_t resize_helper(Widget w, Dimension *oldsz, int gridsz) -{ - Dimension new_w, new_h, common_w, common_h; - - if (!XtIsRealized(w)) - return 0; - - XtVaGetValues(w, XmNwidth, &new_w, XmNheight, &new_h, (char *)NULL); - common_w = MIN(new_w, oldsz[0]); - common_h = MIN(new_h, oldsz[1]); - oldsz[0] = new_w; - oldsz[1] = new_h; - new_w /= gridsz; - new_h /= gridsz; - - /* Round down to multiple of tile dimensions */ - common_w = common_w / new_w * new_w; - common_h = common_h / new_h * new_h; - - if (new_w > 0 && new_h > 0) - return expose_mask(0, 0, common_w, common_h, new_w, new_h); - return 0; -} - static void game_resize(Widget w, void *data, void *cb_data) { - struct app_state *state = data; - uint_fast32_t mask; - - mask = resize_helper(w, state->game_sz, 5); - if (mask) - x11_redraw_game(data, mask); + x11_queue_render(data, -1, 0); } static void goal_resize(Widget w, void *data, void *cb_data) { - struct app_state *state = data; - uint_fast32_t mask; - - mask = resize_helper(w, state->goal_sz, 3); - if (mask) - x11_redraw_goal(data, mask); + 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; @@ -320,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) @@ -336,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) @@ -365,3 +342,66 @@ void ui_initialize(struct app_state *state, Widget shell) 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); +}