X-Git-Url: http://git.draconx.ca/gitweb/rrace.git/blobdiff_plain/bbe659b000e2c281340953c5fc96bd7ac3b94eaa..c11496c3a03550e6103036e09eb27a7bffb7957b:/src/motif.c diff --git a/src/motif.c b/src/motif.c index fe03079..e3ff6c2 100644 --- a/src/motif.c +++ b/src/motif.c @@ -1,6 +1,6 @@ /* * 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 @@ -33,6 +33,11 @@ #define TIMER_UPDATE_MS 33 +#define SPLIT_NUMERATOR 75 +#define SPLIT_DENOMINATOR 100 + +#define MIN(a, b) ((a) < (b) ? (a) : (b)) + #define PROGNAME "rrace" static const char *progname = PROGNAME; static const struct option lopts[] = { LOPTS_INITIALIZER, {0} }; @@ -138,14 +143,13 @@ static void timer_tick(void *data, XtIntervalId *id) 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) @@ -154,16 +158,7 @@ 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; } @@ -173,7 +168,9 @@ static void do_input_move(struct app_state *state, int x, int y) 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)); } @@ -182,7 +179,6 @@ 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: @@ -191,12 +187,8 @@ static void game_input(Widget w, void *data, void *cb_data) 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)); + do_input_move(state, b->x / state->game_tile_sz, + b->y / state->game_tile_sz); break; case Button3: set_view_goal(state, 1); @@ -231,18 +223,19 @@ static void proc_exit(Widget w, XEvent *e, String *argv, Cardinal *argc) 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) @@ -250,10 +243,44 @@ static void proc_about(Widget w, XEvent *e, String *argv, Cardinal *argc) ui_show_about(&state, get_shell(w)); } -static const XtActionsRec menu_actions[] = { +static void proc_resize(Widget form, XEvent *e, String *argv, Cardinal *argc) +{ + Widget game = XtParent(state.game); + Widget goal = XtParent(state.goal); + Dimension w, h, gamesz, gameborder, goalsz, goalborder; + int x, y, gap; + + XtVaGetValues(form, XmNwidth, &w, XmNheight, &h, (char *)NULL); + XtVaGetValues(game, XmNshadowThickness, &gameborder, (char *)NULL); + XtVaGetValues(goal, XmNshadowThickness, &goalborder, + XmNleftOffset, &gap, + (char *)NULL); + + gamesz = MIN(h, w * SPLIT_NUMERATOR / SPLIT_DENOMINATOR); + state.game_tile_sz = (gamesz - 2*gameborder) / 5; + gamesz = 5*state.game_tile_sz + 2*gameborder; + + goalsz = MIN(gamesz*3/5, w - gamesz - gap); + state.goal_tile_sz = (goalsz - 2*goalborder) / 3; + goalsz = 3*state.goal_tile_sz + 2*goalborder; + + x = (w - gamesz - goalsz - gap) / 2; + if (x < 2) x = 0; + + y = (h - gamesz) / 2; + if (y < 3) y = 0; + + XtVaSetValues(game, XmNleftOffset, x, XmNtopOffset, y, (char *)NULL); + XtVaSetValues(game, XmNwidth, gamesz, XmNheight, gamesz, (char *)NULL); + XtVaSetValues(goal, XmNwidth, goalsz, XmNheight, goalsz, (char *)NULL); +} + +static const XtActionsRec app_actions[] = { { "gameNew", proc_new_game }, { "gameExit", proc_exit }, - { "helpAbout", proc_about } + { "helpAbout", proc_about }, + + { "ResizeGameArea", proc_resize } }; static XtAppContext app_initialize(int argc, char **argv) @@ -266,11 +293,11 @@ static XtAppContext app_initialize(int argc, char **argv) progname = argv[0]; shell = early_setup(&app, argc, argv); - XtAppAddActions(app, (void *)menu_actions, XtNumber(menu_actions)); + XtAppAddActions(app, (void *)app_actions, XtNumber(app_actions)); ui_initialize(&state, shell); x11_initialize(&state, shell); - XtAddCallback(state.game, XmNinputCallback, game_input, &state); + XtAddCallback(state.game, XmNinputCallback, game_input, &state); /* Begin with the game in winning state */ game_reset(&state.board); @@ -278,7 +305,7 @@ static XtAppContext app_initialize(int argc, char **argv) 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);