}
/* 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)
+static uint_fast32_t x11_expose_mask(XExposeEvent *e, 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;
+ return board_rect( e->x/tile_w,
+ e->y/tile_h,
+ (e->x+e->width-1)/tile_w,
+ (e->y+e->height-1)/tile_h );
}
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)
+static void 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;
-
- 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_redraw_game(state, 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);
+ Dimension tile_w, tile_h;
+
+ XtVaGetValues(w, XmNwidth, &tile_w, XmNheight, &tile_h, (char *)NULL);
+ if (w == state->game) {
+ uint_least32_t *gp = state->board.game;
+ uint_fast32_t mask;
+
+ if (!(tile_w /= 5) || !(tile_h /= 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 &= x11_expose_mask(e, tile_w, tile_h);
+
+ x11_queue_render(state, mask, 0);
+ } else {
+ if (!(tile_w /= 3) || !(tile_h /= 3))
+ return;
+
+ x11_queue_render(state, 0, x11_expose_mask(e, tile_w, tile_h));
+ }
}
void ui_initialize(struct app_state *state, Widget shell)
XmNheight, &state->game_sz[1],
(char *)NULL);
XtAddCallback(state->game, XmNresizeCallback, game_resize, state);
- XtAddCallback(state->game, XmNexposeCallback, game_expose, 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, XmNexposeCallback, expose, state);
}
static void dialog_close(Widget w, void *data, void *cb_data)