rnd-20020402-1-src
[rocksndiamonds.git] / src / screens.c
index ac3eaef20929d8f7147cab5b174c6e7ed3c05fce..d1d8e1192a515c2a5448c2ca3109e8c80ca8d121 100644 (file)
 #include "network.h"
 #include "init.h"
 
-/* for DrawSetupScreen(), HandleSetupScreen() */
-#define SETUP_SCREEN_POS_START         0
-#define SETUP_SCREEN_POS_END           (SCR_FIELDY - 3)
-#define SETUP_SCREEN_POS_EMPTY1                (SETUP_SCREEN_POS_END - 2)
-#define SETUP_SCREEN_POS_EMPTY2                (SETUP_SCREEN_POS_END - 2)
+/* screens in the setup menu */
+#define SETUP_MODE_MAIN                        0
+#define SETUP_MODE_INPUT               1
+#define SETUP_MODE_SHORTCUT            2
+#define SETUP_MODE_GRAPHICS            3
+#define SETUP_MODE_SOUND               4
 
-/* for HandleSetupInputScreen() */
+#define MAX_SETUP_MODES                        5
+
+/* for input setup functions */
 #define SETUPINPUT_SCREEN_POS_START    0
 #define SETUPINPUT_SCREEN_POS_END      (SCR_FIELDY - 4)
 #define SETUPINPUT_SCREEN_POS_EMPTY1   (SETUPINPUT_SCREEN_POS_START + 3)
 #define SETUPINPUT_SCREEN_POS_EMPTY2   (SETUPINPUT_SCREEN_POS_END - 1)
 
-/* for HandleChooseLevel() */
+/* for various menu stuff  */
 #define MAX_MENU_ENTRIES_ON_SCREEN     (SCR_FIELDY - 2)
 #define MENU_SCREEN_START_YPOS         2
 #define MENU_SCREEN_VALUE_XPOS         14
 #define NUM_SCREEN_SCROLLBARS          1
 #define NUM_SCREEN_GADGETS             3
 
-/* forward declaration for internal use */
+/* forward declarations of internal functions */
 static void HandleScreenGadgets(struct GadgetInfo *);
+static void HandleSetupScreen_Generic(int, int, int, int, int);
+static void HandleSetupScreen_Input(int, int, int, int, int);
+static void CustomizeKeyboard(int);
+static void CalibrateJoystick(int);
 
 static struct GadgetInfo *screen_gadget[NUM_SCREEN_GADGETS];
 
+static void drawCursorExt(int pos, int color, int graphic)
+{
+  static int cursor_array[SCR_FIELDY];
+
+  if (graphic)
+    cursor_array[pos] = graphic;
+
+  graphic = cursor_array[pos];
+
+  if (color == FC_RED)
+    graphic = (graphic == GFX_ARROW_BLUE_LEFT  ? GFX_ARROW_RED_LEFT  :
+              graphic == GFX_ARROW_BLUE_RIGHT ? GFX_ARROW_RED_RIGHT :
+              GFX_KUGEL_ROT);
+
+  DrawGraphic(0, MENU_SCREEN_START_YPOS + pos, graphic);
+}
+
+static void initCursor(int pos, int graphic)
+{
+  drawCursorExt(pos, FC_BLUE, graphic);
+}
+
+static void drawCursor(int pos, int color)
+{
+  drawCursorExt(pos, color, 0);
+}
+
 void DrawHeadline()
 {
   int x = SX + (SXSIZE - strlen(PROGRAM_TITLE_STRING) * FONT1_XSIZE) / 2;
@@ -88,7 +122,7 @@ static void ToggleFullscreenIfNeeded()
 
 void DrawMainMenu()
 {
-  static struct LevelDirInfo *leveldir_last_valid = NULL;
+  static LevelDirTree *leveldir_last_valid = NULL;
   int i;
   char *name_text = (!options.network && setup.team_mode ? "Team:" : "Name:");
 
@@ -96,6 +130,7 @@ void DrawMainMenu()
   FadeSounds();
   KeyboardAutoRepeatOn();
   ActivateJoystickIfAvailable();
+  SetDrawDeactivationMask(REDRAW_NONE);
 
   /* needed if last screen was the playing screen, invoked from level editor */
   if (level_editor_test_game)
@@ -158,8 +193,9 @@ void DrawMainMenu()
     DrawTextF(15*32 + 6, 3*32 + 9 + 7, FC_RED, "ONLY");
   }
 
-  for(i=2; i<10; i++)
-    DrawGraphic(0, i, GFX_KUGEL_BLAU);
+  for(i=0; i<8; i++)
+    initCursor(i, (i == 1 || i == 6 ? GFX_ARROW_BLUE_RIGHT : GFX_KUGEL_BLAU));
+
   DrawGraphic(10, 3, GFX_ARROW_BLUE_LEFT);
   DrawGraphic(14, 3, GFX_ARROW_BLUE_RIGHT);
 
@@ -200,8 +236,8 @@ static void gotoTopLevelDir()
     /* write a "path" into level tree for easy navigation to last level */
     if (leveldir_current->node_parent->node_group->cl_first == -1)
     {
-      int num_leveldirs = numLevelDirInfoInGroup(leveldir_current);
-      int leveldir_pos = posLevelDirInfo(leveldir_current);
+      int num_leveldirs = numTreeInfoInGroup(leveldir_current);
+      int leveldir_pos = posTreeInfo(leveldir_current);
       int num_page_entries;
       int cl_first, cl_cursor;
 
@@ -211,7 +247,7 @@ static void gotoTopLevelDir()
        num_page_entries = MAX_MENU_ENTRIES_ON_SCREEN - 1;
 
       cl_first = MAX(0, leveldir_pos - num_page_entries + 1);
-      cl_cursor = leveldir_pos - cl_first + 1;
+      cl_cursor = leveldir_pos - cl_first;
 
       leveldir_current->node_parent->node_group->cl_first = cl_first;
       leveldir_current->node_parent->node_group->cl_cursor = cl_cursor;
@@ -223,48 +259,31 @@ static void gotoTopLevelDir()
 
 void HandleMainMenu(int mx, int my, int dx, int dy, int button)
 {
-  static int choice = 3;
-  static int redraw = TRUE;
-  int x = (mx + 32 - SX) / 32, y = (my + 32 - SY) / 32;
-
-  if (redraw || button == MB_MENU_INITIALIZE)
-  {
-    DrawGraphic(0, choice - 1, GFX_KUGEL_ROT);
-    redraw = FALSE;
-  }
+  static int choice = 0;
+  int x = 0;
+  int y = choice;
 
   if (button == MB_MENU_INITIALIZE)
+  {
+    drawCursor(choice, FC_RED);
     return;
+  }
 
-  if (dx || dy)
+  if (mx || my)                /* mouse input */
   {
-    if (dx && choice == 4)
-    {
-      x = (dx < 0 ? 11 : 15);
-      y = 4;
-    }
-    else if (dy)
-    {
-      x = 1;
-      y = choice + dy;
-    }
-    else
-      x = y = 0;
-
-    if (y < 3)
-      y = 3;
-    else if (y > 10)
-      y = 10;
+    x = (mx - SX) / 32;
+    y = (my - SY) / 32 - MENU_SCREEN_START_YPOS;
   }
-
-  if (!mx && !my && !dx && !dy)
+  else if (dx || dy)   /* keyboard input */
   {
-    x = 1;
-    y = choice;
+    if (dx && choice == 1)
+      x = (dx < 0 ? 10 : 14);
+    else if (dy)
+      y = choice + dy;
   }
 
-  if (y == 4 && ((x == 11 && level_nr > leveldir_current->first_level) ||
-                (x == 15 && level_nr < leveldir_current->last_level)) &&
+  if (y == 1 && ((x == 10 && level_nr > leveldir_current->first_level) ||
+                (x == 14 && level_nr < leveldir_current->last_level)) &&
       button)
   {
     static unsigned long level_delay = 0;
@@ -272,7 +291,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
     int new_level_nr, old_level_nr = level_nr;
     int font_color = (leveldir_current->readonly ? FC_RED : FC_YELLOW);
 
-    new_level_nr = level_nr + (x == 11 ? -step : +step);
+    new_level_nr = level_nr + (x == 10 ? -step : +step);
     if (new_level_nr < leveldir_current->first_level)
       new_level_nr = leveldir_current->first_level;
     if (new_level_nr > leveldir_current->last_level)
@@ -304,25 +323,25 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
     SyncDisplay();
     DelayReached(&level_delay, 0);     /* reset delay counter */
   }
-  else if (x == 1 && y >= 3 && y <= 10)
+  else if (x == 0 && y >= 0 && y <= 7)
   {
     if (button)
     {
       if (y != choice)
       {
-       DrawGraphic(0, y - 1, GFX_KUGEL_ROT);
-       DrawGraphic(0, choice - 1, GFX_KUGEL_BLAU);
+       drawCursor(y, FC_RED);
+       drawCursor(choice, FC_BLUE);
        choice = y;
       }
     }
     else
     {
-      if (y == 3)
+      if (y == 0)
       {
        game_status = TYPENAME;
        HandleTypeName(strlen(setup.player_name), 0);
       }
-      else if (y == 4)
+      else if (y == 1)
       {
        if (leveldir_first)
        {
@@ -335,12 +354,12 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
          DrawChooseLevel();
        }
       }
-      else if (y == 5)
+      else if (y == 2)
       {
        game_status = HALLOFFAME;
        DrawHallOfFame(-1);
       }
-      else if (y == 6)
+      else if (y == 3)
       {
        if (leveldir_current->readonly &&
            strcmp(setup.player_name, "Artsoft") != 0)
@@ -348,12 +367,12 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
        game_status = LEVELED;
        DrawLevelEd();
       }
-      else if (y == 7)
+      else if (y == 4)
       {
        game_status = HELPSCREEN;
        DrawHelpScreen();
       }
-      else if (y == 8)
+      else if (y == 5)
       {
        if (setup.autorecord)
          TapeStartRecording();
@@ -369,22 +388,21 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
          InitGame();
        }
       }
-      else if (y == 9)
+      else if (y == 6)
       {
        game_status = SETUP;
        DrawSetupScreen();
       }
-      else if (y == 10)
+      else if (y == 7)
       {
        SaveLevelSetup_LastSeries();
        SaveLevelSetup_SeriesInfo();
         if (Request("Do you really want to quit ?", REQ_ASK | REQ_STAY_CLOSED))
          game_status = EXITGAME;
       }
-
-      redraw = TRUE;
     }
   }
+
   BackToFront();
 
   out:
@@ -396,6 +414,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
   }
 }
 
+
 #define MAX_HELPSCREEN_ELS     10
 #define HA_NEXT                        -999
 #define HA_END                 -1000
@@ -898,33 +917,6 @@ void HandleTypeName(int newxpos, Key key)
   BackToFront();
 }
 
-static void drawCursorExt(int pos, int color, int graphic)
-{
-  static int cursor_array[SCR_FIELDY];
-
-  if (graphic)
-    cursor_array[pos] = graphic;
-
-  graphic = cursor_array[pos];
-
-  if (color == FC_RED)
-    graphic = (graphic == GFX_ARROW_BLUE_LEFT  ? GFX_ARROW_RED_LEFT  :
-              graphic == GFX_ARROW_BLUE_RIGHT ? GFX_ARROW_RED_RIGHT :
-              GFX_KUGEL_ROT);
-
-  DrawGraphic(0, MENU_SCREEN_START_YPOS + pos, graphic);
-}
-
-static void initCursor(int pos, int graphic)
-{
-  drawCursorExt(pos, FC_BLUE, graphic);
-}
-
-static void drawCursor(int pos, int color)
-{
-  drawCursorExt(pos, color, 0);
-}
-
 void DrawChooseLevel()
 {
   UnmapAllGadgets();
@@ -943,7 +935,7 @@ static void AdjustChooseLevelScrollbar(int id, int first_entry)
   struct GadgetInfo *gi = screen_gadget[id];
   int items_max, items_visible, item_position;
 
-  items_max = numLevelDirInfoInGroup(leveldir_current);
+  items_max = numTreeInfoInGroup(leveldir_current);
   items_visible = MAX_MENU_ENTRIES_ON_SCREEN - 1;
   item_position = first_entry;
 
@@ -959,7 +951,7 @@ static void drawChooseLevelList(int first_entry, int num_page_entries)
   int i;
   char buffer[SCR_FIELDX * 2];
   int max_buffer_len = (SCR_FIELDX - 2) * 2;
-  int num_leveldirs = numLevelDirInfoInGroup(leveldir_current);
+  int num_leveldirs = numTreeInfoInGroup(leveldir_current);
 
   ClearRectangle(backbuffer, SX, SY, SXSIZE - 32, SYSIZE);
   redraw_mask |= REDRAW_FIELD;
@@ -968,12 +960,12 @@ static void drawChooseLevelList(int first_entry, int num_page_entries)
 
   for(i=0; i<num_page_entries; i++)
   {
-    struct LevelDirInfo *node, *node_first;
+    LevelDirTree *node, *node_first;
     int leveldir_pos = first_entry + i;
     int ypos = MENU_SCREEN_START_YPOS + i;
 
-    node_first = getLevelDirInfoFirstGroupEntry(leveldir_current);
-    node = getLevelDirInfoFromPos(node_first, leveldir_pos);
+    node_first = getTreeInfoFirstGroupEntry(leveldir_current);
+    node = getTreeInfoFromPos(node_first, leveldir_pos);
 
     strncpy(buffer, node->name , max_buffer_len);
     buffer[max_buffer_len] = '\0';
@@ -997,11 +989,11 @@ static void drawChooseLevelList(int first_entry, int num_page_entries)
 
 static void drawChooseLevelInfo(int leveldir_pos)
 {
-  struct LevelDirInfo *node, *node_first;
+  LevelDirTree *node, *node_first;
   int x, last_redraw_mask = redraw_mask;
 
-  node_first = getLevelDirInfoFirstGroupEntry(leveldir_current);
-  node = getLevelDirInfoFromPos(node_first, leveldir_pos);
+  node_first = getTreeInfoFirstGroupEntry(leveldir_current);
+  node = getTreeInfoFromPos(node_first, leveldir_pos);
 
   ClearRectangle(drawto, SX + 32, SY + 32, SXSIZE - 64, 32);
 
@@ -1022,11 +1014,10 @@ static void drawChooseLevelInfo(int leveldir_pos)
 void HandleChooseLevel(int mx, int my, int dx, int dy, int button)
 {
   static unsigned long choose_delay = 0;
-  static int redraw = TRUE;
-  int x = (mx + 32 - SX) / 32;
-  int y = (my + 32 - SY) / 32 - MENU_SCREEN_START_YPOS;
+  int x = 0;
+  int y = leveldir_current->cl_cursor;
   int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
-  int num_leveldirs = numLevelDirInfoInGroup(leveldir_current);
+  int num_leveldirs = numTreeInfoInGroup(leveldir_current);
   int num_page_entries;
 
   if (num_leveldirs <= MAX_MENU_ENTRIES_ON_SCREEN)
@@ -1036,13 +1027,13 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button)
 
   if (button == MB_MENU_INITIALIZE)
   {
-    int leveldir_pos = posLevelDirInfo(leveldir_current);
+    int leveldir_pos = posTreeInfo(leveldir_current);
 
     if (leveldir_current->cl_first == -1)
     {
       leveldir_current->cl_first = MAX(0, leveldir_pos - num_page_entries + 1);
       leveldir_current->cl_cursor =
-       leveldir_pos - leveldir_current->cl_first + 1;
+       leveldir_pos - leveldir_current->cl_first;
     }
 
     if (dx == 999)     /* first entry is set by scrollbar position */
@@ -1053,39 +1044,44 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button)
 
     drawChooseLevelList(leveldir_current->cl_first, num_page_entries);
     drawChooseLevelInfo(leveldir_current->cl_first +
-                       leveldir_current->cl_cursor - 1);
-    redraw = TRUE;
+                       leveldir_current->cl_cursor);
+    drawCursor(leveldir_current->cl_cursor, FC_RED);
+    return;
   }
-
-  if (redraw)
+  else if (button == MB_MENU_LEAVE)
   {
-    drawCursor(leveldir_current->cl_cursor - 1, FC_RED);
-    redraw = FALSE;
-  }
-
-  if (button == MB_MENU_INITIALIZE)
+    if (leveldir_current->node_parent)
+    {
+      leveldir_current = leveldir_current->node_parent;
+      DrawChooseLevel();
+    }
+    else
+    {
+      game_status = MAINMENU;
+      DrawMainMenu();
+    }
     return;
+  }
 
-  if (dx || dy)
+  if (mx || my)                /* mouse input */
+  {
+    x = (mx - SX) / 32;
+    y = (my - SY) / 32 - MENU_SCREEN_START_YPOS;
+  }
+  else if (dx || dy)   /* keyboard input */
   {
     if (dy)
-    {
-      x = 1;
       y = leveldir_current->cl_cursor + dy;
-    }
-    else
-      x = y = 0;       /* no action */
 
     if (ABS(dy) == SCR_FIELDY) /* handle KSYM_Page_Up, KSYM_Page_Down */
     {
       dy = SIGN(dy);
       step = num_page_entries - 1;
-      x = 1;
-      y = (dy < 0 ? 0 : num_page_entries + 1);
+      y = (dy < 0 ? -1 : num_page_entries);
     }
   }
 
-  if (x == 1 && y == 0)
+  if (x == 0 && y == -1)
   {
     if (leveldir_current->cl_first > 0 &&
        (dy || DelayReached(&choose_delay, GADGET_FRAME_DELAY)))
@@ -1096,14 +1092,14 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button)
 
       drawChooseLevelList(leveldir_current->cl_first, num_page_entries);
       drawChooseLevelInfo(leveldir_current->cl_first +
-                         leveldir_current->cl_cursor - 1);
-      drawCursor(leveldir_current->cl_cursor - 1, FC_RED);
+                         leveldir_current->cl_cursor);
+      drawCursor(leveldir_current->cl_cursor, FC_RED);
       AdjustChooseLevelScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL,
                                 leveldir_current->cl_first);
       return;
     }
   }
-  else if (x == 1 && y > num_page_entries)
+  else if (x == 0 && y > num_page_entries - 1)
   {
     if (leveldir_current->cl_first + num_page_entries < num_leveldirs &&
        (dy || DelayReached(&choose_delay, GADGET_FRAME_DELAY)))
@@ -1114,28 +1110,21 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button)
 
       drawChooseLevelList(leveldir_current->cl_first, num_page_entries);
       drawChooseLevelInfo(leveldir_current->cl_first +
-                         leveldir_current->cl_cursor - 1);
-      drawCursor(leveldir_current->cl_cursor - 1, FC_RED);
+                         leveldir_current->cl_cursor);
+      drawCursor(leveldir_current->cl_cursor, FC_RED);
       AdjustChooseLevelScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL,
                                 leveldir_current->cl_first);
       return;
     }
   }
 
-  if (!mx && !my && !dx && !dy)
-  {
-    x = 1;
-    y = leveldir_current->cl_cursor;
-  }
-
   if (dx == 1)
   {
-    struct LevelDirInfo *node_first, *node_cursor;
-    int leveldir_pos =
-      leveldir_current->cl_first + leveldir_current->cl_cursor - 1;
+    LevelDirTree *node_first, *node_cursor;
+    int leveldir_pos = leveldir_current->cl_first + y;
 
-    node_first = getLevelDirInfoFirstGroupEntry(leveldir_current);
-    node_cursor = getLevelDirInfoFromPos(node_first, leveldir_pos);
+    node_first = getTreeInfoFirstGroupEntry(leveldir_current);
+    node_cursor = getTreeInfoFromPos(node_first, leveldir_pos);
 
     if (node_cursor->node_group)
     {
@@ -1143,33 +1132,35 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button)
       node_cursor->cl_cursor = leveldir_current->cl_cursor;
       leveldir_current = node_cursor->node_group;
       DrawChooseLevel();
+      return;
     }
   }
   else if (dx == -1 && leveldir_current->node_parent)
   {
     leveldir_current = leveldir_current->node_parent;
     DrawChooseLevel();
+    return;
   }
 
-  if (x == 1 && y > 0 && y <= num_page_entries)
+  if (x == 0 && y >= 0 && y < num_page_entries)
   {
     if (button)
     {
       if (y != leveldir_current->cl_cursor)
       {
-       drawCursor(y - 1, FC_RED);
-       drawCursor(leveldir_current->cl_cursor - 1, FC_BLUE);
-       drawChooseLevelInfo(leveldir_current->cl_first + y - 1);
+       drawCursor(y, FC_RED);
+       drawCursor(leveldir_current->cl_cursor, FC_BLUE);
+       drawChooseLevelInfo(leveldir_current->cl_first + y);
        leveldir_current->cl_cursor = y;
       }
     }
     else
     {
-      struct LevelDirInfo *node_first, *node_cursor;
-      int leveldir_pos = leveldir_current->cl_first + y - 1;
+      LevelDirTree *node_first, *node_cursor;
+      int leveldir_pos = leveldir_current->cl_first + y;
 
-      node_first = getLevelDirInfoFirstGroupEntry(leveldir_current);
-      node_cursor = getLevelDirInfoFromPos(node_first, leveldir_pos);
+      node_first = getTreeInfoFirstGroupEntry(leveldir_current);
+      node_cursor = getTreeInfoFromPos(node_first, leveldir_pos);
 
       if (node_cursor->node_group)
       {
@@ -1310,10 +1301,37 @@ void HandleHallOfFame(int mx, int my, int dx, int dy, int button)
     DoAnimation();
 }
 
+
+/* ========================================================================= */
+/* setup screen functions                                                    */
+/* ========================================================================= */
+
+static struct TokenInfo *setup_info;
+static int num_setup_info;
+static int setup_mode = SETUP_MODE_MAIN;
+
+static void execSetupMain()
+{
+  setup_mode = SETUP_MODE_MAIN;
+  DrawSetupScreen();
+}
+
+static void execSetupSound()
+{
+  setup_mode = SETUP_MODE_SOUND;
+  DrawSetupScreen();
+}
+
 static void execSetupInput()
 {
-  game_status = SETUPINPUT;
-  DrawSetupInputScreen();
+  setup_mode = SETUP_MODE_INPUT;
+  DrawSetupScreen();
+}
+
+static void execSetupShortcut()
+{
+  setup_mode = SETUP_MODE_SHORTCUT;
+  DrawSetupScreen();
 }
 
 static void execExitSetup()
@@ -1328,13 +1346,19 @@ static void execSaveAndExitSetup()
   execExitSetup();
 }
 
-static struct TokenInfo setup_info[] =
+static struct TokenInfo setup_info_main[] =
 {
+  { TYPE_ENTER_MENU,   execSetupSound,         "Sound Setup"   },
+  { TYPE_ENTER_MENU,   execSetupInput,         "Input Devices" },
+  { TYPE_ENTER_MENU,   execSetupShortcut,      "Key Shortcuts" },
+#if 0
+  { TYPE_EMPTY,                NULL,                   ""              },
   { TYPE_SWITCH,       &setup.sound,           "Sound:",       },
   { TYPE_SWITCH,       &setup.sound_loops,     " Sound Loops:" },
   { TYPE_SWITCH,       &setup.sound_music,     " Game Music:"  },
-#if 0
+#endif
   { TYPE_SWITCH,       &setup.toons,           "Toons:"        },
+#if 0
   { TYPE_SWITCH,       &setup.double_buffering,"Buffered gfx:" },
 #endif
   { TYPE_SWITCH,       &setup.scroll_delay,    "Scroll Delay:" },
@@ -1348,48 +1372,160 @@ static struct TokenInfo setup_info[] =
   { TYPE_SWITCH,       &setup.team_mode,       "Team-Mode:"    },
   { TYPE_SWITCH,       &setup.handicap,        "Handicap:"     },
   { TYPE_SWITCH,       &setup.time_limit,      "Timelimit:"    },
-  { TYPE_ENTER_MENU,   execSetupInput,         "Input Devices" },
   { TYPE_EMPTY,                NULL,                   ""              },
   { TYPE_LEAVE_MENU,   execExitSetup,          "Exit"          },
   { TYPE_LEAVE_MENU,   execSaveAndExitSetup,   "Save and exit" },
   { 0,                 NULL,                   NULL            }
 };
-static int num_setup_info = 0;
 
-static void drawSetupValue(struct TokenInfo *si, int pos)
+static struct TokenInfo setup_info_sound[] =
+{
+  { TYPE_SWITCH,       &setup.sound,           "Sound:",       },
+  { TYPE_EMPTY,                NULL,                   ""              },
+  { TYPE_SWITCH,       &setup.sound_simple,    "Simple Sound:" },
+  { TYPE_SWITCH,       &setup.sound_loops,     "Sound Loops:"  },
+  { TYPE_SWITCH,       &setup.sound_music,     "Game Music:"   },
+  { TYPE_EMPTY,                NULL,                   ""              },
+  { TYPE_LEAVE_MENU,   execSetupMain,          "Exit"          },
+  { 0,                 NULL,                   NULL            }
+};
+
+static struct TokenInfo setup_info_shortcut[] =
+{
+  { TYPE_KEYTEXT,      NULL,                   "Quick Save Game:",     },
+  { TYPE_KEY,          &setup.shortcut.save_game,      ""              },
+  { TYPE_KEYTEXT,      NULL,                   "Quick Load Game:",     },
+  { TYPE_KEY,          &setup.shortcut.load_game,      ""              },
+  { TYPE_EMPTY,                NULL,                   ""                      },
+  { TYPE_LEAVE_MENU,   execSetupMain,          "Exit"                  },
+  { 0,                 NULL,                   NULL                    }
+};
+
+static Key getSetupKey()
+{
+  Key key = KSYM_UNDEFINED;
+  boolean got_key_event = FALSE;
+
+  while (!got_key_event)
+  {
+    if (PendingEvent())                /* got event */
+    {
+      Event event;
+
+      NextEvent(&event);
+
+      switch(event.type)
+      {
+        case EVENT_KEYPRESS:
+         {
+           key = GetEventKey((KeyEvent *)&event, TRUE);
+
+           /* press 'Escape' or 'Enter' to keep the existing key binding */
+           if (key == KSYM_Escape || key == KSYM_Return)
+             key = KSYM_UNDEFINED;     /* keep old value */
+
+           got_key_event = TRUE;
+         }
+         break;
+
+        case EVENT_KEYRELEASE:
+         key_joystick_mapping = 0;
+         break;
+
+        default:
+         HandleOtherEvents(&event);
+         break;
+      }
+    }
+
+    BackToFront();
+    DoAnimation();
+
+    /* don't eat all CPU time */
+    Delay(10);
+  }
+
+  return key;
+}
+
+static void drawSetupValue(int pos)
 {
   int xpos = MENU_SCREEN_VALUE_XPOS;
   int ypos = MENU_SCREEN_START_YPOS + pos;
   int value_color = FC_YELLOW;
-  char *value_string = getSetupValue(si[pos].type & ~TYPE_GHOSTED,
-                                    si[pos].value);
+  char *value_string = getSetupValue(setup_info[pos].type & ~TYPE_GHOSTED,
+                                    setup_info[pos].value);
 
-  if (si[pos].type & TYPE_SWITCH ||
-      si[pos].type & TYPE_YES_NO)
+  if (setup_info[pos].type & TYPE_KEY)
   {
-    boolean value = *(boolean *)(si[pos].value);
-    int value_length = 3;
+    xpos = 3;
 
-    if (!value)
-      value_color = FC_BLUE;
-
-    if (strlen(value_string) < value_length)
-      strcat(value_string, " ");
+    if (setup_info[pos].type & TYPE_QUERY)
+    {
+      value_string = "<press key>";
+      value_color = FC_RED;
+    }
   }
 
+  if (setup_info[pos].type & TYPE_BOOLEAN_STYLE &&
+      !*(boolean *)(setup_info[pos].value))
+    value_color = FC_BLUE;
+
+  DrawText(SX + xpos * 32, SY + ypos * 32,
+          (xpos == 3 ? "              " : "   "), FS_BIG, FC_YELLOW);
   DrawText(SX + xpos * 32, SY + ypos * 32, value_string, FS_BIG, value_color);
 }
 
-void DrawSetupScreen()
+static void changeSetupValue(int pos)
 {
+  if (setup_info[pos].type & TYPE_BOOLEAN_STYLE)
+  {
+    *(boolean *)setup_info[pos].value ^= TRUE;
+  }
+  else if (setup_info[pos].type & TYPE_KEY)
+  {
+    Key key;
+
+    setup_info[pos].type |= TYPE_QUERY;
+    drawSetupValue(pos);
+    setup_info[pos].type &= ~TYPE_QUERY;
+
+    key = getSetupKey();
+    if (key != KSYM_UNDEFINED)
+      *(Key *)setup_info[pos].value = key;
+  }
+
+  drawSetupValue(pos);
+}
+
+static void DrawSetupScreen_Generic()
+{
+  char *title_string = NULL;
   int i;
 
   UnmapAllGadgets();
   CloseDoor(DOOR_CLOSE_2);
   ClearWindow();
 
-  DrawText(SX + 16, SY + 16, "SETUP",FS_BIG,FC_YELLOW);
+  if (setup_mode == SETUP_MODE_MAIN)
+  {
+    setup_info = setup_info_main;
+    title_string = "Setup";
+  }
+  else if (setup_mode == SETUP_MODE_SOUND)
+  {
+    setup_info = setup_info_sound;
+    title_string = "Setup Sound";
+  }
+  else if (setup_mode == SETUP_MODE_SHORTCUT)
+  {
+    setup_info = setup_info_shortcut;
+    title_string = "Setup Shortcuts";
+  }
+
+  DrawText(SX + 16, SY + 16, title_string, FS_BIG, FC_YELLOW);
 
+  num_setup_info = 0;
   for(i=0; setup_info[i].type != 0 && i < MAX_MENU_ENTRIES_ON_SCREEN; i++)
   {
     void *value_ptr = setup_info[i].value;
@@ -1406,86 +1542,77 @@ void DrawSetupScreen()
     DrawText(SX + 32, SY + ypos * 32, setup_info[i].text, FS_BIG, FC_GREEN);
 
     if (setup_info[i].type & TYPE_ENTER_MENU)
-       initCursor(i, GFX_ARROW_BLUE_RIGHT);
+      initCursor(i, GFX_ARROW_BLUE_RIGHT);
     else if (setup_info[i].type & TYPE_LEAVE_MENU)
-       initCursor(i, GFX_ARROW_BLUE_LEFT);
-    else if (setup_info[i].type != TYPE_EMPTY)
+      initCursor(i, GFX_ARROW_BLUE_LEFT);
+    else if (setup_info[i].type & ~TYPE_SKIP_ENTRY)
       initCursor(i, GFX_KUGEL_BLAU);
 
-    if (setup_info[i].type & TYPE_BOOLEAN_STYLE)
-      drawSetupValue(setup_info, i);
+    if (setup_info[i].type & TYPE_VALUE)
+      drawSetupValue(i);
 
     num_setup_info++;
   }
 
   FadeToFront();
   InitAnimation();
-  HandleSetupScreen(0,0,0,0,MB_MENU_INITIALIZE);
+  HandleSetupScreen_Generic(0,0,0,0,MB_MENU_INITIALIZE);
 }
 
-
-#if 1
-
-void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
+void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button)
 {
-  static int choice = 0;
-  static int redraw = TRUE;
-  int x = (mx - SX) / 32;
-  int y = (my - SY) / 32 - MENU_SCREEN_START_YPOS;
-  int pos_start  = SETUP_SCREEN_POS_START;
-  int pos_empty1 = SETUP_SCREEN_POS_EMPTY1;
-  int pos_empty2 = SETUP_SCREEN_POS_EMPTY2;
-  int pos_end    = SETUP_SCREEN_POS_END;
+  static int choice_store[MAX_SETUP_MODES];
+  int choice = choice_store[setup_mode];
+  int x = 0;
+  int y = choice;
 
   if (button == MB_MENU_INITIALIZE)
-    redraw = TRUE;
-
-  if (redraw)
   {
     drawCursor(choice, FC_RED);
-    redraw = FALSE;
+    return;
   }
+  else if (button == MB_MENU_LEAVE)
+  {
+    for (y=0; y<num_setup_info; y++)
+    {
+      if (setup_info[y].type & TYPE_LEAVE_MENU)
+      {
+       void (*menu_callback_function)(void) = setup_info[y].value;
+
+       menu_callback_function();
+       break;  /* absolutely needed because function changes 'setup_info'! */
+      }
+    }
 
-  if (button == MB_MENU_INITIALIZE)
     return;
+  }
 
-  if (dx || dy)
+  if (mx || my)                /* mouse input */
+  {
+    x = (mx - SX) / 32;
+    y = (my - SY) / 32 - MENU_SCREEN_START_YPOS;
+  }
+  else if (dx || dy)   /* keyboard input */
   {
-    x = 0;
-    y = choice;
-
     if (dx)
     {
-      int type = (dx < 0 ? TYPE_LEAVE_MENU : TYPE_ENTER_MENU);
+      int menu_navigation_type = (dx < 0 ? TYPE_LEAVE_MENU : TYPE_ENTER_MENU);
 
-      if (!(setup_info[choice].type & TYPE_ENTER_OR_LEAVE_MENU) ||
-         setup_info[choice].type == type)
+      if ((setup_info[choice].type & menu_navigation_type) ||
+         (setup_info[choice].type & TYPE_BOOLEAN_STYLE))
        button = MB_MENU_CHOICE;
     }
     else if (dy)
       y = choice + dy;
 
-    /* stay in valid range */
-    if (y < 0)
-      y = 0;
-    else if (y > num_setup_info - 1)
-      y = num_setup_info - 1;
-
     /* jump to next non-empty menu entry (up or down) */
-    if (setup_info[y].type == TYPE_EMPTY)
-      while (y > 0 && y < num_setup_info - 1 &&
-            setup_info[y].type == TYPE_EMPTY)
-       y += dy;
-  }
-
-  if (!mx && !my && !dx && !dy)
-  {
-    x = 0;
-    y = choice;
+    while (y > 0 && y < num_setup_info - 1 &&
+          (setup_info[y].type & TYPE_SKIP_ENTRY))
+      y += dy;
   }
 
   if (x == 0 && y >= 0 && y < num_setup_info &&
-      setup_info[y].type != TYPE_EMPTY)
+      (setup_info[y].type & ~TYPE_SKIP_ENTRY))
   {
     if (button)
     {
@@ -1493,463 +1620,65 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
       {
        drawCursor(y, FC_RED);
        drawCursor(choice, FC_BLUE);
-       choice = y;
+       choice = choice_store[setup_mode] = y;
       }
     }
     else if (!(setup_info[y].type & TYPE_GHOSTED))
     {
+#if 0
       if (setup_info[y].type & TYPE_BOOLEAN_STYLE)
       {
        boolean new_value = !*(boolean *)(setup_info[y].value);
 
        *(boolean *)setup_info[y].value = new_value;
-
-       drawSetupValue(setup_info, y);
+       drawSetupValue(y);
+      }
+      else if (setup_info[y].type == TYPE_KEYTEXT &&
+              setup_info[y + 1].type == TYPE_KEY)
+      {
+       changeSetupValue(y + 1);
       }
       else if (setup_info[y].type & TYPE_ENTER_OR_LEAVE_MENU)
       {
        void (*menu_callback_function)(void) = setup_info[choice].value;
 
        menu_callback_function();
-       redraw = TRUE;
       }
-    }
-  }
-
-  BackToFront();
-
-  if (game_status == SETUP)
-    DoAnimation();
-
-  return;
-
-
-
-  if (x == 0 && y >= pos_start && y <= pos_end &&
-      !(y >= pos_empty1 && y <= pos_empty2))
-  {
-    if (button)
-    {
-      if (y != choice)
-      {
-       drawCursor(y, FC_RED);
-       drawCursor(choice, FC_BLUE);
-      }
-      choice = y;
-    }
-    else
-    {
-      int yy = MENU_SCREEN_START_YPOS + y;
-
-      if (y == 0 && audio.sound_available)
-      {
-       if (setup.sound)
-       {
-         DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
-         DrawText(SX+14*32, SY+(yy+1)*32,"off",FS_BIG,FC_BLUE);
-         DrawText(SX+14*32, SY+(yy+2)*32,"off",FS_BIG,FC_BLUE);
-         setup.sound_loops = FALSE;
-         setup.sound_music = FALSE;
-       }
-       else
-         DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
-       setup.sound = !setup.sound;
-      }
-      else if (y == 1 && audio.loops_available)
-      {
-       if (setup.sound_loops)
-         DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
-       else
-       {
-         DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
-         DrawText(SX+14*32, SY+(yy-1)*32,"on ",FS_BIG,FC_YELLOW);
-         setup.sound = TRUE;
-       }
-       setup.sound_loops = !setup.sound_loops;
-      }
-      else if (y == 2 && audio.loops_available)
-      {
-       if (setup.sound_music)
-         DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
-       else
-       {
-         DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
-         DrawText(SX+14*32, SY+(yy-2)*32,"on ",FS_BIG,FC_YELLOW);
-         setup.sound = TRUE;
-       }
-       setup.sound_music = !setup.sound_music;
-      }
-
-#if 0
-      else if (y == 3)
-      {
-       if (setup.toons)
-         DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
-       else
-         DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
-       setup.toons = !setup.toons;
-      }
-      else if (y == 4)
-      {
-#if 0
-       if (setup.double_buffering)
-         DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
-       else
-         DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
-       setup.double_buffering = !setup.double_buffering;
-       setup.direct_draw = !setup.double_buffering;
 #else
-       DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
-       setup.double_buffering = TRUE;
-       setup.direct_draw = !setup.double_buffering;
-#endif
-      }
-#endif
-
-      else if (y == 3)
-      {
-       if (setup.scroll_delay)
-         DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
-       else
-         DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
-       setup.scroll_delay = !setup.scroll_delay;
-      }
-      else if (y == 4)
-      {
-       if (setup.soft_scrolling)
-         DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
-       else
-         DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
-       setup.soft_scrolling = !setup.soft_scrolling;
-      }
-#if 0
-      else if (y == 5)
-      {
-       if (setup.fading)
-         DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
-       else
-         DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
-       setup.fading = !setup.fading;
-      }
-#endif
-      else if (y == 5 && video.fullscreen_available)
-      {
-       if (setup.fullscreen)
-         DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
-       else
-         DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
-       setup.fullscreen = !setup.fullscreen;
-      }
-      else if (y == 6)
-      {
-       if (setup.quick_doors)
-         DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
-       else
-         DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
-       setup.quick_doors = !setup.quick_doors;
-      }
-      else if (y == 7)
-      {
-       if (setup.autorecord)
-         DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
-       else
-         DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
-       setup.autorecord = !setup.autorecord;
-      }
-      else if (y == 8)
-      {
-       if (setup.team_mode)
-         DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
-       else
-         DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
-       setup.team_mode = !setup.team_mode;
-      }
-      else if (y == 9)
-      {
-       if (setup.handicap)
-         DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
-       else
-         DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
-       setup.handicap = !setup.handicap;
-      }
-      else if (y == 10)
-      {
-       if (setup.time_limit)
-         DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
-       else
-         DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
-       setup.time_limit = !setup.time_limit;
-      }
-      else if (y == 11)
-      {
-       game_status = SETUPINPUT;
-       DrawSetupInputScreen();
-       redraw = TRUE;
-      }
-      else if (y == pos_end - 1 || y == pos_end)
-      {
-        if (y == pos_end)
-         SaveSetup();
-
-       game_status = MAINMENU;
-       DrawMainMenu();
-       redraw = TRUE;
-      }
-    }
-  }
-  BackToFront();
-
-  if (game_status==SETUP)
-    DoAnimation();
-}
-
-#else
-
-void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
-{
-  static int choice = 0;
-  static int redraw = TRUE;
-  int x = (mx - SX) / 32;
-  int y = (my - SY) / 32 - MENU_SCREEN_START_YPOS;
-  int pos_start  = SETUP_SCREEN_POS_START;
-  int pos_empty1 = SETUP_SCREEN_POS_EMPTY1;
-  int pos_empty2 = SETUP_SCREEN_POS_EMPTY2;
-  int pos_end    = SETUP_SCREEN_POS_END;
-
-  if (button == MB_MENU_INITIALIZE)
-    redraw = TRUE;
-
-  if (redraw)
-  {
-    drawCursor(choice, FC_RED);
-    redraw = FALSE;
-  }
-
-  if (button == MB_MENU_INITIALIZE)
-    return;
-
-  if (dx || dy)
-  {
-    if (dy)
-    {
-      x = 0;
-      y = choice + dy;
-    }
-    else
-      x = y = -1;
-
-    if (y >= pos_empty1 && y <= pos_empty2)
-      y = (dy > 0 ? pos_empty2 + 1 : pos_empty1 - 1);
-
-    if (y < pos_start)
-      y = pos_start;
-    else if (y > pos_end)
-      y = pos_end;
-  }
-
-  if (!mx && !my && !dx && !dy)
-  {
-    x = 0;
-    y = choice;
-  }
-
-  if (dx == 1 && choice == 11)
-  {
-    game_status = SETUPINPUT;
-    DrawSetupInputScreen();
-    redraw = TRUE;
-  }
-
-  if (x == 0 && y >= pos_start && y <= pos_end &&
-      !(y >= pos_empty1 && y <= pos_empty2))
-  {
-    if (button)
-    {
-      if (y != choice)
-      {
-       drawCursor(y, FC_RED);
-       drawCursor(choice, FC_BLUE);
-      }
-      choice = y;
-    }
-    else
-    {
-      int yy = MENU_SCREEN_START_YPOS + y;
-
-      if (y == 0 && audio.sound_available)
+      if (setup_info[y].type & TYPE_ENTER_OR_LEAVE_MENU)
       {
-       if (setup.sound)
-       {
-         DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
-         DrawText(SX+14*32, SY+(yy+1)*32,"off",FS_BIG,FC_BLUE);
-         DrawText(SX+14*32, SY+(yy+2)*32,"off",FS_BIG,FC_BLUE);
-         setup.sound_loops = FALSE;
-         setup.sound_music = FALSE;
-       }
-       else
-         DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
-       setup.sound = !setup.sound;
-      }
-      else if (y == 1 && audio.loops_available)
-      {
-       if (setup.sound_loops)
-         DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
-       else
-       {
-         DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
-         DrawText(SX+14*32, SY+(yy-1)*32,"on ",FS_BIG,FC_YELLOW);
-         setup.sound = TRUE;
-       }
-       setup.sound_loops = !setup.sound_loops;
-      }
-      else if (y == 2 && audio.loops_available)
-      {
-       if (setup.sound_music)
-         DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
-       else
-       {
-         DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
-         DrawText(SX+14*32, SY+(yy-2)*32,"on ",FS_BIG,FC_YELLOW);
-         setup.sound = TRUE;
-       }
-       setup.sound_music = !setup.sound_music;
-      }
+       void (*menu_callback_function)(void) = setup_info[choice].value;
 
-#if 0
-      else if (y == 3)
-      {
-       if (setup.toons)
-         DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
-       else
-         DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
-       setup.toons = !setup.toons;
+       menu_callback_function();
       }
-      else if (y == 4)
+      else
       {
-#if 0
-       if (setup.double_buffering)
-         DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
-       else
-         DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
-       setup.double_buffering = !setup.double_buffering;
-       setup.direct_draw = !setup.double_buffering;
-#else
-       DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
-       setup.double_buffering = TRUE;
-       setup.direct_draw = !setup.double_buffering;
-#endif
-      }
-#endif
+       if ((setup_info[y].type & TYPE_KEYTEXT) &&
+           (setup_info[y + 1].type & TYPE_KEY))
+         y++;
 
-      else if (y == 3)
-      {
-       if (setup.scroll_delay)
-         DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
-       else
-         DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
-       setup.scroll_delay = !setup.scroll_delay;
-      }
-      else if (y == 4)
-      {
-       if (setup.soft_scrolling)
-         DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
-       else
-         DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
-       setup.soft_scrolling = !setup.soft_scrolling;
-      }
-#if 0
-      else if (y == 5)
-      {
-       if (setup.fading)
-         DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
-       else
-         DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
-       setup.fading = !setup.fading;
+       if (setup_info[y].type & TYPE_VALUE)
+         changeSetupValue(y);
       }
 #endif
-      else if (y == 5 && video.fullscreen_available)
-      {
-       if (setup.fullscreen)
-         DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
-       else
-         DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
-       setup.fullscreen = !setup.fullscreen;
-      }
-      else if (y == 6)
-      {
-       if (setup.quick_doors)
-         DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
-       else
-         DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
-       setup.quick_doors = !setup.quick_doors;
-      }
-      else if (y == 7)
-      {
-       if (setup.autorecord)
-         DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
-       else
-         DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
-       setup.autorecord = !setup.autorecord;
-      }
-      else if (y == 8)
-      {
-       if (setup.team_mode)
-         DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
-       else
-         DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
-       setup.team_mode = !setup.team_mode;
-      }
-      else if (y == 9)
-      {
-       if (setup.handicap)
-         DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
-       else
-         DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
-       setup.handicap = !setup.handicap;
-      }
-      else if (y == 10)
-      {
-       if (setup.time_limit)
-         DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
-       else
-         DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
-       setup.time_limit = !setup.time_limit;
-      }
-      else if (y == 11)
-      {
-       game_status = SETUPINPUT;
-       DrawSetupInputScreen();
-       redraw = TRUE;
-      }
-      else if (y == pos_end - 1 || y == pos_end)
-      {
-        if (y == pos_end)
-         SaveSetup();
-
-       game_status = MAINMENU;
-       DrawMainMenu();
-       redraw = TRUE;
-      }
     }
   }
+
   BackToFront();
 
-  if (game_status==SETUP)
+  if (game_status == SETUP)
     DoAnimation();
 }
 
-#endif
-
-
-void DrawSetupInputScreen()
+void DrawSetupScreen_Input()
 {
   ClearWindow();
-  DrawText(SX+16, SY+16, "SETUP INPUT", FS_BIG, FC_YELLOW);
+  DrawText(SX+16, SY+16, "Setup Input", FS_BIG, FC_YELLOW);
 
   initCursor(0, GFX_KUGEL_BLAU);
   initCursor(1, GFX_KUGEL_BLAU);
   initCursor(2, GFX_ARROW_BLUE_RIGHT);
-  initCursor(13, GFX_KUGEL_BLAU);
+  initCursor(13, GFX_ARROW_BLUE_LEFT);
 
   DrawGraphic(10, MENU_SCREEN_START_YPOS, GFX_ARROW_BLUE_LEFT);
   DrawGraphic(12, MENU_SCREEN_START_YPOS, GFX_ARROW_BLUE_RIGHT);
@@ -1962,7 +1691,7 @@ void DrawSetupInputScreen()
   DrawTextFCentered(SYSIZE - 20, FC_BLUE,
                    "Joysticks deactivated on this screen");
 
-  HandleSetupInputScreen(0,0, 0,0, MB_MENU_INITIALIZE);
+  HandleSetupScreen_Input(0,0, 0,0, MB_MENU_INITIALIZE);
   FadeToFront();
   InitAnimation();
 }
@@ -2059,13 +1788,12 @@ static void drawPlayerSetupInputInfo(int player_nr)
   }
 }
 
-void HandleSetupInputScreen(int mx, int my, int dx, int dy, int button)
+void HandleSetupScreen_Input(int mx, int my, int dx, int dy, int button)
 {
   static int choice = 0;
   static int player_nr = 0;
-  static int redraw = TRUE;
-  int x = (mx - SX) / 32;
-  int y = (my - SY) / 32 - MENU_SCREEN_START_YPOS;
+  int x = 0;
+  int y = choice;
   int pos_start  = SETUPINPUT_SCREEN_POS_START;
   int pos_empty1 = SETUPINPUT_SCREEN_POS_EMPTY1;
   int pos_empty2 = SETUPINPUT_SCREEN_POS_EMPTY2;
@@ -2074,52 +1802,34 @@ void HandleSetupInputScreen(int mx, int my, int dx, int dy, int button)
   if (button == MB_MENU_INITIALIZE)
   {
     drawPlayerSetupInputInfo(player_nr);
-    redraw = TRUE;
+    drawCursor(choice, FC_RED);
+    return;
   }
-
-  if (redraw)
+  else if (button == MB_MENU_LEAVE)
   {
-    drawCursor(choice, FC_RED);
-    redraw = FALSE;
+    setup_mode = SETUP_MODE_MAIN;
+    DrawSetupScreen();
+    InitJoysticks();
   }
 
-  if (button == MB_MENU_INITIALIZE)
-    return;
-
-  if (dx || dy)
+  if (mx || my)                /* mouse input */
+  {
+    x = (mx - SX) / 32;
+    y = (my - SY) / 32 - MENU_SCREEN_START_YPOS;
+  }
+  else if (dx || dy)   /* keyboard input */
   {
     if (dx && choice == 0)
-    {
       x = (dx < 0 ? 10 : 12);
-      y = 0;
-    }
-    else if (dx && choice == 1)
-    {
+    else if ((dx && choice == 1) ||
+            (dx == +1 && choice == 2) ||
+            (dx == -1 && choice == pos_end))
       button = MB_MENU_CHOICE;
-      x = 0;
-      y = 1;
-    }
     else if (dy)
-    {
-      x = 0;
       y = choice + dy;
-    }
-    else
-      x = y = -1;
 
     if (y >= pos_empty1 && y <= pos_empty2)
       y = (dy > 0 ? pos_empty2 + 1 : pos_empty1 - 1);
-
-    if (y < pos_start)
-      y = pos_start;
-    else if (y > pos_end)
-      y = pos_end;
-  }
-
-  if (!mx && !my && !dx && !dy)
-  {
-    x = 0;
-    y = choice;
   }
 
   if (y == 0 && ((x == 0 && !button) || ((x == 10 || x == 12) && button)))
@@ -2142,8 +1852,8 @@ void HandleSetupInputScreen(int mx, int my, int dx, int dy, int button)
       {
        drawCursor(y, FC_RED);
        drawCursor(choice, FC_BLUE);
+       choice = y;
       }
-      choice = y;
     }
     else
     {
@@ -2176,30 +1886,26 @@ void HandleSetupInputScreen(int mx, int my, int dx, int dy, int button)
        if (setup.input[player_nr].use_joystick)
        {
          InitJoysticks();
-         game_status = CALIBRATION;
          CalibrateJoystick(player_nr);
-         game_status = SETUPINPUT;
        }
        else
          CustomizeKeyboard(player_nr);
-
-       redraw = TRUE;
       }
       else if (y == pos_end)
       {
        InitJoysticks();
 
-       game_status = SETUP;
+       setup_mode = SETUP_MODE_MAIN;
        DrawSetupScreen();
-       redraw = TRUE;
       }
     }
   }
+
   BackToFront();
 
   out:
 
-  if (game_status == SETUPINPUT)
+  if (game_status == SETUP)
     DoAnimation();
 }
 
@@ -2330,7 +2036,7 @@ void CustomizeKeyboard(int player_nr)
   setup.input[player_nr].key = custom_key;
 
   StopAnimation();
-  DrawSetupInputScreen();
+  DrawSetupScreen_Input();
 }
 
 static boolean CalibrateJoystickMain(int player_nr)
@@ -2498,7 +2204,7 @@ static boolean CalibrateJoystickMain(int player_nr)
 
   StopAnimation();
 
-  DrawSetupInputScreen();
+  DrawSetupScreen_Input();
 
   /* wait until the last pressed button was released */
   while (Joystick(player_nr) & JOY_BUTTON)
@@ -2530,6 +2236,22 @@ void CalibrateJoystick(int player_nr)
   }
 }
 
+void DrawSetupScreen()
+{
+  if (setup_mode == SETUP_MODE_INPUT)
+    DrawSetupScreen_Input();
+  else
+    DrawSetupScreen_Generic();
+}
+
+void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
+{
+  if (setup_mode == SETUP_MODE_INPUT)
+    HandleSetupScreen_Input(mx, my, dx, dy, button);
+  else
+    HandleSetupScreen_Generic(mx, my, dx, dy, button);
+}
+
 void HandleGameActions()
 {
   if (game_status != PLAYING)
@@ -2729,7 +2451,7 @@ void CreateScreenGadgets()
 
 void MapChooseLevelGadgets()
 {
-  int num_leveldirs = numLevelDirInfoInGroup(leveldir_current);
+  int num_leveldirs = numTreeInfoInGroup(leveldir_current);
   int i;
 
   if (num_leveldirs <= MAX_MENU_ENTRIES_ON_SCREEN)