X-Git-Url: https://git.draconx.ca/gitweb/rrace.git/blobdiff_plain/568ff47f18d09158e4760ff793be9004e4d61a96..5278747bc6615197749a4e882283c9d06901cd80:/src/motif.c diff --git a/src/motif.c b/src/motif.c index 94e959b..66e31df 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 @@ -19,14 +19,24 @@ #include #include #include +#include #include #include #include "help.h" #include "motif.h" +#include "ewmhicon.h" #include "motifopt.h" #include "game.h" +#include "version.h" + +#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; @@ -46,13 +56,14 @@ static char * const default_resources[] = { "*gameExit.accelerator: CtrlQ", "*gameExit.acceleratorText: Ctrl+Q", + "*aboutDialog*pixmapTextPadding: 10", + NULL }; static void print_version(void) { - printf("%s %s\n", PROGNAME, PACKAGE_VERSION); - printf("Copyright (C) 2022 Nick Bowler\n"); + version_print_head("rrace-motif", stdout); puts("License GPLv3+: GNU GPL version 3 or any later version"); puts("This is free software: you are free to change and redistribute it."); puts("There is NO WARRANTY, to the extent permitted by law."); @@ -125,6 +136,22 @@ 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->flags &= ~FLAG_TIMER_RUNNING; + return; + } + + ui_timer_update(state, game_elapsed(&state->board)); + 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) { uint_fast32_t mask; @@ -134,15 +161,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; } @@ -152,7 +177,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)); } @@ -161,7 +188,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: @@ -170,12 +196,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); @@ -193,6 +215,16 @@ static void game_input(Widget w, void *data, void *cb_data) static struct app_state state; +static Widget get_shell(Widget w) +{ + Widget shell; + + for (shell = w; !XtIsWMShell(shell);) + shell = XtParent(shell); + + return shell; +} + static void proc_exit(Widget w, XEvent *e, String *argv, Cardinal *argc) { XtAppSetExitFlag(XtWidgetToApplicationContext(w)); @@ -200,23 +232,63 @@ 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) { - Widget shell; - - for (shell = w; !XtIsWMShell(shell);) - shell = XtParent(shell); + XtAppContext app; game_reset(&state.board); - x11_redraw_goal(&state, -1); + x11_redraw_goal(&state, -1, get_shell(w)); x11_redraw_game(&state, -1); - x11_redraw_icon(&state, shell); 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) +{ + 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 } + { "gameExit", proc_exit }, + { "helpAbout", proc_about }, + + { "ResizeGameArea", proc_resize } }; static XtAppContext app_initialize(int argc, char **argv) @@ -229,11 +301,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); @@ -241,16 +313,17 @@ 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_icon(&state, shell); + x11_redraw_goal(&state, 0, shell); return app; } int main(int argc, char **argv) { + setlocale(LC_ALL, ""); XtAppMainLoop(app_initialize(argc, argv)); return 0; }