X-Git-Url: http://git.draconx.ca/gitweb/rrace.git/blobdiff_plain/43a709ff25b9973a83327a06a6ecc94b09e7787b..8e6b9fd79ca87c131d33d74d40f68df9696c7f5c:/src/motif.c?ds=sidebyside

diff --git a/src/motif.c b/src/motif.c
index 52afaae..be5900d 100644
--- a/src/motif.c
+++ b/src/motif.c
@@ -33,6 +33,7 @@ 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",
 
@@ -67,6 +68,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 +76,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 +103,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) {
@@ -141,8 +141,8 @@ static void proc_new_game(Widget w, XEvent *e, String *argv, Cardinal *argc)
 		shell = XtParent(shell);
 
 	game_reset(&state.board);
-	x11_redraw_goal(&state);
-	x11_redraw_game(&state);
+	x11_redraw_goal(&state, -1);
+	x11_redraw_game(&state, -1);
 	x11_redraw_icon(&state, shell);
 }
 
@@ -162,7 +162,7 @@ static XtAppContext app_initialize(int argc, char **argv)
 	shell = early_setup(&app, argc, argv);
 	XtAppAddActions(app, (void *)menu_actions, XtNumber(menu_actions));
 	ui_initialize(&state, shell);
-	x11_initialize(&state, XtScreen(shell));
+	x11_initialize(&state, shell);
 	game_reset(&state.board);
 	state.use_ewmh_icons = ewmh_probe_wm_icon(shell);
 	XtRealizeWidget(shell);