updated contact info in source file headers
[rocksndiamonds.git] / src / screens.c
index 129d0263a5245b989de182c0644ee68a35cac52a..d28e4d228bb209dee643647144afc39e43f59b47 100644 (file)
@@ -1,15 +1,13 @@
-/***********************************************************
-* Rocks'n'Diamonds -- McDuffin Strikes Back!               *
-*----------------------------------------------------------*
-* (c) 1995-2006 Artsoft Entertainment                      *
-*               Holger Schemel                             *
-*               Detmolder Strasse 189                      *
-*               33604 Bielefeld                            *
-*               Germany                                    *
-*               e-mail: info@artsoft.org                   *
-*----------------------------------------------------------*
-* screens.c                                                *
-***********************************************************/
+// ============================================================================
+// Rocks'n'Diamonds - McDuffin Strikes Back!
+// ----------------------------------------------------------------------------
+// (c) 1995-2014 by Artsoft Entertainment
+//                         Holger Schemel
+//                 info@artsoft.org
+//                 http://www.artsoft.org/
+// ----------------------------------------------------------------------------
+// screens.c
+// ============================================================================
 
 #include "libgame/libgame.h"
 
@@ -38,6 +36,8 @@
 #define MAX_INFO_MODES                 8
 
 /* screens on the setup screen */
+/* (must match GFX_SPECIAL_ARG_SETUP_* values as defined in src/main.h) */
+/* (should also match corresponding entries in src/conf_gfx.c) */
 #define SETUP_MODE_MAIN                        0
 #define SETUP_MODE_GAME                        1
 #define SETUP_MODE_EDITOR              2
 #define SETUP_MODE_SOUND               4
 #define SETUP_MODE_ARTWORK             5
 #define SETUP_MODE_INPUT               6
-#define SETUP_MODE_SHORTCUTS           7
-#define SETUP_MODE_SHORTCUTS_1         8
-#define SETUP_MODE_SHORTCUTS_2         9
-#define SETUP_MODE_SHORTCUTS_3         10
-#define SETUP_MODE_SHORTCUTS_4         11
-#define SETUP_MODE_SHORTCUTS_5         12
+#define SETUP_MODE_TOUCH               7
+#define SETUP_MODE_SHORTCUTS           8
+#define SETUP_MODE_SHORTCUTS_1         9
+#define SETUP_MODE_SHORTCUTS_2         10
+#define SETUP_MODE_SHORTCUTS_3         11
+#define SETUP_MODE_SHORTCUTS_4         12
+#define SETUP_MODE_SHORTCUTS_5         13
 
 /* sub-screens on the setup screen (generic) */
-#define SETUP_MODE_CHOOSE_ARTWORK      13
-#define SETUP_MODE_CHOOSE_OTHER                14
+#define SETUP_MODE_CHOOSE_ARTWORK      14
+#define SETUP_MODE_CHOOSE_OTHER                15
 
 /* sub-screens on the setup screen (specific) */
-#define SETUP_MODE_CHOOSE_GAME_SPEED   15
-#define SETUP_MODE_CHOOSE_SCREEN_MODE  16
+#define SETUP_MODE_CHOOSE_GAME_SPEED   16
 #define SETUP_MODE_CHOOSE_SCROLL_DELAY 17
-#define SETUP_MODE_CHOOSE_GRAPHICS     18
-#define SETUP_MODE_CHOOSE_SOUNDS       19
-#define SETUP_MODE_CHOOSE_MUSIC                20
-
-#define MAX_SETUP_MODES                        21
+#define SETUP_MODE_CHOOSE_SCREEN_MODE  18
+#define SETUP_MODE_CHOOSE_WINDOW_SIZE  19
+#define SETUP_MODE_CHOOSE_SCALING_TYPE 20
+#define SETUP_MODE_CHOOSE_GRAPHICS     21
+#define SETUP_MODE_CHOOSE_SOUNDS       22
+#define SETUP_MODE_CHOOSE_MUSIC                23
+#define SETUP_MODE_CHOOSE_VOLUME_SIMPLE        24
+#define SETUP_MODE_CHOOSE_VOLUME_LOOPS 25
+#define SETUP_MODE_CHOOSE_VOLUME_MUSIC 26
+#define SETUP_MODE_CHOOSE_TOUCH_CONTROL        27
+#define SETUP_MODE_CHOOSE_MOVE_DISTANCE        28
+#define SETUP_MODE_CHOOSE_DROP_DISTANCE        29
+
+#define MAX_SETUP_MODES                        30
 
 /* for input setup functions */
 #define SETUPINPUT_SCREEN_POS_START    0
 /* for various menu stuff  */
 #define MENU_SCREEN_START_XPOS         1
 #define MENU_SCREEN_START_YPOS         2
+#if 1
+#define MENU_SCREEN_VALUE_XPOS         (SCR_FIELDX - 3)
+#define MENU_SCREEN_MAX_XPOS           (SCR_FIELDX - 1)
+#else
 #define MENU_SCREEN_VALUE_XPOS         14
 #define MENU_SCREEN_MAX_XPOS           (SCR_FIELDX - 1)
+#endif
 #define MENU_TITLE1_YPOS               8
 #define MENU_TITLE2_YPOS               46
-#define MAX_INFO_ELEMENTS_ON_SCREEN    10
+#define MENU_SCREEN_INFO_XSTART                16
+#define MENU_SCREEN_INFO_YSTART1       100
+#define MENU_SCREEN_INFO_YSTART2       128
+#define MENU_SCREEN_INFO_YSTEP         (TILEY + 4)
+#define MENU_SCREEN_INFO_YBOTTOM       (SYSIZE - 20)
+#define MENU_SCREEN_INFO_YSIZE         (MENU_SCREEN_INFO_YBOTTOM -     \
+                                        MENU_SCREEN_INFO_YSTART2 -     \
+                                        TILEY / 2)
+#define MAX_INFO_ELEMENTS_ON_SCREEN    128
+#if 1
+#define NUM_INFO_ELEMENTS_ON_SCREEN    MIN(MENU_SCREEN_INFO_YSIZE /    \
+                                            MENU_SCREEN_INFO_YSTEP,    \
+                                            MAX_INFO_ELEMENTS_ON_SCREEN)
+#else
+#define NUM_INFO_ELEMENTS_ON_SCREEN    10
+#endif
 #define MAX_MENU_ENTRIES_ON_SCREEN     (SCR_FIELDY - MENU_SCREEN_START_YPOS)
+#if 1
+#define MAX_MENU_TEXT_LENGTH_BIG       13
+#define MAX_MENU_TEXT_LENGTH_MEDIUM    (MAX_MENU_TEXT_LENGTH_BIG * 2)
+#else
 #define MAX_MENU_TEXT_LENGTH_BIG       (MENU_SCREEN_VALUE_XPOS -       \
                                         MENU_SCREEN_START_XPOS)
 #define MAX_MENU_TEXT_LENGTH_MEDIUM    (MAX_MENU_TEXT_LENGTH_BIG * 2)
+#endif
 
 /* buttons and scrollbars identifiers */
 #define SCREEN_CTRL_ID_PREV_LEVEL      0
@@ -138,6 +172,8 @@ static void CustomizeKeyboard(int);
 static void CalibrateJoystick(int);
 static void execSetupGame(void);
 static void execSetupGraphics(void);
+static void execSetupSound(void);
+static void execSetupTouch(void);
 static void execSetupArtwork(void);
 static void HandleChooseTree(int, int, int, int, int, TreeInfo **);
 
@@ -160,6 +196,7 @@ static void HandleInfoScreen_Program(int);
 static void HandleInfoScreen_Version(int);
 
 static void MapScreenMenuGadgets(int);
+static void MapScreenGadgets(int);
 static void MapScreenTreeGadgets(TreeInfo *);
 
 static struct GadgetInfo *screen_gadget[NUM_SCREEN_GADGETS];
@@ -170,15 +207,74 @@ static int setup_mode = SETUP_MODE_MAIN;
 static TreeInfo *screen_modes = NULL;
 static TreeInfo *screen_mode_current = NULL;
 
+static TreeInfo *window_sizes = NULL;
+static TreeInfo *window_size_current = NULL;
+
+static TreeInfo *scaling_types = NULL;
+static TreeInfo *scaling_type_current = NULL;
+
 static TreeInfo *scroll_delays = NULL;
 static TreeInfo *scroll_delay_current = NULL;
 
 static TreeInfo *game_speeds = NULL;
 static TreeInfo *game_speed_current = NULL;
 
+static TreeInfo *volumes_simple = NULL;
+static TreeInfo *volume_simple_current = NULL;
+
+static TreeInfo *volumes_loops = NULL;
+static TreeInfo *volume_loops_current = NULL;
+
+static TreeInfo *volumes_music = NULL;
+static TreeInfo *volume_music_current = NULL;
+
+static TreeInfo *touch_controls = NULL;
+static TreeInfo *touch_control_current = NULL;
+
+static TreeInfo *move_distances = NULL;
+static TreeInfo *move_distance_current = NULL;
+
+static TreeInfo *drop_distances = NULL;
+static TreeInfo *drop_distance_current = NULL;
+
 static TreeInfo *level_number = NULL;
 static TreeInfo *level_number_current = NULL;
 
+static struct
+{
+  int value;
+  char *text;
+} window_sizes_list[] =
+{
+  {    50,     "50 %"                          },
+  {    80,     "80 %"                          },
+  {    90,     "90 %"                          },
+  {    100,    "100 % (Default)"               },
+  {    110,    "110 %"                         },
+  {    120,    "120 %"                         },
+  {    130,    "130 %"                         },
+  {    140,    "140 %"                         },
+  {    150,    "150 %"                         },
+  {    200,    "200 %"                         },
+  {    250,    "250 %"                         },
+  {    300,    "300 %"                         },
+
+  {    -1,     NULL                            },
+};
+
+static struct
+{
+  char *value;
+  char *text;
+} scaling_types_list[] =
+{
+  {    SCALING_QUALITY_NEAREST, "None"         },
+  {    SCALING_QUALITY_LINEAR,  "Linear"       },
+  {    SCALING_QUALITY_BEST,    "Anisotropic"  },
+
+  {    NULL,                    NULL           },
+};
+
 static struct
 {
   int value;
@@ -229,6 +325,58 @@ static struct
   {    -1,     NULL                            },
 };
 
+static struct
+{
+  int value;
+  char *text;
+} volumes_list[] =
+{
+  {    0,      "0 %"                           },
+  {    10,     "10 %"                          },
+  {    20,     "20 %"                          },
+  {    30,     "30 %"                          },
+  {    40,     "40 %"                          },
+  {    50,     "50 %"                          },
+  {    60,     "60 %"                          },
+  {    70,     "70 %"                          },
+  {    80,     "80 %"                          },
+  {    90,     "90 %"                          },
+  {    100,    "100 %"                         },
+
+  {    -1,     NULL                            },
+};
+
+static struct
+{
+  char *value;
+  char *text;
+} touch_controls_list[] =
+{
+  {    TOUCH_CONTROL_VIRTUAL_BUTTONS,  "Virtual Buttons"       },
+  {    TOUCH_CONTROL_WIPE_GESTURES,    "Wipe Gestures"         },
+
+  {    NULL,                           NULL                    },
+};
+
+static struct
+{
+  int value;
+  char *text;
+} distances_list[] =
+{
+  {    1,      "1 %"                           },
+  {    2,      "2 %"                           },
+  {    3,      "3 %"                           },
+  {    4,      "4 %"                           },
+  {    5,      "5 %"                           },
+  {    10,     "10 %"                          },
+  {    15,     "15 %"                          },
+  {    20,     "20 %"                          },
+  {    25,     "25 %"                          },
+
+  {    -1,     NULL                            },
+};
+
 #define DRAW_MODE(s)           ((s) >= GAME_MODE_MAIN &&               \
                                 (s) <= GAME_MODE_SETUP ? (s) :         \
                                 (s) == GAME_MODE_PSEUDO_TYPENAME ?     \
@@ -278,11 +426,6 @@ static struct
                                    menu.list_size[game_status] :       \
                                    MAX_MENU_ENTRIES_ON_SCREEN)
 
-#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
-#define NUM_SCROLLBAR_BITMAPS          2
-static Bitmap *scrollbar_bitmap[NUM_SCROLLBAR_BITMAPS];
-#endif
-
 
 /* title display and control definitions */
 
@@ -1255,6 +1398,8 @@ void DrawMainMenuExt(int fade_mask, boolean do_fading)
   static LevelDirTree *leveldir_last_valid = NULL;
   boolean levelset_has_changed = FALSE;
 
+  LimitScreenUpdates(FALSE);
+
   FadeSetLeaveScreen();
 
   /* do not fade out here -- function may continue and fade on editor screen */
@@ -1282,7 +1427,8 @@ void DrawMainMenuExt(int fade_mask, boolean do_fading)
   }
 
   /* needed if last screen was the setup screen and fullscreen state changed */
-  ToggleFullscreenIfNeeded();
+  // (moved to "execSetupGraphics()" to change fullscreen state directly)
+  // ToggleFullscreenOrChangeWindowScalingIfNeeded();
 
   /* leveldir_current may be invalid (level group, parent link) */
   if (!validLevelSeries(leveldir_current))
@@ -1305,8 +1451,11 @@ void DrawMainMenuExt(int fade_mask, boolean do_fading)
 #if 1
   FadeOut(fade_mask);
 
+#if 0
   /* needed if last screen was the editor screen */
   UndrawSpecialEditorDoor();
+#endif
+
 #if 0
   if (fade_mask == REDRAW_FIELD)
     BackToFront();
@@ -1318,6 +1467,11 @@ void DrawMainMenuExt(int fade_mask, boolean do_fading)
   ChangeViewportPropertiesIfNeeded();
 #endif
 
+#if 1
+  /* needed if last screen was the editor screen */
+  UndrawSpecialEditorDoor();
+#endif
+
 #if defined(TARGET_SDL)
   SetDrawtoField(DRAW_BACKBUFFER);
 #endif
@@ -1356,7 +1510,7 @@ void DrawMainMenuExt(int fade_mask, boolean do_fading)
   InitializeMainControls();
 
   DrawCursorAndText_Main(-1, FALSE);
-  DrawPreviewLevel(TRUE);
+  DrawPreviewLevelInitial();
 
   HandleMainMenu(0, 0, 0, 0, MB_MENU_INITIALIZE);
 
@@ -1377,7 +1531,13 @@ void DrawMainMenuExt(int fade_mask, boolean do_fading)
   MapScreenMenuGadgets(SCREEN_MASK_MAIN);
 
 #if 1
-  if (fade_mask == REDRAW_ALL)
+  /* copy actual game door content to door double buffer for OpenDoor() */
+  BlitBitmap(drawto, bitmap_db_door_2, VX, VY, VXSIZE, VYSIZE, 0, 0);
+#endif
+
+#if 1
+  // if (fade_mask == REDRAW_ALL)
+  // (always redraw current door state)
   {
     int door_state = GetDoorState();
 
@@ -1387,6 +1547,12 @@ void DrawMainMenuExt(int fade_mask, boolean do_fading)
   }
 #endif
 
+#if 0
+  redraw_mask |= REDRAW_ALL;
+  BackToFront();
+  Delay(3000);
+#endif
+
   DrawMaskedBorder(REDRAW_ALL);
 
   FadeIn(fade_mask);
@@ -1448,7 +1614,7 @@ static void gotoTopLevelDir()
 
 void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
 {
-  static unsigned long title_delay = 0;
+  static unsigned int title_delay = 0;
   static int title_screen_nr = 0;
   static int last_sound = -1, last_music = -1;
   boolean return_to_main_menu = FALSE;
@@ -1673,7 +1839,7 @@ void HandleMainMenu_SelectLevel(int step, int direction)
   {
     /* skipping levels is only allowed when trying to skip single level */
     if (setup.skip_levels && step == 1 &&
-       Request("Level still unsolved ! Skip despite handicap ?", REQ_ASK))
+       Request("Level still unsolved! Skip despite handicap?", REQ_ASK))
     {
       leveldir_current->handicap_level++;
       SaveLevelSetup_SeriesInfo();
@@ -1695,13 +1861,13 @@ void HandleMainMenu_SelectLevel(int step, int direction)
             mci->pos_text->font);
 
     LoadLevel(level_nr);
-    DrawPreviewLevel(TRUE);
+    DrawPreviewLevelInitial();
 
     TapeErase();
     LoadTape(level_nr);
     DrawCompleteVideoDisplay();
 
-    /* needed because DrawPreviewLevel() takes some time */
+    /* needed because DrawPreviewLevelInitial() takes some time */
     BackToFront();
     SyncDisplay();
   }
@@ -1770,6 +1936,10 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
   {
     game_status = GAME_MODE_LEVELNR;
 
+#if 1
+    ChangeViewportPropertiesIfNeeded();
+#endif
+
     DrawChooseLevelNr();
   }
   else if (pos >= MAIN_CONTROL_NAME && pos <= MAIN_CONTROL_QUIT)
@@ -1809,6 +1979,10 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
          gotoTopLevelDir();
 #endif
 
+#if 1
+         ChangeViewportPropertiesIfNeeded();
+#endif
+
          DrawChooseLevelSet();
        }
       }
@@ -1816,13 +1990,19 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
       {
        game_status = GAME_MODE_SCORES;
 
+#if 1
+       ChangeViewportPropertiesIfNeeded();
+#endif
+
        DrawHallOfFame(-1);
       }
       else if (pos == MAIN_CONTROL_EDITOR)
       {
        if (leveldir_current->readonly &&
            !strEqual(setup.player_name, "Artsoft"))
-         Request("This level is read only !", REQ_CONFIRM);
+         Request("This level is read only!", REQ_CONFIRM);
+
+       CloseDoor(DOOR_CLOSE_2);
 
        game_status = GAME_MODE_EDITOR;
 
@@ -1840,6 +2020,10 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
        game_status = GAME_MODE_INFO;
        info_mode = INFO_MODE_MAIN;
 
+#if 1
+       ChangeViewportPropertiesIfNeeded();
+#endif
+
        DrawInfoScreen();
       }
       else if (pos == MAIN_CONTROL_GAME)
@@ -1851,6 +2035,10 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
        game_status = GAME_MODE_SETUP;
        setup_mode = SETUP_MODE_MAIN;
 
+#if 1
+       ChangeViewportPropertiesIfNeeded();
+#endif
+
        DrawSetupScreen();
       }
       else if (pos == MAIN_CONTROL_QUIT)
@@ -1858,17 +2046,19 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
        SaveLevelSetup_LastSeries();
        SaveLevelSetup_SeriesInfo();
 
-        if (Request("Do you really want to quit ?", REQ_ASK | REQ_STAY_CLOSED))
+        if (Request("Do you really want to quit?", REQ_ASK | REQ_STAY_CLOSED))
          game_status = GAME_MODE_QUIT;
       }
     }
   }
 
+#if 0
   if (game_status == GAME_MODE_MAIN)
   {
-    DrawPreviewLevel(FALSE);
+    DrawPreviewLevelAnimation();
     DoAnimation();
   }
+#endif
 }
 
 
@@ -2148,11 +2338,11 @@ void DrawInfoScreen_HelpAnim(int start, int max_anims, boolean init)
 {
   static int infoscreen_step[MAX_INFO_ELEMENTS_ON_SCREEN];
   static int infoscreen_frame[MAX_INFO_ELEMENTS_ON_SCREEN];
-  int xstart = mSX + 16;
-  int ystart1 = mSY - SY + 100;
-  int ystart2 = mSY + 64 + 2 * 32;
-  int ybottom = mSY - SY + SYSIZE - 20;
-  int ystep = TILEY + 4;
+  int xstart = mSX + MENU_SCREEN_INFO_XSTART;
+  int ystart1 = mSY - SY + MENU_SCREEN_INFO_YSTART1;
+  int ystart2 = mSY + MENU_SCREEN_INFO_YSTART2;
+  int ybottom = mSY - SY + MENU_SCREEN_INFO_YBOTTOM;
+  int ystep = MENU_SCREEN_INFO_YSTEP;
   int element, action, direction;
   int graphic;
   int delay;
@@ -2161,7 +2351,7 @@ void DrawInfoScreen_HelpAnim(int start, int max_anims, boolean init)
 
   if (init)
   {
-    for (i = 0; i < MAX_INFO_ELEMENTS_ON_SCREEN; i++)
+    for (i = 0; i < NUM_INFO_ELEMENTS_ON_SCREEN; i++)
       infoscreen_step[i] = infoscreen_frame[i] = 0;
 
     ClearField();
@@ -2178,7 +2368,7 @@ void DrawInfoScreen_HelpAnim(int start, int max_anims, boolean init)
   i = j = 0;
   while (helpanim_info[j].element != HELPANIM_LIST_END)
   {
-    if (i >= start + MAX_INFO_ELEMENTS_ON_SCREEN ||
+    if (i >= start + NUM_INFO_ELEMENTS_ON_SCREEN ||
        i >= max_anims)
       break;
     else if (i < start)
@@ -2335,11 +2525,11 @@ void DrawInfoScreen_Elements()
 
 void HandleInfoScreen_Elements(int button)
 {
-  static unsigned long info_delay = 0;
+  static unsigned int info_delay = 0;
   static int num_anims;
   static int num_pages;
   static int page;
-  int anims_per_page = MAX_INFO_ELEMENTS_ON_SCREEN;
+  int anims_per_page = NUM_INFO_ELEMENTS_ON_SCREEN;
   int i;
 
   if (button == MB_MENU_INITIALIZE)
@@ -2849,6 +3039,18 @@ void DrawInfoScreen_Program()
                    "If you like it, send e-mail to:");
   DrawTextSCentered(ystart2 + 2 * ystep, FONT_TEXT_3,
                    PROGRAM_EMAIL_STRING);
+#if 1
+  DrawTextSCentered(ystart2 + 4 * ystep, FONT_TEXT_2,
+                   "More information and levels:");
+  DrawTextSCentered(ystart2 + 5 * ystep, FONT_TEXT_3,
+                   PROGRAM_WEBSITE_STRING);
+  DrawTextSCentered(ystart2 + 7 * ystep, FONT_TEXT_2,
+                   "If you have created new levels,");
+  DrawTextSCentered(ystart2 + 8 * ystep, FONT_TEXT_2,
+                   "send them to me to include them!");
+  DrawTextSCentered(ystart2 + 9 * ystep, FONT_TEXT_2,
+                   ":-)");
+#else
   DrawTextSCentered(ystart2 + 3 * ystep, FONT_TEXT_2,
                    "or SnailMail to:");
   DrawTextSCentered(ystart2 + 4 * ystep + 0, FONT_TEXT_3,
@@ -2869,6 +3071,7 @@ void DrawInfoScreen_Program()
                    "send them to me to include them!");
   DrawTextSCentered(ystart2 + 11 * ystep, FONT_TEXT_2,
                    ":-)");
+#endif
 
   DrawTextSCentered(ybottom, FONT_TEXT_4,
                    "Press any key or button for info menu");
@@ -2917,14 +3120,19 @@ void DrawInfoScreen_Version()
   int ystart1 = mSY - SY + 100;
   int ystart2 = mSY - SY + 150;
   int ybottom = mSY - SY + SYSIZE - 20;
-  int xstart1 = mSX + 2 * xstep;
-  int xstart2 = mSX + 19 * xstep;
+  int xstart1 = mSX - SX + 2 * xstep;
+  int xstart2 = mSX - SX + 18 * xstep;
 #if defined(TARGET_SDL)
-  int xstart3 = mSX + 29 * xstep;
+  int xstart3 = mSX - SX + 28 * xstep;
   SDL_version sdl_version_compiled;
   const SDL_version *sdl_version_linked;
-  int driver_name_len = 8;
+  int driver_name_len = 10;
+#if defined(TARGET_SDL2)
+  SDL_version sdl_version_linked_ext;
+  const char *driver_name = NULL;
+#else
   char driver_name[driver_name_len];
+#endif
 #endif
 
   SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_VERSION);
@@ -2964,7 +3172,12 @@ void DrawInfoScreen_Version()
   DrawTextF(xstart3, ystart2, font_header, "linked");
 
   SDL_VERSION(&sdl_version_compiled);
+#if defined(TARGET_SDL2)
+  SDL_GetVersion(&sdl_version_linked_ext);
+  sdl_version_linked = &sdl_version_linked_ext;
+#else
   sdl_version_linked = SDL_Linked_Version();
+#endif
 
   ystart2 += 2 * ystep;
   DrawTextF(xstart1, ystart2, font_text, "SDL");
@@ -3024,14 +3237,22 @@ void DrawInfoScreen_Version()
   DrawTextF(xstart2, ystart2, font_header, "Requested");
   DrawTextF(xstart3, ystart2, font_header, "Used");
 
+#if defined(TARGET_SDL2)
+  driver_name = getStringCopyNStatic(SDL_GetVideoDriver(0), driver_name_len);
+#else
   SDL_VideoDriverName(driver_name, driver_name_len);
+#endif
 
   ystart2 += 2 * ystep;
   DrawTextF(xstart1, ystart2, font_text, "SDL_VideoDriver");
   DrawTextF(xstart2, ystart2, font_text, "%s", setup.system.sdl_videodriver);
   DrawTextF(xstart3, ystart2, font_text, "%s", driver_name);
 
+#if defined(TARGET_SDL2)
+  driver_name = getStringCopyNStatic(SDL_GetAudioDriver(0), driver_name_len);
+#else
   SDL_AudioDriverName(driver_name, driver_name_len);
+#endif
 
   ystart2 += ystep;
   DrawTextF(xstart1, ystart2, font_text, "SDL_AudioDriver");
@@ -3210,7 +3431,9 @@ void HandleInfoScreen(int mx, int my, int dx, int dy, int button)
   else
     HandleInfoScreen_Main(mx, my, dx, dy, button);
 
+#if 0
   DoAnimation();
+#endif
 }
 
 
@@ -3318,8 +3541,25 @@ static void DrawChooseTree(TreeInfo **ti_ptr)
   InitAnimation();
 }
 
+static void AdjustScrollbar(int id, int items_max, int items_visible,
+                           int item_position)
+{
+  struct GadgetInfo *gi = screen_gadget[id];
+
+  if (item_position > items_max - items_visible)
+    item_position = items_max - items_visible;
+
+  ModifyGadget(gi, GDI_SCROLLBAR_ITEMS_MAX, items_max,
+              GDI_SCROLLBAR_ITEMS_VISIBLE, items_visible,
+              GDI_SCROLLBAR_ITEM_POSITION, item_position, GDI_END);
+}
+
 static void AdjustChooseTreeScrollbar(int id, int first_entry, TreeInfo *ti)
 {
+#if 1
+  AdjustScrollbar(id, numTreeInfoInGroup(ti), NUM_MENU_ENTRIES_ON_SCREEN,
+                 first_entry);
+#else
   struct GadgetInfo *gi = screen_gadget[id];
   int items_max, items_visible, item_position;
 
@@ -3333,6 +3573,7 @@ static void AdjustChooseTreeScrollbar(int id, int first_entry, TreeInfo *ti)
   ModifyGadget(gi, GDI_SCROLLBAR_ITEMS_MAX, items_max,
               GDI_SCROLLBAR_ITEMS_VISIBLE, items_visible,
               GDI_SCROLLBAR_ITEM_POSITION, item_position, GDI_END);
+#endif
 }
 
 static void drawChooseTreeList(int first_entry, int num_page_entries,
@@ -3520,11 +3761,21 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
     }
     else if (game_status == GAME_MODE_SETUP)
     {
-      if (setup_mode == SETUP_MODE_CHOOSE_GAME_SPEED)
+      if (setup_mode == SETUP_MODE_CHOOSE_GAME_SPEED ||
+         setup_mode == SETUP_MODE_CHOOSE_SCROLL_DELAY)
        execSetupGame();
       else if (setup_mode == SETUP_MODE_CHOOSE_SCREEN_MODE ||
-              setup_mode == SETUP_MODE_CHOOSE_SCROLL_DELAY)
+              setup_mode == SETUP_MODE_CHOOSE_WINDOW_SIZE ||
+              setup_mode == SETUP_MODE_CHOOSE_SCALING_TYPE)
        execSetupGraphics();
+      else if (setup_mode == SETUP_MODE_CHOOSE_VOLUME_SIMPLE ||
+              setup_mode == SETUP_MODE_CHOOSE_VOLUME_LOOPS ||
+              setup_mode == SETUP_MODE_CHOOSE_VOLUME_MUSIC)
+       execSetupSound();
+      else if (setup_mode == SETUP_MODE_CHOOSE_TOUCH_CONTROL ||
+              setup_mode == SETUP_MODE_CHOOSE_MOVE_DISTANCE ||
+              setup_mode == SETUP_MODE_CHOOSE_DROP_DISTANCE)
+       execSetupTouch();
       else
        execSetupArtwork();
     }
@@ -3568,6 +3819,45 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
     if (ti->cl_cursor + dy < 0 ||
        ti->cl_cursor + dy > num_page_entries - 1)
     {
+#if 1
+      boolean redraw = FALSE;
+
+      if (ABS(dy) == SCROLL_PAGE)
+       step = num_page_entries - 1;
+
+      if (dy < 0 && ti->cl_first > 0)
+      {
+       /* scroll page/line up */
+
+       ti->cl_first -= step;
+       if (ti->cl_first < 0)
+         ti->cl_first = 0;
+
+       redraw = TRUE;
+      }
+      else if (dy > 0 && ti->cl_first + num_page_entries < num_entries)
+      {
+       /* scroll page/line down */
+
+       ti->cl_first += step;
+       if (ti->cl_first + num_page_entries > num_entries)
+         ti->cl_first = MAX(0, num_entries - num_page_entries);
+
+       redraw = TRUE;
+      }
+
+      if (redraw)
+      {
+       drawChooseTreeList(ti->cl_first, num_page_entries, ti);
+       drawChooseTreeInfo(ti->cl_first + ti->cl_cursor, ti);
+       drawChooseTreeCursor(ti->cl_cursor, TRUE);
+
+       AdjustChooseTreeScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL,
+                                 ti->cl_first, ti);
+      }
+
+#else
+
       if (ABS(dy) == SCROLL_PAGE)
        step = num_page_entries - 1;
 
@@ -3601,6 +3891,7 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
        AdjustChooseTreeScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL,
                                  ti->cl_first, ti);
       }
+#endif
 
       return;
     }
@@ -3648,6 +3939,11 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
       mx < screen_gadget[SCREEN_CTRL_ID_SCROLL_VERTICAL]->x &&
       y >= 0 && y < num_page_entries)
   {
+#if 0
+    printf("::: TEST/HandleChooseTree [%d, %d, %d, %d]\n", Counter(),
+          button, mx, screen_gadget[SCREEN_CTRL_ID_SCROLL_VERTICAL]->x);
+#endif
+
     if (button)
     {
       if (y != ti->cl_cursor)
@@ -3689,7 +3985,11 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
       }
       else
       {
+#if 1
+       FadeSetEnterMenu();
+#else
        FadeSetEnterScreen();
+#endif
 
        node_cursor->cl_first = ti->cl_first;
        node_cursor->cl_cursor = ti->cl_cursor;
@@ -3706,11 +4006,21 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
 
        if (game_status == GAME_MODE_SETUP)
        {
-         if (setup_mode == SETUP_MODE_CHOOSE_GAME_SPEED)
+         if (setup_mode == SETUP_MODE_CHOOSE_GAME_SPEED ||
+             setup_mode == SETUP_MODE_CHOOSE_SCROLL_DELAY)
            execSetupGame();
          else if (setup_mode == SETUP_MODE_CHOOSE_SCREEN_MODE ||
-                  setup_mode == SETUP_MODE_CHOOSE_SCROLL_DELAY)
+                  setup_mode == SETUP_MODE_CHOOSE_WINDOW_SIZE ||
+                  setup_mode == SETUP_MODE_CHOOSE_SCALING_TYPE)
            execSetupGraphics();
+         else if (setup_mode == SETUP_MODE_CHOOSE_VOLUME_SIMPLE ||
+                  setup_mode == SETUP_MODE_CHOOSE_VOLUME_LOOPS ||
+                  setup_mode == SETUP_MODE_CHOOSE_VOLUME_MUSIC)
+           execSetupSound();
+         else if (setup_mode == SETUP_MODE_CHOOSE_TOUCH_CONTROL ||
+                  setup_mode == SETUP_MODE_CHOOSE_MOVE_DISTANCE ||
+                  setup_mode == SETUP_MODE_CHOOSE_DROP_DISTANCE)
+           execSetupTouch();
          else
            execSetupArtwork();
        }
@@ -3742,7 +4052,9 @@ void HandleChooseLevelSet(int mx, int my, int dx, int dy, int button)
 {
   HandleChooseTree(mx, my, dx, dy, button, &leveldir_current);
 
+#if 0
   DoAnimation();
+#endif
 }
 
 void DrawChooseLevelNr()
@@ -3813,7 +4125,9 @@ void HandleChooseLevelNr(int mx, int my, int dx, int dy, int button)
   HandleChooseTree(mx, my, dx, dy, button, &leveldir_current);
 #endif
 
+#if 0
   DoAnimation();
+#endif
 }
 
 void DrawHallOfFame(int highlight_position)
@@ -3856,7 +4170,7 @@ void DrawHallOfFame(int highlight_position)
 
 static void drawHallOfFameList(int first_entry, int highlight_position)
 {
-  int i;
+  int i, j;
 
   SetMainBackgroundImage(IMG_BACKGROUND_SCORES);
   ClearField();
@@ -3875,12 +4189,22 @@ static void drawHallOfFameList(int first_entry, int highlight_position)
     int font_nr4 = (active ? FONT_TEXT_4_ACTIVE : FONT_TEXT_4);
     int dx1 = 3 * getFontWidth(font_nr1);
     int dx2 = dx1 + getFontWidth(font_nr1);
+#if 1
+    int dx3 = SXSIZE - 5 * getFontWidth(font_nr4);
+    int num_dots = (dx3 - dx2) / getFontWidth(font_nr3);
+#else
     int dx3 = dx2 + 25 * getFontWidth(font_nr3);
+#endif
     int sy = mSY + 64 + i * 32;
 
     DrawText(mSX, sy, int2str(entry + 1, 3), font_nr1);
     DrawText(mSX + dx1, sy, ".", font_nr1);
+#if 1
+    for (j = 0; j < num_dots; j++)
+      DrawText(mSX + dx2 + j * getFontWidth(font_nr3), sy, ".", font_nr3);
+#else
     DrawText(mSX + dx2, sy, ".........................", font_nr3);
+#endif
 
     if (!strEqual(highscore[entry].Name, EMPTY_PLAYER_NAME))
       DrawText(mSX + dx2, sy, highscore[entry].Name, font_nr2);
@@ -3959,7 +4283,9 @@ void HandleHallOfFame(int mx, int my, int dx, int dy, int button)
   if (game_status == GAME_MODE_SCORES)
     PlayMenuSoundIfLoop();
 
+#if 0
   DoAnimation();
+#endif
 }
 
 
@@ -3968,14 +4294,23 @@ void HandleHallOfFame(int mx, int my, int dx, int dy, int button)
 /* ========================================================================= */
 
 static struct TokenInfo *setup_info;
-static int num_setup_info;
+static int num_setup_info;     /* number of setup entries shown on screen */
+static int max_setup_info;     /* total number of setup entries in list */
 
 static char *screen_mode_text;
+static char *window_size_text;
+static char *scaling_type_text;
 static char *scroll_delay_text;
 static char *game_speed_text;
 static char *graphics_set_name;
 static char *sounds_set_name;
 static char *music_set_name;
+static char *volume_simple_text;
+static char *volume_loops_text;
+static char *volume_music_text;
+static char *touch_controls_text;
+static char *move_distance_text;
+static char *drop_distance_text;
 
 static void execSetupMain()
 {
@@ -3984,7 +4319,7 @@ static void execSetupMain()
   DrawSetupScreen();
 }
 
-static void execSetupGame()
+static void execSetupGame_setGameSpeeds()
 {
   if (game_speeds == NULL)
   {
@@ -4032,6 +4367,62 @@ static void execSetupGame()
 
   /* needed for displaying game speed text instead of identifier */
   game_speed_text = game_speed_current->name;
+}
+
+static void execSetupGame_setScrollDelays()
+{
+  if (scroll_delays == NULL)
+  {
+    int i;
+
+    for (i = 0; scroll_delays_list[i].value != -1; i++)
+    {
+      TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED);
+      char identifier[32], name[32];
+      int value = scroll_delays_list[i].value;
+      char *text = scroll_delays_list[i].text;
+
+      ti->node_top = &scroll_delays;
+      ti->sort_priority = value;
+
+      sprintf(identifier, "%d", value);
+      sprintf(name, "%s", text);
+
+      setString(&ti->identifier, identifier);
+      setString(&ti->name, name);
+      setString(&ti->name_sorting, name);
+      setString(&ti->infotext, "Scaling Type");
+
+      pushTreeInfo(&scroll_delays, ti);
+    }
+
+    /* sort scaling type values to start with lowest scaling type value */
+    sortTreeInfo(&scroll_delays);
+
+    /* set current scaling type value to configured scaling type value */
+    scroll_delay_current =
+      getTreeInfoFromIdentifier(scroll_delays,i_to_a(setup.scroll_delay_value));
+
+    /* if that fails, set current scaling type to reliable default value */
+    if (scroll_delay_current == NULL)
+      scroll_delay_current =
+       getTreeInfoFromIdentifier(scroll_delays, i_to_a(STD_SCROLL_DELAY));
+
+    /* if that also fails, set current scaling type to first available value */
+    if (scroll_delay_current == NULL)
+      scroll_delay_current = scroll_delays;
+  }
+
+  setup.scroll_delay_value = atoi(scroll_delay_current->identifier);
+
+  /* needed for displaying scaling type text instead of identifier */
+  scroll_delay_text = scroll_delay_current->name;
+}
+
+static void execSetupGame()
+{
+  execSetupGame_setGameSpeeds();
+  execSetupGame_setScrollDelays();
 
   setup_mode = SETUP_MODE_GAME;
 
@@ -4045,6 +4436,13 @@ static void execSetupChooseGameSpeed()
   DrawSetupScreen();
 }
 
+static void execSetupChooseScrollDelay()
+{
+  setup_mode = SETUP_MODE_CHOOSE_SCROLL_DELAY;
+
+  DrawSetupScreen();
+}
+
 static void execSetupEditor()
 {
   setup_mode = SETUP_MODE_EDITOR;
@@ -4052,18 +4450,154 @@ static void execSetupEditor()
   DrawSetupScreen();
 }
 
-static void execSetupGraphics()
+static void execSetupGraphics_setWindowSizes(boolean update_list)
 {
-  if (video.fullscreen_available && screen_modes == NULL)
+  if (window_sizes != NULL && update_list)
+  {
+    freeTreeInfo(window_sizes);
+
+    window_sizes = NULL;
+  }
+
+  if (window_sizes == NULL)
   {
+    boolean current_window_size_found = FALSE;
     int i;
 
-    for (i = 0; video.fullscreen_modes[i].width != -1; i++)
+    for (i = 0; window_sizes_list[i].value != -1; i++)
     {
       TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED);
       char identifier[32], name[32];
-      int x = video.fullscreen_modes[i].width;
-      int y = video.fullscreen_modes[i].height;
+      int value = window_sizes_list[i].value;
+      char *text = window_sizes_list[i].text;
+
+      ti->node_top = &window_sizes;
+      ti->sort_priority = value;
+
+      sprintf(identifier, "%d", value);
+      sprintf(name, "%s", text);
+
+      setString(&ti->identifier, identifier);
+      setString(&ti->name, name);
+      setString(&ti->name_sorting, name);
+      setString(&ti->infotext, "Window Scaling");
+
+      pushTreeInfo(&window_sizes, ti);
+
+      if (value == setup.window_scaling_percent)
+       current_window_size_found = TRUE;
+    }
+
+    if (!current_window_size_found)
+    {
+      // add entry for non-preset window scaling value
+
+      TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED);
+      char identifier[32], name[32];
+      int value = setup.window_scaling_percent;
+
+      ti->node_top = &window_sizes;
+      ti->sort_priority = value;
+
+      sprintf(identifier, "%d", value);
+      sprintf(name, "%d %% (Current)", value);
+
+      setString(&ti->identifier, identifier);
+      setString(&ti->name, name);
+      setString(&ti->name_sorting, name);
+      setString(&ti->infotext, "Window Scaling");
+
+      pushTreeInfo(&window_sizes, ti);
+    }
+
+    /* sort window size values to start with lowest window size value */
+    sortTreeInfo(&window_sizes);
+
+    /* set current window size value to configured window size value */
+    window_size_current =
+      getTreeInfoFromIdentifier(window_sizes,
+                               i_to_a(setup.window_scaling_percent));
+
+    /* if that fails, set current window size to reliable default value */
+    if (window_size_current == NULL)
+      window_size_current =
+       getTreeInfoFromIdentifier(window_sizes,
+                                 i_to_a(STD_WINDOW_SCALING_PERCENT));
+
+    /* if that also fails, set current window size to first available value */
+    if (window_size_current == NULL)
+      window_size_current = window_sizes;
+  }
+
+  setup.window_scaling_percent = atoi(window_size_current->identifier);
+
+  /* needed for displaying window size text instead of identifier */
+  window_size_text = window_size_current->name;
+}
+
+static void execSetupGraphics_setScalingTypes()
+{
+  if (scaling_types == NULL)
+  {
+    int i;
+
+    for (i = 0; scaling_types_list[i].value != NULL; i++)
+    {
+      TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED);
+      char identifier[32], name[32];
+      char *value = scaling_types_list[i].value;
+      char *text = scaling_types_list[i].text;
+
+      ti->node_top = &scaling_types;
+      ti->sort_priority = i;
+
+      sprintf(identifier, "%s", value);
+      sprintf(name, "%s", text);
+
+      setString(&ti->identifier, identifier);
+      setString(&ti->name, name);
+      setString(&ti->name_sorting, name);
+      setString(&ti->infotext, "Anti-Aliasing");
+
+      pushTreeInfo(&scaling_types, ti);
+    }
+
+    /* sort scaling type values to start with lowest scaling type value */
+    sortTreeInfo(&scaling_types);
+
+    /* set current scaling type value to configured scaling type value */
+    scaling_type_current =
+      getTreeInfoFromIdentifier(scaling_types, setup.window_scaling_quality);
+
+    /* if that fails, set current scaling type to reliable default value */
+    if (scaling_type_current == NULL)
+      scaling_type_current =
+       getTreeInfoFromIdentifier(scaling_types, SCALING_QUALITY_DEFAULT);
+
+    /* if that also fails, set current scaling type to first available value */
+    if (scaling_type_current == NULL)
+      scaling_type_current = scaling_types;
+  }
+
+  setup.window_scaling_quality = scaling_type_current->identifier;
+
+  /* needed for displaying scaling type text instead of identifier */
+  scaling_type_text = scaling_type_current->name;
+}
+
+static void execSetupGraphics_setScreenModes()
+{
+  // if (screen_modes == NULL && video.fullscreen_available)
+  if (screen_modes == NULL && video.fullscreen_modes != NULL)
+  {
+    int i;
+
+    for (i = 0; video.fullscreen_modes[i].width != -1; i++)
+    {
+      TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED);
+      char identifier[32], name[32];
+      int x = video.fullscreen_modes[i].width;
+      int y = video.fullscreen_modes[i].height;
       int xx, yy;
 
       get_aspect_ratio_from_screen_mode(&video.fullscreen_modes[i], &xx, &yy);
@@ -4102,27 +4636,115 @@ static void execSetupGraphics()
       video.fullscreen_available = FALSE;
   }
 
-  if (video.fullscreen_available)
+  // if (video.fullscreen_available)
+  if (screen_mode_current != NULL)
   {
     setup.fullscreen_mode = screen_mode_current->identifier;
 
     /* needed for displaying screen mode name instead of identifier */
     screen_mode_text = screen_mode_current->name;
   }
+}
+
+static void execSetupGraphics()
+{
+  if (setup_mode == SETUP_MODE_CHOOSE_WINDOW_SIZE)
+  {
+    // update "setup.window_scaling_percent" from list selection
+    execSetupGraphics_setWindowSizes(FALSE);
+  }
+  else
+  {
+    // update list selection from "setup.window_scaling_percent"
+    execSetupGraphics_setWindowSizes(TRUE);
+  }
+
+  execSetupGraphics_setScalingTypes();
+  execSetupGraphics_setScreenModes();
+
+  setup_mode = SETUP_MODE_GRAPHICS;
+
+  DrawSetupScreen();
+
+#if defined(TARGET_SDL2)
+  // window scaling may have changed at this point
+  ToggleFullscreenOrChangeWindowScalingIfNeeded();
+
+  // window scaling quality may have changed at this point
+  if (!strEqual(setup.window_scaling_quality, video.window_scaling_quality))
+    SDLSetWindowScalingQuality(setup.window_scaling_quality);
+#endif
+}
+
+#if !defined(PLATFORM_ANDROID)
+#if defined(TARGET_SDL2)
+static void execSetupChooseWindowSize()
+{
+#if 0
+  if (!video.window_scaling_available)
+    return;
+#endif
+
+  setup_mode = SETUP_MODE_CHOOSE_WINDOW_SIZE;
+
+  DrawSetupScreen();
+}
+
+static void execSetupChooseScalingType()
+{
+  setup_mode = SETUP_MODE_CHOOSE_SCALING_TYPE;
+
+  DrawSetupScreen();
+}
+#else
+static void execSetupChooseScreenMode()
+{
+  if (!video.fullscreen_available)
+    return;
+
+  setup_mode = SETUP_MODE_CHOOSE_SCREEN_MODE;
+
+  DrawSetupScreen();
+}
+#endif
+#endif
+
+static void execSetupChooseVolumeSimple()
+{
+  setup_mode = SETUP_MODE_CHOOSE_VOLUME_SIMPLE;
+
+  DrawSetupScreen();
+}
+
+static void execSetupChooseVolumeLoops()
+{
+  setup_mode = SETUP_MODE_CHOOSE_VOLUME_LOOPS;
+
+  DrawSetupScreen();
+}
+
+static void execSetupChooseVolumeMusic()
+{
+  setup_mode = SETUP_MODE_CHOOSE_VOLUME_MUSIC;
+
+  DrawSetupScreen();
+}
 
+static void execSetupSound()
+{
 #if 1
-  if (scroll_delays == NULL)
+  if (volumes_simple == NULL)
   {
     int i;
 
-    for (i = 0; scroll_delays_list[i].value != -1; i++)
+    for (i = 0; volumes_list[i].value != -1; i++)
     {
       TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED);
       char identifier[32], name[32];
-      int value = scroll_delays_list[i].value;
-      char *text = scroll_delays_list[i].text;
+      int value = volumes_list[i].value;
+      char *text = volumes_list[i].text;
 
-      ti->node_top = &scroll_delays;
+      ti->node_top = &volumes_simple;
       ti->sort_priority = value;
 
       sprintf(identifier, "%d", value);
@@ -4131,58 +4753,290 @@ static void execSetupGraphics()
       setString(&ti->identifier, identifier);
       setString(&ti->name, name);
       setString(&ti->name_sorting, name);
-      setString(&ti->infotext, "Scroll Delay");
+      setString(&ti->infotext, "Sound Volume");
 
-      pushTreeInfo(&scroll_delays, ti);
+      pushTreeInfo(&volumes_simple, ti);
     }
 
-    /* sort scroll delay values to start with lowest scroll delay value */
-    sortTreeInfo(&scroll_delays);
+    /* sort volume values to start with lowest volume value */
+    sortTreeInfo(&volumes_simple);
 
-    /* set current scroll delay value to configured scroll delay value */
-    scroll_delay_current =
-      getTreeInfoFromIdentifier(scroll_delays,i_to_a(setup.scroll_delay_value));
+    /* set current volume value to configured volume value */
+    volume_simple_current =
+      getTreeInfoFromIdentifier(volumes_simple,i_to_a(setup.volume_simple));
 
-    /* if that fails, set current scroll delay to reliable default value */
-    if (scroll_delay_current == NULL)
-      scroll_delay_current =
-       getTreeInfoFromIdentifier(scroll_delays, i_to_a(STD_SCROLL_DELAY));
+    /* if that fails, set current volume to reliable default value */
+    if (volume_simple_current == NULL)
+      volume_simple_current =
+       getTreeInfoFromIdentifier(volumes_simple, i_to_a(100));
 
-    /* if that also fails, set current scroll delay to first available value */
-    if (scroll_delay_current == NULL)
-      scroll_delay_current = scroll_delays;
+    /* if that also fails, set current volume to first available value */
+    if (volume_simple_current == NULL)
+      volume_simple_current = volumes_simple;
   }
 
-  setup.scroll_delay_value = atoi(scroll_delay_current->identifier);
+  if (volumes_loops == NULL)
+  {
+    int i;
 
-  /* needed for displaying scroll delay text instead of identifier */
-  scroll_delay_text = scroll_delay_current->name;
+    for (i = 0; volumes_list[i].value != -1; i++)
+    {
+      TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED);
+      char identifier[32], name[32];
+      int value = volumes_list[i].value;
+      char *text = volumes_list[i].text;
+
+      ti->node_top = &volumes_loops;
+      ti->sort_priority = value;
+
+      sprintf(identifier, "%d", value);
+      sprintf(name, "%s", text);
+
+      setString(&ti->identifier, identifier);
+      setString(&ti->name, name);
+      setString(&ti->name_sorting, name);
+      setString(&ti->infotext, "Loops Volume");
+
+      pushTreeInfo(&volumes_loops, ti);
+    }
+
+    /* sort volume values to start with lowest volume value */
+    sortTreeInfo(&volumes_loops);
+
+    /* set current volume value to configured volume value */
+    volume_loops_current =
+      getTreeInfoFromIdentifier(volumes_loops,i_to_a(setup.volume_loops));
+
+    /* if that fails, set current volume to reliable default value */
+    if (volume_loops_current == NULL)
+      volume_loops_current =
+       getTreeInfoFromIdentifier(volumes_loops, i_to_a(100));
+
+    /* if that also fails, set current volume to first available value */
+    if (volume_loops_current == NULL)
+      volume_loops_current = volumes_loops;
+  }
+
+  if (volumes_music == NULL)
+  {
+    int i;
+
+    for (i = 0; volumes_list[i].value != -1; i++)
+    {
+      TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED);
+      char identifier[32], name[32];
+      int value = volumes_list[i].value;
+      char *text = volumes_list[i].text;
+
+      ti->node_top = &volumes_music;
+      ti->sort_priority = value;
+
+      sprintf(identifier, "%d", value);
+      sprintf(name, "%s", text);
+
+      setString(&ti->identifier, identifier);
+      setString(&ti->name, name);
+      setString(&ti->name_sorting, name);
+      setString(&ti->infotext, "Music Volume");
+
+      pushTreeInfo(&volumes_music, ti);
+    }
+
+    /* sort volume values to start with lowest volume value */
+    sortTreeInfo(&volumes_music);
+
+    /* set current volume value to configured volume value */
+    volume_music_current =
+      getTreeInfoFromIdentifier(volumes_music,i_to_a(setup.volume_music));
+
+    /* if that fails, set current volume to reliable default value */
+    if (volume_music_current == NULL)
+      volume_music_current =
+       getTreeInfoFromIdentifier(volumes_music, i_to_a(100));
+
+    /* if that also fails, set current volume to first available value */
+    if (volume_music_current == NULL)
+      volume_music_current = volumes_music;
+  }
+
+  setup.volume_simple = atoi(volume_simple_current->identifier);
+  setup.volume_loops  = atoi(volume_loops_current->identifier);
+  setup.volume_music  = atoi(volume_music_current->identifier);
+
+  /* needed for displaying volume text instead of identifier */
+  volume_simple_text = volume_simple_current->name;
+  volume_loops_text = volume_loops_current->name;
+  volume_music_text = volume_music_current->name;
 #endif
 
-  setup_mode = SETUP_MODE_GRAPHICS;
+  setup_mode = SETUP_MODE_SOUND;
+
   DrawSetupScreen();
 }
 
-static void execSetupChooseScreenMode()
+static void execSetupChooseTouchControls()
 {
-  if (!video.fullscreen_available)
-    return;
+  setup_mode = SETUP_MODE_CHOOSE_TOUCH_CONTROL;
 
-  setup_mode = SETUP_MODE_CHOOSE_SCREEN_MODE;
+  DrawSetupScreen();
+}
+
+static void execSetupChooseMoveDistance()
+{
+  setup_mode = SETUP_MODE_CHOOSE_MOVE_DISTANCE;
 
   DrawSetupScreen();
 }
 
-static void execSetupChooseScrollDelay()
+static void execSetupChooseDropDistance()
 {
-  setup_mode = SETUP_MODE_CHOOSE_SCROLL_DELAY;
+  setup_mode = SETUP_MODE_CHOOSE_DROP_DISTANCE;
 
   DrawSetupScreen();
 }
 
-static void execSetupSound()
+static void execSetupTouch()
 {
-  setup_mode = SETUP_MODE_SOUND;
+#if 1
+  if (touch_controls == NULL)
+  {
+    int i;
+
+    for (i = 0; touch_controls_list[i].value != NULL; i++)
+    {
+      TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED);
+      char identifier[32], name[32];
+      char *value = touch_controls_list[i].value;
+      char *text = touch_controls_list[i].text;
+
+      ti->node_top = &touch_controls;
+      ti->sort_priority = i;
+
+      sprintf(identifier, "%s", value);
+      sprintf(name, "%s", text);
+
+      setString(&ti->identifier, identifier);
+      setString(&ti->name, name);
+      setString(&ti->name_sorting, name);
+      setString(&ti->infotext, "Control Type");
+
+      pushTreeInfo(&touch_controls, ti);
+    }
+
+    /* sort touch control values to start with lowest touch control value */
+    sortTreeInfo(&touch_controls);
+
+    /* set current touch control value to configured touch control value */
+    touch_control_current =
+      getTreeInfoFromIdentifier(touch_controls, setup.touch.control_type);
+
+    /* if that fails, set current touch control to reliable default value */
+    if (touch_control_current == NULL)
+      touch_control_current =
+       getTreeInfoFromIdentifier(touch_controls, TOUCH_CONTROL_DEFAULT);
+
+    /* if that also fails, set current touch control to first available value */
+    if (touch_control_current == NULL)
+      touch_control_current = touch_controls;
+  }
+
+  if (move_distances == NULL)
+  {
+    int i;
+
+    for (i = 0; distances_list[i].value != -1; i++)
+    {
+      TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED);
+      char identifier[32], name[32];
+      int value = distances_list[i].value;
+      char *text = distances_list[i].text;
+
+      ti->node_top = &move_distances;
+      ti->sort_priority = value;
+
+      sprintf(identifier, "%d", value);
+      sprintf(name, "%s", text);
+
+      setString(&ti->identifier, identifier);
+      setString(&ti->name, name);
+      setString(&ti->name_sorting, name);
+      setString(&ti->infotext, "Move Distance");
+
+      pushTreeInfo(&move_distances, ti);
+    }
+
+    /* sort distance values to start with lowest distance value */
+    sortTreeInfo(&move_distances);
+
+    /* set current distance value to configured distance value */
+    move_distance_current =
+      getTreeInfoFromIdentifier(move_distances,
+                               i_to_a(setup.touch.move_distance));
+
+    /* if that fails, set current distance to reliable default value */
+    if (move_distance_current == NULL)
+      move_distance_current =
+       getTreeInfoFromIdentifier(move_distances, i_to_a(1));
+
+    /* if that also fails, set current distance to first available value */
+    if (move_distance_current == NULL)
+      move_distance_current = move_distances;
+  }
+
+  if (drop_distances == NULL)
+  {
+    int i;
+
+    for (i = 0; distances_list[i].value != -1; i++)
+    {
+      TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED);
+      char identifier[32], name[32];
+      int value = distances_list[i].value;
+      char *text = distances_list[i].text;
+
+      ti->node_top = &drop_distances;
+      ti->sort_priority = value;
+
+      sprintf(identifier, "%d", value);
+      sprintf(name, "%s", text);
+
+      setString(&ti->identifier, identifier);
+      setString(&ti->name, name);
+      setString(&ti->name_sorting, name);
+      setString(&ti->infotext, "Drop Distance");
+
+      pushTreeInfo(&drop_distances, ti);
+    }
+
+    /* sort distance values to start with lowest distance value */
+    sortTreeInfo(&drop_distances);
+
+    /* set current distance value to configured distance value */
+    drop_distance_current =
+      getTreeInfoFromIdentifier(drop_distances,
+                               i_to_a(setup.touch.drop_distance));
+
+    /* if that fails, set current distance to reliable default value */
+    if (drop_distance_current == NULL)
+      drop_distance_current =
+       getTreeInfoFromIdentifier(drop_distances, i_to_a(1));
+
+    /* if that also fails, set current distance to first available value */
+    if (drop_distance_current == NULL)
+      drop_distance_current = drop_distances;
+  }
+
+  setup.touch.control_type = touch_control_current->identifier;
+  setup.touch.move_distance = atoi(move_distance_current->identifier);
+  setup.touch.drop_distance = atoi(drop_distance_current->identifier);
+
+  /* needed for displaying volume text instead of identifier */
+  touch_controls_text = touch_control_current->name;
+  move_distance_text = move_distance_current->name;
+  drop_distance_text = drop_distance_current->name;
+#endif
+
+  setup_mode = SETUP_MODE_TOUCH;
 
   DrawSetupScreen();
 }
@@ -4303,7 +5157,12 @@ static struct TokenInfo setup_info_main[] =
   { TYPE_ENTER_MENU,   execSetupGraphics,      "Graphics"              },
   { TYPE_ENTER_MENU,   execSetupSound,         "Sound & Music"         },
   { TYPE_ENTER_MENU,   execSetupArtwork,       "Custom Artwork"        },
+#if !defined(PLATFORM_ANDROID)
   { TYPE_ENTER_MENU,   execSetupInput,         "Input Devices"         },
+  { TYPE_ENTER_MENU,   execSetupTouch,         "Touch Controls"        },
+#else
+  { TYPE_ENTER_MENU,   execSetupTouch,         "Touch Controls"        },
+#endif
   { TYPE_ENTER_MENU,   execSetupShortcuts,     "Key Shortcuts"         },
   { TYPE_EMPTY,                NULL,                   ""                      },
   { TYPE_LEAVE_MENU,   execExitSetup,          "Exit"                  },
@@ -4322,6 +5181,10 @@ static struct TokenInfo setup_info_game[] =
   { TYPE_SWITCH,       &setup.autorecord,      "Auto-Record Tapes:"    },
   { TYPE_ENTER_LIST,   execSetupChooseGameSpeed, "Game Speed:"         },
   { TYPE_STRING,       &game_speed_text,       ""                      },
+#if 1
+  { TYPE_ENTER_LIST,   execSetupChooseScrollDelay, "Scroll Delay:"     },
+  { TYPE_STRING,       &scroll_delay_text,     ""                      },
+#endif
   { TYPE_EMPTY,                NULL,                   ""                      },
   { TYPE_LEAVE_MENU,   execSetupMain,          "Back"                  },
 
@@ -4363,14 +5226,27 @@ static struct TokenInfo setup_info_editor[] =
 
 static struct TokenInfo setup_info_graphics[] =
 {
+#if !defined(PLATFORM_ANDROID)
   { TYPE_SWITCH,       &setup.fullscreen,      "Fullscreen:"           },
+#if defined(TARGET_SDL2)
+  { TYPE_ENTER_LIST,   execSetupChooseWindowSize, "Window Scaling:"    },
+  { TYPE_STRING,       &window_size_text,      ""                      },
+#if 1
+  { TYPE_ENTER_LIST,   execSetupChooseScalingType, "Anti-Aliasing:"    },
+  { TYPE_STRING,       &scaling_type_text,     ""                      },
+#endif
+#else
   { TYPE_ENTER_LIST,   execSetupChooseScreenMode, "Fullscreen Mode:"   },
   { TYPE_STRING,       &screen_mode_text,      ""                      },
+#endif
+#endif
 #if 0
   { TYPE_SWITCH,       &setup.scroll_delay,    "Scroll Delay:"         },
 #endif
-  { TYPE_ENTER_LIST,   execSetupChooseScrollDelay, "Scroll Delay Value:" },
+#if 0
+  { TYPE_ENTER_LIST,   execSetupChooseScrollDelay, "Scroll Delay:"     },
   { TYPE_STRING,       &scroll_delay_text,     ""                      },
+#endif
 #if 0
   { TYPE_SWITCH,       &setup.soft_scrolling,  "Soft Scrolling:"       },
 #endif
@@ -4394,6 +5270,13 @@ static struct TokenInfo setup_info_sound[] =
   { TYPE_SWITCH,       &setup.sound_loops,     "Sound Effects (Looping):" },
   { TYPE_SWITCH,       &setup.sound_music,     "Music:"                },
   { TYPE_EMPTY,                NULL,                   ""                      },
+  { TYPE_ENTER_LIST,   execSetupChooseVolumeSimple, "Sound Volume (Normal):" },
+  { TYPE_STRING,       &volume_simple_text,    ""                      },
+  { TYPE_ENTER_LIST,   execSetupChooseVolumeLoops, "Sound Volume (Looping):" },
+  { TYPE_STRING,       &volume_loops_text,     ""                      },
+  { TYPE_ENTER_LIST,   execSetupChooseVolumeMusic, "Music Volume:"     },
+  { TYPE_STRING,       &volume_music_text,     ""                      },
+  { TYPE_EMPTY,                NULL,                   ""                      },
   { TYPE_LEAVE_MENU,   execSetupMain,          "Back"                  },
 
   { 0,                 NULL,                   NULL                    }
@@ -4451,6 +5334,21 @@ static struct TokenInfo setup_info_input[] =
   { 0,                 NULL,                   NULL                    }
 };
 
+static struct TokenInfo setup_info_touch[] =
+{
+  { TYPE_ENTER_LIST,   execSetupChooseTouchControls, "Touch Control Type:" },
+  { TYPE_STRING,       &touch_controls_text,   ""                      },
+  { TYPE_EMPTY,                NULL,                   ""                      },
+  { TYPE_ENTER_LIST,   execSetupChooseMoveDistance, "Move Trigger Distance:" },
+  { TYPE_STRING,       &move_distance_text,    ""                      },
+  { TYPE_ENTER_LIST,   execSetupChooseDropDistance, "Drop Trigger Distance:" },
+  { TYPE_STRING,       &drop_distance_text,    ""                      },
+  { TYPE_EMPTY,                NULL,                   ""                      },
+  { TYPE_LEAVE_MENU,   execSetupMain,          "Back"                  },
+
+  { 0,                 NULL,                   NULL                    }
+};
+
 static struct TokenInfo setup_info_shortcuts[] =
 {
   { TYPE_ENTER_MENU,   execSetupShortcuts1,    "Various Keys"          },
@@ -4627,6 +5525,123 @@ static int getSetupValueFont(int type, void *value)
     return FONT_VALUE_1;
 }
 
+#if 1
+static void drawSetupValue(int screen_pos, int setup_info_pos_raw)
+{
+  int si_pos = (setup_info_pos_raw < 0 ? screen_pos : setup_info_pos_raw);
+  struct TokenInfo *si = &setup_info[si_pos];
+  boolean font_draw_xoffset_modified = FALSE;
+  int font_draw_xoffset_old = -1;
+  int xoffset = (num_setup_info < max_setup_info ? -1 : 0);
+  int menu_screen_value_xpos = MENU_SCREEN_VALUE_XPOS + xoffset;
+  int menu_screen_max_xpos = MENU_SCREEN_MAX_XPOS + xoffset;
+  int xpos = menu_screen_value_xpos;
+  int ypos = MENU_SCREEN_START_YPOS + screen_pos;
+  int startx = mSX + xpos * 32;
+  int starty = mSY + ypos * 32;
+  int font_nr, font_width;
+#if 0
+  int font_height;
+#endif
+  int type = si->type;
+  void *value = si->value;
+  char *value_string = getSetupValue(type, value);
+#if 1
+  int i;
+#endif
+
+  if (value_string == NULL)
+    return;
+
+  if (type & TYPE_KEY)
+  {
+    xpos = MENU_SCREEN_START_XPOS;
+
+    if (type & TYPE_QUERY)
+      value_string = "<press key>";
+  }
+  else if (type & TYPE_STRING)
+  {
+    int max_value_len = (SCR_FIELDX - 2) * 2;
+
+    xpos = MENU_SCREEN_START_XPOS;
+
+    if (strlen(value_string) > max_value_len)
+      value_string[max_value_len] = '\0';
+  }
+  else if (type & TYPE_YES_NO_AUTO)
+  {
+    xpos = menu_screen_value_xpos - 1;
+  }
+
+  startx = mSX + xpos * 32;
+  starty = mSY + ypos * 32;
+  font_nr = getSetupValueFont(type, value);
+  font_width = getFontWidth(font_nr);
+#if 0
+  font_height = getFontHeight(font_nr);
+#endif
+
+#if 0
+  if (menu_screen_value_xpos < 1 + MAX_MENU_TEXT_LENGTH_BIG)
+    font_nr = ...;
+#endif
+
+  /* downward compatibility correction for Juergen Bonhagen's menu settings */
+  if (setup_mode != SETUP_MODE_INPUT)
+  {
+    int max_menu_text_length_big = (menu_screen_value_xpos -
+                                   MENU_SCREEN_START_XPOS);
+    int max_menu_text_length_medium = max_menu_text_length_big * 2;
+    int check_font_nr = FONT_OPTION_ON; /* known font that needs correction */
+    int font1_xoffset = getFontBitmapInfo(font_nr)->draw_xoffset;
+    int font2_xoffset = getFontBitmapInfo(check_font_nr)->draw_xoffset;
+    int text_startx = mSX + MENU_SCREEN_START_XPOS * 32;
+    int text_font_nr = getSetupTextFont(FONT_MENU_2);
+    int text_font_xoffset = getFontBitmapInfo(text_font_nr)->draw_xoffset;
+    int text_width = max_menu_text_length_medium * getFontWidth(text_font_nr);
+    boolean correct_font_draw_xoffset = FALSE;
+
+    if (xpos == MENU_SCREEN_START_XPOS &&
+       startx + font1_xoffset < text_startx + text_font_xoffset)
+      correct_font_draw_xoffset = TRUE;
+
+    if (xpos == menu_screen_value_xpos &&
+       startx + font2_xoffset < text_startx + text_width + text_font_xoffset)
+      correct_font_draw_xoffset = TRUE;
+
+    /* check if setup value would overlap with setup text when printed */
+    /* (this can happen for extreme/wrong values for font draw offset) */
+    if (correct_font_draw_xoffset)
+    {
+      font_draw_xoffset_old = getFontBitmapInfo(font_nr)->draw_xoffset;
+      font_draw_xoffset_modified = TRUE;
+
+      if (type & TYPE_KEY)
+       getFontBitmapInfo(font_nr)->draw_xoffset += 2 * getFontWidth(font_nr);
+      else if (!(type & TYPE_STRING))
+       getFontBitmapInfo(font_nr)->draw_xoffset = text_font_xoffset + 20 -
+         max_menu_text_length_medium * (16 - getFontWidth(text_font_nr));
+    }
+  }
+
+#if 0
+  DrawBackground(startx, starty, SX + SXSIZE - startx, font_height);
+#else
+  for (i = 0; i <= menu_screen_max_xpos - xpos; i++)
+    DrawText(startx + i * font_width, starty, " ", font_nr);
+#endif
+
+  // printf("::: startx == %d\n", startx);
+
+  DrawText(startx, starty, value_string, font_nr);
+
+  if (font_draw_xoffset_modified)
+    getFontBitmapInfo(font_nr)->draw_xoffset = font_draw_xoffset_old;
+}
+
+#else
+
 static void drawSetupValue(int pos)
 {
   boolean font_draw_xoffset_modified = FALSE;
@@ -4635,7 +5650,10 @@ static void drawSetupValue(int pos)
   int ypos = MENU_SCREEN_START_YPOS + pos;
   int startx = mSX + xpos * 32;
   int starty = mSY + ypos * 32;
-  int font_nr, font_width, font_height;
+  int font_nr, font_width;
+#if 0
+  int font_height;
+#endif
   int type = setup_info[pos].type;
   void *value = setup_info[pos].value;
   char *value_string = getSetupValue(type, value);
@@ -4671,7 +5689,9 @@ static void drawSetupValue(int pos)
   starty = mSY + ypos * 32;
   font_nr = getSetupValueFont(type, value);
   font_width = getFontWidth(font_nr);
+#if 0
   font_height = getFontHeight(font_nr);
+#endif
 
   /* downward compatibility correction for Juergen Bonhagen's menu settings */
   if (setup_mode != SETUP_MODE_INPUT)
@@ -4720,6 +5740,48 @@ static void drawSetupValue(int pos)
   if (font_draw_xoffset_modified)
     getFontBitmapInfo(font_nr)->draw_xoffset = font_draw_xoffset_old;
 }
+#endif
+
+#if 1
+static void changeSetupValue(int screen_pos, int setup_info_pos_raw, int dx)
+{
+  int si_pos = (setup_info_pos_raw < 0 ? screen_pos : setup_info_pos_raw);
+  struct TokenInfo *si = &setup_info[si_pos];
+
+  if (si->type & TYPE_BOOLEAN_STYLE)
+  {
+    *(boolean *)si->value ^= TRUE;
+  }
+  else if (si->type & TYPE_YES_NO_AUTO)
+  {
+    *(int *)si->value =
+      (dx == -1 ?
+       (*(int *)si->value == AUTO ? TRUE :
+       *(int *)si->value == TRUE ? FALSE : AUTO) :
+       (*(int *)si->value == TRUE ? AUTO :
+       *(int *)si->value == AUTO ? FALSE : TRUE));
+  }
+  else if (si->type & TYPE_KEY)
+  {
+    Key key;
+
+    si->type |= TYPE_QUERY;
+    drawSetupValue(screen_pos, setup_info_pos_raw);
+    si->type &= ~TYPE_QUERY;
+
+    key = getSetupKey();
+    if (key != KSYM_UNDEFINED)
+      *(Key *)si->value = key;
+  }
+
+  drawSetupValue(screen_pos, setup_info_pos_raw);
+
+  // fullscreen state may have changed at this point
+  if (si->value == &setup.fullscreen)
+    ToggleFullscreenOrChangeWindowScalingIfNeeded();
+}
+
+#else
 
 static void changeSetupValue(int pos, int dx)
 {
@@ -4741,7 +5803,7 @@ static void changeSetupValue(int pos, int dx)
     Key key;
 
     setup_info[pos].type |= TYPE_QUERY;
-    drawSetupValue(pos);
+    drawSetupValue(pos, -1);
     setup_info[pos].type &= ~TYPE_QUERY;
 
     key = getSetupKey();
@@ -4749,9 +5811,36 @@ static void changeSetupValue(int pos, int dx)
       *(Key *)setup_info[pos].value = key;
   }
 
-  drawSetupValue(pos);
+  drawSetupValue(pos, -1);
+
+  // fullscreen state may have changed at this point
+  if (setup_info[pos].value == &setup.fullscreen)
+    ToggleFullscreenOrChangeWindowScalingIfNeeded();
+}
+#endif
+
+#if 1
+static void DrawCursorAndText_Setup(int screen_pos, int setup_info_pos_raw,
+                                   boolean active)
+{
+  int si_pos = (setup_info_pos_raw < 0 ? screen_pos : setup_info_pos_raw);
+  struct TokenInfo *si = &setup_info[si_pos];
+  int xpos = MENU_SCREEN_START_XPOS;
+  int ypos = MENU_SCREEN_START_YPOS + screen_pos;
+  int font_nr = getSetupTextFont(si->type);
+
+  if (setup_info == setup_info_input)
+    font_nr = FONT_MENU_1;
+
+  if (active)
+    font_nr = FONT_ACTIVE(font_nr);
+
+  DrawText(mSX + xpos * 32, mSY + ypos * 32, si->text, font_nr);
+
+  if (si->type & ~TYPE_SKIP_ENTRY)
+    drawCursor(screen_pos, active);
 }
-
+#else
 static void DrawCursorAndText_Setup(int pos, boolean active)
 {
   int xpos = MENU_SCREEN_START_XPOS;
@@ -4769,6 +5858,58 @@ static void DrawCursorAndText_Setup(int pos, boolean active)
   if (setup_info[pos].type & ~TYPE_SKIP_ENTRY)
     drawCursor(pos, active);
 }
+#endif
+
+static void drawSetupInfoList(struct TokenInfo *setup_info,
+                             int first_entry, int num_page_entries)
+{
+  int i;
+
+  if (num_page_entries > NUM_MENU_ENTRIES_ON_SCREEN)
+    num_page_entries = NUM_MENU_ENTRIES_ON_SCREEN;
+
+  if (num_page_entries > max_setup_info)
+    num_page_entries = max_setup_info;
+
+  if (first_entry + num_page_entries > max_setup_info)
+    first_entry = 0;
+
+#if 1
+  /* clear tree list area, but not title or scrollbar */
+  DrawBackground(mSX, mSY + MENU_SCREEN_START_YPOS * 32,
+                 SC_SCROLLBAR_XPOS + menu.scrollbar_xoffset,
+                 NUM_MENU_ENTRIES_ON_SCREEN * 32);
+#endif
+
+  for (i = 0; i < num_page_entries; i++)
+  {
+    int setup_info_pos = first_entry + i;
+    struct TokenInfo *si = &setup_info[setup_info_pos];
+    void *value_ptr = si->value;
+
+    /* set some entries to "unchangeable" according to other variables */
+    if ((value_ptr == &setup.sound_simple && !audio.sound_available) ||
+       (value_ptr == &setup.sound_loops  && !audio.loops_available) ||
+       (value_ptr == &setup.sound_music  && !audio.music_available) ||
+       (value_ptr == &setup.fullscreen   && !video.fullscreen_available) ||
+       (value_ptr == &screen_mode_text   && !video.fullscreen_available) ||
+       (value_ptr == &window_size_text   && !video.window_scaling_available) ||
+       (value_ptr == &scaling_type_text  && !video.window_scaling_available))
+      si->type |= TYPE_GHOSTED;
+
+    if (si->type & (TYPE_ENTER_MENU|TYPE_ENTER_LIST))
+      initCursor(i, IMG_MENU_BUTTON_ENTER_MENU);
+    else if (si->type & (TYPE_LEAVE_MENU|TYPE_LEAVE_LIST))
+      initCursor(i, IMG_MENU_BUTTON_LEAVE_MENU);
+    else if (si->type & ~TYPE_SKIP_ENTRY)
+      initCursor(i, IMG_MENU_BUTTON);
+
+    DrawCursorAndText_Setup(i, setup_info_pos, FALSE);
+
+    if (si->type & TYPE_VALUE)
+      drawSetupValue(i, setup_info_pos);
+  }
+}
 
 static void DrawSetupScreen_Generic()
 {
@@ -4777,6 +5918,12 @@ static void DrawSetupScreen_Generic()
   int i;
 
   UnmapAllGadgets();
+
+#if 1
+  FreeScreenGadgets();
+  CreateScreenGadgets();
+#endif
+
   CloseDoor(DOOR_CLOSE_2);
 
   if (redraw_mask & REDRAW_ALL)
@@ -4827,6 +5974,11 @@ static void DrawSetupScreen_Generic()
     setup_info = setup_info_artwork;
     title_string = "Custom Artwork";
   }
+  else if (setup_mode == SETUP_MODE_TOUCH)
+  {
+    setup_info = setup_info_touch;
+    title_string = "Setup Touch Ctrls";
+  }
   else if (setup_mode == SETUP_MODE_SHORTCUTS)
   {
     setup_info = setup_info_shortcuts;
@@ -4860,6 +6012,22 @@ static void DrawSetupScreen_Generic()
 
   DrawTextSCentered(mSY - SY + 16, FONT_TITLE_1, title_string);
 
+#if 1
+
+  num_setup_info = 0;
+  for (i = 0; setup_info[i].type != 0 && i < MAX_MENU_ENTRIES_ON_SCREEN; i++)
+    num_setup_info++;
+
+  max_setup_info = 0;
+  for (i = 0; setup_info[i].type != 0; i++)
+    max_setup_info++;
+
+#if 0
+  drawSetupInfoList(setup_info, 0, NUM_MENU_ENTRIES_ON_SCREEN);
+#endif
+
+#else
+
   num_setup_info = 0;
 #if 1
   for (i = 0; setup_info[i].type != 0 && i < MAX_MENU_ENTRIES_ON_SCREEN; i++)
@@ -4874,7 +6042,9 @@ static void DrawSetupScreen_Generic()
        (value_ptr == &setup.sound_loops  && !audio.loops_available) ||
        (value_ptr == &setup.sound_music  && !audio.music_available) ||
        (value_ptr == &setup.fullscreen   && !video.fullscreen_available) ||
-       (value_ptr == &screen_mode_text   && !video.fullscreen_available))
+       (value_ptr == &screen_mode_text   && !video.fullscreen_available) ||
+       (value_ptr == &window_size_text   && !video.window_scaling_available) ||
+       (value_ptr == &scaling_type_text  && !video.window_scaling_available))
       setup_info[i].type |= TYPE_GHOSTED;
 
     if (setup_info[i].type & (TYPE_ENTER_MENU|TYPE_ENTER_LIST))
@@ -4891,6 +6061,7 @@ static void DrawSetupScreen_Generic()
 
     num_setup_info++;
   }
+#endif
 
 #if 0
   DrawTextSCentered(SYSIZE - 20, FONT_TEXT_4,
@@ -4901,6 +6072,10 @@ static void DrawSetupScreen_Generic()
   HandleSetupScreen_Generic(0, 0, 0, 0, MB_MENU_INITIALIZE);
 #endif
 
+#if 1
+  MapScreenGadgets(max_setup_info);
+#endif
+
   if (redraw_all)
     redraw_mask = REDRAW_ALL;
 
@@ -4919,9 +6094,23 @@ static void DrawSetupScreen_Generic()
 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 */
+  static int first_entry_store[MAX_SETUP_MODES];
+  int choice = choice_store[setup_mode];               /* starts with 0 */
+  int first_entry = first_entry_store[setup_mode];     /* starts with 0 */
   int x = 0;
+#if 1
+  int y = choice - first_entry;
+  int y_old = y;
+#else
   int y = choice;
+#endif
+  boolean position_set_by_scrollbar = (dx == 999);
+#if 1
+  int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
+  int num_page_entries;
+
+  num_page_entries = MIN(max_setup_info, NUM_MENU_ENTRIES_ON_SCREEN);
+#endif
 
   if (button == MB_MENU_INITIALIZE)
   {
@@ -4929,21 +6118,56 @@ void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button)
     while (choice < num_setup_info &&
           setup_info[choice].type & TYPE_SKIP_ENTRY)
       choice++;
+#if 0
+    choice_store[setup_mode] = choice;
+#endif
+
+#if 1
+    if (position_set_by_scrollbar)
+      first_entry = first_entry_store[setup_mode] = dy;
+    else
+      AdjustScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL, max_setup_info,
+                     NUM_MENU_ENTRIES_ON_SCREEN, first_entry);
+
+    drawSetupInfoList(setup_info, first_entry, NUM_MENU_ENTRIES_ON_SCREEN);
+#endif
+
+#if 1
+    if (choice < first_entry)
+    {
+      choice = first_entry;
+
+      if (setup_info[choice].type & TYPE_SKIP_ENTRY)
+       choice++;
+    }
+    else if (choice > first_entry + num_page_entries - 1)
+    {
+      choice = first_entry + num_page_entries - 1;
+
+      if (setup_info[choice].type & TYPE_SKIP_ENTRY)
+       choice--;
+    }
+
     choice_store[setup_mode] = choice;
 
-    DrawCursorAndText_Setup(choice, TRUE);
+    DrawCursorAndText_Setup(choice - first_entry, choice, TRUE);
+#else
+    DrawCursorAndText_Setup(choice, -1, TRUE);
+#endif
 
     return;
   }
   else if (button == MB_MENU_LEAVE)
   {
+    int i;
+
     PlaySound(SND_MENU_ITEM_SELECTING);
 
-    for (y = 0; y < num_setup_info; y++)
+    for (i = 0; setup_info[i].type != 0; i++)
     {
-      if (setup_info[y].type & TYPE_LEAVE_MENU)
+      if (setup_info[i].type & TYPE_LEAVE_MENU)
       {
-       void (*menu_callback_function)(void) = setup_info[y].value;
+       void (*menu_callback_function)(void) = setup_info[i].value;
 
        FadeSetLeaveMenu();
 
@@ -4961,8 +6185,94 @@ void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button)
     x = (mx - mSX) / 32;
     y = (my - mSY) / 32 - MENU_SCREEN_START_YPOS;
   }
+#if 1
+  else if (dx || dy)   /* keyboard or scrollbar/scrollbutton input */
+#else
   else if (dx || dy)   /* keyboard input */
+#endif
   {
+    /* move cursor instead of scrolling when already at start/end of list */
+    if (dy == -1 * SCROLL_LINE && first_entry == 0)
+      dy = -1;
+    else if (dy == +1 * SCROLL_LINE &&
+            first_entry + num_page_entries == max_setup_info)
+      dy = 1;
+
+    /* handle scrolling screen one line or page */
+    if (y + dy < 0 ||
+       y + dy > num_page_entries - 1)
+    {
+      boolean redraw = FALSE;
+
+      if (ABS(dy) == SCROLL_PAGE)
+       step = num_page_entries - 1;
+
+      if (dy < 0 && first_entry > 0)
+      {
+       /* scroll page/line up */
+
+       first_entry -= step;
+       if (first_entry < 0)
+         first_entry = 0;
+
+       redraw = TRUE;
+      }
+      else if (dy > 0 && first_entry + num_page_entries < max_setup_info)
+      {
+       /* scroll page/line down */
+
+       first_entry += step;
+       if (first_entry + num_page_entries > max_setup_info)
+         first_entry = MAX(0, max_setup_info - num_page_entries);
+
+       redraw = TRUE;
+      }
+
+      if (redraw)
+      {
+       choice += first_entry - first_entry_store[setup_mode];
+
+       if (choice < first_entry)
+       {
+         choice = first_entry;
+
+         if (setup_info[choice].type & TYPE_SKIP_ENTRY)
+           choice++;
+       }
+       else if (choice > first_entry + num_page_entries - 1)
+       {
+         choice = first_entry + num_page_entries - 1;
+
+         if (setup_info[choice].type & TYPE_SKIP_ENTRY)
+           choice--;
+       }
+#if 1
+       else if (setup_info[choice].type & TYPE_SKIP_ENTRY)
+       {
+         choice += SIGN(dy);
+
+         if (choice < first_entry ||
+             choice > first_entry + num_page_entries - 1)
+         first_entry += SIGN(dy);
+       }
+#endif
+
+       // printf("::: MARK 1: %d\n", first_entry);
+
+       first_entry_store[setup_mode] = first_entry;
+       choice_store[setup_mode] = choice;
+
+       drawSetupInfoList(setup_info, first_entry, NUM_MENU_ENTRIES_ON_SCREEN);
+
+       DrawCursorAndText_Setup(choice - first_entry, choice, TRUE);
+
+       AdjustScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL, max_setup_info,
+                       NUM_MENU_ENTRIES_ON_SCREEN, first_entry);
+      }
+
+      return;
+    }
+
     if (dx)
     {
       int menu_navigation_type = (dx < 0 ? TYPE_LEAVE : TYPE_ENTER);
@@ -4972,29 +6282,132 @@ void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button)
          setup_info[choice].type & TYPE_YES_NO_AUTO)
        button = MB_MENU_CHOICE;
     }
+#if 1
+    else if (dy)
+      y += dy;
+#else
     else if (dy)
       y = choice + dy;
+#endif
 
     /* jump to next non-empty menu entry (up or down) */
+#if 1
+    while (first_entry + y > 0 &&
+          first_entry + y < max_setup_info - 1 &&
+          setup_info[first_entry + y].type & TYPE_SKIP_ENTRY)
+      y += dy;
+#else
     while (y > 0 && y < num_setup_info - 1 &&
-          setup_info[y].type & TYPE_SKIP_ENTRY)
+          setup_info[first_entry + y].type & TYPE_SKIP_ENTRY)
       y += dy;
+#endif
+
+    if (!IN_VIS_FIELD(x, y))
+    {
+      choice += y - y_old;
+#if 1
+      if (choice < first_entry)
+       first_entry = choice;
+      else if (choice > first_entry + num_page_entries - 1)
+       first_entry = choice - num_page_entries + 1;
+#else
+      first_entry += y - y_old;
+#endif
+
+      if (first_entry >= 0 &&
+         first_entry + num_page_entries <= max_setup_info)
+      {
+       first_entry_store[setup_mode] = first_entry;
+
+       if (choice < first_entry)
+         choice = first_entry;
+       else if (choice > first_entry + num_page_entries - 1)
+         choice = first_entry + num_page_entries - 1;
+
+       choice_store[setup_mode] = choice;
+
+       drawSetupInfoList(setup_info, first_entry, NUM_MENU_ENTRIES_ON_SCREEN);
+
+       DrawCursorAndText_Setup(choice - first_entry, choice, TRUE);
+
+       AdjustScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL, max_setup_info,
+                       NUM_MENU_ENTRIES_ON_SCREEN, first_entry);
+      }
+
+      return;
+    }
   }
 
+#if 1
+  if (!anyScrollbarGadgetActive() &&
+      IN_VIS_FIELD(x, y) &&
+      mx < screen_gadget[SCREEN_CTRL_ID_SCROLL_VERTICAL]->x &&
+      y >= 0 && y < num_page_entries)
+#else
   if (IN_VIS_FIELD(x, y) && y >= 0 && y < num_setup_info)
+#endif
   {
+#if 0
+    printf("::: TEST/HandleSetupScreen_Generic [%d, %d, %d, %d]\n", Counter(),
+          button, mx, screen_gadget[SCREEN_CTRL_ID_SCROLL_VERTICAL]->x);
+#endif
+
     if (button)
     {
+#if 1
+      if (first_entry + y != choice &&
+         setup_info[first_entry + y].type & ~TYPE_SKIP_ENTRY)
+      {
+       PlaySound(SND_MENU_ITEM_ACTIVATING);
+
+       DrawCursorAndText_Setup(choice - first_entry, choice, FALSE);
+       DrawCursorAndText_Setup(y, first_entry + y, TRUE);
+
+       choice = choice_store[setup_mode] = first_entry + y;
+      }
+#else
       if (y != choice && setup_info[y].type & ~TYPE_SKIP_ENTRY)
       {
        PlaySound(SND_MENU_ITEM_ACTIVATING);
 
-       DrawCursorAndText_Setup(choice, FALSE);
-       DrawCursorAndText_Setup(y, TRUE);
+       DrawCursorAndText_Setup(choice, -1, FALSE);
+       DrawCursorAndText_Setup(y, -1, TRUE);
 
        choice = choice_store[setup_mode] = y;
       }
+#endif
+    }
+#if 1
+    else if (!(setup_info[first_entry + y].type & TYPE_GHOSTED))
+    {
+      PlaySound(SND_MENU_ITEM_SELECTING);
+
+      /* when selecting key headline, execute function for key value change */
+      if (setup_info[first_entry + y].type & TYPE_KEYTEXT &&
+         setup_info[first_entry + y + 1].type & TYPE_KEY)
+       y++;
+
+      /* when selecting string value, execute function for list selection */
+      if (setup_info[first_entry + y].type & TYPE_STRING && y > 0 &&
+         setup_info[first_entry + y - 1].type & TYPE_ENTER_LIST)
+       y--;
+
+      if (setup_info[first_entry + y].type & TYPE_ENTER_OR_LEAVE)
+      {
+       void (*menu_callback_function)(void) =
+         setup_info[first_entry + y].value;
+
+       FadeSetFromType(setup_info[first_entry + y].type);
+
+       menu_callback_function();
+      }
+      else
+      {
+       if (setup_info[first_entry + y].type & TYPE_VALUE)
+         changeSetupValue(y, first_entry + y, dx);
+      }
     }
+#else
     else if (!(setup_info[y].type & TYPE_GHOSTED))
     {
       PlaySound(SND_MENU_ITEM_SELECTING);
@@ -5023,6 +6436,7 @@ void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button)
          changeSetupValue(y, dx);
       }
     }
+#endif
   }
 }
 
@@ -5065,7 +6479,7 @@ void DrawSetupScreen_Input()
     else if (setup_info[i].type & ~TYPE_SKIP_ENTRY)
       initCursor(i, IMG_MENU_BUTTON);
 
-    DrawCursorAndText_Setup(i, FALSE);
+    DrawCursorAndText_Setup(i, -1, FALSE);
   }
 
 #if 0
@@ -5234,7 +6648,7 @@ void HandleSetupScreen_Input(int mx, int my, int dx, int dy, int button)
   {
     drawPlayerSetupInputInfo(input_player_nr, (choice == 2));
 
-    DrawCursorAndText_Setup(choice, TRUE);
+    DrawCursorAndText_Setup(choice, -1, TRUE);
 
     return;
   }
@@ -5279,8 +6693,8 @@ void HandleSetupScreen_Input(int mx, int my, int dx, int dy, int button)
     {
       if (y != choice)
       {
-       DrawCursorAndText_Setup(choice, FALSE);
-       DrawCursorAndText_Setup(y, TRUE);
+       DrawCursorAndText_Setup(choice, -1, FALSE);
+       DrawCursorAndText_Setup(y, -1, TRUE);
 
        drawPlayerSetupInputInfo(input_player_nr, (y == 2));
 
@@ -5708,16 +7122,32 @@ void DrawSetupScreen()
     DrawSetupScreen_Input();
   else if (setup_mode == SETUP_MODE_CHOOSE_GAME_SPEED)
     DrawChooseTree(&game_speed_current);
-  else if (setup_mode == SETUP_MODE_CHOOSE_SCREEN_MODE)
-    DrawChooseTree(&screen_mode_current);
   else if (setup_mode == SETUP_MODE_CHOOSE_SCROLL_DELAY)
     DrawChooseTree(&scroll_delay_current);
+  else if (setup_mode == SETUP_MODE_CHOOSE_SCREEN_MODE)
+    DrawChooseTree(&screen_mode_current);
+  else if (setup_mode == SETUP_MODE_CHOOSE_WINDOW_SIZE)
+    DrawChooseTree(&window_size_current);
+  else if (setup_mode == SETUP_MODE_CHOOSE_SCALING_TYPE)
+    DrawChooseTree(&scaling_type_current);
   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 if (setup_mode == SETUP_MODE_CHOOSE_VOLUME_SIMPLE)
+    DrawChooseTree(&volume_simple_current);
+  else if (setup_mode == SETUP_MODE_CHOOSE_VOLUME_LOOPS)
+    DrawChooseTree(&volume_loops_current);
+  else if (setup_mode == SETUP_MODE_CHOOSE_VOLUME_MUSIC)
+    DrawChooseTree(&volume_music_current);
+  else if (setup_mode == SETUP_MODE_CHOOSE_TOUCH_CONTROL)
+    DrawChooseTree(&touch_control_current);
+  else if (setup_mode == SETUP_MODE_CHOOSE_MOVE_DISTANCE)
+    DrawChooseTree(&move_distance_current);
+  else if (setup_mode == SETUP_MODE_CHOOSE_DROP_DISTANCE)
+    DrawChooseTree(&drop_distance_current);
   else
     DrawSetupScreen_Generic();
 
@@ -5727,8 +7157,19 @@ void DrawSetupScreen()
 
 void RedrawSetupScreenAfterFullscreenToggle()
 {
+#if 1
+  if (setup_mode == SETUP_MODE_GRAPHICS ||
+      setup_mode == SETUP_MODE_CHOOSE_WINDOW_SIZE)
+  {
+    // update list selection from "setup.window_scaling_percent"
+    execSetupGraphics_setWindowSizes(TRUE);
+
+    DrawSetupScreen();
+  }
+#else
   if (setup_mode == SETUP_MODE_GRAPHICS)
     DrawSetupScreen();
+#endif
 }
 
 void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
@@ -5737,20 +7178,38 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
     HandleSetupScreen_Input(mx, my, dx, dy, button);
   else if (setup_mode == SETUP_MODE_CHOOSE_GAME_SPEED)
     HandleChooseTree(mx, my, dx, dy, button, &game_speed_current);
-  else if (setup_mode == SETUP_MODE_CHOOSE_SCREEN_MODE)
-    HandleChooseTree(mx, my, dx, dy, button, &screen_mode_current);
   else if (setup_mode == SETUP_MODE_CHOOSE_SCROLL_DELAY)
     HandleChooseTree(mx, my, dx, dy, button, &scroll_delay_current);
+  else if (setup_mode == SETUP_MODE_CHOOSE_SCREEN_MODE)
+    HandleChooseTree(mx, my, dx, dy, button, &screen_mode_current);
+  else if (setup_mode == SETUP_MODE_CHOOSE_WINDOW_SIZE)
+    HandleChooseTree(mx, my, dx, dy, button, &window_size_current);
+  else if (setup_mode == SETUP_MODE_CHOOSE_SCALING_TYPE)
+    HandleChooseTree(mx, my, dx, dy, button, &scaling_type_current);
   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 if (setup_mode == SETUP_MODE_CHOOSE_VOLUME_SIMPLE)
+    HandleChooseTree(mx, my, dx, dy, button, &volume_simple_current);
+  else if (setup_mode == SETUP_MODE_CHOOSE_VOLUME_LOOPS)
+    HandleChooseTree(mx, my, dx, dy, button, &volume_loops_current);
+  else if (setup_mode == SETUP_MODE_CHOOSE_VOLUME_MUSIC)
+    HandleChooseTree(mx, my, dx, dy, button, &volume_music_current);
+  else if (setup_mode == SETUP_MODE_CHOOSE_TOUCH_CONTROL)
+    HandleChooseTree(mx, my, dx, dy, button, &touch_control_current);
+  else if (setup_mode == SETUP_MODE_CHOOSE_MOVE_DISTANCE)
+    HandleChooseTree(mx, my, dx, dy, button, &move_distance_current);
+  else if (setup_mode == SETUP_MODE_CHOOSE_DROP_DISTANCE)
+    HandleChooseTree(mx, my, dx, dy, button, &drop_distance_current);
   else
     HandleSetupScreen_Generic(mx, my, dx, dy, button);
 
+#if 0
   DoAnimation();
+#endif
 }
 
 void HandleGameActions()
@@ -5773,13 +7232,13 @@ static void getScreenMenuButtonPos(int *x, int *y, int gadget_id)
   {
 #if 1
     case SCREEN_CTRL_ID_PREV_LEVEL:
-      *x = mSX + menu.main.button.prev_level.x;
-      *y = mSY + menu.main.button.prev_level.y;
+      *x = mSX + GDI_ACTIVE_POS(menu.main.button.prev_level.x);
+      *y = mSY + GDI_ACTIVE_POS(menu.main.button.prev_level.y);
       break;
 
     case SCREEN_CTRL_ID_NEXT_LEVEL:
-      *x = mSX + menu.main.button.next_level.x;
-      *y = mSY + menu.main.button.next_level.y;
+      *x = mSX + GDI_ACTIVE_POS(menu.main.button.next_level.x);
+      *y = mSY + GDI_ACTIVE_POS(menu.main.button.next_level.y);
       break;
 #else
     case SCREEN_CTRL_ID_PREV_LEVEL:
@@ -5879,11 +7338,7 @@ static struct
 
 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;
@@ -5892,11 +7347,7 @@ static struct
 } 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
 #if 1
     -1, -1,    /* these values are not constant, but can change at runtime */
     -1, -1,    /* these values are not constant, but can change at runtime */
@@ -5913,7 +7364,7 @@ static struct
 static void CreateScreenMenubuttons()
 {
   struct GadgetInfo *gi;
-  unsigned long event_mask;
+  unsigned int event_mask;
   int i;
 
   for (i = 0; i < NUM_SCREEN_MENUBUTTONS; i++)
@@ -5966,7 +7417,7 @@ static void CreateScreenMenubuttons()
 static void CreateScreenScrollbuttons()
 {
   struct GadgetInfo *gi;
-  unsigned long event_mask;
+  unsigned int event_mask;
   int i;
 
   /* these values are not constant, but can change at runtime */
@@ -6039,14 +7490,12 @@ static void CreateScreenScrollbars()
   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 x, y, width, height;
     int gd_x1, gd_x2, gd_y1, gd_y2;
     struct GadgetInfo *gi;
     int items_max, items_visible, item_position;
-    unsigned long event_mask;
+    unsigned int event_mask;
     int num_page_entries = NUM_MENU_ENTRIES_ON_SCREEN;
     int id = scrollbar_info[i].gadget_id;
 
@@ -6064,14 +7513,6 @@ static void CreateScreenScrollbars()
     items_visible = num_page_entries;
     item_position = 0;
 
-#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;
@@ -6080,7 +7521,6 @@ static void CreateScreenScrollbars()
     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,
@@ -6124,27 +7564,6 @@ void CreateScreenGadgets()
 {
   int last_game_status = game_status;  /* save current game status */
 
-#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
-
   CreateScreenMenubuttons();
 
 #if 0
@@ -6162,17 +7581,6 @@ 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]);
 }
@@ -6186,8 +7594,25 @@ void MapScreenMenuGadgets(int screen_mask)
       MapGadget(screen_gadget[menubutton_info[i].gadget_id]);
 }
 
+void MapScreenGadgets(int num_entries)
+{
+  int i;
+
+  if (num_entries <= NUM_MENU_ENTRIES_ON_SCREEN)
+    return;
+
+  for (i = 0; i < NUM_SCREEN_SCROLLBUTTONS; i++)
+    MapGadget(screen_gadget[scrollbutton_info[i].gadget_id]);
+
+  for (i = 0; i < NUM_SCREEN_SCROLLBARS; i++)
+    MapGadget(screen_gadget[scrollbar_info[i].gadget_id]);
+}
+
 void MapScreenTreeGadgets(TreeInfo *ti)
 {
+#if 1
+  MapScreenGadgets(numTreeInfoInGroup(ti));
+#else
   int num_entries = numTreeInfoInGroup(ti);
   int i;
 
@@ -6199,6 +7624,7 @@ void MapScreenTreeGadgets(TreeInfo *ti)
 
   for (i = 0; i < NUM_SCREEN_SCROLLBARS; i++)
     MapGadget(screen_gadget[scrollbar_info[i].gadget_id]);
+#endif
 }
 
 static void HandleScreenGadgets(struct GadgetInfo *gi)