Reduce the amount of redundant drawing in the goal area.

[rrace.git] / src / motif_ui.c

diff --git a/src/motif_ui.c b/src/motif_ui.c
index 279f550ffc80bd1806636e552ed0673adaaab47f..4734d054958cee5a495568fb8a16a2fcb66da4af 100644 (file)
--- a/src/motif_ui.c
+++ b/src/motif_ui.c
@@ -30,8 +30,6 @@
 
 #define MIN(a, b) ((a) < (b) ? (a) : (b))
 
-static void game_configure(Widget w);
-
 /* XXX generate this list? */
 enum {
        widgetMainWindow,
@@ -130,7 +128,6 @@ static Widget create_widget(const struct ui_widget *item, Widget parent,
 {
        String name = (void *)&tree_strtab[item->name];
        WidgetClass class;
-       Widget w;
 
        if (item->widget_type == widgetMenuBar)
                return XmCreateMenuBar(parent, name, args, num_args);
@@ -209,13 +206,36 @@ construct_menu(const struct ui_menuitem *root, Widget parent, unsigned i)
 static void game_resize(Widget w, void *data, void *cb_data)
 {
        if (XtIsRealized(w))
-               x11_redraw_game(data);
+               x11_redraw_game(data, -1);
 }
 
 static void goal_resize(Widget w, void *data, void *cb_data)
 {
        if (XtIsRealized(w))
-               x11_redraw_goal(data);
+               x11_redraw_goal(data, -1);
+}
+
+static void do_input_move(struct app_state *state, int x, int y)
+{
+       uint_least32_t *gp = state->board.game, prev[4];
+
+       memcpy(prev, gp, sizeof prev);
+       if (game_do_move(&state->board, x, y) == 0) {
+               uint_least32_t mask;
+
+               if (game_check_goal(&state->board)) {
+                       printf("You win!\n");
+                       game_finish(&state->board);
+               }
+
+               /* Figure out which tiles changed */
+               prev[0] ^= gp[0];
+               prev[1] ^= gp[1];
+               prev[2] ^= gp[2];
+               mask = prev[0] | prev[1] | prev[2];
+
+               x11_redraw_game(state, mask);
+       }
 }
 
 static void game_input(Widget w, void *data, void *cb_data)
@@ -232,20 +252,54 @@ static void game_input(Widget w, void *data, void *cb_data)
                                 XmNheight, &height,
                                 (char *)NULL);
                x = click->x / (width/5);
-               y = click->y / (width/5);
+               y = click->y / (height/5);
        }
 
        if (x > 4 || y > 4)
                return;
 
-       if (game_do_move(&state->board, x, y) == 0) {
-               if (game_check_goal(&state->board)) {
-                       printf("You win!\n");
-                       game_finish(&state->board);
-               }
+       do_input_move(state, x, y);
+}
 
-               x11_redraw_game(state);
-       }
+/* 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_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 /= 5) || !(height /= 5))
+               return;
+
+       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)
@@ -264,10 +318,10 @@ void ui_initialize(struct app_state *state, Widget shell)
 
        state->game = XtNameToWidget(shell, "*gameCanvas");
        XtAddCallback(state->game, XmNresizeCallback, game_resize, state);
-       XtAddCallback(state->game, XmNexposeCallback, game_resize, state);
+       XtAddCallback(state->game, XmNexposeCallback, game_expose, state);
        XtAddCallback(state->game, XmNinputCallback,  game_input,  state);
 
        state->goal = XtNameToWidget(shell, "*goalCanvas");
        XtAddCallback(state->goal, XmNresizeCallback, goal_resize, state);
-       XtAddCallback(state->goal, XmNexposeCallback, goal_resize, state);
+       XtAddCallback(state->goal, XmNexposeCallback, goal_expose, state);
 }