#define MIN(a, b) ((a) < (b) ? (a) : (b))
-static void game_configure(Widget w);
-
/* XXX generate this list? */
enum {
widgetMainWindow,
XtVaSetValues(goal, XmNwidth, goalsz, XmNheight, goalsz, (char *)NULL);
}
-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]);
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,
{
String name = (void *)&tree_strtab[item->name];
WidgetClass class;
- Widget w;
if (item->widget_type == widgetMenuBar)
return XmCreateMenuBar(parent, name, args, num_args);
}
}
+/* 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);
+}
+
+/*
+ * 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)
{
- if (XtIsRealized(w))
- x11_redraw_game(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);
}
static void goal_resize(Widget w, void *data, void *cb_data)
{
- if (XtIsRealized(w))
- x11_redraw_goal(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);
}
-static void game_input(Widget w, void *data, void *cb_data)
+static void game_expose(Widget w, void *data, void *cb_data)
{
XmDrawingAreaCallbackStruct *cbs = cb_data;
- XButtonEvent *click = &cbs->event->xbutton;
- struct app_state *state = data;
+ XExposeEvent *e = &cbs->event->xexpose;
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;
- if (x > 4 || y > 4)
+ XtVaGetValues(w, XmNwidth, &width, XmNheight, &height, (char *)NULL);
+ if (!(width /= 5) || !(height /= 5))
return;
- if (game_do_move(&state->board, x, y) == 0) {
- x11_redraw_game(state);
- }
+ mask = expose_mask(e->x, e->y, e->width, e->height, width, height);
+ x11_redraw_game(data, mask);
+}
+
+static void goal_expose(Widget w, void *data, void *cb_data)
+{
+ XmDrawingAreaCallbackStruct *cbs = cb_data;
+ XExposeEvent *e = &cbs->event->xexpose;
+ Dimension width, height;
+ uint_fast32_t mask;
+
+ 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_redraw_goal(data, mask);
}
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_resize, state);
- XtAddCallback(state->game, XmNinputCallback, game_input, state);
+ XtAddCallback(state->game, XmNexposeCallback, game_expose, 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_resize, state);
+ XtAddCallback(state->goal, XmNexposeCallback, goal_expose, state);
}