X-Git-Url: http://git.draconx.ca/gitweb/rrace.git/blobdiff_plain/48cf657b615567153e5ed786b6034f9b46733f9a..4ba1a1949117408cf81132b4f168a4e7f0a79ac3:/src/motif_ui.c?ds=sidebyside diff --git a/src/motif_ui.c b/src/motif_ui.c index 85241d8..a49dfec 100644 --- a/src/motif_ui.c +++ b/src/motif_ui.c @@ -24,6 +24,7 @@ #include "motif.h" #include "motifstr.h" #include "motifgui.h" +#include "xcounter.h" #define SPLIT_NUMERATOR 75 #define SPLIT_DENOMINATOR 100 @@ -95,25 +96,62 @@ ResizeGameArea(Widget form, XEvent *e, String *args, Cardinal *num_args) XtVaSetValues(goal, XmNwidth, goalsz, XmNheight, goalsz, (char *)NULL); } -static void game_configure(Widget form) +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); + 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); + 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); @@ -121,6 +159,12 @@ static void game_configure(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, @@ -203,93 +247,66 @@ 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 +expose_mask(int rect_x, int rect_y, int rect_w, int rect_h, + int tile_w, int tile_h) { - if (XtIsRealized(w)) - x11_redraw_game(data, -1); + return board_right(rect_x / tile_w) + & board_below(rect_y / tile_h) + & board_above((rect_y + rect_h - 1) / tile_h) + & board_left((rect_x + rect_w - 1) / tile_w); } -static void goal_resize(Widget w, void *data, void *cb_data) +/* + * 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) { - if (XtIsRealized(w)) - x11_redraw_goal(data, -1); + 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 do_input_move(struct app_state *state, int x, int y) +static void game_resize(Widget w, void *data, void *cb_data) { + struct app_state *state = data; uint_fast32_t mask; - if ((mask = game_do_move(&state->board, x, y)) != 0) { - if (game_check_goal(&state->board) == 0) { - int_fast32_t ms = game_finish(&state->board); - unsigned min, sec; - - /* Negative time just means clock jumps and - * display headaches. */ - if (ms < 0) - ms = 0; - - sec = ms / 1000, ms %= 1000; - min = sec / 60, sec %= 60; - printf("You won! Time was %u:%.2u:%.3u\n", - min, sec, (unsigned)ms); - mask |= ~GOAL_MASK; - } - - x11_redraw_game(state, mask); - } -} - -static void set_view_goal(struct app_state *state, int view_goal) -{ - state->view_goal_on_game = view_goal; - x11_redraw_game(state, game_check_goal(&state->board)); + mask = resize_helper(w, state->game_sz, 5); + if (mask) + x11_redraw_game(data, mask); } -static void game_input(Widget w, void *data, void *cb_data) +static void goal_resize(Widget w, void *data, void *cb_data) { - XmDrawingAreaCallbackStruct *cbs = cb_data; - XButtonEvent *b = &cbs->event->xbutton; struct app_state *state = data; - Dimension width, height; - - switch (cbs->event->type) { - case ButtonPress: - switch (b->button) { - case Button1: - if (b->state & Button3Mask) - break; - - XtVaGetValues(w, XmNwidth, &width, - XmNheight, &height, - (char *)NULL); - - do_input_move(state, b->x / (width / 5), - b->y / (height / 5)); - break; - case Button3: - set_view_goal(state, 1); - break; - } - break; - case ButtonRelease: - switch (b->button) { - case Button3: - set_view_goal(state, 0); - break; - } - } -} + uint_fast32_t mask; -/* 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, - int tile_w, int tile_h) -{ - return board_right(rect_x / tile_w) - & board_below(rect_y / tile_h) - & board_above((rect_y + rect_h - 1) / tile_h) - & board_left((rect_x + rect_w - 1) / tile_w); + mask = resize_helper(w, state->goal_sz, 3); + if (mask) + x11_redraw_goal(data, mask); } static void game_expose(Widget w, void *data, void *cb_data) @@ -334,14 +351,17 @@ 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")); - state->game = XtNameToWidget(shell, "*gameCanvas"); + 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); - XtAddCallback(state->game, XmNinputCallback, game_input, state); - state->goal = XtNameToWidget(shell, "*goalCanvas"); + 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); }