rnd-20020407-2-src
[rocksndiamonds.git] / src / screens.c
index b9b7c5dde86630c7858ad9338821c368b830fa09..ece8b097db923651cbc872a395e33111231c8b1c 100644 (file)
 /* screens in the setup menu */
 #define SETUP_MODE_MAIN                        0
 #define SETUP_MODE_INPUT               1
-#define SETUP_MODE_GRAPHICS            2
-#define SETUP_MODE_SOUND               3
+#define SETUP_MODE_SHORTCUT            2
+#define SETUP_MODE_GRAPHICS            3
+#define SETUP_MODE_SOUND               4
+#define SETUP_MODE_CHOOSE_GRAPHICS     5
+#define SETUP_MODE_CHOOSE_SOUNDS       6
+#define SETUP_MODE_CHOOSE_MUSIC                7
 
-#define MAX_SETUP_MODES                        4
+#define MAX_SETUP_MODES                        8
 
-/* for HandleSetupInputScreen() */
+/* 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 execExitSetupChooseArtwork(void);
+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 void HandleChooseTree(int, int, int, int, int, TreeInfo **);
 
 static struct GadgetInfo *screen_gadget[NUM_SCREEN_GADGETS];
+static int setup_mode = SETUP_MODE_MAIN;
 
 static void drawCursorExt(int pos, int color, int graphic)
 {
@@ -117,7 +128,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:");
 
@@ -141,6 +152,9 @@ void DrawMainMenu()
   /* needed if last screen was the setup screen and fullscreen state changed */
   ToggleFullscreenIfNeeded();
 
+  /* needed if last screen (setup/level) changed graphics, sounds or music */
+  ReloadCustomArtwork();
+
 #ifdef TARGET_SDL
   SetDrawtoField(DRAW_BACKBUFFER);
 #endif
@@ -150,7 +164,7 @@ void DrawMainMenu()
 
   /* leveldir_current may be invalid (level group, parent link) */
   if (!validLevelSeries(leveldir_current))
-    leveldir_current = getFirstValidLevelSeries(leveldir_last_valid);
+    leveldir_current = getFirstValidTreeInfoEntry(leveldir_last_valid);
 
   /* store valid level series information */
   leveldir_last_valid = leveldir_current;
@@ -220,7 +234,6 @@ void DrawMainMenu()
 #if 0
   ClearEventQueue();
 #endif
-
 }
 
 static void gotoTopLevelDir()
@@ -231,8 +244,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;
 
@@ -386,6 +399,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
       else if (y == 6)
       {
        game_status = SETUP;
+       setup_mode = SETUP_MODE_MAIN;
        DrawSetupScreen();
       }
       else if (y == 7)
@@ -912,25 +926,25 @@ void HandleTypeName(int newxpos, Key key)
   BackToFront();
 }
 
-void DrawChooseLevel()
+static void DrawChooseTree(TreeInfo **ti_ptr)
 {
   UnmapAllGadgets();
   CloseDoor(DOOR_CLOSE_2);
 
   ClearWindow();
-  HandleChooseLevel(0,0, 0,0, MB_MENU_INITIALIZE);
-  MapChooseLevelGadgets();
+  HandleChooseTree(0,0, 0,0, MB_MENU_INITIALIZE, ti_ptr);
+  MapChooseTreeGadgets(*ti_ptr);
 
   FadeToFront();
   InitAnimation();
 }
 
-static void AdjustChooseLevelScrollbar(int id, int first_entry)
+static void AdjustChooseTreeScrollbar(int id, int first_entry, TreeInfo *ti)
 {
   struct GadgetInfo *gi = screen_gadget[id];
   int items_max, items_visible, item_position;
 
-  items_max = numLevelDirInfoInGroup(leveldir_current);
+  items_max = numTreeInfoInGroup(ti);
   items_visible = MAX_MENU_ENTRIES_ON_SCREEN - 1;
   item_position = first_entry;
 
@@ -941,26 +955,36 @@ static void AdjustChooseLevelScrollbar(int id, int first_entry)
               GDI_SCROLLBAR_ITEM_POSITION, item_position, GDI_END);
 }
 
-static void drawChooseLevelList(int first_entry, int num_page_entries)
+static void drawChooseTreeList(int first_entry, int num_page_entries,
+                              TreeInfo *ti)
 {
   int i;
   char buffer[SCR_FIELDX * 2];
   int max_buffer_len = (SCR_FIELDX - 2) * 2;
-  int num_leveldirs = numLevelDirInfoInGroup(leveldir_current);
+  int num_entries = numTreeInfoInGroup(ti);
+  char *title_string = NULL;
+  int offset = (ti->type == TREE_TYPE_LEVEL_DIR ? 0 : 16);
 
   ClearRectangle(backbuffer, SX, SY, SXSIZE - 32, SYSIZE);
   redraw_mask |= REDRAW_FIELD;
 
-  DrawText(SX, SY, "Level Directories", FS_BIG, FC_GREEN);
+  title_string =
+    (ti->type == TREE_TYPE_LEVEL_DIR ? "Level Directories" :
+     ti->type == TREE_TYPE_GRAPHICS_DIR ? "Custom Graphics" :
+     ti->type == TREE_TYPE_SOUNDS_DIR ? "Custom Sounds" :
+     ti->type == TREE_TYPE_MUSIC_DIR ? "Custom Music" : "");
+
+  DrawText(SX + offset, SY + offset, title_string, FS_BIG,
+          (ti->type == TREE_TYPE_LEVEL_DIR ? FC_GREEN : FC_YELLOW));
 
   for(i=0; i<num_page_entries; i++)
   {
-    struct LevelDirInfo *node, *node_first;
-    int leveldir_pos = first_entry + i;
+    TreeInfo *node, *node_first;
+    int entry_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(ti);
+    node = getTreeInfoFromPos(node_first, entry_pos);
 
     strncpy(buffer, node->name , max_buffer_len);
     buffer[max_buffer_len] = '\0';
@@ -978,17 +1002,20 @@ static void drawChooseLevelList(int first_entry, int num_page_entries)
   if (first_entry > 0)
     DrawGraphic(0, 1, GFX_ARROW_BLUE_UP);
 
-  if (first_entry + num_page_entries < num_leveldirs)
+  if (first_entry + num_page_entries < num_entries)
     DrawGraphic(0, MAX_MENU_ENTRIES_ON_SCREEN + 1, GFX_ARROW_BLUE_DOWN);
 }
 
-static void drawChooseLevelInfo(int leveldir_pos)
+static void drawChooseTreeInfo(int entry_pos, TreeInfo *ti)
 {
-  struct LevelDirInfo *node, *node_first;
+  TreeInfo *node, *node_first;
   int x, last_redraw_mask = redraw_mask;
 
-  node_first = getLevelDirInfoFirstGroupEntry(leveldir_current);
-  node = getLevelDirInfoFromPos(node_first, leveldir_pos);
+  if (ti->type != TREE_TYPE_LEVEL_DIR)
+    return;
+
+  node_first = getTreeInfoFirstGroupEntry(ti);
+  node = getTreeInfoFromPos(node_first, entry_pos);
 
   ClearRectangle(drawto, SX + 32, SY + 32, SXSIZE - 64, 32);
 
@@ -996,7 +1023,7 @@ static void drawChooseLevelInfo(int leveldir_pos)
     DrawTextFCentered(40, FC_RED, "leave group \"%s\"", node->class_desc);
   else if (node->level_group)
     DrawTextFCentered(40, FC_RED, "enter group \"%s\"", node->class_desc);
-  else
+  else if (ti->type == TREE_TYPE_LEVEL_DIR)
     DrawTextFCentered(40, FC_RED, "%3d levels (%s)",
                      node->levels, node->class_desc);
 
@@ -1006,55 +1033,61 @@ static void drawChooseLevelInfo(int leveldir_pos)
     MarkTileDirty(x, 1);
 }
 
-void HandleChooseLevel(int mx, int my, int dx, int dy, int button)
+static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
+                            TreeInfo **ti_ptr)
 {
   static unsigned long choose_delay = 0;
+  TreeInfo *ti = *ti_ptr;
   int x = 0;
-  int y = leveldir_current->cl_cursor;
+  int y = ti->cl_cursor;
   int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
-  int num_leveldirs = numLevelDirInfoInGroup(leveldir_current);
+  int num_entries = numTreeInfoInGroup(ti);
   int num_page_entries;
 
-  if (num_leveldirs <= MAX_MENU_ENTRIES_ON_SCREEN)
-    num_page_entries = num_leveldirs;
+  if (num_entries <= MAX_MENU_ENTRIES_ON_SCREEN)
+    num_page_entries = num_entries;
   else
     num_page_entries = MAX_MENU_ENTRIES_ON_SCREEN - 1;
 
   if (button == MB_MENU_INITIALIZE)
   {
-    int leveldir_pos = posLevelDirInfo(leveldir_current);
+    int entry_pos = posTreeInfo(ti);
 
-    if (leveldir_current->cl_first == -1)
+    if (ti->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;
+      ti->cl_first = MAX(0, entry_pos - num_page_entries + 1);
+      ti->cl_cursor =
+       entry_pos - ti->cl_first;
     }
 
     if (dx == 999)     /* first entry is set by scrollbar position */
-      leveldir_current->cl_first = dy;
+      ti->cl_first = dy;
     else
-      AdjustChooseLevelScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL,
-                                leveldir_current->cl_first);
+      AdjustChooseTreeScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL,
+                               ti->cl_first, ti);
 
-    drawChooseLevelList(leveldir_current->cl_first, num_page_entries);
-    drawChooseLevelInfo(leveldir_current->cl_first +
-                       leveldir_current->cl_cursor);
-    drawCursor(leveldir_current->cl_cursor, FC_RED);
+    drawChooseTreeList(ti->cl_first, num_page_entries, ti);
+    drawChooseTreeInfo(ti->cl_first + ti->cl_cursor, ti);
+    drawCursor(ti->cl_cursor, FC_RED);
     return;
   }
   else if (button == MB_MENU_LEAVE)
   {
-    if (leveldir_current->node_parent)
+    if (ti->node_parent)
     {
-      leveldir_current = leveldir_current->node_parent;
-      DrawChooseLevel();
+      *ti_ptr = ti->node_parent;
+      DrawChooseTree(ti_ptr);
+    }
+    else if (game_status == SETUP)
+    {
+      execExitSetupChooseArtwork();
     }
     else
     {
       game_status = MAINMENU;
       DrawMainMenu();
     }
+
     return;
   }
 
@@ -1066,7 +1099,7 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button)
   else if (dx || dy)   /* keyboard input */
   {
     if (dy)
-      y = leveldir_current->cl_cursor + dy;
+      y = ti->cl_cursor + dy;
 
     if (ABS(dy) == SCR_FIELDY) /* handle KSYM_Page_Up, KSYM_Page_Down */
     {
@@ -1078,62 +1111,60 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button)
 
   if (x == 0 && y == -1)
   {
-    if (leveldir_current->cl_first > 0 &&
+    if (ti->cl_first > 0 &&
        (dy || DelayReached(&choose_delay, GADGET_FRAME_DELAY)))
     {
-      leveldir_current->cl_first -= step;
-      if (leveldir_current->cl_first < 0)
-       leveldir_current->cl_first = 0;
-
-      drawChooseLevelList(leveldir_current->cl_first, num_page_entries);
-      drawChooseLevelInfo(leveldir_current->cl_first +
-                         leveldir_current->cl_cursor);
-      drawCursor(leveldir_current->cl_cursor, FC_RED);
-      AdjustChooseLevelScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL,
-                                leveldir_current->cl_first);
+      ti->cl_first -= step;
+      if (ti->cl_first < 0)
+       ti->cl_first = 0;
+
+      drawChooseTreeList(ti->cl_first, num_page_entries, ti);
+      drawChooseTreeInfo(ti->cl_first + ti->cl_cursor, ti);
+      drawCursor(ti->cl_cursor, FC_RED);
+      AdjustChooseTreeScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL,
+                               ti->cl_first, ti);
       return;
     }
   }
   else if (x == 0 && y > num_page_entries - 1)
   {
-    if (leveldir_current->cl_first + num_page_entries < num_leveldirs &&
+    if (ti->cl_first + num_page_entries < num_entries &&
        (dy || DelayReached(&choose_delay, GADGET_FRAME_DELAY)))
     {
-      leveldir_current->cl_first += step;
-      if (leveldir_current->cl_first + num_page_entries > num_leveldirs)
-       leveldir_current->cl_first = MAX(0, num_leveldirs - num_page_entries);
-
-      drawChooseLevelList(leveldir_current->cl_first, num_page_entries);
-      drawChooseLevelInfo(leveldir_current->cl_first +
-                         leveldir_current->cl_cursor);
-      drawCursor(leveldir_current->cl_cursor, FC_RED);
-      AdjustChooseLevelScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL,
-                                leveldir_current->cl_first);
+      ti->cl_first += step;
+      if (ti->cl_first + num_page_entries > num_entries)
+       ti->cl_first = MAX(0, num_entries - num_page_entries);
+
+      drawChooseTreeList(ti->cl_first, num_page_entries, ti);
+      drawChooseTreeInfo(ti->cl_first + ti->cl_cursor, ti);
+      drawCursor(ti->cl_cursor, FC_RED);
+      AdjustChooseTreeScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL,
+                               ti->cl_first, ti);
       return;
     }
   }
 
   if (dx == 1)
   {
-    struct LevelDirInfo *node_first, *node_cursor;
-    int leveldir_pos = leveldir_current->cl_first + y;
+    TreeInfo *node_first, *node_cursor;
+    int entry_pos = ti->cl_first + y;
 
-    node_first = getLevelDirInfoFirstGroupEntry(leveldir_current);
-    node_cursor = getLevelDirInfoFromPos(node_first, leveldir_pos);
+    node_first = getTreeInfoFirstGroupEntry(ti);
+    node_cursor = getTreeInfoFromPos(node_first, entry_pos);
 
     if (node_cursor->node_group)
     {
-      node_cursor->cl_first = leveldir_current->cl_first;
-      node_cursor->cl_cursor = leveldir_current->cl_cursor;
-      leveldir_current = node_cursor->node_group;
-      DrawChooseLevel();
+      node_cursor->cl_first = ti->cl_first;
+      node_cursor->cl_cursor = ti->cl_cursor;
+      *ti_ptr = node_cursor->node_group;
+      DrawChooseTree(ti_ptr);
       return;
     }
   }
-  else if (dx == -1 && leveldir_current->node_parent)
+  else if (dx == -1 && ti->node_parent)
   {
-    leveldir_current = leveldir_current->node_parent;
-    DrawChooseLevel();
+    *ti_ptr = ti->node_parent;
+    DrawChooseTree(ti_ptr);
     return;
   }
 
@@ -1141,60 +1172,78 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button)
   {
     if (button)
     {
-      if (y != leveldir_current->cl_cursor)
+      if (y != ti->cl_cursor)
       {
        drawCursor(y, FC_RED);
-       drawCursor(leveldir_current->cl_cursor, FC_BLUE);
-       drawChooseLevelInfo(leveldir_current->cl_first + y);
-       leveldir_current->cl_cursor = y;
+       drawCursor(ti->cl_cursor, FC_BLUE);
+       drawChooseTreeInfo(ti->cl_first + y, ti);
+       ti->cl_cursor = y;
       }
     }
     else
     {
-      struct LevelDirInfo *node_first, *node_cursor;
-      int leveldir_pos = leveldir_current->cl_first + y;
+      TreeInfo *node_first, *node_cursor;
+      int entry_pos = ti->cl_first + y;
 
-      node_first = getLevelDirInfoFirstGroupEntry(leveldir_current);
-      node_cursor = getLevelDirInfoFromPos(node_first, leveldir_pos);
+      node_first = getTreeInfoFirstGroupEntry(ti);
+      node_cursor = getTreeInfoFromPos(node_first, entry_pos);
 
       if (node_cursor->node_group)
       {
-       node_cursor->cl_first = leveldir_current->cl_first;
-       node_cursor->cl_cursor = leveldir_current->cl_cursor;
-       leveldir_current = node_cursor->node_group;
-
-       DrawChooseLevel();
+       node_cursor->cl_first = ti->cl_first;
+       node_cursor->cl_cursor = ti->cl_cursor;
+       *ti_ptr = node_cursor->node_group;
+       DrawChooseTree(ti_ptr);
       }
       else if (node_cursor->parent_link)
       {
-       leveldir_current = node_cursor->node_parent;
-
-       DrawChooseLevel();
+       *ti_ptr = node_cursor->node_parent;
+       DrawChooseTree(ti_ptr);
       }
       else
       {
-       node_cursor->cl_first = leveldir_current->cl_first;
-       node_cursor->cl_cursor = leveldir_current->cl_cursor;
-       leveldir_current = node_cursor;
+       node_cursor->cl_first = ti->cl_first;
+       node_cursor->cl_cursor = ti->cl_cursor;
+       *ti_ptr = node_cursor;
 
-       LoadLevelSetup_SeriesInfo();
+       if (ti->type == TREE_TYPE_LEVEL_DIR)
+       {
+         LoadLevelSetup_SeriesInfo();
 
-       SaveLevelSetup_LastSeries();
-       SaveLevelSetup_SeriesInfo();
-       TapeErase();
+         SaveLevelSetup_LastSeries();
+         SaveLevelSetup_SeriesInfo();
+         TapeErase();
+       }
 
-       game_status = MAINMENU;
-       DrawMainMenu();
+       if (game_status == SETUP)
+       {
+         execExitSetupChooseArtwork();
+       }
+       else
+       {
+         game_status = MAINMENU;
+         DrawMainMenu();
+       }
       }
     }
   }
 
   BackToFront();
 
-  if (game_status == CHOOSELEVEL)
+  if (game_status == CHOOSELEVEL || game_status == SETUP)
     DoAnimation();
 }
 
+void DrawChooseLevel()
+{
+  DrawChooseTree(&leveldir_current);
+}
+
+void HandleChooseLevel(int mx, int my, int dx, int dy, int button)
+{
+  HandleChooseTree(mx, my, dx, dy, button, &leveldir_current);
+}
+
 void DrawHallOfFame(int highlight_position)
 {
   UnmapAllGadgets();
@@ -1303,7 +1352,6 @@ void HandleHallOfFame(int mx, int my, int dx, int dy, int button)
 
 static struct TokenInfo *setup_info;
 static int num_setup_info;
-static int setup_mode = SETUP_MODE_MAIN;
 
 static void execSetupMain()
 {
@@ -1311,18 +1359,61 @@ static void execSetupMain()
   DrawSetupScreen();
 }
 
+static void execSetupGraphics()
+{
+  setup.graphics_set = artwork.gfx_current->name;
+
+  setup_mode = SETUP_MODE_GRAPHICS;
+  DrawSetupScreen();
+}
+
 static void execSetupSound()
 {
+  setup.sounds_set = artwork.snd_current->name;
+  setup.music_set = artwork.mus_current->name;
+
   setup_mode = SETUP_MODE_SOUND;
   DrawSetupScreen();
 }
 
+static void execSetupChooseGraphics()
+{
+  setup_mode = SETUP_MODE_CHOOSE_GRAPHICS;
+  DrawSetupScreen();
+}
+
+static void execSetupChooseSounds()
+{
+  setup_mode = SETUP_MODE_CHOOSE_SOUNDS;
+  DrawSetupScreen();
+}
+
+static void execSetupChooseMusic()
+{
+  setup_mode = SETUP_MODE_CHOOSE_MUSIC;
+  DrawSetupScreen();
+}
+
 static void execSetupInput()
 {
   setup_mode = SETUP_MODE_INPUT;
   DrawSetupScreen();
 }
 
+static void execSetupShortcut()
+{
+  setup_mode = SETUP_MODE_SHORTCUT;
+  DrawSetupScreen();
+}
+
+static void execExitSetupChooseArtwork()
+{
+  if (setup_mode == SETUP_MODE_CHOOSE_GRAPHICS)
+    execSetupGraphics();
+  else
+    execSetupSound();
+}
+
 static void execExitSetup()
 {
   game_status = MAINMENU;
@@ -1337,72 +1428,177 @@ static void execSaveAndExitSetup()
 
 static struct TokenInfo setup_info_main[] =
 {
-  { TYPE_ENTER_MENU,   execSetupSound,         "Sound Setup"   },
-  { TYPE_ENTER_MENU,   execSetupInput,         "Input Devices" },
-  { TYPE_EMPTY,                NULL,                   ""              },
+  { TYPE_ENTER_MENU,   execSetupGraphics,      "Graphics Setup"        },
+  { TYPE_ENTER_MENU,   execSetupSound,         "Sound Setup"           },
+  { TYPE_ENTER_MENU,   execSetupInput,         "Input Devices"         },
+  { TYPE_ENTER_MENU,   execSetupShortcut,      "Key Shortcuts"         },
+  { TYPE_EMPTY,                NULL,                   ""                      },
 #if 0
-  { TYPE_SWITCH,       &setup.sound,           "Sound:",       },
-  { TYPE_SWITCH,       &setup.sound_loops,     " Sound Loops:" },
-  { TYPE_SWITCH,       &setup.sound_music,     " Game Music:"  },
+  { TYPE_SWITCH,       &setup.double_buffering,"Buffered gfx:"         },
+  { TYPE_SWITCH,       &setup.fading,          "Fading:"               },
 #endif
-  { TYPE_SWITCH,       &setup.toons,           "Toons:"        },
-#if 0
-  { TYPE_SWITCH,       &setup.double_buffering,"Buffered gfx:" },
-#endif
-  { TYPE_SWITCH,       &setup.scroll_delay,    "Scroll Delay:" },
-  { TYPE_SWITCH,       &setup.soft_scrolling,  "Soft Scroll.:" },
-#if 0
-  { TYPE_SWITCH,       &setup.fading,          "Fading:"       },
-#endif
-  { TYPE_SWITCH,       &setup.fullscreen,      "Fullscreen:"   },
-  { TYPE_SWITCH,       &setup.quick_doors,     "Quick Doors:"  },
-  { TYPE_SWITCH,       &setup.autorecord,      "Auto-Record:"  },
-  { TYPE_SWITCH,       &setup.team_mode,       "Team-Mode:"    },
-  { TYPE_SWITCH,       &setup.handicap,        "Handicap:"     },
-  { TYPE_SWITCH,       &setup.time_limit,      "Timelimit:"    },
-  { TYPE_EMPTY,                NULL,                   ""              },
-  { TYPE_LEAVE_MENU,   execExitSetup,          "Exit"          },
-  { TYPE_LEAVE_MENU,   execSaveAndExitSetup,   "Save and exit" },
-  { 0,                 NULL,                   NULL            }
+  { TYPE_SWITCH,       &setup.quick_doors,     "Quick Doors:"          },
+  { TYPE_SWITCH,       &setup.ask_on_escape,   "Ask on Esc:"           },
+  { TYPE_SWITCH,       &setup.toons,           "Toons:"                },
+  { TYPE_SWITCH,       &setup.autorecord,      "Auto-Record:"          },
+  { TYPE_SWITCH,       &setup.team_mode,       "Team-Mode:"            },
+  { TYPE_SWITCH,       &setup.handicap,        "Handicap:"             },
+  { TYPE_SWITCH,       &setup.time_limit,      "Timelimit:"            },
+  { TYPE_EMPTY,                NULL,                   ""                      },
+  { TYPE_LEAVE_MENU,   execExitSetup,          "Exit"                  },
+  { TYPE_LEAVE_MENU,   execSaveAndExitSetup,   "Save and exit"         },
+  { 0,                 NULL,                   NULL                    }
+};
+
+static struct TokenInfo setup_info_graphics[] =
+{
+  { TYPE_ENTER_MENU,   execSetupChooseGraphics,"Custom Graphics"       },
+  { TYPE_STRING,       &setup.graphics_set,    ""                      },
+  { TYPE_EMPTY,                NULL,                   ""                      },
+  { TYPE_SWITCH,       &setup.fullscreen,      "Fullscreen:"           },
+  { TYPE_SWITCH,       &setup.scroll_delay,    "Scroll Delay:"         },
+  { TYPE_SWITCH,       &setup.soft_scrolling,  "Soft Scroll.:"         },
+  { TYPE_EMPTY,                NULL,                   ""                      },
+  { TYPE_LEAVE_MENU,   execSetupMain,          "Exit"                  },
+  { 0,                 NULL,                   NULL                    }
 };
 
 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            }
+  { 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_ENTER_MENU,   execSetupChooseSounds,  "Custom Sounds"         },
+  { TYPE_STRING,       &setup.sounds_set,      ""                      },
+  { TYPE_ENTER_MENU,   execSetupChooseMusic,   "Custom Music"          },
+  { TYPE_STRING,       &setup.music_set,       ""                      },
+  { 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;
+  int font_size = FS_BIG;
+  int font_color = FC_YELLOW;
   char *value_string = getSetupValue(setup_info[pos].type & ~TYPE_GHOSTED,
                                     setup_info[pos].value);
 
-  if (setup_info[pos].type & TYPE_SWITCH ||
-      setup_info[pos].type & TYPE_YES_NO)
+  if (setup_info[pos].type & TYPE_KEY)
   {
-    boolean value = *(boolean *)(setup_info[pos].value);
-    int value_length = 3;
+    xpos = 3;
 
-    if (!value)
-      value_color = FC_BLUE;
+    if (setup_info[pos].type & TYPE_QUERY)
+    {
+      value_string = "<press key>";
+      font_color = FC_RED;
+    }
+  }
+  else if (setup_info[pos].type & TYPE_STRING)
+  {
+    int max_value_len = (SCR_FIELDX - 2) * 2;
 
-    if (strlen(value_string) < value_length)
-      strcat(value_string, " ");
+    xpos = 1;
+    font_size = FS_MEDIUM;
+
+    if (strlen(value_string) > max_value_len)
+      value_string[max_value_len] = '\0';
   }
+  else if (setup_info[pos].type & TYPE_BOOLEAN_STYLE &&
+          !*(boolean *)(setup_info[pos].value))
+    font_color = FC_BLUE;
 
-  DrawText(SX + xpos * 32, SY + ypos * 32, value_string, FS_BIG, value_color);
+  DrawText(SX + xpos * 32, SY + ypos * 32,
+          (xpos == 3 ? "              " : "   "), FS_BIG, FC_YELLOW);
+  DrawText(SX + xpos * 32, SY + ypos * 32, value_string, font_size,font_color);
 }
 
-static void DrawGenericSetupScreen()
+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;
@@ -1416,10 +1612,20 @@ static void DrawGenericSetupScreen()
     setup_info = setup_info_main;
     title_string = "Setup";
   }
+  else if (setup_mode == SETUP_MODE_GRAPHICS)
+  {
+    setup_info = setup_info_graphics;
+    title_string = "Setup Graphics";
+  }
   else if (setup_mode == SETUP_MODE_SOUND)
   {
     setup_info = setup_info_sound;
-    title_string = "Sound Setup";
+    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);
@@ -1429,6 +1635,7 @@ static void DrawGenericSetupScreen()
   {
     void *value_ptr = setup_info[i].value;
     int ypos = MENU_SCREEN_START_YPOS + i;
+    int font_size = FS_BIG;
 
     /* set some entries to "unchangeable" according to other variables */
     if ((value_ptr == &setup.sound       && !audio.sound_available) ||
@@ -1438,16 +1645,19 @@ static void DrawGenericSetupScreen()
        (value_ptr == &setup.fullscreen  && !video.fullscreen_available))
       setup_info[i].type |= TYPE_GHOSTED;
 
-    DrawText(SX + 32, SY + ypos * 32, setup_info[i].text, FS_BIG, FC_GREEN);
+    if (setup_info[i].type & TYPE_ENTER_OR_LEAVE_MENU)
+      font_size = FS_BIG;
+
+    DrawText(SX + 32, SY + ypos * 32, setup_info[i].text, font_size, FC_GREEN);
 
     if (setup_info[i].type & TYPE_ENTER_MENU)
       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)
+    else if (setup_info[i].type & ~TYPE_SKIP_ENTRY)
       initCursor(i, GFX_KUGEL_BLAU);
 
-    if (setup_info[i].type & TYPE_BOOLEAN_STYLE)
+    if (setup_info[i].type & TYPE_VALUE)
       drawSetupValue(i);
 
     num_setup_info++;
@@ -1455,10 +1665,10 @@ static void DrawGenericSetupScreen()
 
   FadeToFront();
   InitAnimation();
-  HandleSetupScreen(0,0,0,0,MB_MENU_INITIALIZE);
+  HandleSetupScreen_Generic(0,0,0,0,MB_MENU_INITIALIZE);
 }
 
-void HandleGenericSetupScreen(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_store[MAX_SETUP_MODES];
   int choice = choice_store[setup_mode];
@@ -1479,7 +1689,7 @@ void HandleGenericSetupScreen(int mx, int my, int dx, int dy, int button)
        void (*menu_callback_function)(void) = setup_info[y].value;
 
        menu_callback_function();
-       break;  /* absolutely needed because 'setup_info' has changed! */
+       break;  /* absolutely needed because function changes 'setup_info'! */
       }
     }
 
@@ -1495,10 +1705,10 @@ void HandleGenericSetupScreen(int mx, int my, int dx, int dy, int button)
   {
     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)
@@ -1506,12 +1716,12 @@ void HandleGenericSetupScreen(int mx, int my, int dx, int dy, int button)
 
     /* jump to next non-empty menu entry (up or down) */
     while (y > 0 && y < num_setup_info - 1 &&
-          setup_info[y].type == TYPE_EMPTY)
+          (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)
     {
@@ -1524,6 +1734,7 @@ void HandleGenericSetupScreen(int mx, int my, int dx, int dy, int button)
     }
     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);
@@ -1531,12 +1742,34 @@ void HandleGenericSetupScreen(int mx, int my, int dx, int dy, int button)
        *(boolean *)setup_info[y].value = new_value;
        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();
       }
+#else
+      if (setup_info[y].type & TYPE_ENTER_OR_LEAVE_MENU)
+      {
+       void (*menu_callback_function)(void) = setup_info[choice].value;
+
+       menu_callback_function();
+      }
+      else
+      {
+       if ((setup_info[y].type & TYPE_KEYTEXT) &&
+           (setup_info[y + 1].type & TYPE_KEY))
+         y++;
+
+       if (setup_info[y].type & TYPE_VALUE)
+         changeSetupValue(y);
+      }
+#endif
     }
   }
 
@@ -1546,10 +1779,10 @@ void HandleGenericSetupScreen(int mx, int my, int dx, int dy, int button)
     DoAnimation();
 }
 
-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);
@@ -1567,7 +1800,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();
 }
@@ -1664,7 +1897,7 @@ 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;
@@ -1785,22 +2018,6 @@ void HandleSetupInputScreen(int mx, int my, int dx, int dy, int button)
     DoAnimation();
 }
 
-void DrawSetupScreen()
-{
-  if (setup_mode == SETUP_MODE_INPUT)
-    DrawSetupInputScreen();
-  else
-    DrawGenericSetupScreen();
-}
-
-void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
-{
-  if (setup_mode == SETUP_MODE_INPUT)
-    HandleSetupInputScreen(mx, my, dx, dy, button);
-  else
-    HandleGenericSetupScreen(mx, my, dx, dy, button);
-}
-
 void CustomizeKeyboard(int player_nr)
 {
   int i;
@@ -1928,7 +2145,7 @@ void CustomizeKeyboard(int player_nr)
   setup.input[player_nr].key = custom_key;
 
   StopAnimation();
-  DrawSetupInputScreen();
+  DrawSetupScreen_Input();
 }
 
 static boolean CalibrateJoystickMain(int player_nr)
@@ -2096,7 +2313,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)
@@ -2128,6 +2345,34 @@ void CalibrateJoystick(int player_nr)
   }
 }
 
+void DrawSetupScreen()
+{
+  if (setup_mode == SETUP_MODE_INPUT)
+    DrawSetupScreen_Input();
+  else if (setup_mode == SETUP_MODE_CHOOSE_GRAPHICS)
+    DrawChooseTree(&artwork.gfx_current);
+  else if (setup_mode == SETUP_MODE_CHOOSE_SOUNDS)
+    DrawChooseTree(&artwork.snd_current);
+  else if (setup_mode == SETUP_MODE_CHOOSE_MUSIC)
+    DrawChooseTree(&artwork.mus_current);
+  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 if (setup_mode == SETUP_MODE_CHOOSE_GRAPHICS)
+    HandleChooseTree(mx, my, dx, dy, button, &artwork.gfx_current);
+  else if (setup_mode == SETUP_MODE_CHOOSE_SOUNDS)
+    HandleChooseTree(mx, my, dx, dy, button, &artwork.snd_current);
+  else if (setup_mode == SETUP_MODE_CHOOSE_MUSIC)
+    HandleChooseTree(mx, my, dx, dy, button, &artwork.mus_current);
+  else
+    HandleSetupScreen_Generic(mx, my, dx, dy, button);
+}
+
 void HandleGameActions()
 {
   if (game_status != PLAYING)
@@ -2325,19 +2570,19 @@ void CreateScreenGadgets()
   CreateScreenScrollbars();
 }
 
-void MapChooseLevelGadgets()
+void MapChooseTreeGadgets(TreeInfo *ti)
 {
-  int num_leveldirs = numLevelDirInfoInGroup(leveldir_current);
+  int num_entries = numTreeInfoInGroup(ti);
   int i;
 
-  if (num_leveldirs <= MAX_MENU_ENTRIES_ON_SCREEN)
+  if (num_entries <= MAX_MENU_ENTRIES_ON_SCREEN)
     return;
 
   for (i=0; i<NUM_SCREEN_GADGETS; i++)
     MapGadget(screen_gadget[i]);
 }
 
-void UnmapChooseLevelGadgets()
+void UnmapChooseTreeGadgets()
 {
   int i;