X-Git-Url: https://git.draconx.ca/gitweb/rrace.git/blobdiff_plain/320851f215662265a2ab323c2bc7424e1b6acd33..31d8eda9987703c64fc63f4ddb4088cf3be5b7cc:/src/motif_ui.c

diff --git a/src/motif_ui.c b/src/motif_ui.c
index 7eafc64..718375c 100644
--- a/src/motif_ui.c
+++ b/src/motif_ui.c
@@ -268,61 +268,22 @@ expose_mask(int rect_x, int rect_y, int rect_w, int rect_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;
-}
-
 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)
 {
 	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;
 
@@ -330,8 +291,14 @@ static void game_expose(Widget w, void *data, void *cb_data)
 	if (!(width /= 5) || !(height /= 5))
 		return;
 
-	mask = expose_mask(e->x, e->y, e->width, e->height, width, height);
-	x11_redraw_game(data, mask);
+	/*
+	 * 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_queue_render(state, mask, 0);
 }
 
 static void goal_expose(Widget w, void *data, void *cb_data)
@@ -346,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)
@@ -408,7 +375,10 @@ void ui_show_about(struct app_state *state, Widget shell)
 
 	msg = version_format_head("rrace-motif");
 	l = XmMessageBoxGetChild(w, XmDIALOG_MESSAGE_LABEL);
-	XtVaSetValues(l, XmNlabelType, XmPIXMAP_AND_STRING,
+	XtVaSetValues(l, XmNlabelType, XmSTRING,
+#if HAVE_MOTIF_PIXMAP_AND_STRING
+	                 XmNlabelType, XmPIXMAP_AND_STRING,
+#endif
 	                 XmNlabelPixmap, state->icon_pixmap,
 	                 STRING_ARG(XmNlabelString, msg),
 	                 (char *)NULL);