X-Git-Url: http://git.draconx.ca/gitweb/rrace.git/blobdiff_plain/aebcc2d9a4090d8136f750463b1cfbb73916d717..4ba1a1949117408cf81132b4f168a4e7f0a79ac3:/src/motif.c?ds=sidebyside

diff --git a/src/motif.c b/src/motif.c
index 94e959b..7396c0b 100644
--- a/src/motif.c
+++ b/src/motif.c
@@ -28,6 +28,8 @@
 #include "motifopt.h"
 #include "game.h"
 
+#define TIMER_UPDATE_MS 33
+
 #define PROGNAME "rrace"
 static const char *progname = PROGNAME;
 static const struct option lopts[] = { LOPTS_INITIALIZER, {0} };
@@ -125,6 +127,23 @@ static Widget early_setup(XtAppContext *app, int argc, char **argv)
 	return shell;
 }
 
+static void timer_tick(void *data, XtIntervalId *id)
+{
+	struct app_state *state = data;
+	XtAppContext app;
+
+	if (state->board.x > 4) {
+		/* Game is over */
+		state->timer_tick = 0;
+		return;
+	}
+
+	app = XtWidgetToApplicationContext(state->timer);
+	ui_timer_update(state, game_elapsed(&state->board));
+	state->timer_tick = XtAppAddTimeOut(app, TIMER_UPDATE_MS,
+	                                    timer_tick, state);
+}
+
 static void do_input_move(struct app_state *state, int x, int y)
 {
 	uint_fast32_t mask;
@@ -134,15 +153,13 @@ static void do_input_move(struct app_state *state, int x, int y)
 			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;
+			ui_timer_update(state, ms);
 
 			sec = ms / 1000, ms %= 1000;
 			min = sec / 60, sec %= 60;
-			printf("You won!  Time was %u:%.2u:%.3u\n",
+			printf("You won!  Time was %u:%.2u.%.3u\n",
 			       min, sec, (unsigned)ms);
+
 			mask |= ~GOAL_MASK;
 		}
 
@@ -211,6 +228,12 @@ static void proc_new_game(Widget w, XEvent *e, String *argv, Cardinal *argc)
 	x11_redraw_game(&state, -1);
 	x11_redraw_icon(&state, shell);
 
+	if (!state.timer_tick) {
+		XtAppContext app = XtWidgetToApplicationContext(w);
+		state.timer_tick = XtAppAddTimeOut(app, TIMER_UPDATE_MS,
+		                                   timer_tick, &state);
+	}
+
 	game_begin(&state.board);
 }