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 5661c1e4cad1de1289db468eaca6cbac30e92f0c..4734d054958cee5a495568fb8a16a2fcb66da4af 100644 (file)
--- a/src/motif_ui.c
+++ b/src/motif_ui.c
@@ -212,7 +212,7 @@ static void game_resize(Widget w, void *data, void *cb_data)
 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)
@@ -261,24 +261,45 @@ static void game_input(Widget w, void *data, void *cb_data)
        do_input_move(state, x, y);
 }
 
+/* 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;
-       uint_fast32_t tile_mask;
        Dimension width, height;
+       uint_fast32_t mask;
 
        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);
+       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;
 
-       x11_redraw_game(data, tile_mask);
+       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)
@@ -302,5 +323,5 @@ void ui_initialize(struct app_state *state, Widget shell)
 
        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);
 }