rnd-20030428-1-src
[rocksndiamonds.git] / src / screens.c
index 347ae23c65af4f0d71ff06518854fb645f6a2a46..f10614fd52f8a92846216d1d80fd992dd9496af7 100644 (file)
 /***********************************************************
-*  Rocks'n'Diamonds -- McDuffin Strikes Back!              *
+* Rocks'n'Diamonds -- McDuffin Strikes Back!               *
 *----------------------------------------------------------*
-*  (c) 1995-98 Artsoft Entertainment                       *
-*              Holger Schemel                              *
-*              Oststrasse 11a                              *
-*              33604 Bielefeld                             *
-*              phone: ++49 +521 290471                     *
-*              email: aeglos@valinor.owl.de                *
+* (c) 1995-2002 Artsoft Entertainment                      *
+*               Holger Schemel                             *
+*               Detmolder Strasse 189                      *
+*               33604 Bielefeld                            *
+*               Germany                                    *
+*               e-mail: info@artsoft.org                   *
 *----------------------------------------------------------*
-*  screens.c                                               *
+* screens.c                                                *
 ***********************************************************/
 
+#include "libgame/libgame.h"
+
 #include "screens.h"
 #include "events.h"
-#include "sound.h"
 #include "game.h"
 #include "tools.h"
 #include "editor.h"
-#include "misc.h"
 #include "files.h"
-#include "buttons.h"
 #include "tape.h"
-#include "joystick.h"
 #include "cartoons.h"
 #include "network.h"
 #include "init.h"
 
-/* for DrawSetupScreen(), HandleSetupScreen() */
-#define SETUP_SCREEN_POS_START         2
-#define SETUP_SCREEN_POS_END           (SCR_FIELDY - 1)
-#define SETUP_SCREEN_POS_EMPTY1                (SETUP_SCREEN_POS_END - 2)
-#define SETUP_SCREEN_POS_EMPTY2                (SETUP_SCREEN_POS_END - 2)
-
-/* for HandleSetupInputScreen() */
-#define SETUPINPUT_SCREEN_POS_START    2
-#define SETUPINPUT_SCREEN_POS_END      (SCR_FIELDY - 2)
+/* screens in the setup menu */
+#define SETUP_MODE_MAIN                        0
+#define SETUP_MODE_GAME                        1
+#define SETUP_MODE_EDITOR              2
+#define SETUP_MODE_INPUT               3
+#define SETUP_MODE_SHORTCUT            4
+#define SETUP_MODE_GRAPHICS            5
+#define SETUP_MODE_SOUND               6
+#define SETUP_MODE_ARTWORK             7
+#define SETUP_MODE_CHOOSE_GRAPHICS     8
+#define SETUP_MODE_CHOOSE_SOUNDS       9
+#define SETUP_MODE_CHOOSE_MUSIC                10
+
+#define MAX_SETUP_MODES                        11
+
+/* 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() */
-#define MAX_LEVEL_SERIES_ON_SCREEN     (SCR_FIELDY - 2)
-
-#ifdef MSDOS
-extern unsigned char get_ascii(KeySym);
+/* 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
+
+/* buttons and scrollbars identifiers */
+#define SCREEN_CTRL_ID_SCROLL_UP       0
+#define SCREEN_CTRL_ID_SCROLL_DOWN     1
+#define SCREEN_CTRL_ID_SCROLL_VERTICAL 2
+
+#define NUM_SCREEN_SCROLLBUTTONS       2
+#define NUM_SCREEN_SCROLLBARS          1
+#define NUM_SCREEN_GADGETS             3
+
+/* 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 void execSetupArtwork(void);
+static void HandleChooseTree(int, int, int, int, int, TreeInfo **);
+
+static struct GadgetInfo *screen_gadget[NUM_SCREEN_GADGETS];
+static int setup_mode = SETUP_MODE_MAIN;
+
+#define mSX (SX + (game_status >= GAME_MODE_MAIN &&    \
+                  game_status <= GAME_MODE_SETUP ?     \
+                  menu.draw_xoffset[game_status] : menu.draw_xoffset_default))
+#define mSY (SY + (game_status >= GAME_MODE_MAIN &&    \
+                  game_status <= GAME_MODE_SETUP ?     \
+                  menu.draw_yoffset[game_status] : menu.draw_yoffset_default))
+
+#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
+#define NUM_SCROLLBAR_BITMAPS          2
+static Bitmap *scrollbar_bitmap[NUM_SCROLLBAR_BITMAPS];
 #endif
 
+
+static void drawCursorExt(int xpos, int ypos, int color, int graphic)
+{
+  static int cursor_array[SCR_FIELDY];
+
+  if (xpos == 0)
+  {
+    if (graphic != 0)
+      cursor_array[ypos] = graphic;
+    else
+      graphic = cursor_array[ypos];
+  }
+
+  if (color == FC_RED)
+    graphic = (graphic == IMG_MENU_BUTTON_LEFT  ? IMG_MENU_BUTTON_LEFT_ACTIVE :
+              graphic == IMG_MENU_BUTTON_RIGHT ? IMG_MENU_BUTTON_RIGHT_ACTIVE:
+              IMG_MENU_BUTTON_ACTIVE);
+
+  ypos += MENU_SCREEN_START_YPOS;
+
+  DrawBackground(mSX + xpos * TILEX, mSY + ypos * TILEY, TILEX, TILEY);
+  DrawGraphicThruMaskExt(drawto, mSX + xpos * TILEX, mSY + ypos * TILEY,
+                        graphic, 0);
+}
+
+static void initCursor(int ypos, int graphic)
+{
+  drawCursorExt(0, ypos, FC_BLUE, graphic);
+}
+
+static void drawCursor(int ypos, int color)
+{
+  drawCursorExt(0, ypos, color, 0);
+}
+
+static void drawCursorXY(int xpos, int ypos, int graphic)
+{
+  drawCursorExt(xpos, ypos, -1, graphic);
+}
+
+static void PlaySound_Menu_Start(int sound)
+{
+  if (sound_info[sound].loop)
+    PlaySoundLoop(sound);
+  else
+    PlaySound(sound);
+}
+
+static void PlaySound_Menu_Continue(int sound)
+{
+  if (sound_info[sound].loop)
+    PlaySoundLoop(sound);
+}
+
 void DrawHeadline()
 {
-  int x = SX + (SXSIZE - strlen(PROGRAM_TITLE_STRING) * FONT1_XSIZE) / 2;
+  int font1_width = getFontWidth(FONT_TITLE_1);
+  int font2_width = getFontWidth(FONT_TITLE_2);
+  int x1 = SX + (SXSIZE - strlen(PROGRAM_TITLE_STRING)   * font1_width) / 2;
+  int x2 = SX + (SXSIZE - strlen(WINDOW_SUBTITLE_STRING) * font2_width) / 2;
+
+  DrawText(x1, SY + 8,  PROGRAM_TITLE_STRING,   FONT_TITLE_1);
+  DrawText(x2, SY + 46, WINDOW_SUBTITLE_STRING, FONT_TITLE_2);
+}
+
+static void ToggleFullscreenIfNeeded()
+{
+  if (setup.fullscreen != video.fullscreen_enabled)
+  {
+    /* save old door content */
+    BlitBitmap(backbuffer, bitmap_db_door,
+              DX, DY, DXSIZE, DYSIZE, DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1);
+
+    /* toggle fullscreen */
+    ChangeVideoModeIfNeeded(setup.fullscreen);
+    setup.fullscreen = video.fullscreen_enabled;
 
-  DrawText(x, SY + 8, PROGRAM_TITLE_STRING, FS_BIG, FC_YELLOW);
-  DrawTextFCentered(46, FC_RED, COPYRIGHT_STRING);
+    /* redraw background to newly created backbuffer */
+    BlitBitmap(graphic_info[IMG_GLOBAL_BORDER].bitmap, backbuffer,
+              0,0, WIN_XSIZE,WIN_YSIZE, 0,0);
+
+    /* restore old door content */
+    BlitBitmap(bitmap_db_door, backbuffer,
+              DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE, DX, DY);
+
+    redraw_mask = REDRAW_ALL;
+  }
 }
 
 void DrawMainMenu()
 {
-  int i;
+  static LevelDirTree *leveldir_last_valid = NULL;
   char *name_text = (!options.network && setup.team_mode ? "Team:" : "Name:");
+  int font_width = getFontWidth(FONT_MENU_1);
+  int name_width = font_width * strlen("Name:");
+  int level_width = font_width * strlen("Level:");
+  int i;
 
   UnmapAllGadgets();
   FadeSounds();
-  XAutoRepeatOn(display);
+
+  KeyboardAutoRepeatOn();
+  ActivateJoystick();
+
+  SetDrawDeactivationMask(REDRAW_NONE);
+  SetDrawBackgroundMask(REDRAW_FIELD);
+
+  audio.sound_deactivated = FALSE;
 
   /* needed if last screen was the playing screen, invoked from level editor */
   if (level_editor_test_game)
   {
-    game_status = LEVELED;
+    game_status = GAME_MODE_EDITOR;
     DrawLevelEd();
     return;
   }
@@ -73,54 +203,73 @@ void DrawMainMenu()
   /* needed if last screen was the editor screen */
   UndrawSpecialEditorDoor();
 
+  /* needed if last screen was the setup screen and fullscreen state changed */
+  ToggleFullscreenIfNeeded();
+
+  /* needed if last screen (level choice) changed graphics, sounds or music */
+  ReloadCustomArtwork();
+
+#ifdef TARGET_SDL
+  SetDrawtoField(DRAW_BACKBUFFER);
+#endif
+
   /* map gadgets for main menu screen */
   MapTapeButtons();
 
+  /* leveldir_current may be invalid (level group, parent link) */
+  if (!validLevelSeries(leveldir_current))
+    leveldir_current = getFirstValidTreeInfoEntry(leveldir_last_valid);
+
+  /* store valid level series information */
+  leveldir_last_valid = leveldir_current;
+
+  /* level_nr may have been set to value over handicap with level editor */
+  if (setup.handicap && level_nr > leveldir_current->handicap_level)
+    level_nr = leveldir_current->handicap_level;
+
   GetPlayerConfig();
   LoadLevel(level_nr);
 
+  SetMainBackgroundImage(IMG_BACKGROUND_MAIN);
   ClearWindow();
+
   DrawHeadline();
-  DrawText(SX + 32,    SY + 2*32, name_text, FS_BIG, FC_GREEN);
-  DrawText(SX + 6*32,  SY + 2*32, setup.player_name, FS_BIG, FC_RED);
-  DrawText(SX + 32,    SY + 3*32, "Level:", FS_BIG, FC_GREEN);
-  DrawText(SX + 11*32, SY + 3*32, int2str(level_nr,3), FS_BIG,
-          (leveldir[leveldir_nr].readonly ? FC_RED : FC_YELLOW));
-  DrawText(SX + 32,    SY + 4*32, "Hall Of Fame", FS_BIG, FC_GREEN);
-  DrawText(SX + 32,    SY + 5*32, "Level Creator", FS_BIG, FC_GREEN);
-  DrawText(SY + 32,    SY + 6*32, "Info Screen", FS_BIG, FC_GREEN);
-  DrawText(SX + 32,    SY + 7*32, "Start Game", FS_BIG, FC_GREEN);
-  DrawText(SX + 32,    SY + 8*32, "Setup", FS_BIG, FC_GREEN);
-  DrawText(SX + 32,    SY + 9*32, "Quit", FS_BIG, FC_GREEN);
+
+  DrawText(mSX + 32, mSY + 2*32, name_text, FONT_MENU_1);
+  DrawText(mSX + 32, mSY + 3*32, "Level:", FONT_MENU_1);
+  DrawText(mSX + 32, mSY + 4*32, "Hall Of Fame", FONT_MENU_1);
+  DrawText(mSX + 32, mSY + 5*32, "Level Creator", FONT_MENU_1);
+  DrawText(mSX + 32, mSY + 6*32, "Info Screen", FONT_MENU_1);
+  DrawText(mSX + 32, mSY + 7*32, "Start Game", FONT_MENU_1);
+  DrawText(mSX + 32, mSY + 8*32, "Setup", FONT_MENU_1);
+  DrawText(mSX + 32, mSY + 9*32, "Quit", FONT_MENU_1);
+
+  DrawText(mSX + 32 + name_width, mSY + 2*32, setup.player_name, FONT_INPUT_1);
+  DrawText(mSX + level_width + 5 * 32, mSY + 3*32, int2str(level_nr,3),
+          FONT_VALUE_1);
 
   DrawMicroLevel(MICROLEV_XPOS, MICROLEV_YPOS, TRUE);
 
-  DrawTextF(7*32 + 6, 3*32 + 9, FC_RED, "%d-%d",
-           leveldir[leveldir_nr].first_level,
-           leveldir[leveldir_nr].last_level);
+  DrawTextF(mSX + 32 + level_width - 2, mSY + 3*32 + 1, FONT_TEXT_3, "%d-%d",
+           leveldir_current->first_level, leveldir_current->last_level);
 
-  if (leveldir[leveldir_nr].readonly)
+  /*
+  if (leveldir_current->readonly)
+  */
   {
-    DrawTextF(15*32 + 6, 3*32 + 9 - 7, FC_RED, "READ");
-    DrawTextF(15*32 + 6, 3*32 + 9 + 7, FC_RED, "ONLY");
+    DrawTextF(mSX + level_width + 9*32 - 2,
+             mSY + 3*32 + 1 - 7, FONT_TEXT_3, "READ");
+    DrawTextF(mSX + level_width + 9*32 - 2,
+             mSY + 3*32 + 1 + 7, FONT_TEXT_3, "ONLY");
   }
 
-  for(i=2; i<10; i++)
-    DrawGraphic(0, i, GFX_KUGEL_BLAU);
-  DrawGraphic(10, 3, GFX_PFEIL_LEFT);
-  DrawGraphic(14, 3, GFX_PFEIL_RIGHT);
+  for(i=0; i<8; i++)
+    initCursor(i, (i == 1 || i == 6 ? IMG_MENU_BUTTON_RIGHT :IMG_MENU_BUTTON));
 
-  DrawText(SX + 56, SY + 326, "A Game by Artsoft Entertainment",
-          FS_SMALL, FC_RED);
-
-  if (leveldir[leveldir_nr].name)
-  {
-    int len = strlen(leveldir[leveldir_nr].name);
-    int lxpos = SX + (SXSIZE - len * FONT4_XSIZE) / 2;
-    int lypos = SY + 352;
+  drawCursorXY(level_width/32 + 4, 1, IMG_MENU_BUTTON_LEFT);
+  drawCursorXY(level_width/32 + 8, 1, IMG_MENU_BUTTON_RIGHT);
 
-    DrawText(lxpos, lypos, leveldir[leveldir_nr].name, FS_SMALL, FC_SPECIAL2);
-  }
+  DrawText(SX + 56, SY + 326, "A Game by Artsoft Entertainment", FONT_TITLE_2);
 
   FadeToFront();
   InitAnimation();
@@ -136,65 +285,78 @@ void DrawMainMenu()
 #if 0
   ClearEventQueue();
 #endif
-
 }
 
-void HandleMainMenu(int mx, int my, int dx, int dy, int button)
+static void gotoTopLevelDir()
 {
-  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)
+  /* move upwards to top level directory */
+  while (leveldir_current->node_parent)
   {
-    DrawGraphic(0, choice - 1, GFX_KUGEL_ROT);
-    redraw = FALSE;
+    /* 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 = numTreeInfoInGroup(leveldir_current);
+      int leveldir_pos = posTreeInfo(leveldir_current);
+      int num_page_entries;
+      int cl_first, cl_cursor;
+
+      if (num_leveldirs <= MAX_MENU_ENTRIES_ON_SCREEN)
+       num_page_entries = num_leveldirs;
+      else
+       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;
+
+      leveldir_current->node_parent->node_group->cl_first = cl_first;
+      leveldir_current->node_parent->node_group->cl_cursor = cl_cursor;
+    }
+
+    leveldir_current = leveldir_current->node_parent;
   }
+}
+
+void HandleMainMenu(int mx, int my, int dx, int dy, int button)
+{
+  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 - mSX) / 32;
+    y = (my - mSY) / 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[leveldir_nr].first_level) ||
-                (x == 15 && level_nr < leveldir[leveldir_nr].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;
     int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
     int new_level_nr, old_level_nr = level_nr;
-    int font_color = (leveldir[leveldir_nr].readonly ? FC_RED : FC_YELLOW);
 
-    new_level_nr = level_nr + (x == 11 ? -step : +step);
-    if (new_level_nr < leveldir[leveldir_nr].first_level)
-      new_level_nr = leveldir[leveldir_nr].first_level;
-    if (new_level_nr > leveldir[leveldir_nr].last_level)
-      new_level_nr = leveldir[leveldir_nr].last_level;
+    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)
+      new_level_nr = leveldir_current->last_level;
+
+    if (setup.handicap && new_level_nr > leveldir_current->handicap_level)
+      new_level_nr = leveldir_current->handicap_level;
 
     if (old_level_nr == new_level_nr ||
        !DelayReached(&level_delay, GADGET_FRAME_DELAY))
@@ -202,10 +364,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
 
     level_nr = new_level_nr;
 
-    DrawTextExt(drawto, gc, SX + 11 * 32, SY + 3 * 32,
-               int2str(level_nr, 3), FS_BIG, font_color);
-    DrawTextExt(window, gc, SX + 11 * 32, SY + 3 * 32,
-               int2str(level_nr, 3), FS_BIG, font_color);
+    DrawText(mSX + 11 * 32, mSY + 3 * 32, int2str(level_nr, 3), FONT_VALUE_1);
 
     LoadLevel(level_nr);
     DrawMicroLevel(MICROLEV_XPOS, MICROLEV_YPOS, TRUE);
@@ -216,95 +375,102 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
 
     /* needed because DrawMicroLevel() takes some time */
     BackToFront();
-    XSync(display, FALSE);
+    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;
+       game_status = GAME_MODE_PSEUDO_TYPENAME;
        HandleTypeName(strlen(setup.player_name), 0);
       }
-      else if (y == 4)
+      else if (y == 1)
       {
-       if (num_leveldirs)
+       if (leveldir_first)
        {
-         game_status = CHOOSELEVEL;
-         SaveLevelSetup();
+         game_status = GAME_MODE_LEVELS;
+         SaveLevelSetup_LastSeries();
+         SaveLevelSetup_SeriesInfo();
+
+         gotoTopLevelDir();
+
          DrawChooseLevel();
        }
       }
-      else if (y == 5)
+      else if (y == 2)
       {
-       game_status = HALLOFFAME;
+       game_status = GAME_MODE_SCORES;
        DrawHallOfFame(-1);
       }
-      else if (y == 6)
+      else if (y == 3)
       {
-       if (leveldir[leveldir_nr].readonly &&
+       if (leveldir_current->readonly &&
            strcmp(setup.player_name, "Artsoft") != 0)
          Request("This level is read only !", REQ_CONFIRM);
-       game_status = LEVELED;
+       game_status = GAME_MODE_EDITOR;
        DrawLevelEd();
       }
-      else if (y == 7)
+      else if (y == 4)
       {
-       game_status = HELPSCREEN;
+       game_status = GAME_MODE_INFO;
        DrawHelpScreen();
       }
-      else if (y == 8)
+      else if (y == 5)
       {
        if (setup.autorecord)
          TapeStartRecording();
 
-#ifndef MSDOS
+#if defined(PLATFORM_UNIX)
        if (options.network)
          SendToServer_StartPlaying();
        else
 #endif
        {
-         game_status = PLAYING;
+         game_status = GAME_MODE_PLAYING;
+         StopAnimation();
          InitGame();
        }
       }
-      else if (y == 9)
+      else if (y == 6)
       {
-       game_status = SETUP;
+       game_status = GAME_MODE_SETUP;
+       setup_mode = SETUP_MODE_MAIN;
        DrawSetupScreen();
       }
-      else if (y == 10)
+      else if (y == 7)
       {
-       SaveLevelSetup();
+       SaveLevelSetup_LastSeries();
+       SaveLevelSetup_SeriesInfo();
         if (Request("Do you really want to quit ?", REQ_ASK | REQ_STAY_CLOSED))
-         game_status = EXITGAME;
+         game_status = GAME_MODE_QUIT;
       }
-
-      redraw = TRUE;
     }
   }
+
   BackToFront();
 
   out:
 
-  if (game_status == MAINMENU)
+  if (game_status == GAME_MODE_MAIN)
   {
     DrawMicroLevel(MICROLEV_XPOS, MICROLEV_YPOS, FALSE);
     DoAnimation();
   }
 }
 
+
 #define MAX_HELPSCREEN_ELS     10
 #define HA_NEXT                        -999
 #define HA_END                 -1000
@@ -312,113 +478,214 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
 static long helpscreen_state;
 static int helpscreen_step[MAX_HELPSCREEN_ELS];
 static int helpscreen_frame[MAX_HELPSCREEN_ELS];
-static int helpscreen_delay[MAX_HELPSCREEN_ELS];
+
 static int helpscreen_action[] =
 {
-  GFX_SPIELER1_DOWN,4,2,
-  GFX_SPIELER1_UP,4,2,
-  GFX_SPIELER1_LEFT,4,2,
-  GFX_SPIELER1_RIGHT,4,2,
-  GFX_SPIELER1_PUSH_LEFT,4,2,
-  GFX_SPIELER1_PUSH_RIGHT,4,2,                                 HA_NEXT,
-  GFX_ERDREICH,1,100,                                          HA_NEXT,
-  GFX_LEERRAUM,1,100,                                          HA_NEXT,
-  GFX_MORAST_LEER,1,100,                                       HA_NEXT,
-  GFX_BETON,1,100,                                             HA_NEXT,
-  GFX_MAUERWERK,1,100,                                         HA_NEXT,
-  GFX_MAUER_L1,  3,4, GFX_MAUERWERK,1,20, GFX_LEERRAUM,1,10,
-  GFX_MAUER_R1,  3,4, GFX_MAUERWERK,1,20, GFX_LEERRAUM,1,10,
-  GFX_MAUER_UP,  3,4, GFX_MAUERWERK,1,20, GFX_LEERRAUM,1,10,
-  GFX_MAUER_DOWN,3,4, GFX_MAUERWERK,1,20, GFX_LEERRAUM,1,10,   HA_NEXT,
-  GFX_UNSICHTBAR,1,100,                                                HA_NEXT,
-  GFX_FELSBODEN,1,100,                                         HA_NEXT,
-  GFX_CHAR_A,30,4, GFX_CHAR_AUSRUF,32,4,                       HA_NEXT,
-  GFX_EDELSTEIN,2,5,                                           HA_NEXT,
-  GFX_DIAMANT,2,5,                                             HA_NEXT,
-  GFX_EDELSTEIN_BD,2,5,                                                HA_NEXT,
-  GFX_EDELSTEIN_GELB,2,5, GFX_EDELSTEIN_ROT,2,5,
-  GFX_EDELSTEIN_LILA,2,5,                                      HA_NEXT,
-  GFX_FELSBROCKEN,4,5,                                         HA_NEXT,
-  GFX_BOMBE,1,50, GFX_EXPLOSION,8,1, GFX_LEERRAUM,1,10,                HA_NEXT,
-  GFX_KOKOSNUSS,1,50, GFX_CRACKINGNUT,3,1, GFX_EDELSTEIN,1,10, HA_NEXT,
-  GFX_ERZ_EDEL,1,50, GFX_EXPLOSION,8,1, GFX_EDELSTEIN,1,10,    HA_NEXT,
-  GFX_ERZ_DIAM,1,50, GFX_EXPLOSION,8,1, GFX_DIAMANT,1,10,      HA_NEXT,
-  GFX_ERZ_EDEL_BD,1,50, GFX_EXPLOSION,8,1,GFX_EDELSTEIN_BD,1,10,HA_NEXT,
-  GFX_ERZ_EDEL_GELB,1,50, GFX_EXPLOSION,8,1,
-  GFX_EDELSTEIN_GELB,1,10, GFX_ERZ_EDEL_ROT,1,50,
-  GFX_EXPLOSION,8,1, GFX_EDELSTEIN_ROT,1,10,
-  GFX_ERZ_EDEL_LILA,1,50, GFX_EXPLOSION,8,1,
-  GFX_EDELSTEIN_LILA,1,10,                                     HA_NEXT,
-  GFX_GEBLUBBER,4,4,                                           HA_NEXT,
-  GFX_SCHLUESSEL1,4,25,                                                HA_NEXT,
-  GFX_PFORTE1,4,25,                                            HA_NEXT,
-  GFX_PFORTE1X,4,25,                                           HA_NEXT,
-  GFX_DYNAMIT_AUS,1,100,                                       HA_NEXT,
-  GFX_DYNAMIT,7,6, GFX_EXPLOSION,8,1, GFX_LEERRAUM,1,10,       HA_NEXT,
-  GFX_DYNABOMB+0,4,3, GFX_DYNABOMB+3,1,3, GFX_DYNABOMB+2,1,3,
-  GFX_DYNABOMB+1,1,3, GFX_DYNABOMB+0,1,3, GFX_EXPLOSION,8,1,
-  GFX_LEERRAUM,1,10,                                           HA_NEXT,
-  GFX_DYNABOMB_NR,1,100,                                       HA_NEXT,
-  GFX_DYNABOMB_SZ,1,100,                                       HA_NEXT,
-  GFX_FLIEGER+4,1,3, GFX_FLIEGER+0,1,3, GFX_FLIEGER+4,1,3,
-  GFX_FLIEGER+5,1,3, GFX_FLIEGER+1,1,3, GFX_FLIEGER+5,1,3,
-  GFX_FLIEGER+6,1,3, GFX_FLIEGER+2,1,3, GFX_FLIEGER+6,1,3,
-  GFX_FLIEGER+7,1,3, GFX_FLIEGER+3,1,3, GFX_FLIEGER+7,1,3,     HA_NEXT,
-  GFX_KAEFER+4,1,1, GFX_KAEFER+0,1,1, GFX_KAEFER+4,1,1,
-  GFX_KAEFER+5,1,1, GFX_KAEFER+1,1,1, GFX_KAEFER+5,1,1,
-  GFX_KAEFER+6,1,1, GFX_KAEFER+2,1,1, GFX_KAEFER+6,1,1,
-  GFX_KAEFER+7,1,1, GFX_KAEFER+3,1,1, GFX_KAEFER+7,1,1,                HA_NEXT,
-  GFX_BUTTERFLY,2,2,                                           HA_NEXT,
-  GFX_FIREFLY,2,2,                                             HA_NEXT,
-  GFX_PACMAN+0,1,3, GFX_PACMAN+4,1,2, GFX_PACMAN+0,1,3,
-  GFX_PACMAN+1,1,3, GFX_PACMAN+5,1,2, GFX_PACMAN+1,1,3,
-  GFX_PACMAN+2,1,3, GFX_PACMAN+6,1,2, GFX_PACMAN+2,1,3,
-  GFX_PACMAN+3,1,3, GFX_PACMAN+7,1,2, GFX_PACMAN+3,1,3,                HA_NEXT,
-  GFX_MAMPFER+0,4,1, GFX_MAMPFER+3,1,1, GFX_MAMPFER+2,1,1,
-  GFX_MAMPFER+1,1,1, GFX_MAMPFER+0,1,1,                                HA_NEXT,
-  GFX_MAMPFER2+0,4,1, GFX_MAMPFER2+3,1,1, GFX_MAMPFER2+2,1,1,
-  GFX_MAMPFER2+1,1,1, GFX_MAMPFER2+0,1,1,                      HA_NEXT,
-  GFX_ROBOT+0,4,1, GFX_ROBOT+3,1,1, GFX_ROBOT+2,1,1,
-  GFX_ROBOT+1,1,1, GFX_ROBOT+0,1,1,                            HA_NEXT,
-  GFX_MOLE_DOWN,4,2,
-  GFX_MOLE_UP,4,2,
-  GFX_MOLE_LEFT,4,2,
-  GFX_MOLE_RIGHT,4,2,                                          HA_NEXT,
-  GFX_PINGUIN_DOWN,4,2,
-  GFX_PINGUIN_UP,4,2,
-  GFX_PINGUIN_LEFT,4,2,
-  GFX_PINGUIN_RIGHT,4,2,                                       HA_NEXT,
-  GFX_SCHWEIN_DOWN,4,2,
-  GFX_SCHWEIN_UP,4,2,
-  GFX_SCHWEIN_LEFT,4,2,
-  GFX_SCHWEIN_RIGHT,4,2,                                       HA_NEXT,
-  GFX_DRACHE_DOWN,4,2,
-  GFX_DRACHE_UP,4,2,
-  GFX_DRACHE_LEFT,4,2,
-  GFX_DRACHE_RIGHT,4,2,                                                HA_NEXT,
-  GFX_SONDE_START,8,1,                                         HA_NEXT,
-  GFX_ABLENK,4,1,                                              HA_NEXT,
-  GFX_BIRNE_AUS,1,25, GFX_BIRNE_EIN,1,25,                      HA_NEXT,
-  GFX_ZEIT_VOLL,1,25, GFX_ZEIT_LEER,1,25,                      HA_NEXT,
-  GFX_TROPFEN,1,25, GFX_AMOEBING,4,1, GFX_AMOEBE_LEBT,1,10,    HA_NEXT,
-  GFX_AMOEBE_TOT+2,2,50, GFX_AMOEBE_TOT,2,50,                  HA_NEXT,
-  GFX_AMOEBE_LEBT,4,40,                                                HA_NEXT,
-  GFX_AMOEBE_LEBT,1,10,        GFX_AMOEBING,4,2,                       HA_NEXT,
-  GFX_AMOEBE_LEBT,1,25, GFX_AMOEBE_TOT,1,25, GFX_EXPLOSION,8,1,
-  GFX_DIAMANT,1,10,                                            HA_NEXT,
-  GFX_LIFE,1,100,                                              HA_NEXT,
-  GFX_LIFE_ASYNC,1,100,                                                HA_NEXT,
-  GFX_SIEB_INAKTIV,4,2,                                                HA_NEXT,
-  GFX_SIEB2_INAKTIV,4,2,                                       HA_NEXT,
-  GFX_AUSGANG_ZU,1,100, GFX_AUSGANG_ACT,4,2,
-  GFX_AUSGANG_AUF+0,4,2, GFX_AUSGANG_AUF+3,1,2,
-  GFX_AUSGANG_AUF+2,1,2, GFX_AUSGANG_AUF+1,1,2,                        HA_NEXT,
-  GFX_AUSGANG_AUF+0,4,2, GFX_AUSGANG_AUF+3,1,2,
-  GFX_AUSGANG_AUF+2,1,2, GFX_AUSGANG_AUF+1,1,2,                        HA_NEXT,
-  GFX_SOKOBAN_OBJEKT,1,100,                                    HA_NEXT,
-  GFX_SOKOBAN_FELD_LEER,1,100,                                 HA_NEXT,
-  GFX_SOKOBAN_FELD_VOLL,1,100,                                 HA_NEXT,
-  GFX_SPEED_PILL,1,100,                                                HA_NEXT,
+  IMG_PLAYER_1_MOVING_DOWN,            16,
+  IMG_PLAYER_1_MOVING_UP,              16,
+  IMG_PLAYER_1_MOVING_LEFT,            16,
+  IMG_PLAYER_1_MOVING_RIGHT,           16,
+  IMG_PLAYER_1_PUSHING_LEFT,           16,
+  IMG_PLAYER_1_PUSHING_RIGHT,          16,                     HA_NEXT,
+
+  IMG_SAND,                            -1,                     HA_NEXT,
+
+  IMG_EMPTY_SPACE,                     -1,                     HA_NEXT,
+
+  IMG_QUICKSAND_EMPTY,                 -1,                     HA_NEXT,
+
+  IMG_STEELWALL,                       -1,                     HA_NEXT,
+
+  IMG_WALL,                            -1,                     HA_NEXT,
+
+  IMG_EXPANDABLE_WALL_GROWING_LEFT,    20,
+  IMG_WALL,                            50,
+  IMG_EMPTY_SPACE,                     20,
+  IMG_EXPANDABLE_WALL_GROWING_RIGHT,   20,
+  IMG_WALL,                            50,
+  IMG_EMPTY_SPACE,                     20,
+  IMG_EXPANDABLE_WALL_GROWING_UP,      20,
+  IMG_WALL,                            50,
+  IMG_EMPTY_SPACE,                     20,
+  IMG_EXPANDABLE_WALL_GROWING_DOWN,    20,
+  IMG_WALL,                            50,
+  IMG_EMPTY_SPACE,                     20,                     HA_NEXT,
+
+  IMG_INVISIBLE_WALL,                  -1,                     HA_NEXT,
+
+  IMG_WALL_CRUMBLED,                   -1,                     HA_NEXT,
+
+  IMG_FONT_GAME_INFO,                  -1,                     HA_NEXT,
+
+  IMG_EMERALD,                         -1,                     HA_NEXT,
+
+  IMG_DIAMOND,                         -1,                     HA_NEXT,
+
+  IMG_BD_DIAMOND,                      -1,                     HA_NEXT,
+
+  IMG_EMERALD_YELLOW,                  50,
+  IMG_EMERALD_RED,                     50,
+  IMG_EMERALD_PURPLE,                  50,                     HA_NEXT,
+
+  IMG_BD_ROCK,                         -1,                     HA_NEXT,
+
+  IMG_BOMB,                            100,
+  IMG_EXPLOSION,                       16,
+  IMG_EMPTY_SPACE,                     10,                     HA_NEXT,
+
+  IMG_NUT,                             100,
+  IMG_NUT_BREAKING,                    6,
+  IMG_EMERALD,                         20,                     HA_NEXT,
+
+  IMG_WALL_EMERALD,                    100,
+  IMG_EXPLOSION,                       16,
+  IMG_EMERALD,                         20,                     HA_NEXT,
+
+  IMG_WALL_DIAMOND,                    100,
+  IMG_EXPLOSION,                       16,
+  IMG_DIAMOND,                         20,                     HA_NEXT,
+
+  IMG_WALL_BD_DIAMOND,                         100,
+  IMG_EXPLOSION,                       16,
+  IMG_BD_DIAMOND,                      20,                     HA_NEXT,
+
+  IMG_WALL_EMERALD_YELLOW,             100,
+  IMG_EXPLOSION,                       16,
+  IMG_EMERALD_YELLOW,                  20,
+  IMG_WALL_EMERALD_RED,                        100,
+  IMG_EXPLOSION,                       16,
+  IMG_EMERALD_RED,                     20,
+  IMG_WALL_EMERALD_PURPLE,             100,
+  IMG_EXPLOSION,                       16,
+  IMG_EMERALD_PURPLE,                  20,                     HA_NEXT,
+
+  IMG_ACID,                            -1,                     HA_NEXT,
+
+  IMG_KEY_1,                           50,
+  IMG_KEY_2,                           50,
+  IMG_KEY_3,                           50,
+  IMG_KEY_4,                           50,                     HA_NEXT,
+
+  IMG_GATE_1,                          50,
+  IMG_GATE_2,                          50,
+  IMG_GATE_3,                          50,
+  IMG_GATE_4,                          50,                     HA_NEXT,
+
+  IMG_GATE_1_GRAY,                     50,
+  IMG_GATE_2_GRAY,                     50,
+  IMG_GATE_3_GRAY,                     50,
+  IMG_GATE_4_GRAY,                     50,                     HA_NEXT,
+
+  IMG_DYNAMITE,                                -1,                     HA_NEXT,
+
+  IMG_DYNAMITE_ACTIVE,                 96,
+  IMG_EXPLOSION,                       16,
+  IMG_EMPTY_SPACE,                     20,                     HA_NEXT,
+
+  IMG_DYNABOMB_ACTIVE,                 100,
+  IMG_EXPLOSION,                       16,
+  IMG_EMPTY_SPACE,                     20,                     HA_NEXT,
+
+  IMG_DYNABOMB_INCREASE_NUMBER,                -1,                     HA_NEXT,
+
+  IMG_DYNABOMB_INCREASE_SIZE,          -1,                     HA_NEXT,
+
+  IMG_DYNABOMB_INCREASE_POWER,         -1,                     HA_NEXT,
+
+  IMG_SPACESHIP_RIGHT,                 16,
+  IMG_SPACESHIP_UP,                    16,
+  IMG_SPACESHIP_LEFT,                  16,
+  IMG_SPACESHIP_DOWN,                  16,                     HA_NEXT,
+
+  IMG_BUG_RIGHT,                       16,
+  IMG_BUG_UP,                          16,
+  IMG_BUG_LEFT,                                16,
+  IMG_BUG_DOWN,                                16,                     HA_NEXT,
+
+  IMG_BD_BUTTERFLY,                    -1,                     HA_NEXT,
+
+  IMG_BD_FIREFLY,                      -1,                     HA_NEXT,
+
+  IMG_PACMAN_RIGHT,                    16,
+  IMG_PACMAN_UP,                       16,
+  IMG_PACMAN_LEFT,                     16,
+  IMG_PACMAN_DOWN,                     16,                     HA_NEXT,
+
+  IMG_YAMYAM,                          -1,                     HA_NEXT,
+
+  IMG_DARK_YAMYAM,                     -1,                     HA_NEXT,
+
+  IMG_ROBOT,                           -1,                     HA_NEXT,
+
+  IMG_MOLE_MOVING_RIGHT,               16,
+  IMG_MOLE_MOVING_UP,                  16,
+  IMG_MOLE_MOVING_LEFT,                        16,
+  IMG_MOLE_MOVING_DOWN,                        16,                     HA_NEXT,
+
+  IMG_PENGUIN_MOVING_RIGHT,            16,
+  IMG_PENGUIN_MOVING_UP,               16,
+  IMG_PENGUIN_MOVING_LEFT,             16,
+  IMG_PENGUIN_MOVING_DOWN,             16,                     HA_NEXT,
+
+  IMG_PIG_MOVING_RIGHT,                        16,
+  IMG_PIG_MOVING_UP,                   16,
+  IMG_PIG_MOVING_LEFT,                 16,
+  IMG_PIG_MOVING_DOWN,                 16,                     HA_NEXT,
+
+  IMG_DRAGON_MOVING_RIGHT,             16,
+  IMG_DRAGON_MOVING_UP,                        16,
+  IMG_DRAGON_MOVING_LEFT,              16,
+  IMG_DRAGON_MOVING_DOWN,              16,                     HA_NEXT,
+
+  IMG_SATELLITE,                       -1,                     HA_NEXT,
+
+  IMG_ROBOT_WHEEL,                     50,
+  IMG_ROBOT_WHEEL_ACTIVE,              100,                    HA_NEXT,
+
+  IMG_LAMP,                            50,
+  IMG_LAMP_ACTIVE,                     50,                     HA_NEXT,
+
+  IMG_TIME_ORB_FULL,                   50,
+  IMG_TIME_ORB_EMPTY,                  50,                     HA_NEXT,
+
+  IMG_AMOEBA_DROP,                     50,
+  IMG_AMOEBA_GROWING,                  6,
+  IMG_AMOEBA_WET,                      20,                     HA_NEXT,
+
+  IMG_AMOEBA_DEAD,                     -1,                     HA_NEXT,
+
+  IMG_AMOEBA_WET,                      -1,                     HA_NEXT,
+
+  IMG_AMOEBA_WET,                      100,
+  IMG_AMOEBA_GROWING,                  6,                      HA_NEXT,
+
+  IMG_AMOEBA_FULL,                     50,
+  IMG_AMOEBA_DEAD,                     50,
+  IMG_EXPLOSION,                       16,
+  IMG_DIAMOND,                         20,                     HA_NEXT,
+
+  IMG_GAME_OF_LIFE,                    -1,                     HA_NEXT,
+
+  IMG_BIOMAZE,                         -1,                     HA_NEXT,
+
+  IMG_MAGIC_WALL_ACTIVE,               -1,                     HA_NEXT,
+
+  IMG_BD_MAGIC_WALL_ACTIVE,            -1,                     HA_NEXT,
+
+  IMG_EXIT_CLOSED,                     200,
+  IMG_EXIT_OPENING,                    16,
+  IMG_EXIT_OPEN,                       100,                    HA_NEXT,
+
+  IMG_EXIT_OPEN,                       -1,                     HA_NEXT,
+
+  IMG_SOKOBAN_OBJECT,                  -1,                     HA_NEXT,
+
+  IMG_SOKOBAN_FIELD_EMPTY,             -1,                     HA_NEXT,
+
+  IMG_SOKOBAN_FIELD_FULL,              -1,                     HA_NEXT,
+
+  IMG_SPEED_PILL,                      -1,                     HA_NEXT,
+
   HA_END
 };
 static char *helpscreen_eltext[][2] =
@@ -426,7 +693,7 @@ static char *helpscreen_eltext[][2] =
  {"THE HERO:",                         "(Is _this_ guy good old Rockford?)"},
  {"Normal sand:",                      "You can dig through it"},
  {"Empty field:",                      "You can walk through it"},
- {"Quicksand: You cannot pass it,",    "but rocks can fall though it"},
+ {"Quicksand: You cannot pass it,",    "but rocks can fall through it"},
  {"Massive Wall:",                     "Nothing can go through it"},
  {"Normal Wall: You can't go through", "it, but you can bomb it away"},
  {"Growing Wall: Grows in several di-",        "rections if there is an empty field"},
@@ -453,6 +720,7 @@ static char *helpscreen_eltext[][2] =
  {"Dyna Bomb: Explodes in 4 directions","with variable explosion size"},
  {"Dyna Bomb: Increases the number of",        "dyna bombs available at a time"},
  {"Dyna Bomb: Increases the size of",  "explosion of dyna bombs"},
+ {"Dyna Bomb: Increases the power of", "explosion of dyna bombs"},
  {"Spaceship: Moves at the left side", "of walls; don't touch it!"},
  {"Bug: Moves at the right side",      "of walls; don't touch it!"},
  {"Butterfly: Moves at the right side",        "of walls; don't touch it!"},
@@ -485,7 +753,7 @@ static char *helpscreen_eltext[][2] =
  {"Sokoban element: Field with object", "which can be pushed away"},
  {"Speed pill: Lets the player run",    "twice as fast as normally"},
 };
-static int num_helpscreen_els = sizeof(helpscreen_eltext)/(2*sizeof(char *));
+static int num_helpscreen_els = sizeof(helpscreen_eltext) / (2*sizeof(char *));
 
 static char *helpscreen_music[][3] =
 {
@@ -497,9 +765,11 @@ static char *helpscreen_music[][3] =
   { "Voyager",                 "The Alan Parsons Project","Pyramid" },
   { "Twilight Painter",                "Tangerine Dream",      "Heartbreakers" }
 };
+static int num_helpscreen_music = 7;
 static int helpscreen_musicpos;
 
-void DrawHelpScreenElAction(int start)
+#if 0
+void OLD_DrawHelpScreenElAction(int start)
 {
   int i = 0, j = 0;
   int frame, graphic;
@@ -551,7 +821,7 @@ void DrawHelpScreenElAction(int start)
     }
     j++;
 
-    DrawGraphicExt(drawto, gc, xstart, ystart+(i-start)*ystep, graphic+frame);
+    DrawOldGraphicExt(drawto, xstart, ystart+(i-start)*ystep, graphic+frame);
     i++;
   }
 
@@ -561,28 +831,105 @@ void DrawHelpScreenElAction(int start)
     MarkTileDirty(1,i);
   }
 }
+#endif
+
+void DrawHelpScreenElAction(int start)
+{
+  int i = 0, j = 0;
+  int xstart = mSX + 16;
+  int ystart = mSY + 64 + 2 * 32;
+  int ystep = TILEY + 4;
+  int graphic;
+  int frame_count;
+  int sync_frame;
+  int frame;
+
+  while (helpscreen_action[j] != HA_END)
+  {
+    if (i >= start + MAX_HELPSCREEN_ELS || i >= num_helpscreen_els)
+      break;
+    else if (i < start)
+    {
+      while (helpscreen_action[j] != HA_NEXT)
+       j++;
+
+      j++;
+      i++;
+
+      continue;
+    }
+
+    j += 2 * helpscreen_step[i-start];
+    graphic = helpscreen_action[j++];
+    frame_count = helpscreen_action[j++];
+    if (frame_count == -1)
+      frame_count = 1000000;
+
+    if (helpscreen_frame[i-start] == 0)
+    {
+      sync_frame = 0;
+      helpscreen_frame[i-start] = frame_count - 1;
+    }
+    else
+    {
+      sync_frame = frame_count - helpscreen_frame[i-start];
+      helpscreen_frame[i-start]--;
+    }
+
+    if (helpscreen_action[j] == HA_NEXT)
+    {
+      if (!helpscreen_frame[i-start])
+       helpscreen_step[i-start] = 0;
+    }
+    else
+    {
+      if (!helpscreen_frame[i-start])
+       helpscreen_step[i-start]++;
+      while(helpscreen_action[j] != HA_NEXT)
+       j++;
+    }
+    j++;
+
+    frame = getGraphicAnimationFrame(graphic, sync_frame);
+
+    DrawGraphicExt(drawto, xstart, ystart + (i-start) * ystep,
+                  graphic, frame);
+
+    i++;
+  }
+
+  for(i=2; i<16; i++)
+  {
+    MarkTileDirty(0, i);
+    MarkTileDirty(1, i);
+  }
+
+  FrameCounter++;
+}
 
 void DrawHelpScreenElText(int start)
 {
   int i;
-  int xstart = SX + 56, ystart = SY + 65 + 2 * 32, ystep = TILEY + 4;
+  int xstart = mSX + 56, ystart = mSY + 65 + 2 * 32, ystep = TILEY + 4;
   int ybottom = SYSIZE - 20;
 
+  SetMainBackgroundImage(IMG_BACKGROUND_INFO);
   ClearWindow();
   DrawHeadline();
 
-  DrawTextFCentered(100, FC_GREEN, "The game elements:");
+  DrawTextFCentered(100, FONT_TEXT_1, "The game elements:");
 
   for(i=start; i < start + MAX_HELPSCREEN_ELS && i < num_helpscreen_els; i++)
   {
     DrawText(xstart,
             ystart + (i - start) * ystep + (*helpscreen_eltext[i][1] ? 0 : 8),
-            helpscreen_eltext[i][0], FS_SMALL, FC_YELLOW);
+            helpscreen_eltext[i][0], FONT_TEXT_2);
     DrawText(xstart, ystart + (i - start) * ystep + 16,
-            helpscreen_eltext[i][1], FS_SMALL, FC_YELLOW);
+            helpscreen_eltext[i][1], FONT_TEXT_2);
   }
 
-  DrawTextFCentered(ybottom, FC_BLUE, "Press any key or button for next page");
+  DrawTextFCentered(ybottom, FONT_TEXT_4,
+                   "Press any key or button for next page");
 }
 
 void DrawHelpScreenMusicText(int num)
@@ -594,24 +941,24 @@ void DrawHelpScreenMusicText(int num)
   ClearWindow();
   DrawHeadline();
 
-  DrawTextFCentered(100, FC_GREEN, "The game background music loops:");
+  DrawTextFCentered(100, FONT_TEXT_1, "The game background music loops:");
 
-  DrawTextFCentered(ystart + 0 * ystep, FC_YELLOW,
-                   "Excerpt from");
-  DrawTextFCentered(ystart + 1 * ystep, FC_RED, "\"%s\"",
-                   helpscreen_music[num][0]);
-  DrawTextFCentered(ystart + 2 * ystep, FC_YELLOW,
-                   "by");
-  DrawTextFCentered(ystart + 3 * ystep, FC_RED,
+  DrawTextFCentered(ystart + 0 * ystep, FONT_TEXT_2, "Excerpt from");
+  DrawTextFCentered(ystart + 1 * ystep, FONT_TEXT_3,
+                   "\"%s\"", helpscreen_music[num][0]);
+  DrawTextFCentered(ystart + 2 * ystep, FONT_TEXT_2, "by");
+  DrawTextFCentered(ystart + 3 * ystep, FONT_TEXT_3,
                    "%s", helpscreen_music[num][1]);
-  DrawTextFCentered(ystart + 4 * ystep, FC_YELLOW,
-                   "from the album");
-  DrawTextFCentered(ystart + 5 * ystep, FC_RED, "\"%s\"",
-                   helpscreen_music[num][2]);
+  DrawTextFCentered(ystart + 4 * ystep, FONT_TEXT_2, "from the album");
+  DrawTextFCentered(ystart + 5 * ystep, FONT_TEXT_3,
+                   "\"%s\"", helpscreen_music[num][2]);
 
-  DrawTextFCentered(ybottom, FC_BLUE, "Press any key or button for next page");
+  DrawTextFCentered(ybottom, FONT_TEXT_4,
+                   "Press any key or button for next page");
 
+#if 0
   PlaySoundLoop(background_loop[num]);
+#endif
 }
 
 void DrawHelpScreenCreditsText()
@@ -623,22 +970,17 @@ void DrawHelpScreenCreditsText()
   ClearWindow();
   DrawHeadline();
 
-  DrawTextFCentered(100, FC_GREEN,
-                   "Credits:");
-  DrawTextFCentered(ystart + 0 * ystep, FC_YELLOW,
-                   "DOS/Windows port of the game:");
-  DrawTextFCentered(ystart + 1 * ystep, FC_RED,
-                   "Guido Schulz");
-  DrawTextFCentered(ystart + 2 * ystep, FC_YELLOW,
-                   "Additional toons:");
-  DrawTextFCentered(ystart + 3 * ystep, FC_RED,
-                   "Karl Hörnell");
-  DrawTextFCentered(ystart + 5 * ystep, FC_YELLOW,
+  DrawTextFCentered(100, FONT_TEXT_1, "Credits:");
+  DrawTextFCentered(ystart + 0 * ystep, FONT_TEXT_2, "DOS port of the game:");
+  DrawTextFCentered(ystart + 1 * ystep, FONT_TEXT_3, "Guido Schulz");
+  DrawTextFCentered(ystart + 2 * ystep, FONT_TEXT_2, "Additional toons:");
+  DrawTextFCentered(ystart + 3 * ystep, FONT_TEXT_3, "Karl Hörnell");
+  DrawTextFCentered(ystart + 5 * ystep, FONT_TEXT_2,
                    "...and many thanks to all contributors");
-  DrawTextFCentered(ystart + 6 * ystep, FC_YELLOW,
-                   "of new levels!");
+  DrawTextFCentered(ystart + 6 * ystep, FONT_TEXT_2, "of new levels!");
 
-  DrawTextFCentered(ybottom, FC_BLUE, "Press any key or button for next page");
+  DrawTextFCentered(ybottom, FONT_TEXT_4,
+                   "Press any key or button for next page");
 }
 
 void DrawHelpScreenContactText()
@@ -649,33 +991,34 @@ void DrawHelpScreenContactText()
   ClearWindow();
   DrawHeadline();
 
-  DrawTextFCentered(100, FC_GREEN, "Program information:");
+  DrawTextFCentered(100, FONT_TEXT_1, "Program information:");
 
-  DrawTextFCentered(ystart + 0 * ystep, FC_YELLOW,
+  DrawTextFCentered(ystart + 0 * ystep, FONT_TEXT_2,
                    "This game is Freeware!");
-  DrawTextFCentered(ystart + 1 * ystep, FC_YELLOW,
+  DrawTextFCentered(ystart + 1 * ystep, FONT_TEXT_2,
                    "If you like it, send e-mail to:");
-  DrawTextFCentered(ystart + 2 * ystep, FC_RED,
-                   "aeglos@valinor.owl.de");
-  DrawTextFCentered(ystart + 3 * ystep, FC_YELLOW,
+  DrawTextFCentered(ystart + 2 * ystep, FONT_TEXT_3,
+                   "info@artsoft.org");
+  DrawTextFCentered(ystart + 3 * ystep, FONT_TEXT_2,
                    "or SnailMail to:");
-  DrawTextFCentered(ystart + 4 * ystep + 0, FC_RED,
+  DrawTextFCentered(ystart + 4 * ystep + 0, FONT_TEXT_3,
                    "Holger Schemel");
-  DrawTextFCentered(ystart + 4 * ystep + 20, FC_RED,
-                   "Oststrasse 11a");
-  DrawTextFCentered(ystart + 4 * ystep + 40, FC_RED,
+  DrawTextFCentered(ystart + 4 * ystep + 20, FONT_TEXT_3,
+                   "Detmolder Strasse 189");
+  DrawTextFCentered(ystart + 4 * ystep + 40, FONT_TEXT_3,
                    "33604 Bielefeld");
-  DrawTextFCentered(ystart + 4 * ystep + 60, FC_RED,
+  DrawTextFCentered(ystart + 4 * ystep + 60, FONT_TEXT_3,
                    "Germany");
 
-  DrawTextFCentered(ystart + 7 * ystep, FC_YELLOW,
+  DrawTextFCentered(ystart + 7 * ystep, FONT_TEXT_2,
                    "If you have created new levels,");
-  DrawTextFCentered(ystart + 8 * ystep, FC_YELLOW,
+  DrawTextFCentered(ystart + 8 * ystep, FONT_TEXT_2,
                    "send them to me to include them!");
-  DrawTextFCentered(ystart + 9 * ystep, FC_YELLOW,
+  DrawTextFCentered(ystart + 9 * ystep, FONT_TEXT_2,
                    ":-)");
 
-  DrawTextFCentered(ybottom, FC_BLUE, "Press any key or button for main menu");
+  DrawTextFCentered(ybottom, FONT_TEXT_4,
+                   "Press any key or button for main menu");
 }
 
 void DrawHelpScreen()
@@ -686,15 +1029,21 @@ void DrawHelpScreen()
   CloseDoor(DOOR_CLOSE_2);
 
   for(i=0;i<MAX_HELPSCREEN_ELS;i++)
-    helpscreen_step[i] = helpscreen_frame[i] = helpscreen_delay[i] = 0;
+    helpscreen_step[i] = helpscreen_frame[i] = 0;
   helpscreen_musicpos = 0;
   helpscreen_state = 0;
+
   DrawHelpScreenElText(0);
   DrawHelpScreenElAction(0);
 
   FadeToFront();
   InitAnimation();
-  PlaySoundLoop(SND_RHYTHMLOOP);
+
+#if 0
+  PlaySoundLoop(SND_BACKGROUND_INFO);
+#else
+  PlaySound_Menu_Start(SND_BACKGROUND_INFO);
+#endif
 }
 
 void HandleHelpScreen(int button)
@@ -710,22 +1059,27 @@ void HandleHelpScreen(int button)
     if (helpscreen_state < num_helpscreen_els_pages - 1)
     {
       for(i=0;i<MAX_HELPSCREEN_ELS;i++)
-       helpscreen_step[i] = helpscreen_frame[i] = helpscreen_delay[i] = 0;
+       helpscreen_step[i] = helpscreen_frame[i] = 0;
       helpscreen_state++;
-      DrawHelpScreenElText(helpscreen_state*MAX_HELPSCREEN_ELS);
-      DrawHelpScreenElAction(helpscreen_state*MAX_HELPSCREEN_ELS);
+
+      FrameCounter = 0;
+      DrawHelpScreenElText(helpscreen_state * MAX_HELPSCREEN_ELS);
+      DrawHelpScreenElAction(helpscreen_state * MAX_HELPSCREEN_ELS);
     }
-    else if (helpscreen_state < num_helpscreen_els_pages + num_bg_loops - 1)
+    else if (helpscreen_state <
+            num_helpscreen_els_pages + num_helpscreen_music - 1)
     {
       helpscreen_state++;
       DrawHelpScreenMusicText(helpscreen_state - num_helpscreen_els_pages);
     }
-    else if (helpscreen_state == num_helpscreen_els_pages + num_bg_loops - 1)
+    else if (helpscreen_state ==
+            num_helpscreen_els_pages + num_helpscreen_music - 1)
     {
       helpscreen_state++;
       DrawHelpScreenCreditsText();
     }
-    else if (helpscreen_state == num_helpscreen_els_pages + num_bg_loops)
+    else if (helpscreen_state ==
+            num_helpscreen_els_pages + num_helpscreen_music)
     {
       helpscreen_state++;
       DrawHelpScreenContactText();
@@ -733,122 +1087,212 @@ void HandleHelpScreen(int button)
     else
     {
       FadeSounds();
+
+      game_status = GAME_MODE_MAIN;
       DrawMainMenu();
-      game_status = MAINMENU;
     }
   }
   else
   {
-    if (DelayReached(&hs_delay,GAME_FRAME_DELAY * 2))
+    if (DelayReached(&hs_delay, GAME_FRAME_DELAY))
     {
-      if (helpscreen_state<num_helpscreen_els_pages)
-       DrawHelpScreenElAction(helpscreen_state*MAX_HELPSCREEN_ELS);
+      if (helpscreen_state < num_helpscreen_els_pages)
+       DrawHelpScreenElAction(helpscreen_state * MAX_HELPSCREEN_ELS);
     }
+
+    /* !!! workaround for playing "music" that is really a sound loop (and
+       must therefore periodically be reactivated with the current sound
+       engine !!! */
+#if 0
+    PlaySoundLoop(SND_BACKGROUND_INFO);
+#else
+    PlaySound_Menu_Continue(SND_BACKGROUND_INFO);
+#endif
+
     DoAnimation();
   }
 
   BackToFront();
 }
 
-void HandleTypeName(int newxpos, KeySym key)
+void HandleTypeName(int newxpos, Key key)
 {
   static int xpos = 0, ypos = 2;
+  int font_width = getFontWidth(FONT_INPUT_1_ACTIVE);
+  int name_width = getFontWidth(FONT_MENU_1) * strlen("Name:");
+  int startx = mSX + 32 + name_width;
+  int starty = mSY + ypos * 32;
 
   if (newxpos)
   {
     xpos = newxpos;
-    DrawText(SX + 6*32, SY + ypos*32, setup.player_name, FS_BIG, FC_YELLOW);
-    DrawGraphic(xpos + 6, ypos, GFX_KUGEL_ROT);
+
+    DrawText(startx, starty, setup.player_name, FONT_INPUT_1_ACTIVE);
+    DrawText(startx + xpos * font_width, starty, "_", FONT_INPUT_1_ACTIVE);
+
     return;
   }
 
-  if (((key >= XK_A && key <= XK_Z) || (key >= XK_a && key <= XK_z)) && 
+  if (((key >= KSYM_A && key <= KSYM_Z) ||
+       (key >= KSYM_a && key <= KSYM_z)) && 
       xpos < MAX_PLAYER_NAME_LEN)
   {
     char ascii;
 
-    if (key >= XK_A && key <= XK_Z)
-      ascii = 'A' + (char)(key - XK_A);
+    if (key >= KSYM_A && key <= KSYM_Z)
+      ascii = 'A' + (char)(key - KSYM_A);
     else
-      ascii = 'a' + (char)(key - XK_a);
+      ascii = 'a' + (char)(key - KSYM_a);
 
     setup.player_name[xpos] = ascii;
     setup.player_name[xpos + 1] = 0;
     xpos++;
-    DrawTextExt(drawto, gc, SX + 6*32, SY + ypos*32,
-               setup.player_name, FS_BIG, FC_YELLOW);
-    DrawTextExt(window, gc, SX + 6*32, SY + ypos*32,
-               setup.player_name, FS_BIG, FC_YELLOW);
-    DrawGraphic(xpos + 6, ypos, GFX_KUGEL_ROT);
+
+    DrawText(startx, starty, setup.player_name, FONT_INPUT_1_ACTIVE);
+    DrawText(startx + xpos * font_width, starty, "_", FONT_INPUT_1_ACTIVE);
   }
-  else if ((key == XK_Delete || key == XK_BackSpace) && xpos > 0)
+  else if ((key == KSYM_Delete || key == KSYM_BackSpace) && xpos > 0)
   {
     xpos--;
     setup.player_name[xpos] = 0;
-    DrawGraphic(xpos + 6, ypos, GFX_KUGEL_ROT);
-    DrawGraphic(xpos + 7, ypos, GFX_LEERRAUM);
+
+    DrawText(startx + xpos * font_width, starty, "_ ", FONT_INPUT_1_ACTIVE);
   }
-  else if (key == XK_Return && xpos > 0)
+  else if (key == KSYM_Return && xpos > 0)
   {
-    DrawText(SX + 6*32, SY + ypos*32, setup.player_name, FS_BIG, FC_RED);
-    DrawGraphic(xpos + 6, ypos, GFX_LEERRAUM);
+    DrawText(startx, starty, setup.player_name, FONT_INPUT_1);
+    DrawText(startx + xpos * font_width, starty, " ", FONT_INPUT_1_ACTIVE);
 
     SaveSetup();
-    game_status = MAINMENU;
+    game_status = GAME_MODE_MAIN;
   }
 
   BackToFront();
 }
 
-void DrawChooseLevel()
+static void DrawChooseTree(TreeInfo **ti_ptr)
 {
   UnmapAllGadgets();
   CloseDoor(DOOR_CLOSE_2);
 
+  ClearWindow();
+
+  HandleChooseTree(0,0, 0,0, MB_MENU_INITIALIZE, ti_ptr);
+  MapChooseTreeGadgets(*ti_ptr);
+
   FadeToFront();
   InitAnimation();
-  HandleChooseLevel(0,0, 0,0, MB_MENU_INITIALIZE);
 }
 
-static void drawChooseLevelList(int first_entry, int num_page_entries)
+static void AdjustChooseTreeScrollbar(int id, int first_entry, TreeInfo *ti)
 {
-  int i;
-  char buffer[SCR_FIELDX];
+  struct GadgetInfo *gi = screen_gadget[id];
+  int items_max, items_visible, item_position;
 
-  ClearWindow();
-  DrawText(SX, SY, "Level Directories", FS_BIG, FC_GREEN);
+  items_max = numTreeInfoInGroup(ti);
+  items_visible = MAX_MENU_ENTRIES_ON_SCREEN - 1;
+  item_position = first_entry;
+
+  if (item_position > items_max - items_visible)
+    item_position = items_max - items_visible;
+
+  ModifyGadget(gi, GDI_SCROLLBAR_ITEMS_MAX, items_max,
+              GDI_SCROLLBAR_ITEM_POSITION, item_position, GDI_END);
+}
+
+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_entries = numTreeInfoInGroup(ti);
+  char *title_string = NULL;
+  int xoffset_setup = 16;
+  int yoffset_setup = 0;
+  int xoffset = (ti->type == TREE_TYPE_LEVEL_DIR ? 0 : xoffset_setup);
+  int yoffset = (ti->type == TREE_TYPE_LEVEL_DIR ? 0 : yoffset_setup);
+  int last_game_status = game_status;  /* save current game status */
+
+  DrawBackground(SX, SY, SXSIZE - 32, SYSIZE);
+  redraw_mask |= REDRAW_FIELD;
+
+  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 + xoffset, SY + yoffset, title_string, FONT_TITLE_1);
+
+  /* force LEVELS font on artwork setup screen */
+  game_status = GAME_MODE_LEVELS;
 
   for(i=0; i<num_page_entries; i++)
   {
-    strncpy(buffer, leveldir[first_entry + i].name_short , SCR_FIELDX - 1);
-    buffer[SCR_FIELDX - 1] = '\0';
-    DrawText(SX + 32, SY + (i + 2) * 32, buffer,
-            FS_BIG, leveldir[first_entry + i].color);
-    DrawGraphic(0, i + 2, GFX_KUGEL_BLAU);
+    TreeInfo *node, *node_first;
+    int entry_pos = first_entry + i;
+    int ypos = MENU_SCREEN_START_YPOS + i;
+
+    node_first = getTreeInfoFirstGroupEntry(ti);
+    node = getTreeInfoFromPos(node_first, entry_pos);
+
+    strncpy(buffer, node->name , max_buffer_len);
+    buffer[max_buffer_len] = '\0';
+
+    DrawText(mSX + 32, mSY + ypos * 32, buffer, FONT_TEXT_1 + node->color);
+
+    if (node->parent_link)
+      initCursor(i, IMG_MENU_BUTTON_LEFT);
+    else if (node->level_group)
+      initCursor(i, IMG_MENU_BUTTON_RIGHT);
+    else
+      initCursor(i, IMG_MENU_BUTTON);
   }
 
   if (first_entry > 0)
-    DrawGraphic(0, 1, GFX_PFEIL_UP);
+  {
+    int ypos = 1;
+
+    DrawBackground(mSX, mSY + ypos * TILEY, TILEX, TILEY);
+    DrawGraphicThruMaskExt(drawto, mSX, mSY + ypos * TILEY,
+                          IMG_MENU_BUTTON_UP, 0);
+  }
 
-  if (first_entry + num_page_entries < num_leveldirs)
-    DrawGraphic(0, MAX_LEVEL_SERIES_ON_SCREEN + 1, GFX_PFEIL_DOWN);
+  if (first_entry + num_page_entries < num_entries)
+  {
+    int ypos = MAX_MENU_ENTRIES_ON_SCREEN + 1;
+
+    DrawBackground(mSX, mSY + ypos * TILEY, TILEX, TILEY);
+    DrawGraphicThruMaskExt(drawto, mSX, mSY + ypos * TILEY,
+                          IMG_MENU_BUTTON_DOWN, 0);
+  }
+
+  game_status = last_game_status;      /* restore current game status */
 }
 
-static void drawChooseLevelInfo(int leveldir_nr)
+static void drawChooseTreeInfo(int entry_pos, TreeInfo *ti)
 {
+  TreeInfo *node, *node_first;
   int x, last_redraw_mask = redraw_mask;
 
-  XFillRectangle(display, drawto, gc, SX + 32, SY + 32, SXSIZE - 32, 32);
+  if (ti->type != TREE_TYPE_LEVEL_DIR)
+    return;
 
-#if 0
-  DrawTextFCentered(40, FC_RED, "%3d levels (%s)",
-                   leveldir[leveldir_nr].levels,
-                   leveldir[leveldir_nr].readonly ? "readonly" : "writable");
-#else
-  DrawTextFCentered(40, FC_RED, "%3d levels (%s)",
-                   leveldir[leveldir_nr].levels,
-                   leveldir[leveldir_nr].class_desc);
-#endif
+  node_first = getTreeInfoFirstGroupEntry(ti);
+  node = getTreeInfoFromPos(node_first, entry_pos);
+
+  DrawBackground(SX + 32, SY + 32, SXSIZE - 64, 32);
+
+  if (node->parent_link)
+    DrawTextFCentered(40, FONT_TITLE_2, "leave group \"%s\"",
+                     node->class_desc);
+  else if (node->level_group)
+    DrawTextFCentered(40, FONT_TITLE_2, "enter group \"%s\"",
+                     node->class_desc);
+  else if (ti->type == TREE_TYPE_LEVEL_DIR)
+    DrawTextFCentered(40, FONT_TITLE_2, "%3d levels (%s)",
+                     node->levels, node->class_desc);
 
   /* let BackToFront() redraw only what is needed */
   redraw_mask = last_redraw_mask | REDRAW_TILES;
@@ -856,461 +1300,854 @@ static void drawChooseLevelInfo(int leveldir_nr)
     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 int choice = 3;
-  static int first_entry = -1;
   static unsigned long choose_delay = 0;
-  static int redraw = TRUE;
-  int x = (mx + 32 - SX) / 32, y = (my + 32 - SY) / 32;
+  TreeInfo *ti = *ti_ptr;
+  int x = 0;
+  int y = ti->cl_cursor;
   int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
+  int num_entries = numTreeInfoInGroup(ti);
   int num_page_entries;
 
-  if (num_leveldirs <= MAX_LEVEL_SERIES_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_LEVEL_SERIES_ON_SCREEN - 1;
+    num_page_entries = MAX_MENU_ENTRIES_ON_SCREEN - 1;
 
   if (button == MB_MENU_INITIALIZE)
   {
-    if (first_entry == -1)
+    int entry_pos = posTreeInfo(ti);
+
+    if (ti->cl_first == -1)
     {
-      first_entry = MAX(0, leveldir_nr - num_page_entries + 1);
-      choice = leveldir_nr - first_entry + 3;
+      ti->cl_first = MAX(0, entry_pos - num_page_entries + 1);
+      ti->cl_cursor =
+       entry_pos - ti->cl_first;
     }
 
-    drawChooseLevelList(first_entry, num_page_entries);
-    drawChooseLevelInfo(leveldir_nr);
-    redraw = TRUE;
-  }
+    if (dx == 999)     /* first entry is set by scrollbar position */
+      ti->cl_first = dy;
+    else
+      AdjustChooseTreeScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL,
+                               ti->cl_first, ti);
 
-  if (redraw)
-  {
-    DrawGraphic(0, choice - 1, GFX_KUGEL_ROT);
-    redraw = FALSE;
+    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 (ti->node_parent)
+    {
+      *ti_ptr = ti->node_parent;
+      DrawChooseTree(ti_ptr);
+    }
+    else if (game_status == GAME_MODE_SETUP)
+    {
+      execSetupArtwork();
+    }
+    else
+    {
+      game_status = GAME_MODE_MAIN;
+      DrawMainMenu();
+    }
 
-  if (button == MB_MENU_INITIALIZE)
     return;
+  }
 
-  if (dx || dy)
+  if (mx || my)                /* mouse input */
+  {
+    x = (mx - mSX) / 32;
+    y = (my - mSY) / 32 - MENU_SCREEN_START_YPOS;
+  }
+  else if (dx || dy)   /* keyboard input */
   {
     if (dy)
-    {
-      x = 1;
-      y = choice + dy;
-    }
-    else
-      x = y = 0;       /* no action */
+      y = ti->cl_cursor + dy;
 
-    if (ABS(dy) == SCR_FIELDY) /* handle XK_Page_Up, XK_Page_Down */
+    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 ? 2 : num_page_entries + 3);
+      y = (dy < 0 ? -1 : num_page_entries);
     }
   }
 
-  if (x == 1 && y == 2)
+  if (x == 0 && y == -1)
   {
-    if (first_entry > 0 &&
+    if (ti->cl_first > 0 &&
        (dy || DelayReached(&choose_delay, GADGET_FRAME_DELAY)))
     {
-      first_entry -= step;
-      if (first_entry < 0)
-       first_entry = 0;
-
-      drawChooseLevelList(first_entry, num_page_entries);
-      drawChooseLevelInfo(first_entry + choice - 3);
-      DrawGraphic(0, choice - 1, GFX_KUGEL_ROT);
+      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 == 1 && y > num_page_entries + 2)
+  else if (x == 0 && y > num_page_entries - 1)
   {
-    if (first_entry + num_page_entries < num_leveldirs &&
+    if (ti->cl_first + num_page_entries < num_entries &&
        (dy || DelayReached(&choose_delay, GADGET_FRAME_DELAY)))
     {
-      first_entry += step;
-      if (first_entry + num_page_entries > num_leveldirs)
-       first_entry = MAX(0, num_leveldirs - num_page_entries);
-
-      drawChooseLevelList(first_entry, num_page_entries);
-      drawChooseLevelInfo(first_entry + choice - 3);
-      DrawGraphic(0, choice - 1, GFX_KUGEL_ROT);
+      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 (!mx && !my && !dx && !dy)
+  if (dx == 1)
   {
-    x = 1;
-    y = choice;
+    TreeInfo *node_first, *node_cursor;
+    int entry_pos = ti->cl_first + y;
+
+    node_first = getTreeInfoFirstGroupEntry(ti);
+    node_cursor = getTreeInfoFromPos(node_first, entry_pos);
+
+    if (node_cursor->node_group)
+    {
+      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 && ti->node_parent)
+  {
+    *ti_ptr = ti->node_parent;
+    DrawChooseTree(ti_ptr);
+    return;
   }
 
-  if (x == 1 && y >= 3 && y <= num_page_entries + 2)
+  if (x == 0 && y >= 0 && y < num_page_entries)
   {
     if (button)
     {
-      if (y != choice)
+      if (y != ti->cl_cursor)
       {
-        DrawGraphic(0, y - 1, GFX_KUGEL_ROT);
-        DrawGraphic(0, choice - 1, GFX_KUGEL_BLAU);
-       drawChooseLevelInfo(first_entry + y - 3);
-       choice = y;
+       drawCursor(y, FC_RED);
+       drawCursor(ti->cl_cursor, FC_BLUE);
+       drawChooseTreeInfo(ti->cl_first + y, ti);
+       ti->cl_cursor = y;
       }
     }
     else
     {
-      leveldir_nr = first_entry + y - 3;
-      level_nr =
-       getLastPlayedLevelOfLevelSeries(leveldir[leveldir_nr].filename);
+      TreeInfo *node_first, *node_cursor;
+      int entry_pos = ti->cl_first + y;
 
-      SaveLevelSetup();
-      TapeErase();
+      node_first = getTreeInfoFirstGroupEntry(ti);
+      node_cursor = getTreeInfoFromPos(node_first, entry_pos);
 
-      game_status = MAINMENU;
-      DrawMainMenu();
-      redraw = TRUE;
+      if (node_cursor->node_group)
+      {
+       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)
+      {
+       *ti_ptr = node_cursor->node_parent;
+       DrawChooseTree(ti_ptr);
+      }
+      else
+      {
+       node_cursor->cl_first = ti->cl_first;
+       node_cursor->cl_cursor = ti->cl_cursor;
+       *ti_ptr = node_cursor;
+
+       if (ti->type == TREE_TYPE_LEVEL_DIR)
+       {
+         LoadLevelSetup_SeriesInfo();
+
+         SaveLevelSetup_LastSeries();
+         SaveLevelSetup_SeriesInfo();
+         TapeErase();
+       }
+
+       if (game_status == GAME_MODE_SETUP)
+       {
+         execSetupArtwork();
+       }
+       else
+       {
+         game_status = GAME_MODE_MAIN;
+         DrawMainMenu();
+       }
+      }
     }
   }
 
   BackToFront();
 
-  if (game_status == CHOOSELEVEL)
+  if (game_status == GAME_MODE_LEVELS || game_status == GAME_MODE_SETUP)
     DoAnimation();
 }
 
-void DrawHallOfFame(int highlight_position)
+void DrawChooseLevel()
 {
-  int i;
+  SetMainBackgroundImage(IMG_BACKGROUND_LEVELS);
+
+  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();
+  FadeSounds();
   CloseDoor(DOOR_CLOSE_2);
 
   if (highlight_position < 0) 
     LoadScore(level_nr);
 
+  FadeToFront();
+  InitAnimation();
+
+  HandleHallOfFame(highlight_position,0, 0,0, MB_MENU_INITIALIZE);
+
+#if 0
+  PlaySound(SND_BACKGROUND_SCORES);
+#else
+  PlaySound_Menu_Start(SND_BACKGROUND_SCORES);
+#endif
+}
+
+static void drawHallOfFameList(int first_entry, int highlight_position)
+{
+  int i;
+
+  SetMainBackgroundImage(IMG_BACKGROUND_SCORES);
   ClearWindow();
 
-  DrawText(SX + 80, SY + 8, "Hall Of Fame", FS_BIG, FC_YELLOW);
-  DrawTextFCentered(46, FC_RED, "HighScores of Level %d", level_nr);
+  DrawText(mSX + 80, mSY + 8, "Hall Of Fame", FONT_TITLE_1);
+  DrawTextFCentered(46, FONT_TITLE_2, "HighScores of Level %d", level_nr);
 
-  for(i=0; i<MAX_LEVEL_SERIES_ON_SCREEN; i++)
+  for(i=0; i<MAX_MENU_ENTRIES_ON_SCREEN; i++)
   {
-    DrawText(SX, SY + 64 + i * 32, ".................", FS_BIG,
-            (i == highlight_position ? FC_RED : FC_GREEN));
-    DrawText(SX, SY + 64 + i * 32, highscore[i].Name, FS_BIG,
-            (i == highlight_position ? FC_RED : FC_GREEN));
-    DrawText(SX + 12 * 32, SY + 64 + i * 32,
-            int2str(highscore[i].Score, 5), FS_BIG,
-            (i == highlight_position ? FC_RED : FC_GREEN));
+    int entry = first_entry + i;
+    boolean active = (entry == highlight_position);
+    int font_nr1 = (active ? FONT_TEXT_1_ACTIVE : FONT_TEXT_1);
+    int font_nr2 = (active ? FONT_TEXT_2_ACTIVE : FONT_TEXT_2);
+    int font_nr3 = (active ? FONT_TEXT_3_ACTIVE : FONT_TEXT_3);
+    int font_nr4 = (active ? FONT_TEXT_4_ACTIVE : FONT_TEXT_4);
+    int dx1 = 3 * getFontWidth(font_nr1);
+    int dx2 = dx1 + getFontWidth(font_nr1);
+    int dx3 = dx2 + 25 * getFontWidth(font_nr3);
+    int sy = mSY + 64 + i * 32;
+
+    DrawText(mSX, sy, int2str(entry + 1, 3), font_nr1);
+    DrawText(mSX + dx1, sy, ".", font_nr1);
+    DrawText(mSX + dx2, sy, ".........................", font_nr3);
+    if (strcmp(highscore[entry].Name, EMPTY_PLAYER_NAME) != 0)
+      DrawText(mSX + dx2, sy, highscore[entry].Name, font_nr2);
+    DrawText(mSX + dx3, sy, int2str(highscore[entry].Score, 5), font_nr4);
   }
-
-  FadeToFront();
-  InitAnimation();
-  PlaySound(SND_HALLOFFAME);
 }
 
-void HandleHallOfFame(int button)
+void HandleHallOfFame(int mx, int my, int dx, int dy, int button)
 {
+  static int first_entry = 0;
+  static int highlight_position = 0;
+  int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
   int button_released = !button;
 
+  if (button == MB_MENU_INITIALIZE)
+  {
+    first_entry = 0;
+    highlight_position = mx;
+    drawHallOfFameList(first_entry, highlight_position);
+    return;
+  }
+
+  if (ABS(dy) == SCR_FIELDY)   /* handle KSYM_Page_Up, KSYM_Page_Down */
+    step = MAX_MENU_ENTRIES_ON_SCREEN - 1;
+
+  if (dy < 0)
+  {
+    if (first_entry > 0)
+    {
+      first_entry -= step;
+      if (first_entry < 0)
+       first_entry = 0;
+
+      drawHallOfFameList(first_entry, highlight_position);
+      return;
+    }
+  }
+  else if (dy > 0)
+  {
+    if (first_entry + MAX_MENU_ENTRIES_ON_SCREEN < MAX_SCORE_ENTRIES)
+    {
+      first_entry += step;
+      if (first_entry + MAX_MENU_ENTRIES_ON_SCREEN > MAX_SCORE_ENTRIES)
+       first_entry = MAX(0, MAX_SCORE_ENTRIES - MAX_MENU_ENTRIES_ON_SCREEN);
+
+      drawHallOfFameList(first_entry, highlight_position);
+      return;
+    }
+  }
+
   if (button_released)
   {
-    FadeSound(SND_HALLOFFAME);
-    game_status = MAINMENU;
+    FadeSound(SND_BACKGROUND_SCORES);
+    game_status = GAME_MODE_MAIN;
     DrawMainMenu();
-    BackToFront();
   }
-  else
+
+  BackToFront();
+
+  if (game_status == GAME_MODE_SCORES)
+  {
     DoAnimation();
+#if 1
+    PlaySound_Menu_Continue(SND_BACKGROUND_SCORES);
+#endif
+  }
 }
 
-void DrawSetupScreen()
+
+/* ========================================================================= */
+/* setup screen functions                                                    */
+/* ========================================================================= */
+
+static struct TokenInfo *setup_info;
+static int num_setup_info;
+
+static char *graphics_set_name;
+static char *sounds_set_name;
+static char *music_set_name;
+
+static void execSetupMain()
 {
-  int i;
-  static struct setup
-  {
-    boolean *value;
-    char *text;
-  } setup_info[] =
-  {
-    { &setup.sound,            "Sound:",       },
-    { &setup.sound_loops,      " Sound Loops:" },
-    { &setup.sound_music,      " Game Music:"  },
-    { &setup.toons,            "Toons:"        },
-    { &setup.double_buffering, "Buffered gfx:" },
-    { &setup.scroll_delay,     "Scroll Delay:" },
-    { &setup.soft_scrolling,   "Soft Scroll.:" },
-    { &setup.fading,           "Fading:"       },
-    { &setup.quick_doors,      "Quick Doors:"  },
-    { &setup.autorecord,       "Auto-Record:"  },
-    { &setup.team_mode,                "Team-Mode:"    },
-    { NULL,                    "Input Devices" },
-    { NULL,                    ""              },
-    { NULL,                    "Exit"          },
-    { NULL,                    "Save and exit" }
-  };
+  setup_mode = SETUP_MODE_MAIN;
+  DrawSetupScreen();
+}
 
-  UnmapAllGadgets();
-  CloseDoor(DOOR_CLOSE_2);
-  ClearWindow();
+static void execSetupGame()
+{
+  setup_mode = SETUP_MODE_GAME;
+  DrawSetupScreen();
+}
 
-  DrawText(SX + 16, SY + 16, "SETUP",FS_BIG,FC_YELLOW);
+static void execSetupEditor()
+{
+  setup_mode = SETUP_MODE_EDITOR;
+  DrawSetupScreen();
+}
 
-  for(i=SETUP_SCREEN_POS_START;i<=SETUP_SCREEN_POS_END;i++)
-  {
-    int base = i - SETUP_SCREEN_POS_START;
+static void execSetupGraphics()
+{
+  setup_mode = SETUP_MODE_GRAPHICS;
+  DrawSetupScreen();
+}
 
-    if (!(i >= SETUP_SCREEN_POS_EMPTY1 && i <= SETUP_SCREEN_POS_EMPTY2))
-    {
-      DrawGraphic(0,i,GFX_KUGEL_BLAU);
-      DrawText(SX+32,SY+i*32, setup_info[base].text, FS_BIG,FC_GREEN);
-    }
+static void execSetupSound()
+{
+  setup_mode = SETUP_MODE_SOUND;
+  DrawSetupScreen();
+}
 
-    if (setup_info[base].value)
-    {
-      int setting_value = *setup_info[base].value;
+static void execSetupArtwork()
+{
+  /* needed if last screen (setup choice) changed graphics, sounds or music */
+  ReloadCustomArtwork();
 
-      DrawText(SX+14*32, SY+i*32, (setting_value ? "on" : "off"),
-              FS_BIG, (setting_value ? FC_YELLOW : FC_BLUE));
-    }
-  }
+  setup.graphics_set = artwork.gfx_current->identifier;
+  setup.sounds_set = artwork.snd_current->identifier;
+  setup.music_set = artwork.mus_current->identifier;
 
-  FadeToFront();
-  InitAnimation();
-  HandleSetupScreen(0,0,0,0,MB_MENU_INITIALIZE);
+  /* needed for displaying artwork name instead of artwork identifier */
+  graphics_set_name = artwork.gfx_current->name;
+  sounds_set_name = artwork.snd_current->name;
+  music_set_name = artwork.mus_current->name;
+
+  setup_mode = SETUP_MODE_ARTWORK;
+  DrawSetupScreen();
 }
 
-void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
+static void execSetupChooseGraphics()
 {
-  static int choice = 3;
-  static int redraw = TRUE;
-  int x = (mx+32-SX)/32, y = (my+32-SY)/32;
-  int pos_start  = SETUP_SCREEN_POS_START  + 1;
-  int pos_empty1 = SETUP_SCREEN_POS_EMPTY1 + 1;
-  int pos_empty2 = SETUP_SCREEN_POS_EMPTY2 + 1;
-  int pos_end    = SETUP_SCREEN_POS_END    + 1;
+  setup_mode = SETUP_MODE_CHOOSE_GRAPHICS;
+  DrawSetupScreen();
+}
 
-  if (button == MB_MENU_INITIALIZE)
-    redraw = TRUE;
+static void execSetupChooseSounds()
+{
+  setup_mode = SETUP_MODE_CHOOSE_SOUNDS;
+  DrawSetupScreen();
+}
 
-  if (redraw)
+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 execExitSetup()
+{
+  game_status = GAME_MODE_MAIN;
+  DrawMainMenu();
+}
+
+static void execSaveAndExitSetup()
+{
+  SaveSetup();
+  execExitSetup();
+}
+
+static struct TokenInfo setup_info_main[] =
+{
+  { TYPE_ENTER_MENU,   execSetupGame,          "Game Settings"         },
+  { TYPE_ENTER_MENU,   execSetupEditor,        "Editor Settings"       },
+  { TYPE_ENTER_MENU,   execSetupGraphics,      "Graphics"              },
+  { TYPE_ENTER_MENU,   execSetupSound,         "Sound & Music"         },
+  { TYPE_ENTER_MENU,   execSetupArtwork,       "Custom Artwork"        },
+  { TYPE_ENTER_MENU,   execSetupInput,         "Input Devices"         },
+  { TYPE_ENTER_MENU,   execSetupShortcut,      "Key Shortcuts"         },
+  { TYPE_EMPTY,                NULL,                   ""                      },
+  { TYPE_LEAVE_MENU,   execExitSetup,          "Exit"                  },
+  { TYPE_LEAVE_MENU,   execSaveAndExitSetup,   "Save and Exit"         },
+  { 0,                 NULL,                   NULL                    }
+};
+
+static struct TokenInfo setup_info_game[] =
+{
+  { TYPE_SWITCH,       &setup.team_mode,       "Team-Mode:"            },
+  { TYPE_SWITCH,       &setup.handicap,        "Handicap:"             },
+  { TYPE_SWITCH,       &setup.time_limit,      "Timelimit:"            },
+  { TYPE_SWITCH,       &setup.autorecord,      "Auto-Record:"          },
+  { TYPE_EMPTY,                NULL,                   ""                      },
+  { TYPE_LEAVE_MENU,   execSetupMain,          "Back"                  },
+  { 0,                 NULL,                   NULL                    }
+};
+
+static struct TokenInfo setup_info_editor[] =
+{
+  { TYPE_STRING,       NULL,                   "Offer Special Elements:"},
+  { TYPE_SWITCH,       &setup.editor.el_boulderdash,   "BoulderDash:"  },
+  { TYPE_SWITCH,       &setup.editor.el_emerald_mine,  "Emerald Mine:" },
+  { TYPE_SWITCH,       &setup.editor.el_more,          "More:"         },
+  { TYPE_SWITCH,       &setup.editor.el_sokoban,       "Sokoban:"      },
+  { TYPE_SWITCH,       &setup.editor.el_supaplex,      "Supaplex:"     },
+  { TYPE_SWITCH,       &setup.editor.el_diamond_caves, "Diamd. Caves:" },
+  { TYPE_SWITCH,       &setup.editor.el_dx_boulderdash,"DX Boulderd.:" },
+  { TYPE_SWITCH,       &setup.editor.el_chars,         "Characters:"   },
+  { TYPE_SWITCH,       &setup.editor.el_custom,        "Custom:"       },
+  { TYPE_EMPTY,                NULL,                   ""                      },
+  { TYPE_LEAVE_MENU,   execSetupMain,          "Back"                  },
+  { 0,                 NULL,                   NULL                    }
+};
+
+static struct TokenInfo setup_info_graphics[] =
+{
+  { TYPE_SWITCH,       &setup.fullscreen,      "Fullscreen:"           },
+  { TYPE_SWITCH,       &setup.scroll_delay,    "Scroll Delay:"         },
+  { TYPE_SWITCH,       &setup.soft_scrolling,  "Soft Scroll.:"         },
+#if 0
+  { TYPE_SWITCH,       &setup.double_buffering,"Buffered gfx:"         },
+  { TYPE_SWITCH,       &setup.fading,          "Fading:"               },
+#endif
+  { TYPE_SWITCH,       &setup.quick_doors,     "Quick Doors:"          },
+  { TYPE_SWITCH,       &setup.toons,           "Toons:"                },
+  { TYPE_EMPTY,                NULL,                   ""                      },
+  { TYPE_LEAVE_MENU,   execSetupMain,          "Back"                  },
+  { 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,          "Back"                  },
+  { 0,                 NULL,                   NULL                    }
+};
+
+static struct TokenInfo setup_info_artwork[] =
+{
+  { TYPE_ENTER_MENU,   execSetupChooseGraphics,"Custom Graphics"       },
+  { TYPE_STRING,       &graphics_set_name,     ""                      },
+  { TYPE_ENTER_MENU,   execSetupChooseSounds,  "Custom Sounds"         },
+  { TYPE_STRING,       &sounds_set_name,       ""                      },
+  { TYPE_ENTER_MENU,   execSetupChooseMusic,   "Custom Music"          },
+  { TYPE_STRING,       &music_set_name,        ""                      },
+  { TYPE_EMPTY,                NULL,                   ""                      },
+  { TYPE_STRING,       NULL,                   "Override Level Artwork:"},
+  { TYPE_YES_NO,       &setup.override_level_graphics, "Graphics:"     },
+  { TYPE_YES_NO,       &setup.override_level_sounds,   "Sounds:"       },
+  { TYPE_YES_NO,       &setup.override_level_music,    "Music:"        },
+  { TYPE_EMPTY,                NULL,                   ""                      },
+  { TYPE_LEAVE_MENU,   execSetupMain,          "Back"                  },
+  { 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_KEYTEXT,      NULL,                   "Toggle Pause:",        },
+  { TYPE_KEY,          &setup.shortcut.toggle_pause,   ""              },
+  { TYPE_EMPTY,                NULL,                   ""                      },
+  { TYPE_YES_NO,       &setup.ask_on_escape,   "Ask on Esc:"           },
+  { TYPE_EMPTY,                NULL,                   ""                      },
+  { TYPE_LEAVE_MENU,   execSetupMain,          "Back"                  },
+  { 0,                 NULL,                   NULL                    }
+};
+
+static Key getSetupKey()
+{
+  Key key = KSYM_UNDEFINED;
+  boolean got_key_event = FALSE;
+
+  while (!got_key_event)
   {
-    DrawGraphic(0,choice-1,GFX_KUGEL_ROT);
-    redraw = FALSE;
+    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);
   }
 
-  if (button == MB_MENU_INITIALIZE)
+  return key;
+}
+
+static void drawSetupValue(int pos)
+{
+  int xpos = MENU_SCREEN_VALUE_XPOS;
+  int ypos = MENU_SCREEN_START_YPOS + pos;
+  int font_nr = FONT_VALUE_1;
+  char *value_string = getSetupValue(setup_info[pos].type & ~TYPE_GHOSTED,
+                                    setup_info[pos].value);
+
+  if (value_string == NULL)
     return;
 
-  if (dx || dy)
+  if (setup_info[pos].type & TYPE_KEY)
   {
-    if (dy)
+    xpos = 3;
+
+    if (setup_info[pos].type & TYPE_QUERY)
     {
-      x = 1;
-      y = choice+dy;
+      value_string = "<press key>";
+      font_nr = FONT_INPUT_1_ACTIVE;
     }
-    else
-      x = y = 0;
+  }
+  else if (setup_info[pos].type & TYPE_STRING)
+  {
+    int max_value_len = (SCR_FIELDX - 2) * 2;
 
-    if (y >= pos_empty1 && y <= pos_empty2)
-      y = (dy > 0 ? pos_empty2 + 1 : pos_empty1 - 1);
+    xpos = 1;
+    font_nr = FONT_VALUE_2;
+
+    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_nr = FONT_OPTION_OFF;
 
-    if (y < pos_start)
-      y = pos_start;
-    else if (y > pos_end)
-      y = pos_end;
+  DrawText(mSX + xpos * 32, mSY + ypos * 32,
+          (xpos == 3 ? "              " : "   "), font_nr);
+  DrawText(mSX + xpos * 32, mSY + ypos * 32, value_string, font_nr);
+}
+
+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;
   }
 
-  if (!mx && !my && !dx && !dy)
+  drawSetupValue(pos);
+}
+
+static void DrawSetupScreen_Generic()
+{
+  char *title_string = NULL;
+  int i;
+
+  UnmapAllGadgets();
+  CloseDoor(DOOR_CLOSE_2);
+
+  ClearWindow();
+
+  if (setup_mode == SETUP_MODE_MAIN)
+  {
+    setup_info = setup_info_main;
+    title_string = "Setup";
+  }
+  else if (setup_mode == SETUP_MODE_GAME)
   {
-    x = 1;
-    y = choice;
+    setup_info = setup_info_game;
+    title_string = "Setup Game";
+  }
+  else if (setup_mode == SETUP_MODE_EDITOR)
+  {
+    setup_info = setup_info_editor;
+    title_string = "Setup Editor";
+  }
+  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 = "Setup Sound";
+  }
+  else if (setup_mode == SETUP_MODE_ARTWORK)
+  {
+    setup_info = setup_info_artwork;
+    title_string = "Custom Artwork";
+  }
+  else if (setup_mode == SETUP_MODE_SHORTCUT)
+  {
+    setup_info = setup_info_shortcut;
+    title_string = "Setup Shortcuts";
   }
 
-  if (x==1 && y >= pos_start && y <= pos_end &&
-      !(y >= pos_empty1 && y <= pos_empty2))
+  DrawText(mSX + 16, mSY + 16, title_string, FONT_TITLE_1);
+
+  num_setup_info = 0;
+  for(i=0; setup_info[i].type != 0 && i < MAX_MENU_ENTRIES_ON_SCREEN; i++)
   {
-    if (button)
-    {
-      if (y!=choice)
-      {
-       DrawGraphic(0,y-1,GFX_KUGEL_ROT);
-       DrawGraphic(0,choice-1,GFX_KUGEL_BLAU);
-      }
-      choice = y;
-    }
-    else
-    {
-      int yy = y-1;
+    void *value_ptr = setup_info[i].value;
+    int ypos = MENU_SCREEN_START_YPOS + i;
+    int font_nr = FONT_MENU_1;
 
-      if (y==3 && sound_status==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==4 && sound_loops_allowed)
-      {
-       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==5 && sound_loops_allowed)
-      {
-       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;
-      }
-      else if (y==6)
-      {
-       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==7)
-      {
-#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
-      }
-      else if (y==8)
-      {
-       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==9)
-      {
-       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;
-      }
-      else if (y==10)
-      {
-       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;
-      }
-      else if (y==11)
-      {
-       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==12)
+    /* set some entries to "unchangeable" according to other variables */
+    if ((value_ptr == &setup.sound       && !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))
+      setup_info[i].type |= TYPE_GHOSTED;
+
+    if (setup_info[i].type & TYPE_STRING)
+      font_nr = FONT_MENU_2;
+
+    DrawText(mSX + 32, mSY + ypos * 32, setup_info[i].text, font_nr);
+
+    if (setup_info[i].type & TYPE_ENTER_MENU)
+      initCursor(i, IMG_MENU_BUTTON_RIGHT);
+    else if (setup_info[i].type & TYPE_LEAVE_MENU)
+      initCursor(i, IMG_MENU_BUTTON_LEFT);
+    else if (setup_info[i].type & ~TYPE_SKIP_ENTRY)
+      initCursor(i, IMG_MENU_BUTTON);
+
+    if (setup_info[i].type & TYPE_VALUE)
+      drawSetupValue(i);
+
+    num_setup_info++;
+  }
+
+  FadeToFront();
+  InitAnimation();
+  HandleSetupScreen_Generic(0,0,0,0,MB_MENU_INITIALIZE);
+}
+
+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];       /* always starts with 0 */
+  int x = 0;
+  int y = choice;
+
+  if (button == MB_MENU_INITIALIZE)
+  {
+    /* advance to first valid menu entry */
+    while (choice < num_setup_info &&
+          (setup_info[choice].type & TYPE_SKIP_ENTRY))
+      choice++;
+    choice_store[setup_mode] = choice;
+
+    drawCursor(choice, FC_RED);
+    return;
+  }
+  else if (button == MB_MENU_LEAVE)
+  {
+    for (y=0; y<num_setup_info; y++)
+    {
+      if (setup_info[y].type & TYPE_LEAVE_MENU)
       {
-       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;
+       void (*menu_callback_function)(void) = setup_info[y].value;
+
+       menu_callback_function();
+       break;  /* absolutely needed because function changes 'setup_info'! */
       }
-      else if (y==13)
+    }
+
+    return;
+  }
+
+  if (mx || my)                /* mouse input */
+  {
+    x = (mx - mSX) / 32;
+    y = (my - mSY) / 32 - MENU_SCREEN_START_YPOS;
+  }
+  else if (dx || dy)   /* keyboard input */
+  {
+    if (dx)
+    {
+      int menu_navigation_type = (dx < 0 ? TYPE_LEAVE_MENU : TYPE_ENTER_MENU);
+
+      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;
+
+    /* jump to next non-empty menu entry (up or down) */
+    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_SKIP_ENTRY))
+  {
+    if (button)
+    {
+      if (y != choice)
       {
-       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;
+       drawCursor(y, FC_RED);
+       drawCursor(choice, FC_BLUE);
+       choice = choice_store[setup_mode] = y;
       }
-      else if (y==14)
+    }
+    else if (!(setup_info[y].type & TYPE_GHOSTED))
+    {
+      if (setup_info[y].type & TYPE_ENTER_OR_LEAVE_MENU)
       {
-       game_status = SETUPINPUT;
-       DrawSetupInputScreen();
-       redraw = TRUE;
+       void (*menu_callback_function)(void) = setup_info[choice].value;
+
+       menu_callback_function();
       }
-      else if (y==pos_end-1 || y==pos_end)
+      else
       {
-        if (y==pos_end)
-       {
-         SaveSetup();
-
-         /*
-         SaveJoystickData();
-         */
-
-#ifdef MSDOS
-         save_joystick_data(JOYSTICK_FILENAME);
-#endif
+       if ((setup_info[y].type & TYPE_KEYTEXT) &&
+           (setup_info[y + 1].type & TYPE_KEY))
+         y++;
 
-
-       }
-
-       game_status = MAINMENU;
-       DrawMainMenu();
-       redraw = TRUE;
+       if (setup_info[y].type & TYPE_VALUE)
+         changeSetupValue(y);
       }
     }
   }
+
   BackToFront();
 
-  if (game_status==SETUP)
+  if (game_status == GAME_MODE_SETUP)
     DoAnimation();
 }
 
-void DrawSetupInputScreen()
+void DrawSetupScreen_Input()
 {
   ClearWindow();
-  DrawText(SX+16, SY+16, "SETUP INPUT", FS_BIG, FC_YELLOW);
 
-  DrawGraphic(0, 2, GFX_KUGEL_BLAU);
-  DrawGraphic(0, 3, GFX_KUGEL_BLAU);
-  DrawGraphic(0, 4, GFX_KUGEL_BLAU);
-  DrawGraphic(0, 15, GFX_KUGEL_BLAU);
-  DrawGraphic(10, 2, GFX_PFEIL_LEFT);
-  DrawGraphic(12, 2, GFX_PFEIL_RIGHT);
+  DrawText(mSX+16, mSY+16, "Setup Input", FONT_TITLE_1);
 
-  DrawText(SX+32, SY+2*32, "Player:", FS_BIG, FC_GREEN);
-  DrawText(SX+32, SY+3*32, "Device:", FS_BIG, FC_GREEN);
-  DrawText(SX+32, SY+15*32, "Exit", FS_BIG, FC_GREEN);
+  initCursor(0, IMG_MENU_BUTTON);
+  initCursor(1, IMG_MENU_BUTTON);
+  initCursor(2, IMG_MENU_BUTTON_RIGHT);
+  initCursor(13, IMG_MENU_BUTTON_LEFT);
 
-  DrawTextFCentered(SYSIZE - 20, FC_BLUE,
+  drawCursorXY(10, 0, IMG_MENU_BUTTON_LEFT);
+  drawCursorXY(12, 0, IMG_MENU_BUTTON_RIGHT);
+
+  DrawText(mSX+32, mSY+2*32, "Player:", FONT_MENU_1);
+  DrawText(mSX+32, mSY+3*32, "Device:", FONT_MENU_1);
+  DrawText(mSX+32, mSY+15*32, "Back",   FONT_MENU_1);
+
+#if 0
+  DeactivateJoystickForCalibration();
+  DrawTextFCentered(SYSIZE - 20, FONT_TEXT_4,
                    "Joysticks deactivated on this screen");
+#endif
 
-  HandleSetupInputScreen(0,0, 0,0, MB_MENU_INITIALIZE);
+  HandleSetupScreen_Input(0,0, 0,0, MB_MENU_INITIALIZE);
   FadeToFront();
   InitAnimation();
 }
@@ -1332,7 +2169,8 @@ static void setJoystickDeviceToNr(char *device_name, int device_nr)
       device_name[strlen(device_name) - 1] = '0' + (char)(device_nr % 10);
   }
   else
-    strncpy(device_name, joystick_device_name[device_nr], strlen(device_name));
+    strncpy(device_name, getDeviceNameFromJoystickNr(device_nr),
+           strlen(device_name));
 }
 
 static void drawPlayerSetupInputInfo(int player_nr)
@@ -1341,7 +2179,7 @@ static void drawPlayerSetupInputInfo(int player_nr)
   static struct SetupKeyboardInfo custom_key;
   static struct
   {
-    KeySym *keysym;
+    Key *key;
     char *text;
   } custom[] =
   {
@@ -1362,138 +2200,124 @@ static void drawPlayerSetupInputInfo(int player_nr)
 
   custom_key = setup.input[player_nr].key;
 
-  DrawText(SX+11*32, SY+2*32, int2str(player_nr + 1, 1), FS_BIG, FC_RED);
-  DrawGraphic(8, 2, GFX_SPIELER1 + player_nr);
+  DrawText(mSX+11*32, mSY+2*32, int2str(player_nr +1, 1), FONT_INPUT_1_ACTIVE);
+#if 1
+  DrawGraphicThruMaskExt(drawto, mSX + 8 * TILEX, mSY + 2 * TILEY,
+                        PLAYER_NR_GFX(IMG_PLAYER_1, player_nr), 0);
+#else
+  DrawGraphicThruMask(8, 2, PLAYER_NR_GFX(IMG_PLAYER_1, player_nr), 0);
+#endif
 
   if (setup.input[player_nr].use_joystick)
   {
     char *device_name = setup.input[player_nr].joy.device_name;
 
-    DrawText(SX+8*32, SY+3*32,
+    DrawText(mSX+8*32, mSY+3*32,
             joystick_name[getJoystickNrFromDeviceName(device_name)],
-            FS_BIG, FC_YELLOW);
-    DrawText(SX+32, SY+4*32, "Calibrate", FS_BIG, FC_GREEN);
+            FONT_VALUE_1);
+    DrawText(mSX+32, mSY+4*32, "Calibrate", FONT_MENU_1);
   }
   else
   {
-    DrawText(SX+8*32, SY+3*32, "Keyboard ", FS_BIG, FC_YELLOW);
-    DrawText(SX+32, SY+4*32, "Customize", FS_BIG, FC_GREEN);
+    DrawText(mSX+8*32, mSY+3*32, "Keyboard ", FONT_VALUE_1);
+    DrawText(mSX+32,   mSY+4*32, "Customize", FONT_MENU_1);
   }
 
-  DrawText(SX+32, SY+5*32, "Actual Settings:", FS_BIG, FC_GREEN);
-  DrawGraphic(1, 6, GFX_PFEIL_LEFT);
-  DrawGraphic(1, 7, GFX_PFEIL_RIGHT);
-  DrawGraphic(1, 8, GFX_PFEIL_UP);
-  DrawGraphic(1, 9, GFX_PFEIL_DOWN);
-  DrawText(SX+2*32, SY+6*32, ":", FS_BIG, FC_BLUE);
-  DrawText(SX+2*32, SY+7*32, ":", FS_BIG, FC_BLUE);
-  DrawText(SX+2*32, SY+8*32, ":", FS_BIG, FC_BLUE);
-  DrawText(SX+2*32, SY+9*32, ":", FS_BIG, FC_BLUE);
-  DrawText(SX+32, SY+10*32, "Snap Field:", FS_BIG, FC_BLUE);
-  DrawText(SX+32, SY+12*32, "Place Bomb:", FS_BIG, FC_BLUE);
+  DrawText(mSX+32, mSY+5*32, "Actual Settings:", FONT_MENU_1);
+  drawCursorXY(1, 4, IMG_MENU_BUTTON_LEFT);
+  drawCursorXY(1, 5, IMG_MENU_BUTTON_RIGHT);
+  drawCursorXY(1, 6, IMG_MENU_BUTTON_UP);
+  drawCursorXY(1, 7, IMG_MENU_BUTTON_DOWN);
+  DrawText(mSX+2*32, mSY+6*32, ":", FONT_VALUE_OLD);
+  DrawText(mSX+2*32, mSY+7*32, ":", FONT_VALUE_OLD);
+  DrawText(mSX+2*32, mSY+8*32, ":", FONT_VALUE_OLD);
+  DrawText(mSX+2*32, mSY+9*32, ":", FONT_VALUE_OLD);
+  DrawText(mSX+32, mSY+10*32, "Snap Field:", FONT_VALUE_OLD);
+  DrawText(mSX+32, mSY+12*32, "Place Bomb:", FONT_VALUE_OLD);
 
   for (i=0; i<6; i++)
   {
     int ypos = 6 + i + (i > 3 ? i-3 : 0);
 
-    DrawText(SX + 3*32, SY + ypos*32,
-            "              ", FS_BIG, FC_YELLOW);
-    DrawText(SX + 3*32, SY + ypos*32,
+    DrawText(mSX + 3*32, mSY + ypos*32,
+            "              ", FONT_VALUE_1);
+    DrawText(mSX + 3*32, mSY + ypos*32,
             (setup.input[player_nr].use_joystick ?
              custom[i].text :
-             getKeyNameFromKeySym(*custom[i].keysym)),
-            FS_BIG, FC_YELLOW);
+             getKeyNameFromKey(*custom[i].key)), FONT_VALUE_1);
   }
 }
 
-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 = 3;
+  static int choice = 0;
   static int player_nr = 0;
-  static int redraw = TRUE;
-  int x = (mx+32-SX)/32, y = (my+32-SY)/32;
-  int pos_start  = SETUPINPUT_SCREEN_POS_START  + 1;
-  int pos_empty1 = SETUPINPUT_SCREEN_POS_EMPTY1 + 1;
-  int pos_empty2 = SETUPINPUT_SCREEN_POS_EMPTY2 + 1;
-  int pos_end    = SETUPINPUT_SCREEN_POS_END    + 1;
+  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;
+  int pos_end    = SETUPINPUT_SCREEN_POS_END;
 
   if (button == MB_MENU_INITIALIZE)
   {
     drawPlayerSetupInputInfo(player_nr);
-    redraw = TRUE;
+    drawCursor(choice, FC_RED);
+    return;
   }
-
-  if (redraw)
+  else if (button == MB_MENU_LEAVE)
   {
-    DrawGraphic(0,choice-1,GFX_KUGEL_ROT);
-    redraw = FALSE;
+    setup_mode = SETUP_MODE_MAIN;
+    DrawSetupScreen();
+    InitJoysticks();
   }
 
-  if (button == MB_MENU_INITIALIZE)
-    return;
-
-  if (dx || dy)
+  if (mx || my)                /* mouse input */
   {
-    if (dx && choice == 3)
-    {
-      x = (dx < 0 ? 11 : 13);
-      y = 3;
-    }
-    else if (dx && choice == 4)
-    {
+    x = (mx - mSX) / 32;
+    y = (my - mSY) / 32 - MENU_SCREEN_START_YPOS;
+  }
+  else if (dx || dy)   /* keyboard input */
+  {
+    if (dx && choice == 0)
+      x = (dx < 0 ? 10 : 12);
+    else if ((dx && choice == 1) ||
+            (dx == +1 && choice == 2) ||
+            (dx == -1 && choice == pos_end))
       button = MB_MENU_CHOICE;
-      x = 1;
-      y = 4;
-    }
     else if (dy)
-    {
-      x = 1;
       y = choice + dy;
-    }
-    else
-      x = y = 0;
 
     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 = 1;
-    y = choice;
   }
 
-  if (y == 3 && ((x == 1 && !button) || ((x == 11 || x == 13) && button)))
+  if (y == 0 && ((x == 0 && !button) || ((x == 10 || x == 12) && button)))
   {
     static unsigned long delay = 0;
 
     if (!DelayReached(&delay, GADGET_FRAME_DELAY))
       goto out;
 
-    player_nr = (player_nr + (x == 11 ? -1 : +1) + MAX_PLAYERS) % MAX_PLAYERS;
+    player_nr = (player_nr + (x == 10 ? -1 : +1) + MAX_PLAYERS) % MAX_PLAYERS;
 
     drawPlayerSetupInputInfo(player_nr);
   }
-  else if (x==1 && y >= pos_start && y <= pos_end &&
+  else if (x == 0 && y >= pos_start && y <= pos_end &&
           !(y >= pos_empty1 && y <= pos_empty2))
   {
     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;
       }
-      choice = y;
     }
     else
     {
-      if (y == 4)
+      if (y == 1)
       {
        char *device_name = setup.input[player_nr].joy.device_name;
 
@@ -1515,61 +2339,33 @@ void HandleSetupInputScreen(int mx, int my, int dx, int dy, int button)
            setJoystickDeviceToNr(device_name, new_device_nr);
        }
 
-
-       /*
-       InitJoysticks();
-       */
-
-
-#if 0
-       int one_joystick_nr       = (dx >= 0 ? 0 : 1);
-       int the_other_joystick_nr = (dx >= 0 ? 1 : 0);
-
-       if (setup.input[player_nr].use_joystick)
-       {
-         if (setup.input[player_nr].joystick_nr == one_joystick_nr)
-           setup.input[player_nr].joystick_nr = the_other_joystick_nr;
-         else
-           setup.input[player_nr].use_joystick = FALSE;
-       }
-       else
-       {
-         setup.input[player_nr].use_joystick = TRUE;
-         setup.input[player_nr].joystick_nr = one_joystick_nr;
-       }
-#endif
-
        drawPlayerSetupInputInfo(player_nr);
       }
-      else if (y == 5)
+      else if (y == 2)
       {
        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 == GAME_MODE_SETUP)
     DoAnimation();
 }
 
@@ -1581,7 +2377,7 @@ void CustomizeKeyboard(int player_nr)
   static struct SetupKeyboardInfo custom_key;
   static struct
   {
-    KeySym *keysym;
+    Key *key;
     char *text;
   } customize_step[] =
   {
@@ -1597,86 +2393,88 @@ void CustomizeKeyboard(int player_nr)
   custom_key = setup.input[player_nr].key;
 
   ClearWindow();
-  DrawText(SX + 16, SY + 16, "Keyboard Input", FS_BIG, FC_YELLOW);
+  DrawText(mSX + 16, mSY + 16, "Keyboard Input", FONT_TITLE_1);
 
   BackToFront();
   InitAnimation();
 
   step_nr = 0;
-  DrawText(SX, SY + (2+2*step_nr)*32,
-          customize_step[step_nr].text, FS_BIG, FC_RED);
-  DrawText(SX, SY + (2+2*step_nr+1)*32,
-          "Key:", FS_BIG, FC_RED);
-  DrawText(SX + 4*32, SY + (2+2*step_nr+1)*32,
-          getKeyNameFromKeySym(*customize_step[step_nr].keysym),
-          FS_BIG, FC_BLUE);
+  DrawText(mSX, mSY + (2+2*step_nr)*32,
+          customize_step[step_nr].text, FONT_INPUT_1_ACTIVE);
+  DrawText(mSX, mSY + (2+2*step_nr+1)*32,
+          "Key:", FONT_INPUT_1_ACTIVE);
+  DrawText(mSX + 4*32, mSY + (2+2*step_nr+1)*32,
+          getKeyNameFromKey(*customize_step[step_nr].key), FONT_VALUE_OLD);
 
   while(!finished)
   {
-    if (XPending(display))     /* got event from X server */
+    if (PendingEvent())                /* got event */
     {
-      XEvent event;
+      Event event;
 
-      XNextEvent(display, &event);
+      NextEvent(&event);
 
       switch(event.type)
       {
-        case KeyPress:
+        case EVENT_KEYPRESS:
          {
-           KeySym key = XLookupKeysym((XKeyEvent *)&event,
-                                      ((XKeyEvent *)&event)->state);
+           Key key = GetEventKey((KeyEvent *)&event, FALSE);
 
-           if (key == XK_Escape || (key == XK_Return && step_nr == 6))
+           if (key == KSYM_Escape || (key == KSYM_Return && step_nr == 6))
            {
              finished = TRUE;
              break;
            }
 
+           /* all keys configured -- wait for "Escape" or "Return" key */
+           if (step_nr == 6)
+             break;
+
            /* press 'Enter' to keep the existing key binding */
-           if (key == XK_Return || step_nr == 6)
-             key = *customize_step[step_nr].keysym;
+           if (key == KSYM_Return)
+             key = *customize_step[step_nr].key;
 
            /* check if key already used */
            for (i=0; i<step_nr; i++)
-             if (*customize_step[i].keysym == key)
+             if (*customize_step[i].key == key)
                break;
            if (i < step_nr)
              break;
 
            /* got new key binding */
-           *customize_step[step_nr].keysym = key;
-           DrawText(SX + 4*32, SY + (2+2*step_nr+1)*32,
-                    "             ", FS_BIG, FC_YELLOW);
-           DrawText(SX + 4*32, SY + (2+2*step_nr+1)*32,
-                    getKeyNameFromKeySym(key), FS_BIG, FC_YELLOW);
+           *customize_step[step_nr].key = key;
+           DrawText(mSX + 4*32, mSY + (2+2*step_nr+1)*32,
+                    "             ", FONT_VALUE_1);
+           DrawText(mSX + 4*32, mSY + (2+2*step_nr+1)*32,
+                    getKeyNameFromKey(key), FONT_VALUE_1);
            step_nr++;
 
            /* un-highlight last query */
-           DrawText(SX, SY+(2+2*(step_nr-1))*32,
-                    customize_step[step_nr-1].text, FS_BIG, FC_GREEN);
-           DrawText(SX, SY+(2+2*(step_nr-1)+1)*32,
-                    "Key:", FS_BIG, FC_GREEN);
+           DrawText(mSX, mSY+(2+2*(step_nr-1))*32,
+                    customize_step[step_nr-1].text, FONT_MENU_1);
+           DrawText(mSX, mSY+(2+2*(step_nr-1)+1)*32,
+                    "Key:", FONT_MENU_1);
 
            /* press 'Enter' to leave */
            if (step_nr == 6)
            {
-             DrawText(SX + 16, SY + 15*32+16,
-                      "Press Enter", FS_BIG, FC_YELLOW);
+             DrawText(mSX + 16, mSY + 15*32+16,
+                      "Press Enter", FONT_TITLE_1);
              break;
            }
 
            /* query next key binding */
-           DrawText(SX, SY+(2+2*step_nr)*32,
-                    customize_step[step_nr].text, FS_BIG, FC_RED);
-           DrawText(SX, SY+(2+2*step_nr+1)*32,
-                    "Key:", FS_BIG, FC_RED);
-           DrawText(SX + 4*32, SY+(2+2*step_nr+1)*32,
-                    getKeyNameFromKeySym(*customize_step[step_nr].keysym),
-                    FS_BIG, FC_BLUE);
+           DrawText(mSX, mSY+(2+2*step_nr)*32,
+                    customize_step[step_nr].text, FONT_INPUT_1_ACTIVE);
+           DrawText(mSX, mSY+(2+2*step_nr+1)*32,
+                    "Key:", FONT_INPUT_1_ACTIVE);
+           DrawText(mSX + 4*32, mSY+(2+2*step_nr+1)*32,
+                    getKeyNameFromKey(*customize_step[step_nr].key),
+                    FONT_VALUE_OLD);
          }
          break;
 
-        case KeyRelease:
+        case EVENT_KEYRELEASE:
          key_joystick_mapping = 0;
          break;
 
@@ -1697,106 +2495,86 @@ void CustomizeKeyboard(int player_nr)
   setup.input[player_nr].key = custom_key;
 
   StopAnimation();
-  DrawSetupInputScreen();
+  DrawSetupScreen_Input();
 }
 
-void CalibrateJoystick(int player_nr)
+static boolean CalibrateJoystickMain(int player_nr)
 {
-#ifdef __FreeBSD__
-  struct joystick joy_ctrl;
-#else
-  struct joystick_control
-  {
-    int buttons;
-    int x;
-    int y;
-  } joy_ctrl;
-#endif
-
-#ifndef MSDOS
-  int new_joystick_xleft = 128, new_joystick_xright = 128;
-  int new_joystick_yupper = 128, new_joystick_ylower = 128;
+  int new_joystick_xleft = JOYSTICK_XMIDDLE;
+  int new_joystick_xright = JOYSTICK_XMIDDLE;
+  int new_joystick_yupper = JOYSTICK_YMIDDLE;
+  int new_joystick_ylower = JOYSTICK_YMIDDLE;
   int new_joystick_xmiddle, new_joystick_ymiddle;
-#else
-  int calibration_step = 1;
-#endif
 
-  int joystick_fd = stored_player[player_nr].joystick_fd;
+  int joystick_fd = joystick.fd[player_nr];
   int x, y, last_x, last_y, xpos = 8, ypos = 3;
   boolean check[3][3];
-  int check_remaining;
+  int check_remaining = 3 * 3;
+  int joy_x, joy_y;
   int joy_value;
   int result = -1;
 
-  if (joystick_status == JOYSTICK_OFF ||
-      joystick_fd < 0 ||
-      !setup.input[player_nr].use_joystick)
-    goto error_out;
+  if (joystick.status == JOYSTICK_NOT_AVAILABLE)
+    return FALSE;
 
-  ClearWindow();
+  if (joystick_fd < 0 || !setup.input[player_nr].use_joystick)
+    return FALSE;
 
-#ifndef MSDOS
-  DrawText(SX,      SY +  6*32, " ROTATE JOYSTICK ", FS_BIG, FC_YELLOW);
-  DrawText(SX,      SY +  7*32, "IN ALL DIRECTIONS", FS_BIG, FC_YELLOW);
-  DrawText(SX + 16, SY +  9*32, "  IF ALL BALLS  ",  FS_BIG, FC_YELLOW);
-  DrawText(SX,      SY + 10*32, "   ARE YELLOW,   ", FS_BIG, FC_YELLOW);
-  DrawText(SX,      SY + 11*32, "PRESS ANY BUTTON!", FS_BIG, FC_YELLOW);
-  check_remaining = 3 * 3;
-#else
-  DrawText(SX,      SY +  7*32, "  MOVE JOYSTICK  ", FS_BIG, FC_YELLOW);
-  DrawText(SX + 16, SY +  8*32, "       TO       ",  FS_BIG, FC_YELLOW);
-  DrawText(SX,      SY +  9*32, " CENTER POSITION ",  FS_BIG, FC_YELLOW);
-  DrawText(SX,      SY + 10*32, "       AND       ", FS_BIG, FC_YELLOW);
-  DrawText(SX,      SY + 11*32, "PRESS ANY BUTTON!", FS_BIG, FC_YELLOW);
-  check_remaining = 0;
-#endif
+  ClearWindow();
 
-  for(y=0; y<3; y++)
+  for(y=0; y < 3; y++)
   {
-    for(x=0; x<3; x++)
+    for(x=0; x < 3; x++)
     {
+      DrawGraphic(xpos + x - 1, ypos + y - 1, IMG_MENU_CALIBRATE_BLUE, 0);
       check[x][y] = FALSE;
-      DrawGraphic(xpos + x - 1, ypos + y - 1, GFX_KUGEL_BLAU);
     }
   }
 
+  DrawText(mSX,      mSY +  6 * 32, " ROTATE JOYSTICK ", FONT_TITLE_1);
+  DrawText(mSX,      mSY +  7 * 32, "IN ALL DIRECTIONS", FONT_TITLE_1);
+  DrawText(mSX + 16, mSY +  9 * 32, "  IF ALL BALLS  ",  FONT_TITLE_1);
+  DrawText(mSX,      mSY + 10 * 32, "   ARE YELLOW,   ", FONT_TITLE_1);
+  DrawText(mSX,      mSY + 11 * 32, " CENTER JOYSTICK ", FONT_TITLE_1);
+  DrawText(mSX,      mSY + 12 * 32, "       AND       ", FONT_TITLE_1);
+  DrawText(mSX,      mSY + 13 * 32, "PRESS ANY BUTTON!", FONT_TITLE_1);
+
   joy_value = Joystick(player_nr);
   last_x = (joy_value & JOY_LEFT ? -1 : joy_value & JOY_RIGHT ? +1 : 0);
   last_y = (joy_value & JOY_UP   ? -1 : joy_value & JOY_DOWN  ? +1 : 0);
-  DrawGraphic(xpos + last_x, ypos + last_y, GFX_KUGEL_ROT);
 
-  BackToFront();
+  /* eventually uncalibrated center position (joystick could be uncentered) */
+  if (!ReadJoystick(joystick_fd, &joy_x, &joy_y, NULL, NULL))
+    return FALSE;
 
-#ifdef __FreeBSD__
-  joy_ctrl.b1 = joy_ctrl.b2 = 0;
-#else
-  joy_ctrl.buttons = 0;
-#endif
+  new_joystick_xmiddle = joy_x;
+  new_joystick_ymiddle = joy_y;
 
-  while(Joystick(player_nr) & JOY_BUTTON);
+  DrawGraphic(xpos + last_x, ypos + last_y, IMG_MENU_CALIBRATE_RED, 0);
+  BackToFront();
 
+  while(Joystick(player_nr) & JOY_BUTTON);     /* wait for released button */
   InitAnimation();
 
   while(result < 0)
   {
-    if (XPending(display))     /* got event from X server */
+    if (PendingEvent())                /* got event */
     {
-      XEvent event;
+      Event event;
 
-      XNextEvent(display, &event);
+      NextEvent(&event);
 
       switch(event.type)
       {
-       case KeyPress:
-         switch(XLookupKeysym((XKeyEvent *)&event,
-                              ((XKeyEvent *)&event)->state))
+       case EVENT_KEYPRESS:
+         switch(GetEventKey((KeyEvent *)&event, TRUE))
          {
-           case XK_Return:
+           case KSYM_Return:
              if (check_remaining == 0)
                result = 1;
              break;
 
-           case XK_Escape:
+           case KSYM_Escape:
              result = 0;
              break;
 
@@ -1805,7 +2583,7 @@ void CalibrateJoystick(int player_nr)
          }
          break;
 
-       case KeyRelease:
+       case EVENT_KEYRELEASE:
          key_joystick_mapping = 0;
          break;
 
@@ -1815,22 +2593,13 @@ void CalibrateJoystick(int player_nr)
       }
     }
 
-#ifndef MSDOS
-    if (read(joystick_fd, &joy_ctrl, sizeof(joy_ctrl)) != sizeof(joy_ctrl))
-    {
-      joystick_status = JOYSTICK_OFF;
-      goto error_out;
-    }
+    if (!ReadJoystick(joystick_fd, &joy_x, &joy_y, NULL, NULL))
+      return FALSE;
 
-    new_joystick_xleft  = MIN(new_joystick_xleft,  joy_ctrl.x);
-    new_joystick_xright = MAX(new_joystick_xright, joy_ctrl.x);
-    new_joystick_yupper = MIN(new_joystick_yupper, joy_ctrl.y);
-    new_joystick_ylower = MAX(new_joystick_ylower, joy_ctrl.y);
-
-    new_joystick_xmiddle =
-      new_joystick_xleft + (new_joystick_xright - new_joystick_xleft) / 2;
-    new_joystick_ymiddle =
-      new_joystick_yupper + (new_joystick_ylower - new_joystick_yupper) / 2;
+    new_joystick_xleft  = MIN(new_joystick_xleft,  joy_x);
+    new_joystick_xright = MAX(new_joystick_xright, joy_x);
+    new_joystick_yupper = MIN(new_joystick_yupper, joy_y);
+    new_joystick_ylower = MAX(new_joystick_ylower, joy_y);
 
     setup.input[player_nr].joy.xleft = new_joystick_xleft;
     setup.input[player_nr].joy.yupper = new_joystick_yupper;
@@ -1840,61 +2609,19 @@ void CalibrateJoystick(int player_nr)
     setup.input[player_nr].joy.ymiddle = new_joystick_ymiddle;
 
     CheckJoystickData();
-#endif
 
     joy_value = Joystick(player_nr);
 
     if (joy_value & JOY_BUTTON && check_remaining == 0)
-    {
       result = 1;
 
-#ifdef MSDOS
-      if (calibration_step == 1)
-      {
-       remove_joystick();
-       InitJoysticks();
-      }
-      else if (calibrate_joystick(joystick_fd) != 0)
-      {
-       joystick_status = JOYSTICK_OFF;
-       goto error_out;
-      }
-
-      if (joy[joystick_fd].flags & JOYFLAG_CALIBRATE)
-      {
-       calibration_step++;
-       result = -1;
-
-       DrawText(SX,      SY +  7*32, "  MOVE JOYSTICK  ", FS_BIG, FC_YELLOW);
-       DrawText(SX + 16, SY +  8*32, "       TO       ",  FS_BIG, FC_YELLOW);
-
-       if (calibration_step == 2)
-         DrawText(SX + 16, SY + 9*32," THE UPPER LEFT ",  FS_BIG, FC_YELLOW);
-       else
-         DrawText(SX,      SY + 9*32," THE LOWER RIGHT ", FS_BIG, FC_YELLOW);
-
-       DrawText(SX,      SY + 10*32, "       AND       ", FS_BIG, FC_YELLOW);
-       DrawText(SX,      SY + 11*32, "PRESS ANY BUTTON!", FS_BIG, FC_YELLOW);
-
-       BackToFront();
-
-       while(Joystick(player_nr) & JOY_BUTTON)
-         DoAnimation();
-      }
-#endif
-    }
-
     x = (joy_value & JOY_LEFT ? -1 : joy_value & JOY_RIGHT ? +1 : 0);
     y = (joy_value & JOY_UP   ? -1 : joy_value & JOY_DOWN  ? +1 : 0);
 
     if (x != last_x || y != last_y)
     {
-#ifndef MSDOS
-      DrawGraphic(xpos + last_x, ypos + last_y, GFX_KUGEL_GELB);
-#else
-      DrawGraphic(xpos + last_x, ypos + last_y, GFX_KUGEL_BLAU);
-#endif
-      DrawGraphic(xpos + x,      ypos + y,      GFX_KUGEL_ROT);
+      DrawGraphic(xpos + last_x, ypos + last_y, IMG_MENU_CALIBRATE_YELLOW, 0);
+      DrawGraphic(xpos + x,      ypos + y,      IMG_MENU_CALIBRATE_RED,    0);
 
       last_x = x;
       last_y = y;
@@ -1906,6 +2633,7 @@ void CalibrateJoystick(int player_nr)
       }
 
 #if 0
+#ifdef DEBUG
       printf("LEFT / MIDDLE / RIGHT == %d / %d / %d\n",
             setup.input[player_nr].joy.xleft,
             setup.input[player_nr].joy.xmiddle,
@@ -1914,6 +2642,7 @@ void CalibrateJoystick(int player_nr)
             setup.input[player_nr].joy.yupper,
             setup.input[player_nr].joy.ymiddle,
             setup.input[player_nr].joy.ylower);
+#endif
 #endif
 
     }
@@ -1925,25 +2654,82 @@ void CalibrateJoystick(int player_nr)
     Delay(10);
   }
 
+  /* calibrated center position (joystick should now be centered) */
+  if (!ReadJoystick(joystick_fd, &joy_x, &joy_y, NULL, NULL))
+    return FALSE;
+
+  new_joystick_xmiddle = joy_x;
+  new_joystick_ymiddle = joy_y;
+
   StopAnimation();
 
-  DrawSetupInputScreen();
-  while(Joystick(player_nr) & JOY_BUTTON);
-  return;
+  DrawSetupScreen_Input();
+
+  /* wait until the last pressed button was released */
+  while (Joystick(player_nr) & JOY_BUTTON)
+  {
+    if (PendingEvent())                /* got event */
+    {
+      Event event;
 
-  error_out:
+      NextEvent(&event);
+      HandleOtherEvents(&event);
 
-  ClearWindow();
-  DrawText(SX + 16, SY + 6*32, "  JOYSTICK NOT  ", FS_BIG, FC_YELLOW);
-  DrawText(SX,      SY + 7*32, "    AVAILABLE    ", FS_BIG, FC_YELLOW);
-  BackToFront();
-  Delay(2000);
-  DrawSetupInputScreen();
+      Delay(10);
+    }
+  }
+
+  return TRUE;
+}
+
+void CalibrateJoystick(int player_nr)
+{
+  if (!CalibrateJoystickMain(player_nr))
+  {
+    ClearWindow();
+
+    DrawText(mSX + 16, mSY + 6*32, "  JOYSTICK NOT  ",  FONT_TITLE_1);
+    DrawText(mSX,      mSY + 7*32, "    AVAILABLE    ", FONT_TITLE_1);
+    BackToFront();
+    Delay(2000);       /* show error message for two seconds */
+  }
+}
+
+void DrawSetupScreen()
+{
+  DeactivateJoystick();
+
+  SetMainBackgroundImage(IMG_BACKGROUND_SETUP);
+
+  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)
+  if (game_status != GAME_MODE_PLAYING)
     return;
 
   if (local_player->LevelSolved)
@@ -1955,4 +2741,299 @@ void HandleGameActions()
   GameActions();
 
   BackToFront();
+
+#if 1
+  if (tape.auto_play && !tape.playing)
+    AutoPlayTape();    /* continue automatically playing next tape */
+#endif
+}
+
+/* ---------- new screen button stuff -------------------------------------- */
+
+/* graphic position and size values for buttons and scrollbars */
+#define SC_SCROLLBUTTON_XSIZE          32
+#define SC_SCROLLBUTTON_YSIZE          32
+
+#define SC_SCROLL_UP_XPOS              (SXSIZE - SC_SCROLLBUTTON_XSIZE)
+#define SC_SCROLL_UP_YPOS              SC_SCROLLBUTTON_YSIZE
+#define SC_SCROLL_DOWN_XPOS            SC_SCROLL_UP_XPOS
+#define SC_SCROLL_DOWN_YPOS            (SYSIZE - SC_SCROLLBUTTON_YSIZE)
+#define SC_SCROLL_VERTICAL_XPOS                SC_SCROLL_UP_XPOS
+#define SC_SCROLL_VERTICAL_YPOS          (SC_SCROLL_UP_YPOS + SC_SCROLLBUTTON_YSIZE)
+#define SC_SCROLL_VERTICAL_XSIZE       SC_SCROLLBUTTON_XSIZE
+#define SC_SCROLL_VERTICAL_YSIZE       (SYSIZE - 3 * SC_SCROLLBUTTON_YSIZE)
+
+#define SC_BORDER_SIZE                 14
+
+static struct
+{
+  int gfx_unpressed, gfx_pressed;
+  int x, y;
+  int gadget_id;
+  char *infotext;
+} scrollbutton_info[NUM_SCREEN_SCROLLBUTTONS] =
+{
+  {
+    IMG_MENU_BUTTON_UP, IMG_MENU_BUTTON_UP_ACTIVE,
+    SC_SCROLL_UP_XPOS, SC_SCROLL_UP_YPOS,
+    SCREEN_CTRL_ID_SCROLL_UP,
+    "scroll up"
+  },
+  {
+    IMG_MENU_BUTTON_DOWN, IMG_MENU_BUTTON_DOWN_ACTIVE,
+    SC_SCROLL_DOWN_XPOS, SC_SCROLL_DOWN_YPOS,
+    SCREEN_CTRL_ID_SCROLL_DOWN,
+    "scroll down"
+  }
+};
+
+static struct
+{
+#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
+  Bitmap **gfx_unpressed, **gfx_pressed;
+#else
+  int gfx_unpressed, gfx_pressed;
+#endif
+  int x, y;
+  int width, height;
+  int type;
+  int gadget_id;
+  char *infotext;
+} scrollbar_info[NUM_SCREEN_SCROLLBARS] =
+{
+  {
+#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
+    &scrollbar_bitmap[0], &scrollbar_bitmap[1],
+#else
+    IMG_MENU_SCROLLBAR, IMG_MENU_SCROLLBAR_ACTIVE,
+#endif
+    SX + SC_SCROLL_VERTICAL_XPOS, SY + SC_SCROLL_VERTICAL_YPOS,
+    SC_SCROLL_VERTICAL_XSIZE, SC_SCROLL_VERTICAL_YSIZE,
+    GD_TYPE_SCROLLBAR_VERTICAL,
+    SCREEN_CTRL_ID_SCROLL_VERTICAL,
+    "scroll level series vertically"
+  }
+};
+
+static void CreateScreenScrollbuttons()
+{
+  struct GadgetInfo *gi;
+  unsigned long event_mask;
+  int i;
+
+  for (i=0; i<NUM_SCREEN_SCROLLBUTTONS; i++)
+  {
+    Bitmap *gd_bitmap_unpressed, *gd_bitmap_pressed;
+    int gfx_unpressed, gfx_pressed;
+    int x, y, width, height;
+    int gd_x1, gd_x2, gd_y1, gd_y2;
+    int id = scrollbutton_info[i].gadget_id;
+
+    x = scrollbutton_info[i].x;
+    y = scrollbutton_info[i].y;
+
+    event_mask = GD_EVENT_PRESSED | GD_EVENT_REPEATED;
+
+    x += SX;
+    y += SY;
+    width = SC_SCROLLBUTTON_XSIZE;
+    height = SC_SCROLLBUTTON_YSIZE;
+
+    gfx_unpressed = scrollbutton_info[i].gfx_unpressed;
+    gfx_pressed   = scrollbutton_info[i].gfx_pressed;
+    gd_bitmap_unpressed = graphic_info[gfx_unpressed].bitmap;
+    gd_bitmap_pressed   = graphic_info[gfx_pressed].bitmap;
+    gd_x1 = graphic_info[gfx_unpressed].src_x;
+    gd_y1 = graphic_info[gfx_unpressed].src_y;
+    gd_x2 = graphic_info[gfx_pressed].src_x;
+    gd_y2 = graphic_info[gfx_pressed].src_y;
+
+    gi = CreateGadget(GDI_CUSTOM_ID, id,
+                     GDI_CUSTOM_TYPE_ID, i,
+                     GDI_INFO_TEXT, scrollbutton_info[i].infotext,
+                     GDI_X, x,
+                     GDI_Y, y,
+                     GDI_WIDTH, width,
+                     GDI_HEIGHT, height,
+                     GDI_TYPE, GD_TYPE_NORMAL_BUTTON,
+                     GDI_STATE, GD_BUTTON_UNPRESSED,
+                     GDI_DESIGN_UNPRESSED, gd_bitmap_unpressed, gd_x1, gd_y1,
+                     GDI_DESIGN_PRESSED, gd_bitmap_pressed, gd_x2, gd_y2,
+                     GDI_EVENT_MASK, event_mask,
+                     GDI_CALLBACK_ACTION, HandleScreenGadgets,
+                     GDI_END);
+
+    if (gi == NULL)
+      Error(ERR_EXIT, "cannot create gadget");
+
+    screen_gadget[id] = gi;
+  }
+}
+
+static void CreateScreenScrollbars()
+{
+  int i;
+
+  for (i=0; i<NUM_SCREEN_SCROLLBARS; i++)
+  {
+    Bitmap *gd_bitmap_unpressed, *gd_bitmap_pressed;
+#if !defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
+    int gfx_unpressed, gfx_pressed;
+#endif
+    int gd_x1, gd_x2, gd_y1, gd_y2;
+    struct GadgetInfo *gi;
+    int items_max, items_visible, item_position;
+    unsigned long event_mask;
+    int num_page_entries = MAX_MENU_ENTRIES_ON_SCREEN - 1;
+    int id = scrollbar_info[i].gadget_id;
+
+    items_max = num_page_entries;
+    items_visible = num_page_entries;
+    item_position = 0;
+
+    event_mask = GD_EVENT_MOVING | GD_EVENT_OFF_BORDERS;
+
+#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
+    gd_bitmap_unpressed = *scrollbar_info[i].gfx_unpressed;
+    gd_bitmap_pressed   = *scrollbar_info[i].gfx_pressed;
+    gd_x1 = 0;
+    gd_y1 = 0;
+    gd_x2 = 0;
+    gd_y2 = 0;
+#else
+    gfx_unpressed = scrollbar_info[i].gfx_unpressed;
+    gfx_pressed   = scrollbar_info[i].gfx_pressed;
+    gd_bitmap_unpressed = graphic_info[gfx_unpressed].bitmap;
+    gd_bitmap_pressed   = graphic_info[gfx_pressed].bitmap;
+    gd_x1 = graphic_info[gfx_unpressed].src_x;
+    gd_y1 = graphic_info[gfx_unpressed].src_y;
+    gd_x2 = graphic_info[gfx_pressed].src_x;
+    gd_y2 = graphic_info[gfx_pressed].src_y;
+#endif
+
+    gi = CreateGadget(GDI_CUSTOM_ID, id,
+                     GDI_CUSTOM_TYPE_ID, i,
+                     GDI_INFO_TEXT, scrollbar_info[i].infotext,
+                     GDI_X, scrollbar_info[i].x,
+                     GDI_Y, scrollbar_info[i].y,
+                     GDI_WIDTH, scrollbar_info[i].width,
+                     GDI_HEIGHT, scrollbar_info[i].height,
+                     GDI_TYPE, scrollbar_info[i].type,
+                     GDI_SCROLLBAR_ITEMS_MAX, items_max,
+                     GDI_SCROLLBAR_ITEMS_VISIBLE, items_visible,
+                     GDI_SCROLLBAR_ITEM_POSITION, item_position,
+                     GDI_STATE, GD_BUTTON_UNPRESSED,
+                     GDI_DESIGN_UNPRESSED, gd_bitmap_unpressed, gd_x1, gd_y1,
+                     GDI_DESIGN_PRESSED, gd_bitmap_pressed, gd_x2, gd_y2,
+                     GDI_BORDER_SIZE, SC_BORDER_SIZE, SC_BORDER_SIZE,
+                     GDI_EVENT_MASK, event_mask,
+                     GDI_CALLBACK_ACTION, HandleScreenGadgets,
+                     GDI_END);
+
+    if (gi == NULL)
+      Error(ERR_EXIT, "cannot create gadget");
+
+    screen_gadget[id] = gi;
+  }
+}
+
+void CreateScreenGadgets()
+{
+#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
+  int i;
+
+  for (i=0; i < NUM_SCROLLBAR_BITMAPS; i++)
+  {
+    scrollbar_bitmap[i] = CreateBitmap(TILEX, TILEY, DEFAULT_DEPTH);
+
+    /* copy pointers to clip mask and GC */
+    scrollbar_bitmap[i]->clip_mask =
+      graphic_info[IMG_MENU_SCROLLBAR + i].clip_mask;
+    scrollbar_bitmap[i]->stored_clip_gc =
+      graphic_info[IMG_MENU_SCROLLBAR + i].clip_gc;
+
+    BlitBitmap(graphic_info[IMG_MENU_SCROLLBAR + i].bitmap,
+              scrollbar_bitmap[i],
+              graphic_info[IMG_MENU_SCROLLBAR + i].src_x,
+              graphic_info[IMG_MENU_SCROLLBAR + i].src_y,
+              TILEX, TILEY, 0, 0);
+  }
+#endif
+
+  CreateScreenScrollbuttons();
+  CreateScreenScrollbars();
+}
+
+void FreeScreenGadgets()
+{
+  int i;
+
+#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
+  for (i=0; i < NUM_SCROLLBAR_BITMAPS; i++)
+  {
+    /* prevent freeing clip mask and GC twice */
+    scrollbar_bitmap[i]->clip_mask = None;
+    scrollbar_bitmap[i]->stored_clip_gc = None;
+
+    FreeBitmap(scrollbar_bitmap[i]);
+  }
+#endif
+
+  for (i=0; i<NUM_SCREEN_GADGETS; i++)
+    FreeGadget(screen_gadget[i]);
+}
+
+void MapChooseTreeGadgets(TreeInfo *ti)
+{
+  int num_entries = numTreeInfoInGroup(ti);
+  int i;
+
+  if (num_entries <= MAX_MENU_ENTRIES_ON_SCREEN)
+    return;
+
+  for (i=0; i<NUM_SCREEN_GADGETS; i++)
+    MapGadget(screen_gadget[i]);
+}
+
+void UnmapChooseTreeGadgets()
+{
+  int i;
+
+  for (i=0; i<NUM_SCREEN_GADGETS; i++)
+    UnmapGadget(screen_gadget[i]);
+}
+
+static void HandleScreenGadgets(struct GadgetInfo *gi)
+{
+  int id = gi->custom_id;
+
+  if (game_status != GAME_MODE_LEVELS && game_status != GAME_MODE_SETUP)
+    return;
+
+  switch (id)
+  {
+    case SCREEN_CTRL_ID_SCROLL_UP:
+      if (game_status == GAME_MODE_LEVELS)
+       HandleChooseLevel(mSX,mSY + 32, 0,0, MB_MENU_MARK);
+      else if (game_status == GAME_MODE_SETUP)
+       HandleSetupScreen(mSX,mSY + 32, 0,0, MB_MENU_MARK);
+      break;
+
+    case SCREEN_CTRL_ID_SCROLL_DOWN:
+      if (game_status == GAME_MODE_LEVELS)
+       HandleChooseLevel(mSX,mSY + SYSIZE - 32, 0,0, MB_MENU_MARK);
+      else if (game_status == GAME_MODE_SETUP)
+       HandleSetupScreen(mSX,mSY + SYSIZE - 32, 0,0, MB_MENU_MARK);
+      break;
+
+    case SCREEN_CTRL_ID_SCROLL_VERTICAL:
+      if (game_status == GAME_MODE_LEVELS)
+       HandleChooseLevel(0,0, 999,gi->event.item_position,MB_MENU_INITIALIZE);
+      else if (game_status == GAME_MODE_SETUP)
+       HandleSetupScreen(0,0, 999,gi->event.item_position,MB_MENU_INITIALIZE);
+      break;
+
+    default:
+      break;
+  }
 }