X-Git-Url: http://git.draconx.ca/gitweb/rrace.git/blobdiff_plain/b39d19918b63b80d1f3b068d158fe43415b9d1b6..48cf657b615567153e5ed786b6034f9b46733f9a:/src/motif_ui.c

diff --git a/src/motif_ui.c b/src/motif_ui.c
index 5661c1e..85241d8 100644
--- a/src/motif_ui.c
+++ b/src/motif_ui.c
@@ -212,73 +212,114 @@ 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)
 {
-	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);
+	uint_fast32_t mask;
+
+	if ((mask = game_do_move(&state->board, x, y)) != 0) {
+		if (game_check_goal(&state->board) == 0) {
+			int_fast32_t ms = game_finish(&state->board);
+			unsigned min, sec;
+
+			/* Negative time just means clock jumps and
+			 * display headaches. */
+			if (ms < 0)
+				ms = 0;
+
+			sec = ms / 1000, ms %= 1000;
+			min = sec / 60, sec %= 60;
+			printf("You won!  Time was %u:%.2u:%.3u\n",
+			       min, sec, (unsigned)ms);
+			mask |= ~GOAL_MASK;
 		}
 
-		/* 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 set_view_goal(struct app_state *state, int view_goal)
+{
+	state->view_goal_on_game = view_goal;
+	x11_redraw_game(state, game_check_goal(&state->board));
+}
+
 static void game_input(Widget w, void *data, void *cb_data)
 {
 	XmDrawingAreaCallbackStruct *cbs = cb_data;
-	XButtonEvent *click = &cbs->event->xbutton;
+	XButtonEvent *b = &cbs->event->xbutton;
 	struct app_state *state = data;
 	Dimension width, height;
-	unsigned x = -1, y = -1;
 
 	switch (cbs->event->type) {
 	case ButtonPress:
-		XtVaGetValues(w, XmNwidth, &width,
-		                 XmNheight, &height,
-		                 (char *)NULL);
-		x = click->x / (width/5);
-		y = click->y / (height/5);
+		switch (b->button) {
+		case Button1:
+			if (b->state & Button3Mask)
+				break;
+
+			XtVaGetValues(w, XmNwidth, &width,
+			                 XmNheight, &height,
+			                 (char *)NULL);
+
+			do_input_move(state, b->x / (width / 5),
+			                     b->y / (height / 5));
+			break;
+		case Button3:
+			set_view_goal(state, 1);
+			break;
+		}
+		break;
+	case ButtonRelease:
+		switch (b->button) {
+		case Button3:
+			set_view_goal(state, 0);
+			break;
+		}
 	}
+}
 
-	if (x > 4 || y > 4)
-		return;
-
-	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 +343,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);
 }