added using narrow fonts for setup values on setup screens with scrollbar

[rocksndiamonds.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index aaf7998abd5277c7dd6a11a43be76541b9ee00ef..665504da737c031a13d00298ee2d54f59f828b03 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -5542,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"       },
@@ -5605,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"
@@ -5718,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,