/*
* X11 GUI for slide puzzle game
- * Copyright © 2022 Nick Bowler
+ * Copyright © 2022-2023 Nick Bowler
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include <Xm/XmAll.h>
#include "help.h"
+#include "xtra.h"
#include "motif.h"
#include "ewmhicon.h"
#include "motifopt.h"
#define PROGNAME "rrace"
static const char *progname = PROGNAME;
-static const struct option lopts[] = { LOPTS_INITIALIZER, {0} };
static char * const default_resources[] = {
"*title: RRace",
fprintf(f, "Try %s --help for more information.\n", progname);
}
-static void print_help(void)
+static void print_help(const struct option *lopts)
{
struct lopt_help help = {0};
const struct option *opt;
Widget shell;
int opt;
+ XTRA_PACKED_LOPTS(lopts);
+
/* Check for --help/--version early (before X connection) */
opterr = 0;
while ((opt = getopt_long_only(argc, argv, "", lopts, NULL)) != -1) {
print_version();
exit(EXIT_SUCCESS);
case LOPT_HELP:
- print_help();
+ print_help(lopts);
exit(EXIT_SUCCESS);
}
}
if (state->board.x > 4) {
/* Game is over */
- state->timer_tick = 0;
+ state->flags &= ~FLAG_TIMER_RUNNING;
return;
}
- app = XtWidgetToApplicationContext(state->game);
ui_timer_update(state, game_elapsed(&state->board));
- state->timer_tick = XtAppAddTimeOut(app, TIMER_UPDATE_MS,
- timer_tick, state);
+ app = XtWidgetToApplicationContext(state->game);
+ XtAppAddTimeOut(app, TIMER_UPDATE_MS, timer_tick, state);
}
static void do_input_move(struct app_state *state, int x, int y)
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);
-
+ ui_timer_update(state, game_finish(&state->board));
mask |= ~GOAL_MASK;
}
static void set_view_goal(struct app_state *state, int view_goal)
{
- state->view_goal_on_game = !!view_goal;
+ state->flags &= ~FLAG_VIEW_GOAL_ON_GAME;
+ state->flags |= view_goal ? FLAG_VIEW_GOAL_ON_GAME : 0;
+
x11_redraw_game(state, game_check_goal(&state->board));
}
static void proc_new_game(Widget w, XEvent *e, String *argv, Cardinal *argc)
{
+ XtAppContext app;
+
game_reset(&state.board);
+ state.flags &= ~FLAG_VIEW_GOAL_ON_GAME;
x11_redraw_goal(&state, -1, get_shell(w));
x11_redraw_game(&state, -1);
- if (!state.timer_tick) {
- XtAppContext app = XtWidgetToApplicationContext(w);
- state.timer_tick = XtAppAddTimeOut(app, TIMER_UPDATE_MS,
- timer_tick, &state);
- }
-
game_begin(&state.board);
+ if (!(state.flags & FLAG_TIMER_RUNNING)) {
+ state.flags |= FLAG_TIMER_RUNNING;
+ timer_tick(&state, 0);
+ }
}
static void proc_about(Widget w, XEvent *e, String *argv, Cardinal *argc)
state.board.game[i] = state.board.goal[i] << GOAL_SHIFT;
game_finish(&state.board);
- state.use_ewmh_icons = ewmh_probe_wm_icon(shell);
+ state.flags = ewmh_probe_wm_icon(shell);
XtRealizeWidget(shell);
x11_redraw_goal(&state, 0, shell);