#include "xcounter.h"
#include "version.h"
-#define SPLIT_NUMERATOR 75
-#define SPLIT_DENOMINATOR 100
-
-#define MIN(a, b) ((a) < (b) ? (a) : (b))
-
/* XXX generate this list? */
enum {
widgetMainWindow,
uint_least16_t label;
} mainmenu[] = { MAINMENU_INITIALIZER };
-static void
-ResizeGameArea(Widget form, XEvent *e, String *args, Cardinal *num_args)
-{
- 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);
-
- gamesz = MIN(h, w * SPLIT_NUMERATOR / SPLIT_DENOMINATOR);
- gamesz = 5*( (gamesz - 2*gameborder)/5 ) + 2*gameborder;
-
- goalsz = MIN(gamesz*3/5, w - gamesz - gap);
- goalsz = 3*( (goalsz - 2*goalborder)/3 ) + 2*goalborder;
-
- x = (w - gamesz - goalsz - gap) / 2;
- if (x < 2) x = 0;
-
- y = (h - gamesz) / 2;
- if (y < 3) y = 0;
-
- XtVaSetValues(game, XmNleftOffset, x, XmNtopOffset, y, (char *)NULL);
- XtVaSetValues(game, XmNwidth, gamesz, XmNheight, gamesz, (char *)NULL);
- XtVaSetValues(goal, XmNwidth, goalsz, XmNheight, goalsz, (char *)NULL);
-}
-
static char *timer_text(int_fast32_t ms, char *buf)
{
unsigned min, sec;
char buf[100];
if (ms < 0) {
- xcounter_simple_update(state->timer, "\n");
+ xcounter_update(state->timer, "\n");
return;
}
- xcounter_simple_update(state->timer, timer_text(ms, buf));
+ xcounter_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]);
+ 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,
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));
+ 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);
- resize_rec.string = "ResizeGameArea";
- resize_rec.proc = ResizeGameArea;
- XtAppAddActions(XtWidgetToApplicationContext(form), &resize_rec, 1);
XtOverrideTranslations(form, XtParseTranslationTable(
"<Configure>: ResizeGameArea()\n"
"<Map>: ResizeGameArea()\n"
/*
* Performing the initial update of the layout seems to avoid
- * some weird problems on Motif 2.1
+ * some weird initial sizing problems on Motif 2.1
*/
- ResizeGameArea(form, 0, 0, 0);
+ XtCallActionProc(form, "ResizeGameArea", 0, 0, 0);
}
static Widget create_widget(const struct ui_widget *item, Widget parent,
}
/* 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);
-}
-
-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)
+static uint_fast32_t x11_expose_mask(XExposeEvent *e, int tile_sz)
{
- x11_queue_render(data, 0, -1);
+ 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 game_expose(Widget w, void *data, void *cb_data)
+static void resize(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;
- XtVaGetValues(w, XmNwidth, &width, XmNheight, &height, (char *)NULL);
- if (!(width /= 5) || !(height /= 5))
- return;
-
- /*
- * 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);
+ x11_queue_render(data, -1, 1 << (w == state->game));
}
-static void goal_expose(Widget w, void *data, void *cb_data)
+static void expose(Widget w, void *data, void *cb_data)
{
XmDrawingAreaCallbackStruct *cbs = cb_data;
XExposeEvent *e = &cbs->event->xexpose;
- Dimension width, height;
+ struct app_state *state = data;
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;
+ }
- XtVaGetValues(w, XmNwidth, &width, XmNheight, &height, (char *)NULL);
- if (!(width /= 3) || !(height /= 3))
- return;
-
- mask = expose_mask(e->x, e->y, e->width, e->height, width, height);
- x11_queue_render(data, 0, mask);
+ 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)
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, XmNresizeCallback, resize, state);
+ XtAddCallback(state->game, XmNexposeCallback, 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);
+ XtAddCallback(state->goal, XmNresizeCallback, resize, state);
+ XtAddCallback(state->goal, XmNexposeCallback, expose, state);
}
static void dialog_close(Widget w, void *data, void *cb_data)
projects / rrace.git / blobdiff