X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=665504da737c031a13d00298ee2d54f59f828b03;hb=cea1ea492e56f8816aa76b3d59ae44c4f3b73339;hp=a7c5c83b6450463379f8e88a938b92b019dc5bc6;hpb=cbab48e3ea7c2821978dccb4f299e81e9c567050;p=rocksndiamonds.git

diff --git a/src/main.c b/src/main.c
index a7c5c83b..665504da 100644
--- a/src/main.c
+++ b/src/main.c
@@ -5490,6 +5490,7 @@ struct SpecialSuffixInfo special_suffix_info[NUM_SPECIAL_GFX_ARGS + 1 + 1] =
   { ".PREVIEW",			GFX_SPECIAL_ARG_PREVIEW,		},
   { ".CRUMBLED",		GFX_SPECIAL_ARG_CRUMBLED,		},
   { ".TYPENAME",		GFX_SPECIAL_ARG_TYPENAME,		},
+  { ".SUBMENU",			GFX_SPECIAL_ARG_SUBMENU,		},
   { ".MENU",			GFX_SPECIAL_ARG_MENU,			},
   { ".TOONS",			GFX_SPECIAL_ARG_TOONS,			},
   { ".FADING",			GFX_SPECIAL_ARG_FADING,			},
@@ -5541,11 +5542,14 @@ struct FontInfo font_info[NUM_FONTS + 1] =
   { "font.input_2.active"	},
   { "font.input_1"		},
   { "font.input_2"		},
+  { "font.option_off_narrow"	},
   { "font.option_off"		},
+  { "font.option_on_narrow"	},
   { "font.option_on"		},
   { "font.value_1"		},
   { "font.value_2"		},
   { "font.value_old"		},
+  { "font.value_narrow"		},
   { "font.level_number.active"	},
   { "font.level_number"		},
   { "font.tape_recorder"	},
@@ -5604,7 +5608,6 @@ static void print_usage()
 	"Usage: %s [OPTION]... [HOSTNAME [PORT]]\n"
 	"\n"
 	"Options:\n"
-	"  -d, --display HOSTNAME[:SCREEN]  specify X server display\n"
 	"  -b, --basepath DIRECTORY         alternative base DIRECTORY\n"
 	"  -l, --level DIRECTORY            alternative level DIRECTORY\n"
 	"  -g, --graphics DIRECTORY         alternative graphics DIRECTORY\n"
@@ -5717,6 +5720,14 @@ static void InitProgramConfig(char *command_filename)
   userdata_subdir = USERDATA_DIRECTORY_OTHER;
 #endif
 
+  // set default window size (only relevant on program startup)
+  if (setup.internal.default_window_width  != 0 &&
+      setup.internal.default_window_height != 0)
+  {
+    WIN_XSIZE = setup.internal.default_window_width;
+    WIN_YSIZE = setup.internal.default_window_height;
+  }
+
   InitProgramInfo(command_filename,
 		  config_filename,
 		  userdata_subdir,