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

diff --git a/src/motif.c b/src/motif.c
index 7396c0b..c8261fc 100644
--- a/src/motif.c
+++ b/src/motif.c
@@ -19,14 +19,17 @@
 #include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <locale.h>
 #include <getopt.h>
 
 #include <Xm/XmAll.h>
 
 #include "help.h"
 #include "motif.h"
+#include "ewmhicon.h"
 #include "motifopt.h"
 #include "game.h"
+#include "version.h"
 
 #define TIMER_UPDATE_MS 33
 
@@ -48,13 +51,14 @@ static char * const default_resources[] = {
 	"*gameExit.accelerator: Ctrl<Key>Q",
 	"*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.");
@@ -210,6 +214,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));
@@ -217,16 +231,11 @@ 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);
-
 	game_reset(&state.board);
 
 	x11_redraw_goal(&state, -1);
 	x11_redraw_game(&state, -1);
-	x11_redraw_icon(&state, shell);
+	x11_redraw_icon(&state, get_shell(w));
 
 	if (!state.timer_tick) {
 		XtAppContext app = XtWidgetToApplicationContext(w);
@@ -237,9 +246,15 @@ static void proc_new_game(Widget w, XEvent *e, String *argv, Cardinal *argc)
 	game_begin(&state.board);
 }
 
+static void proc_about(Widget w, XEvent *e, String *argv, Cardinal *argc)
+{
+	ui_show_about(&state, get_shell(w));
+}
+
 static const XtActionsRec menu_actions[] = {
 	{ "gameNew", proc_new_game },
-	{ "gameExit", proc_exit }
+	{ "gameExit", proc_exit },
+	{ "helpAbout", proc_about }
 };
 
 static XtAppContext app_initialize(int argc, char **argv)
@@ -274,6 +289,7 @@ static XtAppContext app_initialize(int argc, char **argv)
 
 int main(int argc, char **argv)
 {
+	setlocale(LC_ALL, "");
 	XtAppMainLoop(app_initialize(argc, argv));
 	return 0;
 }