fixed fading complete screen if playfield viewport has changed
[rocksndiamonds.git] / src / screens.c
index dbbd50758440729770eec943d72452c5529157d4..9c02fc9e3a7f697a1792f00656d9e77d3de7b393 100644 (file)
 #include "init.h"
 #include "config.h"
 
+
+#define DEBUG_JOYSTICKS                0
+
+
 /* screens on the info screen */
 #define INFO_MODE_MAIN                 0
 #define INFO_MODE_TITLE                        1
@@ -84,6 +88,9 @@
 #define SETUPINPUT_SCREEN_POS_EMPTY1   (SETUPINPUT_SCREEN_POS_START + 3)
 #define SETUPINPUT_SCREEN_POS_EMPTY2   (SETUPINPUT_SCREEN_POS_END - 1)
 
+#define MENU_SETUP_FONT_TITLE          FONT_TEXT_1
+#define MENU_SETUP_FONT_TEXT           FONT_TITLE_2
+
 /* for various menu stuff  */
 #define MENU_SCREEN_START_XPOS         1
 #define MENU_SCREEN_START_YPOS         2
 #define MENU_SCREEN_MAX_XPOS           (SCR_FIELDX - 1)
 #define MENU_TITLE1_YPOS               8
 #define MENU_TITLE2_YPOS               46
+#define MENU_INFO_FONT_TITLE           FONT_TEXT_1
+#define MENU_INFO_FONT_HEAD            FONT_TEXT_2
+#define MENU_INFO_FONT_TEXT            FONT_TEXT_3
+#define MENU_INFO_FONT_FOOT            FONT_TEXT_4
+#define MENU_INFO_SPACE_HEAD           (menu.headline2_spacing_info[info_mode])
 #define MENU_SCREEN_INFO_XSTART                16
 #define MENU_SCREEN_INFO_YSTART1       100
-#define MENU_SCREEN_INFO_YSTART2       128
+#define MENU_SCREEN_INFO_YSTART2       (MENU_SCREEN_INFO_YSTART1 +            \
+                                        getMenuTextStep(MENU_INFO_SPACE_HEAD, \
+                                                        MENU_INFO_FONT_TITLE))
 #define MENU_SCREEN_INFO_YSTEP         (TILEY + 4)
 #define MENU_SCREEN_INFO_YBOTTOM       (SYSIZE - 20)
 #define MENU_SCREEN_INFO_YSIZE         (MENU_SCREEN_INFO_YBOTTOM -     \
@@ -163,7 +177,7 @@ 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 ConfigureJoystick(int);
 static void execSetupGame(void);
 static void execSetupGraphics(void);
 static void execSetupSound(void);
@@ -413,7 +427,7 @@ static struct
                                 GAME_MODE_MAIN : GAME_MODE_DEFAULT)
 
 /* (there are no draw offset definitions needed for INFO_MODE_TITLE) */
-#define DRAW_MODE_INFO(i)      ((i) >= INFO_MODE_ELEMENTS &&           \
+#define DRAW_MODE_INFO(i)      ((i) >= INFO_MODE_TITLE &&              \
                                 (i) <= INFO_MODE_LEVELSET ? (i) :      \
                                 INFO_MODE_MAIN)
 
@@ -430,6 +444,9 @@ static struct
 #define DRAW_YOFFSET_INFO(i)   (DRAW_MODE_INFO(i) == INFO_MODE_MAIN ?  \
                                 menu.draw_yoffset[GAME_MODE_INFO] :    \
                                 menu.draw_yoffset_info[DRAW_MODE_INFO(i)])
+#define EXTRA_SPACING_INFO(i)  (DRAW_MODE_INFO(i) == INFO_MODE_MAIN ? \
+                                menu.extra_spacing[GAME_MODE_INFO] :   \
+                                menu.extra_spacing_info[DRAW_MODE_INFO(i)])
 
 #define DRAW_XOFFSET_SETUP(i)  (DRAW_MODE_SETUP(i) == SETUP_MODE_MAIN ? \
                                 menu.draw_xoffset[GAME_MODE_SETUP] :   \
@@ -437,6 +454,9 @@ static struct
 #define DRAW_YOFFSET_SETUP(i)  (DRAW_MODE_SETUP(i) == SETUP_MODE_MAIN ? \
                                 menu.draw_yoffset[GAME_MODE_SETUP] :   \
                                 menu.draw_yoffset_setup[DRAW_MODE_SETUP(i)])
+#define EXTRA_SPACING_SETUP(i) (DRAW_MODE_SETUP(i) == SETUP_MODE_MAIN ? \
+                                menu.extra_spacing[GAME_MODE_SETUP] :  \
+                                menu.extra_spacing_setup[DRAW_MODE_SETUP(i)])
 
 #define DRAW_XOFFSET(s)                ((s) == GAME_MODE_INFO ?                \
                                 DRAW_XOFFSET_INFO(info_mode) :         \
@@ -448,6 +468,11 @@ static struct
                                 (s) == GAME_MODE_SETUP ?               \
                                 DRAW_YOFFSET_SETUP(setup_mode) :       \
                                 menu.draw_yoffset[DRAW_MODE(s)])
+#define EXTRA_SPACING(s)       ((s) == GAME_MODE_INFO ?                \
+                                EXTRA_SPACING_INFO(info_mode) :        \
+                                (s) == GAME_MODE_SETUP ?               \
+                                EXTRA_SPACING_SETUP(setup_mode) :      \
+                                menu.extra_spacing[DRAW_MODE(s)])
 
 #define mSX                    (SX + DRAW_XOFFSET(game_status))
 #define mSY                    (SY + DRAW_YOFFSET(game_status))
@@ -1413,7 +1438,6 @@ void DrawMainMenu()
   ExpireSoundLoops(FALSE);
 
   KeyboardAutoRepeatOn();
-  ActivateJoystick();
 
   audio.sound_deactivated = FALSE;
 
@@ -1462,7 +1486,7 @@ void DrawMainMenu()
   if (redraw_mask & REDRAW_ALL)
     fade_mask = REDRAW_ALL;
 
-  if (CheckIfGlobalBorderHasChanged())
+  if (CheckIfGlobalBorderOrPlayfieldViewportHasChanged())
     fade_mask = REDRAW_ALL;
 
   FadeOut(fade_mask);
@@ -1479,6 +1503,8 @@ void DrawMainMenu()
   LoadLevel(level_nr);
   LoadScore(level_nr);
 
+  SaveLevelSetup_SeriesInfo();
+
   // set this after "ChangeViewportPropertiesIfNeeded()" (which may reset it)
   SetDrawDeactivationMask(REDRAW_NONE);
   SetDrawBackgroundMask(REDRAW_FIELD);
@@ -1782,6 +1808,8 @@ void HandleMainMenu_SelectLevel(int step, int direction, int selected_level_nr)
     LoadTape(level_nr);
     DrawCompleteVideoDisplay();
 
+    SaveLevelSetup_SeriesInfo();
+
     /* needed because DrawPreviewLevelInitial() takes some time */
     BackToFront();
     /* SyncDisplay(); */
@@ -2158,7 +2186,7 @@ static void DrawInfoScreen_Main()
   if (redraw_mask & REDRAW_ALL)
     fade_mask = REDRAW_ALL;
 
-  if (CheckIfGlobalBorderHasChanged())
+  if (CheckIfGlobalBorderOrPlayfieldViewportHasChanged())
     fade_mask = REDRAW_ALL;
 
   UnmapAllGadgets();
@@ -2513,10 +2541,34 @@ void HandleInfoScreen_Main(int mx, int my, int dx, int dy, int button)
                   info_mode, num_info_info, max_info_info);
 }
 
+static int getMenuFontSpacing(int spacing_height, int font_nr)
+{
+  int font_spacing = getFontHeight(font_nr) + EXTRA_SPACING(game_status);
+
+  return (spacing_height < 0 ? ABS(spacing_height) * font_spacing :
+         spacing_height);
+}
+
+static int getMenuTextSpacing(int spacing_height, int font_nr)
+{
+  return (getMenuFontSpacing(spacing_height, font_nr) +
+         EXTRA_SPACING(game_status));
+}
+
+static int getMenuTextStep(int spacing_height, int font_nr)
+{
+  return getFontHeight(font_nr) + getMenuTextSpacing(spacing_height, font_nr);
+}
+
 void DrawInfoScreen_NotAvailable(char *text_title, char *text_error)
 {
+  int font_title = MENU_INFO_FONT_TITLE;
+  int font_error = FONT_TEXT_2;
+  int font_foot  = MENU_INFO_FONT_FOOT;
+  int spacing_title = menu.headline1_spacing_info[info_mode];
+  int ystep_title = getMenuTextStep(spacing_title, font_title);
   int ystart1 = mSY - SY + 100;
-  int ystart2 = mSY - SY + 150;
+  int ystart2 = ystart1 + ystep_title;
   int ybottom = mSY - SY + SYSIZE - 20;
 
   SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO);
@@ -2526,10 +2578,10 @@ void DrawInfoScreen_NotAvailable(char *text_title, char *text_error)
   ClearField();
   DrawHeadline();
 
-  DrawTextSCentered(ystart1, FONT_TEXT_1, text_title);
-  DrawTextSCentered(ystart2, FONT_TEXT_2, text_error);
+  DrawTextSCentered(ystart1, font_title, text_title);
+  DrawTextSCentered(ystart2, font_error, text_error);
 
-  DrawTextSCentered(ybottom, FONT_TEXT_4,
+  DrawTextSCentered(ybottom, font_foot,
                    "Press any key or button for info menu");
 
   FadeIn(REDRAW_FIELD);
@@ -2539,6 +2591,8 @@ 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 font_title = MENU_INFO_FONT_TITLE;
+  int font_foot  = MENU_INFO_FONT_FOOT;
   int xstart = mSX + MENU_SCREEN_INFO_XSTART;
   int ystart1 = mSY - SY + MENU_SCREEN_INFO_YSTART1;
   int ystart2 = mSY + MENU_SCREEN_INFO_YSTART2;
@@ -2558,9 +2612,9 @@ void DrawInfoScreen_HelpAnim(int start, int max_anims, boolean init)
     ClearField();
     DrawHeadline();
 
-    DrawTextSCentered(ystart1, FONT_TEXT_1, "The Game Elements:");
+    DrawTextSCentered(ystart1, font_title, "The Game Elements:");
 
-    DrawTextSCentered(ybottom, FONT_TEXT_4,
+    DrawTextSCentered(ybottom, font_foot,
                      "Press any key or button for next page");
 
     FrameCounter = 0;
@@ -2667,10 +2721,12 @@ void DrawInfoScreen_HelpText(int element, int action, int direction, int ypos)
 {
   int font_nr = FONT_INFO_ELEMENTS;
   int font_width = getFontWidth(font_nr);
-  int sx = mSX + MINI_TILEX + TILEX + MINI_TILEX;
-  int sy = mSY + 65 + 2 * 32 + 1;
+  int font_height = getFontHeight(font_nr);
+  int yoffset = (TILEX - 2 * font_height) / 2;
+  int xstart = mSX + MINI_TILEX + TILEX + MINI_TILEX;
+  int ystart = mSY + MENU_SCREEN_INFO_YSTART2 + yoffset;
   int ystep = TILEY + 4;
-  int pad_x = sx - SX;
+  int pad_x = xstart - SX;
   int max_chars_per_line = (SXSIZE - pad_x - MINI_TILEX) / font_width;
   int max_lines_per_text = 2;    
   char *text = NULL;
@@ -2691,9 +2747,9 @@ void DrawInfoScreen_HelpText(int element, int action, int direction, int ypos)
     text = "No description available";
 
   if (strlen(text) <= max_chars_per_line)      /* only one line of text */
-    sy += getFontHeight(font_nr) / 2;
+    ystart += getFontHeight(font_nr) / 2;
 
-  DrawTextBuffer(sx, sy + ypos * ystep, text, font_nr,
+  DrawTextBuffer(xstart, ystart + ypos * ystep, text, font_nr,
                 max_chars_per_line, -1, max_lines_per_text, 0, -1,
                 TRUE, FALSE, FALSE);
 }
@@ -2822,10 +2878,16 @@ void DrawInfoScreen_Music()
 void HandleInfoScreen_Music(int button)
 {
   static struct MusicFileInfo *list = NULL;
-  int ystart1 = mSY - SY + 100;
-  int ystart2 = mSY - SY + 150;
+  int font_title = MENU_INFO_FONT_TITLE;
+  int font_head  = MENU_INFO_FONT_HEAD;
+  int font_text  = MENU_INFO_FONT_TEXT;
+  int font_foot  = MENU_INFO_FONT_FOOT;
+  int spacing_title = menu.headline1_spacing_info[info_mode];
+  int spacing_head  = menu.headline2_spacing_info[info_mode];
+  int ystep_title = getMenuTextStep(spacing_title, font_title);
+  int ystep_head  = getMenuTextStep(spacing_head,  font_head);
+  int ystart = mSY - SY + 100;
   int ybottom = mSY - SY + SYSIZE - 20;
-  int dy = 30;
 
   if (button == MB_MENU_INITIALIZE)
   {
@@ -2838,10 +2900,10 @@ void HandleInfoScreen_Music(int button)
       ClearField();
       DrawHeadline();
 
-      DrawTextSCentered(ystart1, FONT_TEXT_1,
+      DrawTextSCentered(ystart, font_title,
                        "No music info for this level set.");
 
-      DrawTextSCentered(ybottom, FONT_TEXT_4,
+      DrawTextSCentered(ybottom, font_foot,
                        "Press any key or button for info menu");
 
       return;
@@ -2861,8 +2923,6 @@ void HandleInfoScreen_Music(int button)
   }
   else if (button == MB_MENU_CHOICE || button == MB_MENU_INITIALIZE)
   {
-    int y = 0;
-
     if (button != MB_MENU_INITIALIZE)
     {
       PlaySound(SND_MENU_ITEM_SELECTING);
@@ -2901,51 +2961,66 @@ void HandleInfoScreen_Music(int button)
       else
        PlaySound(sound);
 
-      DrawTextSCentered(ystart1, FONT_TEXT_1, "The Game Background Sounds:");
+      DrawTextSCentered(ystart, font_title, "The Game Background Sounds:");
     }
     else
     {
       PlayMusic(list->music);
 
-      DrawTextSCentered(ystart1, FONT_TEXT_1, "The Game Background Music:");
+      DrawTextSCentered(ystart, font_title, "The Game Background Music:");
     }
 
+    ystart += ystep_title;
+
     if (!strEqual(list->title, UNKNOWN_NAME))
     {
       if (!strEqual(list->title_header, UNKNOWN_NAME))
-       DrawTextSCentered(ystart2 + y++ * dy, FONT_TEXT_2, list->title_header);
+      {
+       DrawTextSCentered(ystart, font_head, list->title_header);
+       ystart += ystep_head;
+      }
 
-      DrawTextFCentered(ystart2 + y++ * dy, FONT_TEXT_3, "\"%s\"", list->title);
+      DrawTextFCentered(ystart, font_text, "\"%s\"", list->title);
+      ystart += ystep_head;
     }
 
     if (!strEqual(list->artist, UNKNOWN_NAME))
     {
       if (!strEqual(list->artist_header, UNKNOWN_NAME))
-       DrawTextSCentered(ystart2 + y++ * dy, FONT_TEXT_2, list->artist_header);
+       DrawTextSCentered(ystart, font_head, list->artist_header);
       else
-       DrawTextSCentered(ystart2 + y++ * dy, FONT_TEXT_2, "by");
+       DrawTextSCentered(ystart, font_head, "by");
+
+      ystart += ystep_head;
 
-      DrawTextFCentered(ystart2 + y++ * dy, FONT_TEXT_3, "%s", list->artist);
+      DrawTextFCentered(ystart, font_text, "%s", list->artist);
+      ystart += ystep_head;
     }
 
     if (!strEqual(list->album, UNKNOWN_NAME))
     {
       if (!strEqual(list->album_header, UNKNOWN_NAME))
-       DrawTextSCentered(ystart2 + y++ * dy, FONT_TEXT_2, list->album_header);
+       DrawTextSCentered(ystart, font_head, list->album_header);
       else
-       DrawTextSCentered(ystart2 + y++ * dy, FONT_TEXT_2, "from the album");
+       DrawTextSCentered(ystart, font_head, "from the album");
+
+      ystart += ystep_head;
 
-      DrawTextFCentered(ystart2 + y++ * dy, FONT_TEXT_3, "\"%s\"", list->album);
+      DrawTextFCentered(ystart, font_text, "\"%s\"", list->album);
+      ystart += ystep_head;
     }
 
     if (!strEqual(list->year, UNKNOWN_NAME))
     {
       if (!strEqual(list->year_header, UNKNOWN_NAME))
-       DrawTextSCentered(ystart2 + y++ * dy, FONT_TEXT_2, list->year_header);
+       DrawTextSCentered(ystart, font_head, list->year_header);
       else
-       DrawTextSCentered(ystart2 + y++ * dy, FONT_TEXT_2, "from the year");
+       DrawTextSCentered(ystart, font_head, "from the year");
 
-      DrawTextFCentered(ystart2 + y++ * dy, FONT_TEXT_3, "%s", list->year);
+      ystart += ystep_head;
+
+      DrawTextFCentered(ystart, font_text, "%s", list->year);
+      ystart += ystep_head;
     }
 
     DrawTextSCentered(ybottom, FONT_TEXT_4,
@@ -2961,174 +3036,232 @@ void HandleInfoScreen_Music(int button)
 
 static void DrawInfoScreen_CreditsScreen(int screen_nr)
 {
-  int ystart1 = mSY - SY + 100;
-  int ystart2 = mSY - SY + 150;
+  int font_title = MENU_INFO_FONT_TITLE;
+  int font_head  = MENU_INFO_FONT_HEAD;
+  int font_text  = MENU_INFO_FONT_TEXT;
+  int font_foot  = MENU_INFO_FONT_FOOT;
+  int spacing_title = menu.headline1_spacing_info[info_mode];
+  int spacing_head  = menu.headline2_spacing_info[info_mode];
+  int spacing_para  = menu.paragraph_spacing_info[info_mode];
+  int spacing_line  = menu.line_spacing_info[info_mode];
+  int ystep_title = getMenuTextStep(spacing_title, font_title);
+  int ystep_head  = getMenuTextStep(spacing_head,  font_head);
+  int ystep_para  = getMenuTextStep(spacing_para,  font_text);
+  int ystep_line  = getMenuTextStep(spacing_line,  font_text);
+  int ystart = mSY - SY + 100;
   int ybottom = mSY - SY + SYSIZE - 20;
-  int ystep = 30;
 
   ClearField();
   DrawHeadline();
 
-  DrawTextSCentered(ystart1, FONT_TEXT_1, "Credits:");
+  DrawTextSCentered(ystart, font_title, "Credits:");
+  ystart += ystep_title;
 
   if (screen_nr == 0)
   {
-    DrawTextSCentered(ystart2 + 0 * ystep, FONT_TEXT_2,
+    DrawTextSCentered(ystart, font_head,
                      "Special thanks to");
-    DrawTextSCentered(ystart2 + 1 * ystep, FONT_TEXT_3,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_text,
                      "Peter Liepa");
-    DrawTextSCentered(ystart2 + 2 * ystep, FONT_TEXT_2,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_head,
                      "for creating");
-    DrawTextSCentered(ystart2 + 3 * ystep, FONT_TEXT_3,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_text,
                      "\"Boulder Dash\"");
-    DrawTextSCentered(ystart2 + 4 * ystep, FONT_TEXT_2,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_head,
                      "in the year");
-    DrawTextSCentered(ystart2 + 5 * ystep, FONT_TEXT_3,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_text,
                      "1984");
-    DrawTextSCentered(ystart2 + 6 * ystep, FONT_TEXT_2,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_head,
                      "published by");
-    DrawTextSCentered(ystart2 + 7 * ystep, FONT_TEXT_3,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_text,
                      "First Star Software");
   }
   else if (screen_nr == 1)
   {
-    DrawTextSCentered(ystart2 + 0 * ystep, FONT_TEXT_2,
+    DrawTextSCentered(ystart, font_head,
                      "Special thanks to");
-    DrawTextSCentered(ystart2 + 1 * ystep, FONT_TEXT_3,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_text,
                      "Klaus Heinz & Volker Wertich");
-    DrawTextSCentered(ystart2 + 2 * ystep, FONT_TEXT_2,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_head,
                      "for creating");
-    DrawTextSCentered(ystart2 + 3 * ystep, FONT_TEXT_3,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_text,
                      "\"Emerald Mine\"");
-    DrawTextSCentered(ystart2 + 4 * ystep, FONT_TEXT_2,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_head,
                      "in the year");
-    DrawTextSCentered(ystart2 + 5 * ystep, FONT_TEXT_3,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_text,
                      "1987");
-    DrawTextSCentered(ystart2 + 6 * ystep, FONT_TEXT_2,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_head,
                      "published by");
-    DrawTextSCentered(ystart2 + 7 * ystep, FONT_TEXT_3,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_text,
                      "Kingsoft");
   }
   else if (screen_nr == 2)
   {
-    DrawTextSCentered(ystart2 + 0 * ystep, FONT_TEXT_2,
+    DrawTextSCentered(ystart, font_head,
                      "Special thanks to");
-    DrawTextSCentered(ystart2 + 1 * ystep, FONT_TEXT_3,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_text,
                      "Michael Stopp & Philip Jespersen");
-    DrawTextSCentered(ystart2 + 2 * ystep, FONT_TEXT_2,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_head,
                      "for creating");
-    DrawTextSCentered(ystart2 + 3 * ystep, FONT_TEXT_3,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_text,
                      "\"Supaplex\"");
-    DrawTextSCentered(ystart2 + 4 * ystep, FONT_TEXT_2,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_head,
                      "in the year");
-    DrawTextSCentered(ystart2 + 5 * ystep, FONT_TEXT_3,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_text,
                      "1991");
-    DrawTextSCentered(ystart2 + 6 * ystep, FONT_TEXT_2,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_head,
                      "published by");
-    DrawTextSCentered(ystart2 + 7 * ystep, FONT_TEXT_3,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_text,
                      "Digital Integration");
   }
   else if (screen_nr == 3)
   {
-    DrawTextSCentered(ystart2 + 0 * ystep, FONT_TEXT_2,
+    DrawTextSCentered(ystart, font_head,
                      "Special thanks to");
-    DrawTextSCentered(ystart2 + 1 * ystep, FONT_TEXT_3,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_text,
                      "Hiroyuki Imabayashi");
-    DrawTextSCentered(ystart2 + 2 * ystep, FONT_TEXT_2,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_head,
                      "for creating");
-    DrawTextSCentered(ystart2 + 3 * ystep, FONT_TEXT_3,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_text,
                      "\"Sokoban\"");
-    DrawTextSCentered(ystart2 + 4 * ystep, FONT_TEXT_2,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_head,
                      "in the year");
-    DrawTextSCentered(ystart2 + 5 * ystep, FONT_TEXT_3,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_text,
                      "1982");
-    DrawTextSCentered(ystart2 + 6 * ystep, FONT_TEXT_2,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_head,
                      "published by");
-    DrawTextSCentered(ystart2 + 7 * ystep, FONT_TEXT_3,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_text,
                      "Thinking Rabbit");
   }
   else if (screen_nr == 4)
   {
-    DrawTextSCentered(ystart2 + 0 * ystep, FONT_TEXT_2,
+    DrawTextSCentered(ystart, font_head,
                      "Special thanks to");
-    DrawTextSCentered(ystart2 + 1 * ystep, FONT_TEXT_3,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_text,
                      "Alan Bond");
-    DrawTextSCentered(ystart2 + 2 * ystep, FONT_TEXT_2,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_head,
                      "and");
-    DrawTextSCentered(ystart2 + 3 * ystep, FONT_TEXT_3,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_text,
                      "J\xfcrgen Bonhagen");
-    DrawTextSCentered(ystart2 + 4 * ystep, FONT_TEXT_2,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_head,
                      "for the continuous creation");
-    DrawTextSCentered(ystart2 + 5 * ystep, FONT_TEXT_2,
+    ystart += ystep_line;
+    DrawTextSCentered(ystart, font_head,
                      "of outstanding level sets");
   }
   else if (screen_nr == 5)
   {
-    DrawTextSCentered(ystart2 + 0 * ystep, FONT_TEXT_2,
+    DrawTextSCentered(ystart, font_head,
                      "Thanks to");
-    DrawTextSCentered(ystart2 + 1 * ystep, FONT_TEXT_3,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_text,
                      "Peter Elzner");
-    DrawTextSCentered(ystart2 + 2 * ystep, FONT_TEXT_2,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_head,
                      "for ideas and inspiration by");
-    DrawTextSCentered(ystart2 + 3 * ystep, FONT_TEXT_3,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_text,
                      "Diamond Caves");
+    ystart += ystep_para;
 
-    DrawTextSCentered(ystart2 + 5 * ystep, FONT_TEXT_2,
+    DrawTextSCentered(ystart, font_head,
                      "Thanks to");
-    DrawTextSCentered(ystart2 + 6 * ystep, FONT_TEXT_3,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_text,
                      "Steffest");
-    DrawTextSCentered(ystart2 + 7 * ystep, FONT_TEXT_2,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_head,
                      "for ideas and inspiration by");
-    DrawTextSCentered(ystart2 + 8 * ystep, FONT_TEXT_3,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_text,
                      "DX-Boulderdash");
   }
   else if (screen_nr == 6)
   {
-    DrawTextSCentered(ystart2 + 0 * ystep, FONT_TEXT_2,
+    DrawTextSCentered(ystart, font_head,
                      "Thanks to");
-    DrawTextSCentered(ystart2 + 1 * ystep, FONT_TEXT_3,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_text,
                      "David Tritscher");
-#if 1
-    DrawTextSCentered(ystart2 + 2 * ystep, FONT_TEXT_2,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_head,
                      "for the code base used for the");
-    DrawTextSCentered(ystart2 + 3 * ystep, FONT_TEXT_2,
+    ystart += ystep_line;
+    DrawTextSCentered(ystart, font_head,
                      "native Emerald Mine engine");
-#else
-    DrawTextSCentered(ystart2 + 2 * ystep, FONT_TEXT_2,
-                     "for the new Emerald Mine engine");
-#endif
   }
   else if (screen_nr == 7)
   {
-    DrawTextSCentered(ystart2 + 0 * ystep, FONT_TEXT_2,
+    DrawTextSCentered(ystart, font_head,
                      "Thanks to");
-    DrawTextSCentered(ystart2 + 1 * ystep, FONT_TEXT_3,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_text,
                      "Guido Schulz");
-    DrawTextSCentered(ystart2 + 2 * ystep, FONT_TEXT_2,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_head,
                      "for the initial DOS port");
+    ystart += ystep_para;
 
-    DrawTextSCentered(ystart2 + 4 * ystep, FONT_TEXT_2,
+    DrawTextSCentered(ystart, font_head,
                      "Thanks to");
-    DrawTextSCentered(ystart2 + 5 * ystep, FONT_TEXT_3,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_text,
                      "Karl H\xf6rnell");
-    DrawTextSCentered(ystart2 + 6 * ystep, FONT_TEXT_2,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_head,
                      "for some additional toons");
   }
   else if (screen_nr == 8)
   {
-    DrawTextSCentered(ystart2 + 0 * ystep, FONT_TEXT_2,
+    DrawTextSCentered(ystart, font_head,
                      "And not to forget:");
-    DrawTextSCentered(ystart2 + 1 * ystep, FONT_TEXT_2,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_head,
                      "Many thanks to");
-    DrawTextSCentered(ystart2 + 2 * ystep, FONT_TEXT_3,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_text,
                      "All those who contributed");
-    DrawTextSCentered(ystart2 + 3 * ystep, FONT_TEXT_3,
+    ystart += ystep_line;
+    DrawTextSCentered(ystart, font_text,
                      "levels to this game");
-    DrawTextSCentered(ystart2 + 4 * ystep, FONT_TEXT_3,
+    ystart += ystep_line;
+    DrawTextSCentered(ystart, font_text,
                      "since 1995");
   }
 
-  DrawTextSCentered(ybottom, FONT_TEXT_4,
+  DrawTextSCentered(ybottom, font_foot,
                    "Press any key or button for next page");
 }
 
@@ -3204,10 +3337,20 @@ void HandleInfoScreen_Credits(int button)
 
 void DrawInfoScreen_Program()
 {
-  int ystart1 = mSY - SY + 100;
-  int ystart2 = mSY - SY + 150;
+  int font_title = MENU_INFO_FONT_TITLE;
+  int font_head  = MENU_INFO_FONT_HEAD;
+  int font_text  = MENU_INFO_FONT_TEXT;
+  int font_foot  = MENU_INFO_FONT_FOOT;
+  int spacing_title = menu.headline1_spacing_info[info_mode];
+  int spacing_head  = menu.headline2_spacing_info[info_mode];
+  int spacing_para  = menu.paragraph_spacing_info[info_mode];
+  int spacing_line  = menu.line_spacing_info[info_mode];
+  int ystep_title = getMenuTextStep(spacing_title, font_title);
+  int ystep_head  = getMenuTextStep(spacing_head,  font_head);
+  int ystep_para  = getMenuTextStep(spacing_para,  font_text);
+  int ystep_line  = getMenuTextStep(spacing_line,  font_text);
+  int ystart = mSY - SY + 100;
   int ybottom = mSY - SY + SYSIZE - 20;
-  int ystep = 30;
 
   SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_PROGRAM);
 
@@ -3216,26 +3359,36 @@ void DrawInfoScreen_Program()
   ClearField();
   DrawHeadline();
 
-  DrawTextSCentered(ystart1, FONT_TEXT_1, "Program Information:");
+  DrawTextSCentered(ystart, font_title, "Program Information:");
+  ystart += ystep_title;
 
-  DrawTextSCentered(ystart2 + 0 * ystep, FONT_TEXT_2,
+  DrawTextSCentered(ystart, font_head,
                    "This game is Freeware!");
-  DrawTextSCentered(ystart2 + 1 * ystep, FONT_TEXT_2,
+  ystart += ystep_head;
+  DrawTextSCentered(ystart, font_head,
                    "If you like it, send e-mail to:");
-  DrawTextSCentered(ystart2 + 2 * ystep, FONT_TEXT_3,
+  ystart += ystep_head;
+  DrawTextSCentered(ystart, font_text,
                    setup.internal.program_email);
-  DrawTextSCentered(ystart2 + 4 * ystep, FONT_TEXT_2,
+  ystart += ystep_para;
+
+  DrawTextSCentered(ystart, font_head,
                    "More information and levels:");
-  DrawTextSCentered(ystart2 + 5 * ystep, FONT_TEXT_3,
+  ystart += ystep_head;
+  DrawTextSCentered(ystart, font_text,
                    setup.internal.program_website);
-  DrawTextSCentered(ystart2 + 7 * ystep, FONT_TEXT_2,
+  ystart += ystep_para;
+
+  DrawTextSCentered(ystart, font_head,
                    "If you have created new levels,");
-  DrawTextSCentered(ystart2 + 8 * ystep, FONT_TEXT_2,
+  ystart += ystep_line;
+  DrawTextSCentered(ystart, font_head,
                    "send them to me to include them!");
-  DrawTextSCentered(ystart2 + 9 * ystep, FONT_TEXT_2,
+  ystart += ystep_head;
+  DrawTextSCentered(ystart, font_head,
                    ":-)");
 
-  DrawTextSCentered(ybottom, FONT_TEXT_4,
+  DrawTextSCentered(ybottom, font_foot,
                    "Press any key or button for info menu");
 
   FadeIn(REDRAW_FIELD);
@@ -3269,12 +3422,20 @@ void HandleInfoScreen_Program(int button)
 
 void DrawInfoScreen_Version()
 {
-  int font_header = FONT_TEXT_3;
-  int font_text = FONT_TEXT_2;
+  int font_title = MENU_INFO_FONT_TITLE;
+  int font_head  = MENU_INFO_FONT_HEAD;
+  int font_text  = MENU_INFO_FONT_TEXT;
+  int font_foot  = MENU_INFO_FONT_FOOT;
+  int spacing_title = menu.headline1_spacing_info[info_mode];
+  int spacing_head  = menu.headline2_spacing_info[info_mode];
+  int spacing_para  = menu.paragraph_spacing_info[info_mode];
+  int spacing_line  = menu.line_spacing_info[info_mode];
   int xstep = getFontWidth(font_text);
-  int ystep = getFontHeight(font_text);
-  int ystart1 = mSY - SY + 100;
-  int ystart2 = mSY - SY + 150;
+  int ystep_title = getMenuTextStep(spacing_title, font_title);
+  int ystep_head  = getMenuTextStep(spacing_head,  font_head);
+  int ystep_para  = getMenuTextStep(spacing_para,  font_text);
+  int ystep_line  = getMenuTextStep(spacing_line,  font_text);
+  int ystart  = mSY - SY + 100;
   int ybottom = mSY - SY + SYSIZE - 20;
   int xstart1 = mSX - SX + 2 * xstep;
   int xstart2 = mSX - SX + 18 * xstep;
@@ -3296,31 +3457,46 @@ void DrawInfoScreen_Version()
   ClearField();
   DrawHeadline();
 
-  DrawTextSCentered(ystart1, FONT_TEXT_1, "Version Information:");
+  DrawTextSCentered(ystart, font_title, "Version Information:");
+  ystart += ystep_title;
 
-  DrawTextF(xstart1, ystart2, font_header, "Name");
-  DrawTextF(xstart2, ystart2, font_text, getProgramTitleString());
+  DrawTextF(xstart1, ystart, font_head, "Name");
+  DrawTextF(xstart2, ystart, font_text, getProgramTitleString());
+  ystart += ystep_line;
 
-  ystart2 += ystep;
-  DrawTextF(xstart1, ystart2, font_header, "Version");
-  DrawTextF(xstart2, ystart2, font_text, getProgramVersionString());
+  if (!strEqual(getProgramVersionString(), getProgramRealVersionString()))
+  {
+    DrawTextF(xstart1, ystart, font_head, "Version (fake)");
+    DrawTextF(xstart2, ystart, font_text, getProgramVersionString());
+    ystart += ystep_line;
 
-  ystart2 += ystep;
-  DrawTextF(xstart1, ystart2, font_header, "Platform");
-  DrawTextF(xstart2, ystart2, font_text, PLATFORM_STRING);
+    DrawTextF(xstart1, ystart, font_head, "Version (real)");
+    DrawTextF(xstart2, ystart, font_text, getProgramRealVersionString());
+    ystart += ystep_line;
+  }
+  else
+  {
+    DrawTextF(xstart1, ystart, font_head, "Version");
+    DrawTextF(xstart2, ystart, font_text, getProgramVersionString());
+    ystart += ystep_line;
+  }
+
+  DrawTextF(xstart1, ystart, font_head, "Platform");
+  DrawTextF(xstart2, ystart, font_text, PLATFORM_STRING);
+  ystart += ystep_line;
 
-  ystart2 += ystep;
-  DrawTextF(xstart1, ystart2, font_header, "Target");
-  DrawTextF(xstart2, ystart2, font_text, TARGET_STRING);
+  DrawTextF(xstart1, ystart, font_head, "Target");
+  DrawTextF(xstart2, ystart, font_text, TARGET_STRING);
+  ystart += ystep_line;
 
-  ystart2 += ystep;
-  DrawTextF(xstart1, ystart2, font_header, "Source date");
-  DrawTextF(xstart2, ystart2, font_text, getSourceDateString());
+  DrawTextF(xstart1, ystart, font_head, "Source date");
+  DrawTextF(xstart2, ystart, font_text, getSourceDateString());
+  ystart += ystep_para;
 
-  ystart2 += 3 * ystep;
-  DrawTextF(xstart1, ystart2, font_header, "Library");
-  DrawTextF(xstart2, ystart2, font_header, "compiled");
-  DrawTextF(xstart3, ystart2, font_header, "linked");
+  DrawTextF(xstart1, ystart, font_head, "Library");
+  DrawTextF(xstart2, ystart, font_head, "compiled");
+  DrawTextF(xstart3, ystart, font_head, "linked");
+  ystart += ystep_head;
 
   SDL_VERSION(&sdl_version_compiled);
 #if defined(TARGET_SDL2)
@@ -3330,63 +3506,63 @@ void DrawInfoScreen_Version()
   sdl_version_linked = SDL_Linked_Version();
 #endif
 
-  ystart2 += 2 * ystep;
-  DrawTextF(xstart1, ystart2, font_text, "SDL");
-  DrawTextF(xstart2, ystart2, font_text, "%d.%d.%d",
+  DrawTextF(xstart1, ystart, font_text, "SDL");
+  DrawTextF(xstart2, ystart, font_text, "%d.%d.%d",
            sdl_version_compiled.major,
            sdl_version_compiled.minor,
            sdl_version_compiled.patch);
-  DrawTextF(xstart3, ystart2, font_text, "%d.%d.%d",
+  DrawTextF(xstart3, ystart, font_text, "%d.%d.%d",
            sdl_version_linked->major,
            sdl_version_linked->minor,
            sdl_version_linked->patch);
+  ystart += ystep_line;
 
   SDL_IMAGE_VERSION(&sdl_version_compiled);
   sdl_version_linked = IMG_Linked_Version();
 
-  ystart2 += ystep;
-  DrawTextF(xstart1, ystart2, font_text, "SDL_image");
-  DrawTextF(xstart2, ystart2, font_text, "%d.%d.%d",
+  DrawTextF(xstart1, ystart, font_text, "SDL_image");
+  DrawTextF(xstart2, ystart, font_text, "%d.%d.%d",
            sdl_version_compiled.major,
            sdl_version_compiled.minor,
            sdl_version_compiled.patch);
-  DrawTextF(xstart3, ystart2, font_text, "%d.%d.%d",
+  DrawTextF(xstart3, ystart, font_text, "%d.%d.%d",
            sdl_version_linked->major,
            sdl_version_linked->minor,
            sdl_version_linked->patch);
+  ystart += ystep_line;
 
   SDL_MIXER_VERSION(&sdl_version_compiled);
   sdl_version_linked = Mix_Linked_Version();
 
-  ystart2 += ystep;
-  DrawTextF(xstart1, ystart2, font_text, "SDL_mixer");
-  DrawTextF(xstart2, ystart2, font_text, "%d.%d.%d",
+  DrawTextF(xstart1, ystart, font_text, "SDL_mixer");
+  DrawTextF(xstart2, ystart, font_text, "%d.%d.%d",
            sdl_version_compiled.major,
            sdl_version_compiled.minor,
            sdl_version_compiled.patch);
-  DrawTextF(xstart3, ystart2, font_text, "%d.%d.%d",
+  DrawTextF(xstart3, ystart, font_text, "%d.%d.%d",
            sdl_version_linked->major,
            sdl_version_linked->minor,
            sdl_version_linked->patch);
+  ystart += ystep_line;
 
   SDL_NET_VERSION(&sdl_version_compiled);
   sdl_version_linked = SDLNet_Linked_Version();
 
-  ystart2 += ystep;
-  DrawTextF(xstart1, ystart2, font_text, "SDL_net");
-  DrawTextF(xstart2, ystart2, font_text, "%d.%d.%d",
+  DrawTextF(xstart1, ystart, font_text, "SDL_net");
+  DrawTextF(xstart2, ystart, font_text, "%d.%d.%d",
            sdl_version_compiled.major,
            sdl_version_compiled.minor,
            sdl_version_compiled.patch);
-  DrawTextF(xstart3, ystart2, font_text, "%d.%d.%d",
+  DrawTextF(xstart3, ystart, font_text, "%d.%d.%d",
            sdl_version_linked->major,
            sdl_version_linked->minor,
            sdl_version_linked->patch);
+  ystart += ystep_para;
 
-  ystart2 += 3 * ystep;
-  DrawTextF(xstart1, ystart2, font_header, "Driver");
-  DrawTextF(xstart2, ystart2, font_header, "Requested");
-  DrawTextF(xstart3, ystart2, font_header, "Used");
+  DrawTextF(xstart1, ystart, font_head, "Driver");
+  DrawTextF(xstart2, ystart, font_head, "Requested");
+  DrawTextF(xstart3, ystart, font_head, "Used");
+  ystart += ystep_head;
 
 #if defined(TARGET_SDL2)
   driver_name = getStringCopyNStatic(SDL_GetVideoDriver(0), driver_name_len);
@@ -3394,10 +3570,10 @@ void DrawInfoScreen_Version()
   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);
+  DrawTextF(xstart1, ystart, font_text, "SDL_VideoDriver");
+  DrawTextF(xstart2, ystart, font_text, "%s", setup.system.sdl_videodriver);
+  DrawTextF(xstart3, ystart, font_text, "%s", driver_name);
+  ystart += ystep_line;
 
 #if defined(TARGET_SDL2)
   driver_name = getStringCopyNStatic(SDL_GetAudioDriver(0), driver_name_len);
@@ -3405,12 +3581,11 @@ void DrawInfoScreen_Version()
   SDL_AudioDriverName(driver_name, driver_name_len);
 #endif
 
-  ystart2 += ystep;
-  DrawTextF(xstart1, ystart2, font_text, "SDL_AudioDriver");
-  DrawTextF(xstart2, ystart2, font_text, "%s", setup.system.sdl_audiodriver);
-  DrawTextF(xstart3, ystart2, font_text, "%s", driver_name);
+  DrawTextF(xstart1, ystart, font_text, "SDL_AudioDriver");
+  DrawTextF(xstart2, ystart, font_text, "%s", setup.system.sdl_audiodriver);
+  DrawTextF(xstart3, ystart, font_text, "%s", driver_name);
 
-  DrawTextSCentered(ybottom, FONT_TEXT_4,
+  DrawTextSCentered(ybottom, font_foot,
                    "Press any key or button for info menu");
 
   FadeIn(REDRAW_FIELD);
@@ -3447,7 +3622,7 @@ void DrawInfoScreen_LevelSet()
   struct TitleMessageInfo *tmi = &readme;
   char *filename = getLevelSetInfoFilename();
   char *title = "Level Set Information:";
-  int ystart1 = mSY - SY + 100;
+  int ystart = mSY - SY + 100;
   int ybottom = mSY - SY + SYSIZE - 20;
 
   if (filename == NULL)
@@ -3464,7 +3639,7 @@ void DrawInfoScreen_LevelSet()
   ClearField();
   DrawHeadline();
 
-  DrawTextSCentered(ystart1, FONT_TEXT_1, title);
+  DrawTextSCentered(ystart, FONT_TEXT_1, title);
 
   /* if x position set to "-1", automatically determine by playfield width */
   if (tmi->x == -1)
@@ -3663,7 +3838,7 @@ static void DrawChooseTree(TreeInfo **ti_ptr)
 {
   int fade_mask = REDRAW_FIELD;
 
-  if (CheckIfGlobalBorderHasChanged())
+  if (CheckIfGlobalBorderOrPlayfieldViewportHasChanged())
     fade_mask = REDRAW_ALL;
 
   if (strEqual((*ti_ptr)->subdir, STRING_TOP_DIRECTORY))
@@ -4182,7 +4357,7 @@ void DrawHallOfFame(int highlight_position)
 {
   int fade_mask = REDRAW_FIELD;
 
-  if (CheckIfGlobalBorderHasChanged())
+  if (CheckIfGlobalBorderOrPlayfieldViewportHasChanged())
     fade_mask = REDRAW_ALL;
 
   UnmapAllGadgets();
@@ -4190,7 +4365,6 @@ void DrawHallOfFame(int highlight_position)
 
   /* (this is needed when called from GameEnd() after winning a game) */
   KeyboardAutoRepeatOn();
-  ActivateJoystick();
 
   /* (this is needed when called from GameEnd() after winning a game) */
   SetDrawDeactivationMask(REDRAW_NONE);
@@ -5239,14 +5413,12 @@ static void execSetupChooseMusic()
   DrawSetupScreen();
 }
 
-#if !defined(PLATFORM_ANDROID)
 static void execSetupInput()
 {
   setup_mode = SETUP_MODE_INPUT;
 
   DrawSetupScreen();
 }
-#endif
 
 static void execSetupShortcuts()
 {
@@ -5310,12 +5482,8 @@ 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"                  },
@@ -5451,7 +5619,7 @@ static struct TokenInfo setup_info_input[] =
 {
   { TYPE_SWITCH,       NULL,                   "Player:"               },
   { TYPE_SWITCH,       NULL,                   "Device:"               },
-  { TYPE_ENTER_MENU,   NULL,                   ""                      },
+  { TYPE_SWITCH,       NULL,                   ""                      },
   { TYPE_EMPTY,                NULL,                   ""                      },
   { TYPE_EMPTY,                NULL,                   ""                      },
   { TYPE_EMPTY,                NULL,                   ""                      },
@@ -5597,12 +5765,10 @@ static Key getSetupKey()
 
   while (!got_key_event)
   {
-    if (PendingEvent())                /* got event */
-    {
-      Event event;
-
-      NextEvent(&event);
+    Event event;
 
+    if (NextValidEvent(&event))
+    {
       switch (event.type)
       {
         case EVENT_KEYPRESS:
@@ -5635,7 +5801,9 @@ static Key getSetupKey()
 
 static int getSetupValueFont(int type, void *value)
 {
-  if (type & TYPE_KEY)
+  if (type & TYPE_GHOSTED)
+    return FONT_OPTION_OFF;
+  else if (type & TYPE_KEY)
     return (type & TYPE_QUERY ? FONT_INPUT_1_ACTIVE : FONT_VALUE_1);
   else if (type & TYPE_STRING)
     return FONT_VALUE_2;
@@ -5813,6 +5981,28 @@ static void changeSetupValue(int screen_pos, int setup_info_pos_raw, int dx)
     ToggleFullscreenOrChangeWindowScalingIfNeeded();
 }
 
+static struct TokenInfo *getSetupInfoFinal(struct TokenInfo *setup_info_orig)
+{
+  static struct TokenInfo *setup_info_hide = NULL;
+  int list_size = 0;
+  int list_pos = 0;
+  int i;
+
+  /* determine maximum list size of target list */
+  while (setup_info_orig[list_size++].type != 0);
+
+  /* free, allocate and clear memory for target list */
+  checked_free(setup_info_hide);
+  setup_info_hide = checked_calloc(list_size * sizeof(struct TokenInfo));
+
+  /* copy setup info list without setup entries marked as hidden */
+  for (i = 0; setup_info_orig[i].type != 0; i++)
+    if (!hideSetupEntry(setup_info_orig[i].value))
+      setup_info_hide[list_pos++] = setup_info_orig[i];
+
+  return setup_info_hide;
+}
+
 static void DrawSetupScreen_Generic()
 {
   int fade_mask = REDRAW_FIELD;
@@ -5820,7 +6010,7 @@ static void DrawSetupScreen_Generic()
   char *title_string = NULL;
   int i;
 
-  if (CheckIfGlobalBorderHasChanged())
+  if (CheckIfGlobalBorderOrPlayfieldViewportHasChanged())
     fade_mask = REDRAW_ALL;
 
   UnmapAllGadgets();
@@ -5912,6 +6102,9 @@ static void DrawSetupScreen_Generic()
     title_string = "Setup Shortcuts";
   }
 
+  /* use modified setup info without setup entries marked as hidden */
+  setup_info = getSetupInfoFinal(setup_info);
+
   DrawTextSCentered(mSY - SY + 16, FONT_TITLE_1, title_string);
 
   // determine maximal number of setup entries that can be displayed on screen
@@ -5956,9 +6149,6 @@ void DrawSetupScreen_Input()
 
   DrawTextSCentered(mSY - SY + 16, FONT_TITLE_1, "Setup Input");
 
-  DrawTextSCentered(SYSIZE - 20, FONT_TITLE_2,
-                   "Joysticks deactivated on this screen");
-
   for (i = 0; setup_info[i].type != 0 && i < MAX_MENU_ENTRIES_ON_SCREEN; i++)
   {
     if (setup_info[i].type & (TYPE_ENTER_MENU|TYPE_ENTER_LIST))
@@ -6014,12 +6204,12 @@ static void drawPlayerSetupInputInfo(int player_nr, boolean active)
     char *text;
   } custom[] =
   {
-    { &custom_key.left,  "Joystick Left"  },
-    { &custom_key.right, "Joystick Right" },
-    { &custom_key.up,    "Joystick Up"    },
-    { &custom_key.down,  "Joystick Down"  },
-    { &custom_key.snap,  "Button 1"       },
-    { &custom_key.drop,  "Button 2"       }
+    { &custom_key.left,  "Axis/Pad Left"  },
+    { &custom_key.right, "Axis/Pad Right" },
+    { &custom_key.up,    "Axis/Pad Up"    },
+    { &custom_key.down,  "Axis/Pad Down"  },
+    { &custom_key.snap,  "Button 1/A/X"   },
+    { &custom_key.drop,  "Button 2/B/Y"   }
   };
   static char *joystick_name[MAX_PLAYERS] =
   {
@@ -6030,8 +6220,6 @@ static void drawPlayerSetupInputInfo(int player_nr, boolean active)
   };
   int text_font_nr = (active ? FONT_MENU_1_ACTIVE : FONT_MENU_1);
 
-  InitJoysticks();
-
   custom_key = setup.input[player_nr].key;
 
   DrawText(mSX + 11 * 32, mSY + 2 * 32, int2str(player_nr + 1, 1),
@@ -6045,11 +6233,13 @@ static void drawPlayerSetupInputInfo(int player_nr, boolean active)
   if (setup.input[player_nr].use_joystick)
   {
     char *device_name = setup.input[player_nr].joy.device_name;
-    char *text = joystick_name[getJoystickNrFromDeviceName(device_name)];
-    int font_nr = (joystick.fd[player_nr] < 0 ? FONT_VALUE_OLD : FONT_VALUE_1);
+    int joystick_nr = getJoystickNrFromDeviceName(device_name);
+    boolean joystick_active = CheckJoystickOpened(joystick_nr);
+    char *text = joystick_name[joystick_nr];
+    int font_nr = (joystick_active ? FONT_VALUE_1 : FONT_VALUE_OLD);
 
     DrawText(mSX + 8 * 32, mSY + 3 * 32, text, font_nr);
-    DrawText(mSX + 32, mSY + 4 * 32, "Calibrate", text_font_nr);
+    DrawText(mSX + 32, mSY + 4 * 32, "Configure", text_font_nr);
   }
   else
   {
@@ -6142,7 +6332,6 @@ void HandleSetupScreen_Input(int mx, int my, int dx, int dy, int button)
     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;
     else if (dy)
@@ -6201,10 +6390,7 @@ void HandleSetupScreen_Input(int mx, int my, int dx, int dy, int button)
       else if (y == 2)
       {
        if (setup.input[input_player_nr].use_joystick)
-       {
-         InitJoysticks();
-         CalibrateJoystick(input_player_nr);
-       }
+         ConfigureJoystick(input_player_nr);
        else
          CustomizeKeyboard(input_player_nr);
       }
@@ -6263,12 +6449,10 @@ void CustomizeKeyboard(int player_nr)
 
   while (!finished)
   {
-    if (PendingEvent())                /* got event */
-    {
-      Event event;
-
-      NextEvent(&event);
+    Event event;
 
+    if (NextValidEvent(&event))
+    {
       switch (event.type)
       {
         case EVENT_KEYPRESS:
@@ -6351,190 +6535,430 @@ void CustomizeKeyboard(int player_nr)
   DrawSetupScreen_Input();
 }
 
-static boolean CalibrateJoystickMain(int player_nr)
-{
-  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;
+/* game controller mapping generator by Gabriel Jacobo <gabomdq@gmail.com> */
 
-  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 = 3 * 3;
-  int joy_x, joy_y;
-  int joy_value;
-  int result = -1;
+#define MARKER_BUTTON          1
+#define MARKER_AXIS_X          2
+#define MARKER_AXIS_Y          3
 
-  if (joystick.status == JOYSTICK_NOT_AVAILABLE)
-    return FALSE;
+static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick)
+{
+#if defined(TARGET_SDL2)
+  static boolean bitmaps_initialized = FALSE;
+  boolean screen_initialized = FALSE;
+  static Bitmap *controller, *button, *axis_x, *axis_y;
+  char *name;
+  boolean success = TRUE;
+  boolean done = FALSE, next = FALSE;
+  Event event;
+  int alpha = 200, alpha_step = -1;
+  int alpha_ticks = 0;
+  char mapping[4096], temp[4096];
+  int font_name = MENU_SETUP_FONT_TITLE;
+  int font_info = MENU_SETUP_FONT_TEXT;
+  int spacing_name = menu.line_spacing_setup[SETUP_MODE_INPUT];
+  int spacing_line = menu.line_spacing_setup[SETUP_MODE_INPUT];
+  int spacing_para = menu.paragraph_spacing_setup[SETUP_MODE_INPUT];
+  int ystep_name = getMenuTextStep(spacing_name, font_name);
+  int ystep_line = getMenuTextStep(spacing_line, font_info);
+  int ystep_para = getMenuTextStep(spacing_para, font_info);
+  int i, j;
 
-  if (joystick_fd < 0 || !setup.input[player_nr].use_joystick)
-    return FALSE;
+  struct
+  {
+    int x, y;
+    int marker;
+    char *field;
+    int axis, button, hat, hat_value;
+    char mapping[4096];
+  }
+  *step, *prev_step, steps[] =
+  {
+    { 356, 155, MARKER_BUTTON, "a",            },
+    { 396, 122, MARKER_BUTTON, "b",            },
+    { 320, 125, MARKER_BUTTON, "x",            },
+    { 358,  95, MARKER_BUTTON, "y",            },
+    { 162, 125, MARKER_BUTTON, "back",         },
+    { 216, 125, MARKER_BUTTON, "guide",                },
+    { 271, 125, MARKER_BUTTON, "start",                },
+    { 110, 200, MARKER_BUTTON, "dpleft",       },
+    { 146, 228, MARKER_BUTTON, "dpdown",       },
+    { 178, 200, MARKER_BUTTON, "dpright",      },
+    { 146, 172, MARKER_BUTTON, "dpup",         },
+    {  50,  40, MARKER_BUTTON, "leftshoulder", },
+    {  88, -10, MARKER_AXIS_Y, "lefttrigger",  },
+    { 382,  40, MARKER_BUTTON, "rightshoulder",        },
+    { 346, -10, MARKER_AXIS_Y, "righttrigger", },
+    {  73, 141, MARKER_BUTTON, "leftstick",    },
+    { 282, 210, MARKER_BUTTON, "rightstick",   },
+    {  73, 141, MARKER_AXIS_X, "leftx",                },
+    {  73, 141, MARKER_AXIS_Y, "lefty",                },
+    { 282, 210, MARKER_AXIS_X, "rightx",       },
+    { 282, 210, MARKER_AXIS_Y, "righty",       },
+  };
 
-  FadeSetEnterMenu();
-  FadeOut(REDRAW_FIELD);
+  unsigned int event_frame_delay = 0;
+  unsigned int event_frame_delay_value = GAME_FRAME_DELAY;
 
-  ClearField();
+  ResetDelayCounter(&event_frame_delay);
 
-  for (y = 0; y < 3; y++)
+  if (!bitmaps_initialized)
   {
-    for (x = 0; x < 3; x++)
-    {
-      DrawFixedGraphic(xpos + x - 1, ypos + y - 1, IMG_MENU_CALIBRATE_BLUE, 0);
-      check[x][y] = FALSE;
-    }
+    controller = LoadCustomImage("joystick/controller.png");
+    button     = LoadCustomImage("joystick/button.png");
+    axis_x     = LoadCustomImage("joystick/axis_x.png");
+    axis_y     = LoadCustomImage("joystick/axis_y.png");
+
+    bitmaps_initialized = TRUE;
   }
 
-  DrawTextSCentered(mSY - SY +  6 * 32, FONT_TITLE_1, "Rotate joystick");
-  DrawTextSCentered(mSY - SY +  7 * 32, FONT_TITLE_1, "in all directions");
-  DrawTextSCentered(mSY - SY +  9 * 32, FONT_TITLE_1, "if all balls");
-  DrawTextSCentered(mSY - SY + 10 * 32, FONT_TITLE_1, "are marked,");
-  DrawTextSCentered(mSY - SY + 11 * 32, FONT_TITLE_1, "center joystick");
-  DrawTextSCentered(mSY - SY + 12 * 32, FONT_TITLE_1, "and");
-  DrawTextSCentered(mSY - SY + 13 * 32, FONT_TITLE_1, "press any button!");
+  name = getFormattedJoystickName(SDL_JoystickName(joystick));
 
-  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);
+#if DEBUG_JOYSTICKS
+  /* print info about the joystick we are watching */
+  Error(ERR_DEBUG, "watching joystick %d: (%s)\n",
+       SDL_JoystickInstanceID(joystick), name);
+  Error(ERR_DEBUG, "joystick has %d axes, %d hats, %d balls, and %d buttons\n",
+       SDL_JoystickNumAxes(joystick), SDL_JoystickNumHats(joystick),
+       SDL_JoystickNumBalls(joystick), SDL_JoystickNumButtons(joystick));
+#endif
 
-  /* eventually uncalibrated center position (joystick could be uncentered) */
-  if (!ReadJoystick(joystick_fd, &joy_x, &joy_y, NULL, NULL))
-    return FALSE;
+  /* initialize mapping with GUID and name */
+  SDL_JoystickGetGUIDString(SDL_JoystickGetGUID(joystick), temp, sizeof(temp));
 
-  new_joystick_xmiddle = joy_x;
-  new_joystick_ymiddle = joy_y;
+  snprintf(mapping, sizeof(mapping), "%s,%s,platform:%s,",
+          temp, name, SDL_GetPlatform());
 
-  DrawFixedGraphic(xpos + last_x, ypos + last_y, IMG_MENU_CALIBRATE_RED, 0);
+  /* loop through all steps (buttons and axes), getting joystick events */
+  for (i = 0; i < SDL_arraysize(steps) && !done;)
+  {
+    Bitmap *marker = button;   /* initialize with reliable default value */
 
-  FadeIn(REDRAW_FIELD);
+    step = &steps[i];
+    strcpy(step->mapping, mapping);
+    step->axis = -1;
+    step->button = -1;
+    step->hat = -1;
+    step->hat_value = -1;
 
-  while (Joystick(player_nr) & JOY_BUTTON);    /* wait for released button */
+    marker = (step->marker == MARKER_BUTTON ? button :
+             step->marker == MARKER_AXIS_X ? axis_x :
+             step->marker == MARKER_AXIS_Y ? axis_y : marker);
 
-  while (result < 0)
-  {
-    if (PendingEvent())                /* got event */
+    next = FALSE;
+
+    while (!done && !next)
     {
-      Event event;
+      alpha += alpha_step * (int)(SDL_GetTicks() - alpha_ticks) / 5;
+      alpha_ticks = SDL_GetTicks();
+
+      if (alpha >= 255)
+      {
+       alpha = 255;
+       alpha_step = -1;
+      }
+      else if (alpha < 128)
+      {
+       alpha = 127;
+       alpha_step = 1;
+      }
 
-      NextEvent(&event);
+      int controller_x = SX + (SXSIZE - controller->width) / 2;
+      int controller_y = SY + ystep_line;
 
-      switch (event.type)
+      int marker_x = controller_x + step->x;
+      int marker_y = controller_y + step->y;
+
+      int ystart1 = mSY - 2 * SY + controller_y + controller->height;
+      int ystart2 = ystart1 + ystep_name + ystep_line;
+
+      ClearField();
+
+      DrawTextSCentered(ystart1, font_name, name);
+
+      DrawTextSCentered(ystart2, font_info,
+                       "Press buttons and move axes on");
+      ystart2 += ystep_line;
+      DrawTextSCentered(ystart2, font_info,
+                       "your controller when indicated.");
+      ystart2 += ystep_line;
+      DrawTextSCentered(ystart2, font_info,
+                       "(Your controller may look different.)");
+      ystart2 += ystep_para;
+
+#if defined(PLATFORM_ANDROID)
+      DrawTextSCentered(ystart2, font_info,
+                       "To correct a mistake,");
+      ystart2 += ystep_line;
+      DrawTextSCentered(ystart2, font_info,
+                       "press the 'back' button.");
+      ystart2 += ystep_line;
+      DrawTextSCentered(ystart2, font_info,
+                       "To skip a button or axis,");
+      ystart2 += ystep_line;
+      DrawTextSCentered(ystart2, font_info,
+                       "press the 'menu' button.");
+#else
+      DrawTextSCentered(ystart2, font_info,
+                       "To correct a mistake,");
+      ystart2 += ystep_line;
+      DrawTextSCentered(ystart2, font_info,
+                       "press the 'backspace' key.");
+      ystart2 += ystep_line;
+      DrawTextSCentered(ystart2, font_info,
+                       "To skip a button or axis,");
+      ystart2 += ystep_line;
+      DrawTextSCentered(ystart2, font_info,
+                       "press the 'return' key.");
+      ystart2 += ystep_line;
+      DrawTextSCentered(ystart2, font_info,
+                       "To exit, press the 'escape' key.");
+#endif
+
+      BlitBitmapMasked(controller, drawto, 0, 0,
+                      controller->width, controller->height,
+                      controller_x, controller_y);
+
+      SDL_SetSurfaceAlphaMod(marker->surface_masked, alpha);
+
+      BlitBitmapMasked(marker, drawto, 0, 0,
+                      marker->width, marker->height,
+                      marker_x, marker_y);
+
+      if (!screen_initialized)
+       FadeIn(REDRAW_FIELD);
+      else
+       BackToFront();
+
+      screen_initialized = TRUE;
+
+      while (NextValidEvent(&event))
       {
-       case EVENT_KEYPRESS:
-         switch (GetEventKey((KeyEvent *)&event, TRUE))
-         {
-           case KSYM_Return:
-             if (check_remaining == 0)
-               result = 1;
+       switch (event.type)
+       {
+         case SDL_JOYAXISMOTION:
+           if (event.jaxis.value > 20000 ||
+               event.jaxis.value < -20000)
+           {
+             for (j = 0; j < i; j++)
+               if (steps[j].axis == event.jaxis.axis)
+                 break;
+
+             if (j == i)
+             {
+               if (step->marker != MARKER_AXIS_X &&
+                   step->marker != MARKER_AXIS_Y)
+                 break;
+
+               step->axis = event.jaxis.axis;
+               strcat(mapping, step->field);
+               snprintf(temp, sizeof(temp), ":a%u,", event.jaxis.axis);
+               strcat(mapping, temp);
+               i++;
+               next = TRUE;
+             }
+           }
+
+           break;
+
+         case SDL_JOYHATMOTION:
+           /* ignore centering; we're probably just coming back
+              to the center from the previous item we set */
+           if (event.jhat.value == SDL_HAT_CENTERED)
              break;
 
-           case KSYM_Escape:
-             FadeSkipNextFadeIn();
-             result = 0;
+           for (j = 0; j < i; j++)
+             if (steps[j].hat == event.jhat.hat &&
+                 steps[j].hat_value == event.jhat.value)
+               break;
+
+           if (j == i)
+           {
+             step->hat = event.jhat.hat;
+             step->hat_value = event.jhat.value;
+             strcat(mapping, step->field);
+             snprintf(temp, sizeof(temp), ":h%u.%u,",
+                      event.jhat.hat, event.jhat.value );
+             strcat(mapping, temp);
+             i++;
+             next = TRUE;
+           }
+
+           break;
+
+         case SDL_JOYBALLMOTION:
+           break;
+
+         case SDL_JOYBUTTONUP:
+           for (j = 0; j < i; j++)
+             if (steps[j].button == event.jbutton.button)
+               break;
+
+           if (j == i)
+           {
+             step->button = event.jbutton.button;
+             strcat(mapping, step->field);
+             snprintf(temp, sizeof(temp), ":b%u,", event.jbutton.button);
+             strcat(mapping, temp);
+             i++;
+             next = TRUE;
+           }
+
+           break;
+
+         case SDL_FINGERDOWN:
+         case SDL_MOUSEBUTTONDOWN:
+           /* skip this step */
+           i++;
+           next = TRUE;
+
+           break;
+
+         case SDL_KEYDOWN:
+           if (event.key.keysym.sym == KSYM_BackSpace ||
+               event.key.keysym.sym == KSYM_Back)
+           {
+             if (i == 0)
+             {
+               /* leave screen */
+               success = FALSE;
+               done = TRUE;
+             }
+
+             /* undo this step */
+             prev_step = &steps[i - 1];
+             strcpy(mapping, prev_step->mapping);
+             i--;
+             next = TRUE;
+
              break;
+           }
+
+           if (event.key.keysym.sym == KSYM_space ||
+               event.key.keysym.sym == KSYM_Return ||
+               event.key.keysym.sym == KSYM_Menu)
+           {
+             /* skip this step */
+             i++;
+             next = TRUE;
 
-           default:
              break;
-         }
-         break;
+           }
 
-       case EVENT_KEYRELEASE:
-         key_joystick_mapping = 0;
-         break;
+           if (event.key.keysym.sym == KSYM_Escape)
+           {
+             /* leave screen */
+             success = FALSE;
+             done = TRUE;
+           }
 
-       default:
-         HandleOtherEvents(&event);
+           break;
+
+         case SDL_QUIT:
+           program.exit_function(0);
+           break;
+
+         default:
+           break;
+       }
+
+       // do not handle events for longer than standard frame delay period
+       if (DelayReached(&event_frame_delay, event_frame_delay_value))
          break;
       }
     }
+  }
 
-    if (!ReadJoystick(joystick_fd, &joy_x, &joy_y, NULL, NULL))
-      return FALSE;
+  if (success)
+  {
+#if DEBUG_JOYSTICKS
+    Error(ERR_DEBUG, "New game controller mapping:\n\n%s\n\n", mapping);
+#endif
 
-    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);
+    // activate mapping for this game
+    SDL_GameControllerAddMapping(mapping);
 
-    setup.input[player_nr].joy.xleft = new_joystick_xleft;
-    setup.input[player_nr].joy.yupper = new_joystick_yupper;
-    setup.input[player_nr].joy.xright = new_joystick_xright;
-    setup.input[player_nr].joy.ylower = new_joystick_ylower;
-    setup.input[player_nr].joy.xmiddle = new_joystick_xmiddle;
-    setup.input[player_nr].joy.ymiddle = new_joystick_ymiddle;
+    // save mapping to personal mappings
+    SaveSetup_AddGameControllerMapping(mapping);
+  }
 
-    CheckJoystickData();
+  /* wait until the last pending event was removed from event queue */
+  while (NextValidEvent(&event));
 
-    joy_value = Joystick(player_nr);
+  return success;
+#else
+  return TRUE;
+#endif
+}
 
-    if (joy_value & JOY_BUTTON && check_remaining == 0)
-      result = 1;
+static int ConfigureJoystickMain(int player_nr)
+{
+  char *device_name = setup.input[player_nr].joy.device_name;
+  int joystick_nr = getJoystickNrFromDeviceName(device_name);
+  boolean joystick_active = CheckJoystickOpened(joystick_nr);
+  int success = FALSE;
+  int i;
 
-    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 (joystick.status == JOYSTICK_NOT_AVAILABLE)
+    return JOYSTICK_NOT_AVAILABLE;
 
-    if (x != last_x || y != last_y)
-    {
-      DrawFixedGraphic(xpos + last_x, ypos + last_y,
-                      IMG_MENU_CALIBRATE_YELLOW, 0);
-      DrawFixedGraphic(xpos + x,      ypos + y,
-                      IMG_MENU_CALIBRATE_RED,    0);
+  if (!joystick_active || !setup.input[player_nr].use_joystick)
+    return JOYSTICK_NOT_AVAILABLE;
 
-      last_x = x;
-      last_y = y;
+  FadeSetEnterMenu();
+  FadeOut(REDRAW_FIELD);
 
-      if (check_remaining > 0 && !check[x+1][y+1])
-      {
-       check[x+1][y+1] = TRUE;
-       check_remaining--;
-      }
-    }
+  // close all joystick devices (potentially opened as game controllers)
+  for (i = 0; i < SDL_NumJoysticks(); i++)
+    SDLCloseJoystick(i);
 
-    BackToFront();
-  }
+  // open joystick device as plain joystick to configure as game controller
+  SDL_Joystick *joystick = SDL_JoystickOpen(joystick_nr);
 
-  /* calibrated center position (joystick should now be centered) */
-  if (!ReadJoystick(joystick_fd, &joy_x, &joy_y, NULL, NULL))
+  // as the joystick was successfully opened before, this should not happen
+  if (joystick == NULL)
     return FALSE;
 
-  new_joystick_xmiddle = joy_x;
-  new_joystick_ymiddle = joy_y;
+  // create new game controller mapping (buttons and axes) for joystick device
+  success = ConfigureJoystickMapButtonsAndAxes(joystick);
 
-  /* wait until the last pressed button was released */
-  while (Joystick(player_nr) & JOY_BUTTON)
-  {
-    if (PendingEvent())                /* got event */
-    {
-      Event event;
+  // close joystick (and maybe re-open as configured game controller later)
+  SDL_JoystickClose(joystick);
 
-      NextEvent(&event);
-      HandleOtherEvents(&event);
+  // re-open all joystick devices (potentially as game controllers)
+  for (i = 0; i < SDL_NumJoysticks(); i++)
+    SDLOpenJoystick(i);
 
-      BackToFront();
-    }
-  }
+  // clear all joystick input actions for all joystick devices
+  SDLClearJoystickState();
 
-  return TRUE;
+  return (success ? JOYSTICK_CONFIGURED : JOYSTICK_NOT_CONFIGURED);
 }
 
-void CalibrateJoystick(int player_nr)
+void ConfigureJoystick(int player_nr)
 {
-  if (!CalibrateJoystickMain(player_nr))
+  boolean state = ConfigureJoystickMain(player_nr);
+
+  if (state != JOYSTICK_NOT_CONFIGURED)
   {
+    boolean success = (state == JOYSTICK_CONFIGURED);
+    char *message = (success ? " IS CONFIGURED! " : " NOT AVAILABLE! ");
     char *device_name = setup.input[player_nr].joy.device_name;
     int nr = getJoystickNrFromDeviceName(device_name) + 1;
     int xpos = mSX - SX;
     int ypos = mSY - SY;
+    unsigned int wait_frame_delay = 0;
+    unsigned int wait_frame_delay_value = 2000;
+
+    ResetDelayCounter(&wait_frame_delay);
 
     ClearField();
 
     DrawTextF(xpos + 16, ypos + 6 * 32, FONT_TITLE_1, "   JOYSTICK %d   ", nr);
-    DrawTextF(xpos + 16, ypos + 7 * 32, FONT_TITLE_1, " NOT AVAILABLE! ");
-    BackToFront();
+    DrawTextF(xpos + 16, ypos + 7 * 32, FONT_TITLE_1, message);
 
-    Delay(2000);               /* show error message for a short time */
+    while (!DelayReached(&wait_frame_delay, wait_frame_delay_value))
+      BackToFront();
 
     ClearEventQueue();
   }
@@ -6544,8 +6968,6 @@ void CalibrateJoystick(int player_nr)
 
 void DrawSetupScreen()
 {
-  DeactivateJoystick();
-
   if (setup_mode == SETUP_MODE_INPUT)
     DrawSetupScreen_Input();
   else if (setup_mode == SETUP_MODE_CHOOSE_GAME_SPEED)