Reduce the amount of redundant drawing in the game area.

[rrace.git] / src / motif_ui.c

diff --git a/src/motif_ui.c b/src/motif_ui.c
index adbb3e501c3909ae162a7588525b26c8fa656459..5661c1e4cad1de1289db468eaca6cbac30e92f0c 100644 (file)
--- a/src/motif_ui.c
+++ b/src/motif_ui.c
@@ -206,7 +206,7 @@ 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)
@@ -215,6 +215,29 @@ static void goal_resize(Widget w, void *data, void *cb_data)
                x11_redraw_goal(data);
 }
 
+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)
 {
        XmDrawingAreaCallbackStruct *cbs = cb_data;
@@ -229,20 +252,33 @@ 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);
-       }
+static void game_expose(Widget w, void *data, void *cb_data)
+{
+       XmDrawingAreaCallbackStruct *cbs = cb_data;
+       XExposeEvent *e = &cbs->event->xexpose;
+       uint_fast32_t tile_mask;
+       Dimension width, height;
+
+       XtVaGetValues(w, XmNwidth, &width, XmNheight, &height, (char *)NULL);
+       if (!(width /= 5) || !(height /= 5))
+               return;
+
+       /* Figure out which tiles have been uncovered */
+       tile_mask  = board_right(e->x / width);
+       tile_mask &= board_below(e->y / height);
+       tile_mask &= board_above((e->y + e->height - 1) / height);
+       tile_mask &= board_left((e->x + e->width - 1) / width);
+
+       x11_redraw_game(data, tile_mask);
 }
 
 void ui_initialize(struct app_state *state, Widget shell)
@@ -261,7 +297,7 @@ 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");