X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fscreens.c;h=97feee66acb6eeb9a44db9773e255011b628e869;hp=cb979767cbd2360bbeaddcefc1b4493bd668004b;hb=f78f30b84a0345ea31b30c5bd95e338c9d9ebd4b;hpb=957e1f3bce8fd0bfa083e5932d27a2298478020e

diff --git a/src/screens.c b/src/screens.c
index cb979767..97feee66 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -76,6 +76,8 @@
 
 #define MAX_SETUP_MODES			31
 
+#define MAX_MENU_MODES			MAX(MAX_INFO_MODES, MAX_SETUP_MODES)
+
 /* for input setup functions */
 #define SETUPINPUT_SCREEN_POS_START	0
 #define SETUPINPUT_SCREEN_POS_END	(SCR_FIELDY - 4)
@@ -172,10 +174,8 @@ static void HandleChooseTree(int, int, int, int, int, TreeInfo **);
 static void DrawChooseLevelSet(void);
 static void DrawChooseLevelNr(void);
 static void DrawInfoScreen(void);
-static void DrawAndFadeInInfoScreen(int);
 static void DrawSetupScreen(void);
 
-static void DrawInfoScreenExt(int, int);
 static void DrawInfoScreen_NotAvailable(char *, char *);
 static void DrawInfoScreen_HelpAnim(int, int, boolean);
 static void DrawInfoScreen_HelpText(int, int, int, int);
@@ -235,6 +235,9 @@ static TreeInfo *drop_distance_current = NULL;
 static TreeInfo *level_number = NULL;
 static TreeInfo *level_number_current = NULL;
 
+static unsigned int sync_frame_delay = 0;
+static unsigned int sync_frame_delay_value = GAME_FRAME_DELAY;
+
 static struct
 {
   int value;
@@ -326,11 +329,12 @@ static struct
   char *text;
 } snapshot_modes_list[] =
 {
-  {	STR_SNAPSHOT_MODE_OFF,		"Off"		},
-  {	STR_SNAPSHOT_MODE_EVERY_STEP,	"Every Step"	},
-  {	STR_SNAPSHOT_MODE_EVERY_MOVE,	"Every Move"	},
+  {	STR_SNAPSHOT_MODE_OFF,			"Off"		},
+  {	STR_SNAPSHOT_MODE_EVERY_STEP,		"Every Step"	},
+  {	STR_SNAPSHOT_MODE_EVERY_MOVE,		"Every Move"	},
+  {	STR_SNAPSHOT_MODE_EVERY_COLLECT,	"Every Collect"	},
 
-  {	NULL,			 	NULL		},
+  {	NULL,			 		NULL		},
 };
 
 static struct
@@ -455,6 +459,7 @@ struct TitleControlInfo
 {
   boolean is_image;
   boolean initial;
+  boolean first;
   int local_nr;
   int sort_priority;
 };
@@ -803,44 +808,29 @@ static int getTitleMusic(struct TitleControlInfo *tci)
 static struct TitleFadingInfo getTitleFading(struct TitleControlInfo *tci)
 {
   boolean is_image = tci->is_image;
-  int initial = tci->initial;
+  boolean initial = tci->initial;
+  boolean first = tci->first;
   int nr = tci->local_nr;
+  struct TitleMessageInfo tmi;
   struct TitleFadingInfo ti;
 
-  if (is_image)
-  {
-    int graphic = getTitleScreenGraphic(nr, initial);
-
-    /* initialize fading control values to default title config settings */
-    ti = (initial ? title_initial_default : title_default);
-
-    /* override default settings with image config settings, if defined */
-    if (graphic_info[graphic].fade_mode != FADE_MODE_DEFAULT)
-      ti.fade_mode = graphic_info[graphic].fade_mode;
-    if (graphic_info[graphic].fade_delay > -1)
-      ti.fade_delay = graphic_info[graphic].fade_delay;
-    if (graphic_info[graphic].post_delay > -1)
-      ti.post_delay = graphic_info[graphic].post_delay;
-    if (graphic_info[graphic].auto_delay > -1)
-      ti.auto_delay = graphic_info[graphic].auto_delay;
-  }
-  else
-  {
-    if (initial)
-    {
-      ti.fade_mode  = titlemessage_initial[nr].fade_mode;
-      ti.fade_delay = titlemessage_initial[nr].fade_delay;
-      ti.post_delay = titlemessage_initial[nr].post_delay;
-      ti.auto_delay = titlemessage_initial[nr].auto_delay;
-    }
-    else
-    {
-      ti.fade_mode  = titlemessage[nr].fade_mode;
-      ti.fade_delay = titlemessage[nr].fade_delay;
-      ti.post_delay = titlemessage[nr].post_delay;
-      ti.auto_delay = titlemessage[nr].auto_delay;
-    }
-  }
+  tmi = (is_image ? (initial ? (first ?
+				titlescreen_initial_first[nr] :
+				titlescreen_initial[nr])
+		             : (first ?
+				titlescreen_first[nr] :
+				titlescreen[nr]))
+	          : (initial ? (first ?
+				titlemessage_initial_first[nr] :
+				titlemessage_initial[nr])
+		             : (first ?
+				titlemessage_first[nr] :
+				titlemessage[nr])));
+
+  ti.fade_mode  = tmi.fade_mode;
+  ti.fade_delay = tmi.fade_delay;
+  ti.post_delay = tmi.post_delay;
+  ti.auto_delay = tmi.auto_delay;
 
   return ti;
 }
@@ -872,6 +862,8 @@ static void InitializeTitleControlsExt_AddTitleInfo(boolean is_image,
   title_controls[num_title_screens].local_nr = nr;
   title_controls[num_title_screens].sort_priority = sort_priority;
 
+  title_controls[num_title_screens].first = FALSE;	/* will be set later */
+
   num_title_screens++;
 }
 
@@ -914,6 +906,9 @@ static void InitializeTitleControls(boolean show_title_initial)
   /* sort title screens according to sort_priority and title number */
   qsort(title_controls, num_title_screens, sizeof(struct TitleControlInfo),
 	compareTitleControlInfo);
+
+  /* mark first title screen */
+  title_controls[0].first = TRUE;
 }
 
 static boolean visibleMenuPos(struct MenuPosInfo *pos)
@@ -1252,14 +1247,6 @@ void DrawHeadline()
 		    setup.internal.program_copyright);
 }
 
-int effectiveGameStatus()
-{
-  if (game_status == GAME_MODE_INFO && info_mode == INFO_MODE_TITLE)
-    return GAME_MODE_TITLE;
-
-  return game_status;
-}
-
 void DrawTitleScreenImage(int nr, boolean initial)
 {
   int graphic = getTitleScreenGraphic(nr, initial);
@@ -1316,6 +1303,14 @@ void DrawTitleScreenMessage(int nr, boolean initial)
   /* force TITLE font on title message screen */
   game_status = getTitleMessageGameMode(initial);
 
+  /* if chars *and* width set to "-1", automatically determine width */
+  if (tmi->chars == -1 && tmi->width == -1)
+    tmi->width = viewport.window[game_status].width;
+
+  /* if lines *and* height set to "-1", automatically determine height */
+  if (tmi->lines == -1 && tmi->height == -1)
+    tmi->height = viewport.window[game_status].height;
+
   /* if chars set to "-1", automatically determine by text and font width */
   if (tmi->chars == -1)
     tmi->chars = tmi->width / getFontWidth(tmi->font);
@@ -1328,6 +1323,14 @@ void DrawTitleScreenMessage(int nr, boolean initial)
   else
     tmi->height = tmi->lines * getFontHeight(tmi->font);
 
+  /* if x set to "-1", automatically determine by width and alignment */
+  if (tmi->x == -1)
+    tmi->x = -1 * ALIGNED_XPOS(0, tmi->width, tmi->align);
+
+  /* if y set to "-1", automatically determine by height and alignment */
+  if (tmi->y == -1)
+    tmi->y = -1 * ALIGNED_YPOS(0, tmi->height, tmi->valign);
+
   SetDrawBackgroundMask(REDRAW_ALL);
   SetWindowBackgroundImage(getTitleBackground(nr, initial, FALSE));
 
@@ -1366,10 +1369,11 @@ boolean CheckTitleScreen(boolean levelset_has_changed)
   return (show_titlescreen && num_title_screens > 0);
 }
 
-void DrawMainMenuExt(int fade_mask, boolean do_fading)
+void DrawMainMenu()
 {
   static LevelDirTree *leveldir_last_valid = NULL;
   boolean levelset_has_changed = FALSE;
+  int fade_mask = REDRAW_FIELD;
 
   LimitScreenUpdates(FALSE);
 
@@ -1415,13 +1419,16 @@ void DrawMainMenuExt(int fade_mask, boolean do_fading)
   /* needed if last screen (level choice) changed graphics, sounds or music */
   ReloadCustomArtwork(0);
 
+  /* needed if different viewport properties defined for menues */
+  ChangeViewportPropertiesIfNeeded();
+
   if (redraw_mask & REDRAW_ALL)
     fade_mask = REDRAW_ALL;
 
-  FadeOut(fade_mask);
+  if (CheckIfGlobalBorderHasChanged())
+    fade_mask = REDRAW_ALL;
 
-  /* needed if different viewport properties defined for menues */
-  ChangeViewportPropertiesIfNeeded();
+  FadeOut(fade_mask);
 
   /* needed if last screen was the editor screen */
   UndrawSpecialEditorDoor();
@@ -1430,6 +1437,7 @@ void DrawMainMenuExt(int fade_mask, boolean do_fading)
 
   if (CheckTitleScreen(levelset_has_changed))
   {
+    game_status_last_screen = GAME_MODE_MAIN;
     game_status = GAME_MODE_TITLE;
 
     DrawTitleScreen();
@@ -1450,8 +1458,10 @@ void DrawMainMenuExt(int fade_mask, boolean do_fading)
 
   SetMainBackgroundImage(IMG_BACKGROUND_MAIN);
 
+#if 0
   if (fade_mask == REDRAW_ALL)
     RedrawGlobalBorder();
+#endif
 
   ClearField();
 
@@ -1479,11 +1489,12 @@ void DrawMainMenuExt(int fade_mask, boolean do_fading)
   MapScreenMenuGadgets(SCREEN_MASK_MAIN);
 
   /* copy actual game door content to door double buffer for OpenDoor() */
+  BlitBitmap(drawto, bitmap_db_door_1, DX, DY, DXSIZE, DYSIZE, 0, 0);
   BlitBitmap(drawto, bitmap_db_door_2, VX, VY, VXSIZE, VYSIZE, 0, 0);
 
   OpenDoor(GetDoorState() | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
 
-  DrawMaskedBorder(REDRAW_ALL);
+  DrawMaskedBorder(fade_mask);
 
   FadeIn(fade_mask);
   FadeSetEnterMenu();
@@ -1499,16 +1510,6 @@ void DrawMainMenuExt(int fade_mask, boolean do_fading)
   OpenDoor(DOOR_CLOSE_1 | DOOR_OPEN_2);
 }
 
-void DrawAndFadeInMainMenu(int fade_mask)
-{
-  DrawMainMenuExt(fade_mask, TRUE);
-}
-
-void DrawMainMenu()
-{
-  DrawMainMenuExt(REDRAW_ALL, FALSE);
-}
-
 static void gotoTopLevelDir()
 {
   /* move upwards until inside (but not above) top level directory */
@@ -1545,11 +1546,7 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
   static int title_screen_nr = 0;
   static int last_sound = -1, last_music = -1;
   boolean return_to_main_menu = FALSE;
-  boolean use_fading_main_menu = TRUE;
   struct TitleControlInfo *tci;
-  struct TitleFadingInfo fading_default;
-  struct TitleFadingInfo fading_last = fading;
-  struct TitleFadingInfo fading_next;
   int sound, music;
 
   if (button == MB_MENU_INITIALIZE)
@@ -1561,10 +1558,21 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
     last_sound = SND_UNDEFINED;
     last_music = MUS_UNDEFINED;
 
-    if (game_status == GAME_MODE_INFO)
+    if (num_title_screens != 0)
+    {
+      FadeSetEnterScreen();
+
+      /* use individual title fading instead of global "enter screen" fading */
+      fading = getTitleFading(tci);
+    }
+
+    if (game_status_last_screen == GAME_MODE_INFO)
     {
       if (num_title_screens == 0)
       {
+	/* switch game mode from title screen mode back to info screen mode */
+	game_status = GAME_MODE_INFO;
+
 	DrawInfoScreen_NotAvailable("Title screen information:",
 				    "No title screen for this level set.");
 
@@ -1576,22 +1584,17 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
       FadeOut(REDRAW_ALL);
     }
 
+    /* only required to update logic for redrawing global border */
+    ClearField();
+
+    /* title screens may have different window size */
+    ChangeViewportPropertiesIfNeeded();
+
     if (tci->is_image)
       DrawTitleScreenImage(tci->local_nr, tci->initial);
     else
       DrawTitleScreenMessage(tci->local_nr, tci->initial);
 
-    fading_default = (tci->initial ? title_initial_default : title_default);
-
-    fading = fading_next = getTitleFading(tci);
-
-    if (!(fading_last.fade_mode & FADE_TYPE_TRANSFORM) &&
-	fading_next.fade_mode & FADE_TYPE_TRANSFORM)
-    {
-      fading.fade_mode = FADE_MODE_FADE;
-      fading.fade_delay = fading_default.fade_delay;
-    }
-
     sound = getTitleSound(tci);
     music = getTitleMusic(tci);
 
@@ -1607,8 +1610,6 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
 
     FadeIn(REDRAW_ALL);
 
-    fading = fading_next;
-
     DelayReached(&title_delay, 0);	/* reset delay counter */
 
     return;
@@ -1620,16 +1621,15 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
   if (button == MB_MENU_LEAVE)
   {
     return_to_main_menu = TRUE;
-    use_fading_main_menu = FALSE;
   }
   else if (button == MB_MENU_CHOICE)
   {
-    if (game_status == GAME_MODE_INFO && num_title_screens == 0)
+    if (game_status_last_screen == GAME_MODE_INFO && num_title_screens == 0)
     {
-      FadeSetEnterScreen();
-
+      game_status = GAME_MODE_INFO;
       info_mode = INFO_MODE_MAIN;
-      DrawAndFadeInInfoScreen(REDRAW_FIELD);
+
+      DrawInfoScreen();
 
       return;
     }
@@ -1647,6 +1647,8 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
       if (music == MUS_UNDEFINED || music != last_music)
 	FadeMusic();
 
+      fading = getTitleFading(tci);
+
       FadeOut(REDRAW_ALL);
 
       if (tci->is_image)
@@ -1654,8 +1656,6 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
       else
 	DrawTitleScreenMessage(tci->local_nr, tci->initial);
 
-      fading_next = getTitleFading(tci);
-
       sound = getTitleSound(tci);
       music = getTitleMusic(tci);
 
@@ -1667,15 +1667,8 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
       last_sound = sound;
       last_music = music;
 
-      /* last screen already faded out, next screen has no animation */
-      if (!(fading.fade_mode & FADE_TYPE_TRANSFORM) &&
-	  fading_next.fade_mode == FADE_MODE_NONE)
-	fading = fading_next;
-
       FadeIn(REDRAW_ALL);
 
-      fading = fading_next;
-
       DelayReached(&title_delay, 0);	/* reset delay counter */
     }
     else
@@ -1690,19 +1683,21 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
   {
     SetMouseCursor(CURSOR_DEFAULT);
 
-    if (game_status == GAME_MODE_INFO)
-    {
-      int fade_mask = (num_title_screens == 0 ? REDRAW_FIELD : REDRAW_ALL);
+    /* force full menu screen redraw after displaying title screens */
+    redraw_mask = REDRAW_ALL;
 
+    if (game_status_last_screen == GAME_MODE_INFO)
+    {
+      game_status = GAME_MODE_INFO;
       info_mode = INFO_MODE_MAIN;
 
-      DrawInfoScreenExt(fade_mask, use_fading_main_menu);
+      DrawInfoScreen();
     }
     else	/* default: return to main menu */
     {
       game_status = GAME_MODE_MAIN;
 
-      DrawMainMenuExt(REDRAW_ALL, use_fading_main_menu);
+      DrawMainMenu();
     }
   }
 }
@@ -1831,6 +1826,10 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
   }
   else if (pos == MAIN_CONTROL_LEVEL_NUMBER && !button)
   {
+    StopAnimation();
+
+    CloseDoor(DOOR_CLOSE_2);
+
     game_status = GAME_MODE_LEVELNR;
 
     ChangeViewportPropertiesIfNeeded();
@@ -1865,6 +1864,10 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
       {
 	if (leveldir_first)
 	{
+	  StopAnimation();
+
+	  CloseDoor(DOOR_CLOSE_2);
+
 	  game_status = GAME_MODE_LEVELS;
 
 	  SaveLevelSetup_LastSeries();
@@ -1880,9 +1883,11 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
       }
       else if (pos == MAIN_CONTROL_SCORES)
       {
-	game_status = GAME_MODE_SCORES;
+	StopAnimation();
 
-	ChangeViewportPropertiesIfNeeded();
+	CloseDoor(DOOR_CLOSE_2);
+
+	game_status = GAME_MODE_SCORES;
 
 	DrawHallOfFame(-1);
       }
@@ -1892,6 +1897,8 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
 	    !strEqual(setup.player_name, "Artsoft"))
 	  Request("This level is read only!", REQ_CONFIRM);
 
+	StopAnimation();
+
 	CloseDoor(DOOR_CLOSE_2);
 
 	game_status = GAME_MODE_EDITOR;
@@ -1902,6 +1909,10 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
       }
       else if (pos == MAIN_CONTROL_INFO)
       {
+	StopAnimation();
+
+	CloseDoor(DOOR_CLOSE_2);
+
 	game_status = GAME_MODE_INFO;
 	info_mode = INFO_MODE_MAIN;
 
@@ -1911,10 +1922,16 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
       }
       else if (pos == MAIN_CONTROL_GAME)
       {
+	StopAnimation();
+
 	StartGameActions(options.network, setup.autorecord, level.random_seed);
       }
       else if (pos == MAIN_CONTROL_SETUP)
       {
+	StopAnimation();
+
+	CloseDoor(DOOR_CLOSE_2);
+
 	game_status = GAME_MODE_SETUP;
 	setup_mode = SETUP_MODE_MAIN;
 
@@ -1998,7 +2015,7 @@ static void execExitInfo()
 {
   game_status = GAME_MODE_MAIN;
 
-  DrawMainMenuExt(REDRAW_FIELD, FALSE);
+  DrawMainMenu();
 }
 
 static struct TokenInfo info_info_main[] =
@@ -2016,60 +2033,117 @@ static struct TokenInfo info_info_main[] =
   { 0,			NULL,			NULL			}
 };
 
-static void DrawCursorAndText_Info(int screen_pos, int info_info_pos_raw,
-				    boolean active)
+static int getMenuTextFont(int type)
+{
+  if (type & (TYPE_SWITCH	|
+	      TYPE_YES_NO	|
+	      TYPE_YES_NO_AUTO	|
+	      TYPE_STRING	|
+	      TYPE_ECS_AGA	|
+	      TYPE_KEYTEXT	|
+	      TYPE_ENTER_LIST))
+    return FONT_MENU_2;
+  else
+    return FONT_MENU_1;
+}
+
+static struct TokenInfo *setup_info;
+static struct TokenInfo setup_info_input[];
+
+static struct TokenInfo *menu_info;
+
+static void DrawCursorAndText_Menu_Ext(struct TokenInfo *token_info,
+				       int screen_pos, int menu_info_pos_raw,
+				       boolean active)
 {
-  int ii_pos = (info_info_pos_raw < 0 ? screen_pos : info_info_pos_raw);
-  struct TokenInfo *ii = &info_info[ii_pos];
+  int pos = (menu_info_pos_raw < 0 ? screen_pos : menu_info_pos_raw);
+  struct TokenInfo *ti = &token_info[pos];
   int xpos = MENU_SCREEN_START_XPOS;
   int ypos = MENU_SCREEN_START_YPOS + screen_pos;
-  int font_nr = FONT_MENU_1;
+  int font_nr = getMenuTextFont(ti->type);
+
+  if (token_info == setup_info_input)
+    font_nr = FONT_MENU_1;
 
   if (active)
     font_nr = FONT_ACTIVE(font_nr);
 
-  DrawText(mSX + xpos * 32, mSY + ypos * 32, ii->text, font_nr);
+  DrawText(mSX + xpos * 32, mSY + ypos * 32, ti->text, font_nr);
 
-  if (ii->type & ~TYPE_SKIP_ENTRY)
+  if (ti->type & ~TYPE_SKIP_ENTRY)
     drawCursor(screen_pos, active);
 }
 
-static void drawInfoInfoList(struct TokenInfo *info_info,
-			     int first_entry, int num_page_entries)
+static void DrawCursorAndText_Menu(int screen_pos, int menu_info_pos_raw,
+				   boolean active)
 {
-  int i;
+  DrawCursorAndText_Menu_Ext(menu_info, screen_pos, menu_info_pos_raw, active);
+}
 
-  if (num_page_entries > NUM_MENU_ENTRIES_ON_SCREEN)
-    num_page_entries = NUM_MENU_ENTRIES_ON_SCREEN;
+static void DrawCursorAndText_Setup(int screen_pos, int menu_info_pos_raw,
+				    boolean active)
+{
+  DrawCursorAndText_Menu_Ext(setup_info, screen_pos, menu_info_pos_raw, active);
+}
 
-  if (num_page_entries > max_info_info)
-    num_page_entries = max_info_info;
+static char *screen_mode_text;
+static char *window_size_text;
+static char *scaling_type_text;
+
+static void drawSetupValue(int, int);
+
+static void drawMenuInfoList(int first_entry, int num_page_entries,
+			     int max_page_entries)
+{
+  int i;
 
-  if (first_entry + num_page_entries > max_info_info)
+  if (first_entry + num_page_entries > max_page_entries)
     first_entry = 0;
 
   clearMenuListArea();
 
   for (i = 0; i < num_page_entries; i++)
   {
-    int info_info_pos = first_entry + i;
-    struct TokenInfo *ii = &info_info[info_info_pos];
+    int menu_info_pos = first_entry + i;
+    struct TokenInfo *si = &menu_info[menu_info_pos];
+    void *value_ptr = si->value;
+
+    /* set some entries to "unchangeable" according to other variables */
+    if ((value_ptr == &setup.sound_simple && !audio.sound_available) ||
+	(value_ptr == &setup.sound_loops  && !audio.loops_available) ||
+	(value_ptr == &setup.sound_music  && !audio.music_available) ||
+	(value_ptr == &setup.fullscreen   && !video.fullscreen_available) ||
+	(value_ptr == &screen_mode_text   && !video.fullscreen_available) ||
+	(value_ptr == &window_size_text   && !video.window_scaling_available) ||
+	(value_ptr == &scaling_type_text  && !video.window_scaling_available))
+      si->type |= TYPE_GHOSTED;
 
-    if (ii->type & (TYPE_ENTER_MENU|TYPE_ENTER_LIST))
+    if (si->type & (TYPE_ENTER_MENU|TYPE_ENTER_LIST))
       initCursor(i, IMG_MENU_BUTTON_ENTER_MENU);
-    else if (ii->type & (TYPE_LEAVE_MENU|TYPE_LEAVE_LIST))
+    else if (si->type & (TYPE_LEAVE_MENU|TYPE_LEAVE_LIST))
       initCursor(i, IMG_MENU_BUTTON_LEAVE_MENU);
-    else if (ii->type & ~TYPE_SKIP_ENTRY)
+    else if (si->type & ~TYPE_SKIP_ENTRY)
       initCursor(i, IMG_MENU_BUTTON);
 
-    DrawCursorAndText_Info(i, info_info_pos, FALSE);
+    DrawCursorAndText_Menu(i, menu_info_pos, FALSE);
+
+    if (si->type & TYPE_VALUE &&
+	menu_info == setup_info)
+      drawSetupValue(i, menu_info_pos);
   }
 }
 
-static void DrawInfoScreen_Main(int fade_mask, boolean do_fading)
+static void DrawInfoScreen_Main()
 {
+  int fade_mask = REDRAW_FIELD;
   int i;
 
+  if (redraw_mask & REDRAW_ALL)
+    fade_mask = REDRAW_ALL;
+
+  if (CheckIfGlobalBorderHasChanged())
+    fade_mask = REDRAW_ALL;
+
   UnmapAllGadgets();
 
   FreeScreenGadgets();
@@ -2084,12 +2158,9 @@ static void DrawInfoScreen_Main(int fade_mask, boolean do_fading)
 
   FadeOut(fade_mask);
 
-  if (fade_mask == REDRAW_ALL)
-  {
-    RedrawGlobalBorder();
+  ChangeViewportPropertiesIfNeeded();
 
-    OpenDoor(DOOR_CLOSE_1 | DOOR_CLOSE_2 | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
-  }
+  OpenDoor(GetDoorState() | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
 
   ClearField();
 
@@ -2099,7 +2170,7 @@ static void DrawInfoScreen_Main(int fade_mask, boolean do_fading)
 
   // determine maximal number of info entries that can be displayed on screen
   num_info_info = 0;
-  for (i = 0; info_info[i].type != 0 && i < MAX_MENU_ENTRIES_ON_SCREEN; i++)
+  for (i = 0; info_info[i].type != 0 && i < NUM_MENU_ENTRIES_ON_SCREEN; i++)
     num_info_info++;
 
   // determine maximal number of info entries available for menu of info screen
@@ -2114,6 +2185,11 @@ static void DrawInfoScreen_Main(int fade_mask, boolean do_fading)
   PlayMenuSound();
   PlayMenuMusic();
 
+#if 1
+  // needed after returning from title screens with different window size
+  OpenDoor(GetDoorState() | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
+#endif
+
   DrawMaskedBorder(fade_mask);
 
   FadeIn(fade_mask);
@@ -2121,88 +2197,90 @@ static void DrawInfoScreen_Main(int fade_mask, boolean do_fading)
   InitAnimation();
 }
 
-void HandleInfoScreen_Main(int mx, int my, int dx, int dy, int button)
+static void changeSetupValue(int, int, int);
+
+void HandleMenuScreen(int mx, int my, int dx, int dy, int button,
+		      int mode, int num_page_entries, int max_page_entries)
 {
-  static int choice_store[MAX_INFO_MODES];
-  static int first_entry_store[MAX_INFO_MODES];
-  static int num_page_entries_last = 0;
-  int choice = choice_store[info_mode];			/* starts with 0 */
-  int first_entry = first_entry_store[info_mode];	/* starts with 0 */
+  static int num_page_entries_all_last[NUM_SPECIAL_GFX_ARGS][MAX_MENU_MODES];
+  static int choice_stores[NUM_SPECIAL_GFX_ARGS][MAX_MENU_MODES];
+  static int first_entry_stores[NUM_SPECIAL_GFX_ARGS][MAX_MENU_MODES];
+  int *num_page_entries_last = num_page_entries_all_last[game_status];
+  int *choice_store = choice_stores[game_status];
+  int *first_entry_store = first_entry_stores[game_status];
+  int choice = choice_store[mode];		/* starts with 0 */
+  int first_entry = first_entry_store[mode];	/* starts with 0 */
   int x = 0;
   int y = choice - first_entry;
   int y_old = y;
   boolean position_set_by_scrollbar = (dx == 999);
   int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
-  int num_page_entries;
-
-  num_page_entries = MIN(max_info_info, NUM_MENU_ENTRIES_ON_SCREEN);
+  int i;
 
   if (button == MB_MENU_INITIALIZE)
   {
     // check if number of menu page entries has changed (may happen by change
     // of custom artwork definition value for 'list_size' for this menu screen)
     // (in this case, the last menu position most probably has to be corrected)
-    if (num_page_entries != num_page_entries_last)
+    if (num_page_entries != num_page_entries_last[mode])
     {
-      int i;
+      choice_store[mode] = first_entry_store[mode] = 0;
 
-      for (i = 0; i < MAX_INFO_MODES; i++)
-	choice_store[i] = first_entry_store[i] = 0;
+      choice = first_entry = 0;
+      y = y_old = 0;
 
-      num_page_entries_last = num_page_entries;
-
-      HandleInfoScreen_Main(mx, my, dx, dy, button);
-
-      return;
+      num_page_entries_last[mode] = num_page_entries;
     }
 
     /* advance to first valid menu entry */
-    while (choice < num_info_info &&
-	   info_info[choice].type & TYPE_SKIP_ENTRY)
+    while (choice < num_page_entries &&
+	   menu_info[choice].type & TYPE_SKIP_ENTRY)
       choice++;
 
     if (position_set_by_scrollbar)
-      first_entry = first_entry_store[info_mode] = dy;
+      first_entry = first_entry_store[mode] = dy;
     else
-      AdjustScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL, max_info_info,
+      AdjustScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL, max_page_entries,
 		      NUM_MENU_ENTRIES_ON_SCREEN, first_entry);
 
-    drawInfoInfoList(info_info, first_entry, NUM_MENU_ENTRIES_ON_SCREEN);
+    drawMenuInfoList(first_entry, num_page_entries, max_page_entries);
 
     if (choice < first_entry)
     {
       choice = first_entry;
 
-      if (info_info[choice].type & TYPE_SKIP_ENTRY)
+      if (menu_info[choice].type & TYPE_SKIP_ENTRY)
 	choice++;
     }
     else if (choice > first_entry + num_page_entries - 1)
     {
       choice = first_entry + num_page_entries - 1;
 
-      if (info_info[choice].type & TYPE_SKIP_ENTRY)
+      if (menu_info[choice].type & TYPE_SKIP_ENTRY)
 	choice--;
     }
 
-    choice_store[info_mode] = choice;
+    choice_store[mode] = choice;
 
-    DrawCursorAndText_Info(choice - first_entry, choice, TRUE);
+    DrawCursorAndText_Menu(choice - first_entry, choice, TRUE);
 
     return;
   }
   else if (button == MB_MENU_LEAVE)
   {
-    for (y = 0; y < num_info_info; y++)
+    PlaySound(SND_MENU_ITEM_SELECTING);
+
+    for (i = 0; i < max_page_entries; i++)
     {
-      if (info_info[y].type & TYPE_LEAVE_MENU)
+      if (menu_info[i].type & TYPE_LEAVE_MENU)
       {
-	void (*menu_callback_function)(void) = info_info[y].value;
+	void (*menu_callback_function)(void) = menu_info[i].value;
 
 	FadeSetLeaveMenu();
 
 	menu_callback_function();
 
-	break;	/* absolutely needed because function changes 'info_info'! */
+	break;	/* absolutely needed because function changes 'menu_info'! */
       }
     }
 
@@ -2220,7 +2298,7 @@ void HandleInfoScreen_Main(int mx, int my, int dx, int dy, int button)
     if (dy == -1 * SCROLL_LINE && first_entry == 0)
       dy = -1;
     else if (dy == +1 * SCROLL_LINE &&
-	     first_entry + num_page_entries == max_info_info)
+	     first_entry + num_page_entries == max_page_entries)
       dy = 1;
 
     /* handle scrolling screen one line or page */
@@ -2242,36 +2320,36 @@ void HandleInfoScreen_Main(int mx, int my, int dx, int dy, int button)
 
 	redraw = TRUE;
       }
-      else if (dy > 0 && first_entry + num_page_entries < max_info_info)
+      else if (dy > 0 && first_entry + num_page_entries < max_page_entries)
       {
 	/* scroll page/line down */
 
 	first_entry += step;
-	if (first_entry + num_page_entries > max_info_info)
-	  first_entry = MAX(0, max_info_info - num_page_entries);
+	if (first_entry + num_page_entries > max_page_entries)
+	  first_entry = MAX(0, max_page_entries - num_page_entries);
 
 	redraw = TRUE;
       }
 
       if (redraw)
       {
-	choice += first_entry - first_entry_store[info_mode];
+	choice += first_entry - first_entry_store[mode];
 
 	if (choice < first_entry)
 	{
 	  choice = first_entry;
 
-	  if (info_info[choice].type & TYPE_SKIP_ENTRY)
+	  if (menu_info[choice].type & TYPE_SKIP_ENTRY)
 	    choice++;
 	}
 	else if (choice > first_entry + num_page_entries - 1)
 	{
 	  choice = first_entry + num_page_entries - 1;
 
-	  if (info_info[choice].type & TYPE_SKIP_ENTRY)
+	  if (menu_info[choice].type & TYPE_SKIP_ENTRY)
 	    choice--;
 	}
-	else if (info_info[choice].type & TYPE_SKIP_ENTRY)
+	else if (menu_info[choice].type & TYPE_SKIP_ENTRY)
 	{
 	  choice += SIGN(dy);
 
@@ -2280,14 +2358,14 @@ void HandleInfoScreen_Main(int mx, int my, int dx, int dy, int button)
 	  first_entry += SIGN(dy);
 	}
 
-	first_entry_store[info_mode] = first_entry;
-	choice_store[info_mode] = choice;
+	first_entry_store[mode] = first_entry;
+	choice_store[mode] = choice;
 
-	drawInfoInfoList(info_info, first_entry, NUM_MENU_ENTRIES_ON_SCREEN);
+	drawMenuInfoList(first_entry, num_page_entries, max_page_entries);
 
-	DrawCursorAndText_Info(choice - first_entry, choice, TRUE);
+	DrawCursorAndText_Menu(choice - first_entry, choice, TRUE);
 
-	AdjustScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL, max_info_info,
+	AdjustScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL, max_page_entries,
 			NUM_MENU_ENTRIES_ON_SCREEN, first_entry);
       }
 
@@ -2298,9 +2376,9 @@ void HandleInfoScreen_Main(int mx, int my, int dx, int dy, int button)
     {
       int menu_navigation_type = (dx < 0 ? TYPE_LEAVE : TYPE_ENTER);
 
-      if (info_info[choice].type & menu_navigation_type ||
-	  info_info[choice].type & TYPE_BOOLEAN_STYLE ||
-	  info_info[choice].type & TYPE_YES_NO_AUTO)
+      if (menu_info[choice].type & menu_navigation_type ||
+	  menu_info[choice].type & TYPE_BOOLEAN_STYLE ||
+	  menu_info[choice].type & TYPE_YES_NO_AUTO)
 	button = MB_MENU_CHOICE;
     }
     else if (dy)
@@ -2308,8 +2386,8 @@ void HandleInfoScreen_Main(int mx, int my, int dx, int dy, int button)
 
     /* jump to next non-empty menu entry (up or down) */
     while (first_entry + y > 0 &&
-	   first_entry + y < max_info_info - 1 &&
-	   info_info[first_entry + y].type & TYPE_SKIP_ENTRY)
+	   first_entry + y < max_page_entries - 1 &&
+	   menu_info[first_entry + y].type & TYPE_SKIP_ENTRY)
       y += dy;
 
     if (!IN_VIS_MENU(x, y))
@@ -2322,22 +2400,22 @@ void HandleInfoScreen_Main(int mx, int my, int dx, int dy, int button)
 	first_entry = choice - num_page_entries + 1;
 
       if (first_entry >= 0 &&
-	  first_entry + num_page_entries <= max_info_info)
+	  first_entry + num_page_entries <= max_page_entries)
       {
-	first_entry_store[info_mode] = first_entry;
+	first_entry_store[mode] = first_entry;
 
 	if (choice < first_entry)
 	  choice = first_entry;
 	else if (choice > first_entry + num_page_entries - 1)
 	  choice = first_entry + num_page_entries - 1;
 
-	choice_store[info_mode] = choice;
+	choice_store[mode] = choice;
 
-	drawInfoInfoList(info_info, first_entry, NUM_MENU_ENTRIES_ON_SCREEN);
+	drawMenuInfoList(first_entry, num_page_entries, max_page_entries);
 
-	DrawCursorAndText_Info(choice - first_entry, choice, TRUE);
+	DrawCursorAndText_Menu(choice - first_entry, choice, TRUE);
 
-	AdjustScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL, max_info_info,
+	AdjustScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL, max_page_entries,
 			NUM_MENU_ENTRIES_ON_SCREEN, first_entry);
       }
 
@@ -2353,33 +2431,56 @@ void HandleInfoScreen_Main(int mx, int my, int dx, int dy, int button)
     if (button)
     {
       if (first_entry + y != choice &&
-	  info_info[first_entry + y].type & ~TYPE_SKIP_ENTRY)
+	  menu_info[first_entry + y].type & ~TYPE_SKIP_ENTRY)
       {
 	PlaySound(SND_MENU_ITEM_ACTIVATING);
 
-	DrawCursorAndText_Info(choice - first_entry, choice, FALSE);
-	DrawCursorAndText_Info(y, first_entry + y, TRUE);
+	DrawCursorAndText_Menu(choice - first_entry, choice, FALSE);
+	DrawCursorAndText_Menu(y, first_entry + y, TRUE);
 
-	choice = choice_store[info_mode] = first_entry + y;
+	choice = choice_store[mode] = first_entry + y;
       }
     }
-    else if (!(info_info[first_entry + y].type & TYPE_GHOSTED))
+    else if (!(menu_info[first_entry + y].type & TYPE_GHOSTED))
     {
       PlaySound(SND_MENU_ITEM_SELECTING);
 
-      if (info_info[first_entry + y].type & TYPE_ENTER_OR_LEAVE)
+      /* when selecting key headline, execute function for key value change */
+      if (menu_info[first_entry + y].type & TYPE_KEYTEXT &&
+	  menu_info[first_entry + y + 1].type & TYPE_KEY)
+	y++;
+
+      /* when selecting string value, execute function for list selection */
+      if (menu_info[first_entry + y].type & TYPE_STRING && y > 0 &&
+	  menu_info[first_entry + y - 1].type & TYPE_ENTER_LIST)
+	y--;
+
+      if (menu_info[first_entry + y].type & TYPE_ENTER_OR_LEAVE)
       {
 	void (*menu_callback_function)(void) =
-	  info_info[first_entry + y].value;
+	  menu_info[first_entry + y].value;
 
-	FadeSetFromType(info_info[first_entry + y].type);
+	FadeSetFromType(menu_info[first_entry + y].type);
 
 	menu_callback_function();
       }
+      else if (menu_info[first_entry + y].type & TYPE_VALUE &&
+	       menu_info == setup_info)
+      {
+	changeSetupValue(y, first_entry + y, dx);
+      }
     }
   }
 }
 
+void HandleInfoScreen_Main(int mx, int my, int dx, int dy, int button)
+{
+  menu_info = info_info;
+
+  HandleMenuScreen(mx, my, dx, dy, button,
+		   info_mode, num_info_info, max_info_info);
+}
+
 void DrawInfoScreen_NotAvailable(char *text_title, char *text_error)
 {
   int ystart1 = mSY - SY + 100;
@@ -2567,6 +2668,9 @@ void DrawInfoScreen_HelpText(int element, int action, int direction, int ypos)
 
 void DrawInfoScreen_TitleScreen()
 {
+  game_status_last_screen = GAME_MODE_INFO;
+  game_status = GAME_MODE_TITLE;
+
   DrawTitleScreen();
 }
 
@@ -2644,7 +2748,7 @@ void HandleInfoScreen_Elements(int button)
       FadeSoundsAndMusic();
 
       info_mode = INFO_MODE_MAIN;
-      DrawAndFadeInInfoScreen(REDRAW_FIELD);
+      DrawInfoScreen();
 
       return;
     }
@@ -2743,7 +2847,7 @@ void HandleInfoScreen_Music(int button)
       FadeSoundsAndMusic();
 
       info_mode = INFO_MODE_MAIN;
-      DrawAndFadeInInfoScreen(REDRAW_FIELD);
+      DrawInfoScreen();
 
       return;
     }
@@ -3047,7 +3151,7 @@ void HandleInfoScreen_Credits(int button)
       FadeSoundsAndMusic();
 
       info_mode = INFO_MODE_MAIN;
-      DrawAndFadeInInfoScreen(REDRAW_FIELD);
+      DrawInfoScreen();
 
       return;
     }
@@ -3126,7 +3230,7 @@ void HandleInfoScreen_Program(int button)
     FadeSoundsAndMusic();
 
     info_mode = INFO_MODE_MAIN;
-    DrawAndFadeInInfoScreen(REDRAW_FIELD);
+    DrawInfoScreen();
   }
   else
   {
@@ -3301,7 +3405,7 @@ void HandleInfoScreen_Version(int button)
     FadeSoundsAndMusic();
 
     info_mode = INFO_MODE_MAIN;
-    DrawAndFadeInInfoScreen(REDRAW_FIELD);
+    DrawInfoScreen();
   }
   else
   {
@@ -3389,7 +3493,7 @@ void HandleInfoScreen_LevelSet(int button)
     FadeSoundsAndMusic();
 
     info_mode = INFO_MODE_MAIN;
-    DrawAndFadeInInfoScreen(REDRAW_FIELD);
+    DrawInfoScreen();
   }
   else
   {
@@ -3397,7 +3501,7 @@ void HandleInfoScreen_LevelSet(int button)
   }
 }
 
-static void DrawInfoScreenExt(int fade_mask, boolean do_fading)
+static void DrawInfoScreen()
 {
   SetMainBackgroundImage(IMG_BACKGROUND_INFO);
 
@@ -3416,7 +3520,7 @@ static void DrawInfoScreenExt(int fade_mask, boolean do_fading)
   else if (info_mode == INFO_MODE_LEVELSET)
     DrawInfoScreen_LevelSet();
   else
-    DrawInfoScreen_Main(fade_mask, do_fading);
+    DrawInfoScreen_Main();
 
   if (info_mode != INFO_MODE_MAIN &&
       info_mode != INFO_MODE_TITLE &&
@@ -3427,16 +3531,6 @@ static void DrawInfoScreenExt(int fade_mask, boolean do_fading)
   }
 }
 
-void DrawAndFadeInInfoScreen(int fade_mask)
-{
-  DrawInfoScreenExt(fade_mask, TRUE);
-}
-
-void DrawInfoScreen()
-{
-  DrawInfoScreenExt(REDRAW_FIELD, FALSE);
-}
-
 void HandleInfoScreen(int mx, int my, int dx, int dy, int button)
 {
   if (info_mode == INFO_MODE_TITLE)
@@ -3547,13 +3641,16 @@ void HandleTypeName(int newxpos, Key key)
 
 static void DrawChooseTree(TreeInfo **ti_ptr)
 {
-  int fade_mask = (DrawingAreaChanged() ? REDRAW_ALL : REDRAW_FIELD);
+  int fade_mask = REDRAW_FIELD;
+
+  if (CheckIfGlobalBorderHasChanged())
+    fade_mask = REDRAW_ALL;
 
   if (strEqual((*ti_ptr)->subdir, STRING_TOP_DIRECTORY))
   {
     game_status = GAME_MODE_MAIN;
 
-    DrawMainMenuExt(REDRAW_FIELD, FALSE);
+    DrawMainMenu();
 
     return;
   }
@@ -3567,11 +3664,15 @@ static void DrawChooseTree(TreeInfo **ti_ptr)
 
   FadeOut(fade_mask);
 
+  OpenDoor(GetDoorState() | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
+
   ClearField();
 
   HandleChooseTree(0, 0, 0, 0, MB_MENU_INITIALIZE, ti_ptr);
   MapScreenTreeGadgets(*ti_ptr);
 
+  DrawMaskedBorder(fade_mask);
+
   FadeIn(fade_mask);
 
   InitAnimation();
@@ -3760,7 +3861,7 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
 
       game_status = GAME_MODE_MAIN;
 
-      DrawMainMenuExt(REDRAW_FIELD, FALSE);
+      DrawMainMenu();
     }
 
     return;
@@ -4043,7 +4144,16 @@ void HandleChooseLevelNr(int mx, int my, int dx, int dy, int button)
 
 void DrawHallOfFame(int highlight_position)
 {
-  int fade_mask = (DrawingAreaChanged() ? REDRAW_ALL : REDRAW_FIELD);
+  int fade_mask = REDRAW_FIELD;
+
+  /* required before door position may be changed in next step */
+  CloseDoor(DOOR_CLOSE_ALL);
+
+  /* needed if different viewport properties defined for scores */
+  ChangeViewportPropertiesIfNeeded();
+
+  if (CheckIfGlobalBorderHasChanged())
+    fade_mask = REDRAW_ALL;
 
   UnmapAllGadgets();
   FadeSoundsAndMusic();
@@ -4056,8 +4166,6 @@ void DrawHallOfFame(int highlight_position)
   SetDrawDeactivationMask(REDRAW_NONE);
   SetDrawBackgroundMask(REDRAW_FIELD);
 
-  CloseDoor(DOOR_CLOSE_ALL);
-
   if (highlight_position < 0) 
     LoadScore(level_nr);
 
@@ -4070,8 +4178,12 @@ void DrawHallOfFame(int highlight_position)
   PlayMenuSound();
   PlayMenuMusic();
 
+  OpenDoor(GetDoorState() | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
+
   HandleHallOfFame(highlight_position, 0, 0, 0, MB_MENU_INITIALIZE);
 
+  DrawMaskedBorder(fade_mask);
+
   FadeIn(fade_mask);
 }
 
@@ -4173,7 +4285,7 @@ void HandleHallOfFame(int mx, int my, int dx, int dy, int button)
 
     game_status = GAME_MODE_MAIN;
 
-    DrawAndFadeInMainMenu(REDRAW_FIELD);
+    DrawMainMenu();
   }
 
   if (game_status == GAME_MODE_SCORES)
@@ -5163,7 +5275,7 @@ static void execExitSetup()
 {
   game_status = GAME_MODE_MAIN;
 
-  DrawMainMenuExt(REDRAW_FIELD, FALSE);
+  DrawMainMenu();
 }
 
 static void execSaveAndExitSetup()
@@ -5209,6 +5321,7 @@ static struct TokenInfo setup_info_game[] =
 #endif
   { TYPE_ENTER_LIST, execSetupChooseSnapshotMode,"Game Engine Snapshot Mode:" },
   { TYPE_STRING,	&snapshot_mode_text,	""			},
+  { TYPE_SWITCH,	&setup.show_snapshot_buttons,"Show Snapshot Buttons:" },
   { TYPE_EMPTY,		NULL,			""			},
   { TYPE_LEAVE_MENU,	execSetupMain, 		"Back"			},
 
@@ -5270,7 +5383,7 @@ static struct TokenInfo setup_info_graphics[] =
   { TYPE_SWITCH,	&setup.quick_switch,	"Quick Player Focus Switch:" },
   { TYPE_SWITCH,	&setup.quick_doors,	"Quick Menu Doors:"	},
   { TYPE_SWITCH,	&setup.show_titlescreen,"Show Title Screens:"	},
-  { TYPE_SWITCH,	&setup.toons,		"Show Toons:"		},
+  { TYPE_SWITCH,	&setup.toons,		"Show Menu Animations:"	},
   { TYPE_ECS_AGA,	&setup.prefer_aga_graphics,"EMC graphics preference:" },
   { TYPE_SWITCH, &setup.sp_show_border_elements,"Supaplex Border Elements:" },
   { TYPE_SWITCH,	&setup.small_game_graphics, "Small Game Graphics:" },
@@ -5489,27 +5602,12 @@ static Key getSetupKey()
     DoAnimation();
     BackToFront();
 
-    /* don't eat all CPU time */
-    Delay(10);
+    WaitUntilDelayReached(&sync_frame_delay, sync_frame_delay_value);
   }
 
   return key;
 }
 
-static int getSetupTextFont(int type)
-{
-  if (type & (TYPE_SWITCH	|
-	      TYPE_YES_NO	|
-	      TYPE_YES_NO_AUTO	|
-	      TYPE_STRING	|
-	      TYPE_ECS_AGA	|
-	      TYPE_KEYTEXT	|
-	      TYPE_ENTER_LIST))
-    return FONT_MENU_2;
-  else
-    return FONT_MENU_1;
-}
-
 static int getSetupValueFont(int type, void *value)
 {
   if (type & TYPE_KEY)
@@ -5585,7 +5683,7 @@ static void drawSetupValue(int screen_pos, int setup_info_pos_raw)
     int font1_xoffset = getFontBitmapInfo(font_nr)->draw_xoffset;
     int font2_xoffset = getFontBitmapInfo(check_font_nr)->draw_xoffset;
     int text_startx = mSX + MENU_SCREEN_START_XPOS * 32;
-    int text_font_nr = getSetupTextFont(FONT_MENU_2);
+    int text_font_nr = getMenuTextFont(FONT_MENU_2);
     int text_font_xoffset = getFontBitmapInfo(text_font_nr)->draw_xoffset;
     int text_width = max_menu_text_length_medium * getFontWidth(text_font_nr);
     boolean correct_font_draw_xoffset = FALSE;
@@ -5660,80 +5758,16 @@ static void changeSetupValue(int screen_pos, int setup_info_pos_raw, int dx)
     ToggleFullscreenOrChangeWindowScalingIfNeeded();
 }
 
-static void DrawCursorAndText_Setup(int screen_pos, int setup_info_pos_raw,
-				    boolean active)
-{
-  int si_pos = (setup_info_pos_raw < 0 ? screen_pos : setup_info_pos_raw);
-  struct TokenInfo *si = &setup_info[si_pos];
-  int xpos = MENU_SCREEN_START_XPOS;
-  int ypos = MENU_SCREEN_START_YPOS + screen_pos;
-  int font_nr = getSetupTextFont(si->type);
-
-  if (setup_info == setup_info_input)
-    font_nr = FONT_MENU_1;
-
-  if (active)
-    font_nr = FONT_ACTIVE(font_nr);
-
-  DrawText(mSX + xpos * 32, mSY + ypos * 32, si->text, font_nr);
-
-  if (si->type & ~TYPE_SKIP_ENTRY)
-    drawCursor(screen_pos, active);
-}
-
-static void drawSetupInfoList(struct TokenInfo *setup_info,
-			      int first_entry, int num_page_entries)
-{
-  int i;
-
-  if (num_page_entries > NUM_MENU_ENTRIES_ON_SCREEN)
-    num_page_entries = NUM_MENU_ENTRIES_ON_SCREEN;
-
-  if (num_page_entries > max_setup_info)
-    num_page_entries = max_setup_info;
-
-  if (first_entry + num_page_entries > max_setup_info)
-    first_entry = 0;
-
-  clearMenuListArea();
-
-  for (i = 0; i < num_page_entries; i++)
-  {
-    int setup_info_pos = first_entry + i;
-    struct TokenInfo *si = &setup_info[setup_info_pos];
-    void *value_ptr = si->value;
-
-    /* set some entries to "unchangeable" according to other variables */
-    if ((value_ptr == &setup.sound_simple && !audio.sound_available) ||
-	(value_ptr == &setup.sound_loops  && !audio.loops_available) ||
-	(value_ptr == &setup.sound_music  && !audio.music_available) ||
-	(value_ptr == &setup.fullscreen   && !video.fullscreen_available) ||
-	(value_ptr == &screen_mode_text   && !video.fullscreen_available) ||
-	(value_ptr == &window_size_text   && !video.window_scaling_available) ||
-	(value_ptr == &scaling_type_text  && !video.window_scaling_available))
-      si->type |= TYPE_GHOSTED;
-
-    if (si->type & (TYPE_ENTER_MENU|TYPE_ENTER_LIST))
-      initCursor(i, IMG_MENU_BUTTON_ENTER_MENU);
-    else if (si->type & (TYPE_LEAVE_MENU|TYPE_LEAVE_LIST))
-      initCursor(i, IMG_MENU_BUTTON_LEAVE_MENU);
-    else if (si->type & ~TYPE_SKIP_ENTRY)
-      initCursor(i, IMG_MENU_BUTTON);
-
-    DrawCursorAndText_Setup(i, setup_info_pos, FALSE);
-
-    if (si->type & TYPE_VALUE)
-      drawSetupValue(i, setup_info_pos);
-  }
-}
-
 static void DrawSetupScreen_Generic()
 {
-  int fade_mask = (DrawingAreaChanged() ? REDRAW_ALL : REDRAW_FIELD);
+  int fade_mask = REDRAW_FIELD;
   boolean redraw_all = FALSE;
   char *title_string = NULL;
   int i;
 
+  if (CheckIfGlobalBorderHasChanged())
+    fade_mask = REDRAW_ALL;
+
   UnmapAllGadgets();
 
   FreeScreenGadgets();
@@ -5746,6 +5780,8 @@ static void DrawSetupScreen_Generic()
 
   FadeOut(fade_mask);
 
+  OpenDoor(GetDoorState() | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
+
   ClearField();
 
   if (setup_mode == SETUP_MODE_MAIN)
@@ -5833,6 +5869,8 @@ static void DrawSetupScreen_Generic()
   if (redraw_all)
     redraw_mask = fade_mask = REDRAW_ALL;
 
+  DrawMaskedBorder(fade_mask);
+
   FadeIn(fade_mask);
 
   InitAnimation();
@@ -5840,280 +5878,10 @@ static void DrawSetupScreen_Generic()
 
 void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button)
 {
-  static int choice_store[MAX_SETUP_MODES];
-  static int first_entry_store[MAX_SETUP_MODES];
-  static int num_page_entries_last = 0;
-  int choice = choice_store[setup_mode];		/* starts with 0 */
-  int first_entry = first_entry_store[setup_mode];	/* starts with 0 */
-  int x = 0;
-  int y = choice - first_entry;
-  int y_old = y;
-  boolean position_set_by_scrollbar = (dx == 999);
-  int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
-  int num_page_entries;
-
-  num_page_entries = MIN(max_setup_info, NUM_MENU_ENTRIES_ON_SCREEN);
-
-  if (button == MB_MENU_INITIALIZE)
-  {
-    // check if number of menu page entries has changed (may happen by change
-    // of custom artwork definition value for 'list_size' for this menu screen)
-    // (in this case, the last menu position most probably has to be corrected)
-    if (num_page_entries != num_page_entries_last)
-    {
-      int i;
-
-      for (i = 0; i < MAX_INFO_MODES; i++)
-	choice_store[i] = first_entry_store[i] = 0;
-
-      num_page_entries_last = num_page_entries;
-
-      HandleSetupScreen_Generic(mx, my, dx, dy, button);
-
-      return;
-    }
-
-    /* advance to first valid menu entry */
-    while (choice < num_setup_info &&
-	   setup_info[choice].type & TYPE_SKIP_ENTRY)
-      choice++;
-
-    if (position_set_by_scrollbar)
-      first_entry = first_entry_store[setup_mode] = dy;
-    else
-      AdjustScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL, max_setup_info,
-		      NUM_MENU_ENTRIES_ON_SCREEN, first_entry);
-
-    drawSetupInfoList(setup_info, first_entry, NUM_MENU_ENTRIES_ON_SCREEN);
-
-    if (choice < first_entry)
-    {
-      choice = first_entry;
-
-      if (setup_info[choice].type & TYPE_SKIP_ENTRY)
-	choice++;
-    }
-    else if (choice > first_entry + num_page_entries - 1)
-    {
-      choice = first_entry + num_page_entries - 1;
-
-      if (setup_info[choice].type & TYPE_SKIP_ENTRY)
-	choice--;
-    }
-
-    choice_store[setup_mode] = choice;
-
-    DrawCursorAndText_Setup(choice - first_entry, choice, TRUE);
-
-    return;
-  }
-  else if (button == MB_MENU_LEAVE)
-  {
-    int i;
-
-    PlaySound(SND_MENU_ITEM_SELECTING);
-
-    for (i = 0; setup_info[i].type != 0; i++)
-    {
-      if (setup_info[i].type & TYPE_LEAVE_MENU)
-      {
-	void (*menu_callback_function)(void) = setup_info[i].value;
-
-	FadeSetLeaveMenu();
-
-	menu_callback_function();
-
-	break;	/* absolutely needed because function changes 'setup_info'! */
-      }
-    }
-
-    return;
-  }
-
-  if (mx || my)		/* mouse input */
-  {
-    x = (mx - mSX) / 32;
-    y = (my - mSY) / 32 - MENU_SCREEN_START_YPOS;
-  }
-  else if (dx || dy)	/* keyboard or scrollbar/scrollbutton input */
-  {
-    /* move cursor instead of scrolling when already at start/end of list */
-    if (dy == -1 * SCROLL_LINE && first_entry == 0)
-      dy = -1;
-    else if (dy == +1 * SCROLL_LINE &&
-	     first_entry + num_page_entries == max_setup_info)
-      dy = 1;
-
-    /* handle scrolling screen one line or page */
-    if (y + dy < 0 ||
-	y + dy > num_page_entries - 1)
-    {
-      boolean redraw = FALSE;
-
-      if (ABS(dy) == SCROLL_PAGE)
-	step = num_page_entries - 1;
-
-      if (dy < 0 && first_entry > 0)
-      {
-	/* scroll page/line up */
-
-	first_entry -= step;
-	if (first_entry < 0)
-	  first_entry = 0;
-
-	redraw = TRUE;
-      }
-      else if (dy > 0 && first_entry + num_page_entries < max_setup_info)
-      {
-	/* scroll page/line down */
-
-	first_entry += step;
-	if (first_entry + num_page_entries > max_setup_info)
-	  first_entry = MAX(0, max_setup_info - num_page_entries);
+  menu_info = setup_info;
 
-	redraw = TRUE;
-      }
-
-      if (redraw)
-      {
-	choice += first_entry - first_entry_store[setup_mode];
-
-	if (choice < first_entry)
-	{
-	  choice = first_entry;
-
-	  if (setup_info[choice].type & TYPE_SKIP_ENTRY)
-	    choice++;
-	}
-	else if (choice > first_entry + num_page_entries - 1)
-	{
-	  choice = first_entry + num_page_entries - 1;
-
-	  if (setup_info[choice].type & TYPE_SKIP_ENTRY)
-	    choice--;
-	}
-	else if (setup_info[choice].type & TYPE_SKIP_ENTRY)
-	{
-	  choice += SIGN(dy);
-
-	  if (choice < first_entry ||
-	      choice > first_entry + num_page_entries - 1)
-	  first_entry += SIGN(dy);
-	}
-
-	first_entry_store[setup_mode] = first_entry;
-	choice_store[setup_mode] = choice;
-
-	drawSetupInfoList(setup_info, first_entry, NUM_MENU_ENTRIES_ON_SCREEN);
-
-	DrawCursorAndText_Setup(choice - first_entry, choice, TRUE);
-
-	AdjustScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL, max_setup_info,
-			NUM_MENU_ENTRIES_ON_SCREEN, first_entry);
-      }
-
-      return;
-    }
-
-    if (dx)
-    {
-      int menu_navigation_type = (dx < 0 ? TYPE_LEAVE : TYPE_ENTER);
-
-      if (setup_info[choice].type & menu_navigation_type ||
-	  setup_info[choice].type & TYPE_BOOLEAN_STYLE ||
-	  setup_info[choice].type & TYPE_YES_NO_AUTO)
-	button = MB_MENU_CHOICE;
-    }
-    else if (dy)
-      y += dy;
-
-    /* jump to next non-empty menu entry (up or down) */
-    while (first_entry + y > 0 &&
-	   first_entry + y < max_setup_info - 1 &&
-	   setup_info[first_entry + y].type & TYPE_SKIP_ENTRY)
-      y += dy;
-
-    if (!IN_VIS_MENU(x, y))
-    {
-      choice += y - y_old;
-
-      if (choice < first_entry)
-	first_entry = choice;
-      else if (choice > first_entry + num_page_entries - 1)
-	first_entry = choice - num_page_entries + 1;
-
-      if (first_entry >= 0 &&
-	  first_entry + num_page_entries <= max_setup_info)
-      {
-	first_entry_store[setup_mode] = first_entry;
-
-	if (choice < first_entry)
-	  choice = first_entry;
-	else if (choice > first_entry + num_page_entries - 1)
-	  choice = first_entry + num_page_entries - 1;
-
-	choice_store[setup_mode] = choice;
-
-	drawSetupInfoList(setup_info, first_entry, NUM_MENU_ENTRIES_ON_SCREEN);
-
-	DrawCursorAndText_Setup(choice - first_entry, choice, TRUE);
-
-	AdjustScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL, max_setup_info,
-			NUM_MENU_ENTRIES_ON_SCREEN, first_entry);
-      }
-
-      return;
-    }
-  }
-
-  if (!anyScrollbarGadgetActive() &&
-      IN_VIS_MENU(x, y) &&
-      mx < screen_gadget[SCREEN_CTRL_ID_SCROLL_VERTICAL]->x &&
-      y >= 0 && y < num_page_entries)
-  {
-    if (button)
-    {
-      if (first_entry + y != choice &&
-	  setup_info[first_entry + y].type & ~TYPE_SKIP_ENTRY)
-      {
-	PlaySound(SND_MENU_ITEM_ACTIVATING);
-
-	DrawCursorAndText_Setup(choice - first_entry, choice, FALSE);
-	DrawCursorAndText_Setup(y, first_entry + y, TRUE);
-
-	choice = choice_store[setup_mode] = first_entry + y;
-      }
-    }
-    else if (!(setup_info[first_entry + y].type & TYPE_GHOSTED))
-    {
-      PlaySound(SND_MENU_ITEM_SELECTING);
-
-      /* when selecting key headline, execute function for key value change */
-      if (setup_info[first_entry + y].type & TYPE_KEYTEXT &&
-	  setup_info[first_entry + y + 1].type & TYPE_KEY)
-	y++;
-
-      /* when selecting string value, execute function for list selection */
-      if (setup_info[first_entry + y].type & TYPE_STRING && y > 0 &&
-	  setup_info[first_entry + y - 1].type & TYPE_ENTER_LIST)
-	y--;
-
-      if (setup_info[first_entry + y].type & TYPE_ENTER_OR_LEAVE)
-      {
-	void (*menu_callback_function)(void) =
-	  setup_info[first_entry + y].value;
-
-	FadeSetFromType(setup_info[first_entry + y].type);
-
-	menu_callback_function();
-      }
-      else
-      {
-	if (setup_info[first_entry + y].type & TYPE_VALUE)
-	  changeSetupValue(y, first_entry + y, dx);
-      }
-    }
-  }
+  HandleMenuScreen(mx, my, dx, dy, button,
+		   setup_mode, num_setup_info, max_setup_info);
 }
 
 void DrawSetupScreen_Input()
@@ -6521,8 +6289,7 @@ void CustomizeKeyboard(int player_nr)
     DoAnimation();
     BackToFront();
 
-    /* don't eat all CPU time */
-    Delay(10);
+    WaitUntilDelayReached(&sync_frame_delay, sync_frame_delay_value);
   }
 
   /* write new key bindings back to player setup */
@@ -6677,8 +6444,7 @@ static boolean CalibrateJoystickMain(int player_nr)
     DoAnimation();
     BackToFront();
 
-    /* don't eat all CPU time */
-    Delay(10);
+    WaitUntilDelayReached(&sync_frame_delay, sync_frame_delay_value);
   }
 
   /* calibrated center position (joystick should now be centered) */
@@ -6700,7 +6466,7 @@ static boolean CalibrateJoystickMain(int player_nr)
       NextEvent(&event);
       HandleOtherEvents(&event);
 
-      Delay(10);
+      WaitUntilDelayReached(&sync_frame_delay, sync_frame_delay_value);
     }
   }