X-Git-Url: http://git.draconx.ca/gitweb/rrace.git/blobdiff_plain/c871e6fab6382d4a46ec0c410386041a8aadef65..4ba1a1949117408cf81132b4f168a4e7f0a79ac3:/src/motif.c

diff --git a/src/motif.c b/src/motif.c
index 75a985b..7396c0b 100644
--- a/src/motif.c
+++ b/src/motif.c
@@ -28,18 +28,20 @@
 #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} };
 
 static char * const default_resources[] = {
+	"*title: RRace",
 	"*game.height: 371", // 365 + 2*shadowThickness
 	"*game.width: 498",
 
 	"*game.XmFrame.shadowThickness: 3",
 	"*game.XmFrame.shadowType: shadow_in",
 	"*goalArea.leftOffset: 1",
-	"*gameCanvas.background: #202020",
 
 	"*gameNew.accelerator: Ctrl<Key>N",
 	"*gameNew.acceleratorText: Ctrl+N",
@@ -67,6 +69,7 @@ static void print_usage(FILE *f)
 
 static void print_help(void)
 {
+	struct lopt_help help = {0};
 	const struct option *opt;
 
 	print_usage(stdout);
@@ -74,8 +77,6 @@ static void print_help(void)
 	putchar('\n');
 	puts("Options:");
 	for (opt = lopts; opt->name; opt++) {
-		struct lopt_help help;
-
 		if (!lopt_get_help(opt, &help))
 			continue;
 		help_print_option(opt, help.arg, help.desc, 20);
@@ -103,9 +104,9 @@ static Widget early_setup(XtAppContext *app, int argc, char **argv)
 		}
 	}
 
-	shell = XtOpenApplication(app, PROGNAME, NULL, 0,
+	shell = XtOpenApplication(app, PACKAGE_TARNAME, NULL, 0,
 	                          &argc, argv, (String *)default_resources,
-				  sessionShellWidgetClass, NULL, 0);
+	                          sessionShellWidgetClass, NULL, 0);
 
 	opterr = optind = 1;
 	while ((opt = getopt_long_only(argc, argv, "", lopts, NULL)) != -1) {
@@ -126,6 +127,87 @@ 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;
+
+	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;
+
+			ui_timer_update(state, ms);
+
+			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;
+		}
+
+		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 *b = &cbs->event->xbutton;
+	struct app_state *state = data;
+	Dimension width, height;
+
+	switch (cbs->event->type) {
+	case ButtonPress:
+		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;
+		}
+	}
+}
+
 static struct app_state state;
 
 static void proc_exit(Widget w, XEvent *e, String *argv, Cardinal *argc)
@@ -141,9 +223,18 @@ static void proc_new_game(Widget w, XEvent *e, String *argv, Cardinal *argc)
 		shell = XtParent(shell);
 
 	game_reset(&state.board);
+
 	x11_redraw_goal(&state, -1);
 	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);
 }
 
 static const XtActionsRec menu_actions[] = {
@@ -155,6 +246,7 @@ static XtAppContext app_initialize(int argc, char **argv)
 {
 	XtAppContext app;
 	Widget shell;
+	int i;
 
 	if (argc > 0)
 		progname = argv[0];
@@ -163,7 +255,15 @@ static XtAppContext app_initialize(int argc, char **argv)
 	XtAppAddActions(app, (void *)menu_actions, XtNumber(menu_actions));
 	ui_initialize(&state, shell);
 	x11_initialize(&state, shell);
+
+	XtAddCallback(state.game, XmNinputCallback,  game_input, &state);
+
+	/* Begin with the game in winning state */
 	game_reset(&state.board);
+	for (i = 0; i < 3; i++)
+		state.board.game[i] = state.board.goal[i] << GOAL_SHIFT;
+	game_finish(&state.board);
+
 	state.use_ewmh_icons = ewmh_probe_wm_icon(shell);
 	XtRealizeWidget(shell);