Improve exposure mask calculation.

[rrace.git] / src / motif_ui.c

diff --git a/src/motif_ui.c b/src/motif_ui.c
index fefcfedef7505a6509074f76e5ffe1d2e9d57ecb..3edd3aba3cf4964074b48217fb568aa6773e30f4 100644 (file)
--- a/src/motif_ui.c
+++ b/src/motif_ui.c
@@ -262,61 +262,20 @@ 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;
+       return board_rect( rect_x/tile_w,
+                          rect_y/tile_h,
+                         (rect_x+rect_w-1)/tile_w,
+                         (rect_y+rect_h-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)
@@ -339,8 +298,7 @@ static void game_expose(Widget w, void *data, void *cb_data)
         */
        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);
+       x11_queue_render(state, mask, 0);
 }
 
 static void goal_expose(Widget w, void *data, void *cb_data)
@@ -355,7 +313,7 @@ static void goal_expose(Widget w, void *data, void *cb_data)
                return;
 
        mask = expose_mask(e->x, e->y, e->width, e->height, width, height);
-       x11_redraw_goal(data, mask);
+       x11_queue_render(data, 0, mask);
 }
 
 void ui_initialize(struct app_state *state, Widget shell)