rnd-20061017-1-src
[rocksndiamonds.git] / src / screens.c
index 17a7910c5746ccb8f36ac00286b3ded4eda465e7..be4f8a48e5c525804fd36ee2f34b10e14141fb05 100644 (file)
@@ -72,9 +72,9 @@
 #define MAX_MENU_TEXT_LENGTH_MEDIUM    (MAX_MENU_TEXT_LENGTH_BIG * 2)
 
 /* buttons and scrollbars identifiers */
-#define SCREEN_CTRL_ID_LAST_LEVEL      0
+#define SCREEN_CTRL_ID_PREV_LEVEL      0
 #define SCREEN_CTRL_ID_NEXT_LEVEL      1
-#define SCREEN_CTRL_ID_LAST_PLAYER     2
+#define SCREEN_CTRL_ID_PREV_PLAYER     2
 #define SCREEN_CTRL_ID_NEXT_PLAYER     3
 #define SCREEN_CTRL_ID_SCROLL_UP       4
 #define SCREEN_CTRL_ID_SCROLL_DOWN     5
 
 #define SC_BORDER_SIZE                 14
 
+/* other useful macro definitions */
+#define BUTTON_GRAPHIC_ACTIVE(g)                                              \
+       (g == IMG_MENU_BUTTON_LEFT       ? IMG_MENU_BUTTON_LEFT_ACTIVE       : \
+        g == IMG_MENU_BUTTON_RIGHT      ? IMG_MENU_BUTTON_RIGHT_ACTIVE      : \
+        g == IMG_MENU_BUTTON_UP         ? IMG_MENU_BUTTON_UP_ACTIVE         : \
+        g == IMG_MENU_BUTTON_DOWN       ? IMG_MENU_BUTTON_DOWN_ACTIVE       : \
+         g == IMG_MENU_BUTTON_LEAVE_MENU ? IMG_MENU_BUTTON_LEAVE_MENU_ACTIVE : \
+         g == IMG_MENU_BUTTON_ENTER_MENU ? IMG_MENU_BUTTON_ENTER_MENU_ACTIVE : \
+         g == IMG_MENU_BUTTON_PREV_LEVEL ? IMG_MENU_BUTTON_PREV_LEVEL_ACTIVE : \
+         g == IMG_MENU_BUTTON_NEXT_LEVEL ? IMG_MENU_BUTTON_NEXT_LEVEL_ACTIVE : \
+         IMG_MENU_BUTTON_ACTIVE)
+
 
 /* forward declarations of internal functions */
 static void HandleScreenGadgets(struct GadgetInfo *);
@@ -170,56 +182,323 @@ static Bitmap *scrollbar_bitmap[NUM_SCROLLBAR_BITMAPS];
 #endif
 
 
-static void drawCursorExt(int xpos, int ypos, int color, int g)
+#define MAIN_CONTROL_NAME              0
+#define MAIN_CONTROL_LEVELS            1
+#define MAIN_CONTROL_SCORES            2
+#define MAIN_CONTROL_EDITOR            3
+#define MAIN_CONTROL_INFO              4
+#define MAIN_CONTROL_GAME              5
+#define MAIN_CONTROL_SETUP             6
+#define MAIN_CONTROL_QUIT              7
+#define MAIN_CONTROL_PREV_LEVEL                8
+#define MAIN_CONTROL_NEXT_LEVEL                9
+#define MAIN_CONTROL_CURRENT_LEVEL     10
+#define MAIN_CONTROL_FIRST_LEVEL       11
+#define MAIN_CONTROL_LAST_LEVEL                12
+#define MAIN_CONTROL_LEVELSET_INFO     13
+#define MAIN_CONTROL_LEVEL_INFO                14
+
+static char main_text_name[10];
+static char main_text_current_level[10];
+static char main_text_first_level[10];
+static char main_text_last_level[10];
+static char main_input_name[MAX_PLAYER_NAME_LEN + 1];
+
+static struct
+{
+  int nr;
+
+  struct Rect *pos_button;
+  int button_graphic;
+
+  struct Rect *pos_text;
+  char *text;
+  int font_text;
+
+  struct Rect *pos_input;
+  char *input;
+  int font_input;
+}
+main_controls[] =
+{
+  {
+    MAIN_CONTROL_NAME,
+    &menu.main.button.name,            IMG_MENU_BUTTON,
+    &menu.main.text.name,              main_text_name,         FONT_MENU_1,
+    &menu.main.input.name,             main_input_name,        FONT_INPUT_1,
+  },
+  {
+    MAIN_CONTROL_LEVELS,
+    &menu.main.button.levels,          IMG_MENU_BUTTON_ENTER_MENU,
+    &menu.main.text.levels,            "Levelset",             FONT_MENU_1,
+    NULL,                              NULL,                   -1,
+  },
+  {
+    MAIN_CONTROL_SCORES,
+    &menu.main.button.scores,          IMG_MENU_BUTTON,
+    &menu.main.text.scores,            "Hall Of Fame",         FONT_MENU_1,
+    NULL,                              NULL,                   -1,
+  },
+  {
+    MAIN_CONTROL_EDITOR,
+    &menu.main.button.editor,          IMG_MENU_BUTTON,
+    &menu.main.text.editor,            "Level Creator",        FONT_MENU_1,    
+    NULL,                              NULL,                   -1,
+  },
+  {
+    MAIN_CONTROL_INFO,
+    &menu.main.button.info,            IMG_MENU_BUTTON_ENTER_MENU,
+    &menu.main.text.info,              "Info Screen",          FONT_MENU_1,
+    NULL,                              NULL,                   -1,
+  },
+  {
+    MAIN_CONTROL_GAME,
+    &menu.main.button.game,            IMG_MENU_BUTTON,
+    &menu.main.text.game,              "Start Game",           FONT_MENU_1,
+    NULL,                              NULL,                   -1,
+  },
+  {
+    MAIN_CONTROL_SETUP,
+    &menu.main.button.setup,           IMG_MENU_BUTTON_ENTER_MENU,
+    &menu.main.text.setup,             "Setup",                FONT_MENU_1,
+    NULL,                              NULL,                   -1,
+  },
+  {
+    MAIN_CONTROL_QUIT,
+    &menu.main.button.quit,            IMG_MENU_BUTTON,
+    &menu.main.text.quit,              "Quit",                 FONT_MENU_1,
+    NULL,                              NULL,                   -1,
+  },
+#if 0
+  {
+    MAIN_CONTROL_PREV_LEVEL,
+    &menu.main.button.prev_level,      IMG_MENU_BUTTON_PREV_LEVEL,
+    NULL,                              NULL,                   -1,
+    NULL,                              NULL,                   -1,
+  },
+  {
+    MAIN_CONTROL_NEXT_LEVEL,
+    &menu.main.button.next_level,      IMG_MENU_BUTTON_NEXT_LEVEL,
+    NULL,                              NULL,                   -1,
+    NULL,                              NULL,                   -1,
+  },
+#endif
+  {
+    MAIN_CONTROL_CURRENT_LEVEL,
+    NULL,                              -1,
+    &menu.main.text.current_level,     main_text_current_level,FONT_VALUE_1,
+    NULL,                              NULL,                   -1,
+  },
+  {
+    MAIN_CONTROL_FIRST_LEVEL,
+    NULL,                              -1,
+    &menu.main.text.first_level,       main_text_first_level,  FONT_TEXT_3,
+    NULL,                              NULL,                   -1,
+  },
+  {
+    MAIN_CONTROL_LAST_LEVEL,
+    NULL,                              -1,
+    &menu.main.text.last_level,                main_text_last_level,   FONT_TEXT_3,
+    NULL,                              NULL,                   -1,
+  },
+  {
+    MAIN_CONTROL_LEVELSET_INFO,
+    NULL,                              -1,
+    &menu.main.text.levelset_info,     NULL,                   -1,
+    NULL,                              NULL,                   -1,
+  },
+  {
+    MAIN_CONTROL_LEVEL_INFO,
+    NULL,                              -1,
+    &menu.main.text.level_info,                NULL,                   -1,
+    NULL,                              NULL,                   -1,
+  },
+
+  {
+    -1,
+    NULL,                              -1,
+    NULL,                              NULL,                   -1,
+    NULL,                              NULL,                   -1,
+  }
+};
+
+
+static void InitializeMainControls()
+{
+  boolean local_team_mode = (!options.network && setup.team_mode);
+  int i;
+
+  /* set main control text values to dynamically determined values */
+  sprintf(main_text_name,          "%s",   local_team_mode ? "Team:" : "Name:");
+  sprintf(main_text_current_level, "%s",   int2str(level_nr, 3));
+  sprintf(main_text_first_level,   "%03d", leveldir_current->first_level);
+  sprintf(main_text_last_level,    "%03d", leveldir_current->last_level);
+  sprintf(main_input_name,         "%s",   setup.player_name);
+
+  /* set main control screen positions to dynamically determined values */
+  for (i = 0; main_controls[i].nr != -1; i++)
+  {
+    int nr                  = main_controls[i].nr;
+    struct Rect *pos_button = main_controls[i].pos_button;
+    struct Rect *pos_text   = main_controls[i].pos_text;
+    struct Rect *pos_input  = main_controls[i].pos_input;
+    char *text              = main_controls[i].text;
+    char *input             = main_controls[i].input;
+    int button_graphic      = main_controls[i].button_graphic;
+    int font_text           = main_controls[i].font_text;
+    int font_input          = main_controls[i].font_input;
+
+    int font_text_width   = (font_text  != -1 ? getFontWidth(font_text)   : 0);
+    int font_text_height  = (font_text  != -1 ? getFontHeight(font_text)  : 0);
+    int font_input_width  = (font_input != -1 ? getFontWidth(font_input)  : 0);
+    int font_input_height = (font_input != -1 ? getFontHeight(font_input) : 0);
+    int text_chars  = (text  != NULL ? strlen(text)  : 0);
+    int input_chars = (input != NULL ? strlen(input) : 0);
+
+    int button_width =
+      (button_graphic != -1 ? graphic_info[button_graphic].width  : 0);
+    int button_height =
+      (button_graphic != -1 ? graphic_info[button_graphic].height : 0);
+    int text_width   = font_text_width * text_chars;
+    int text_height  = font_text_height;
+    int input_width  = font_input_width * input_chars;
+    int input_height = font_input_height;
+
+    if (nr == MAIN_CONTROL_NAME)
+    {
+#if 0
+      if (menu.main.input.name.x == -1)
+       menu.main.input.name.x = menu.main.text.name.x + text_width;
+      if (menu.main.input.name.y == -1)
+       menu.main.input.name.y = menu.main.text.name.y;
+#endif
+
+      menu.main.input.name.width  = font_input_width * MAX_PLAYER_NAME_LEN;
+      menu.main.input.name.height = font_input_height;
+    }
+
+    if (pos_button != NULL)
+    {
+      if (pos_button->width == 0)
+       pos_button->width = button_width;
+      if (pos_button->height == 0)
+       pos_button->height = button_height;
+    }
+
+    if (pos_text != NULL)
+    {
+      if (pos_text->x == -1 && pos_button != NULL)
+       pos_text->x = pos_button->x + pos_button->width;
+      if (pos_text->y == -1 && pos_button != NULL)
+       pos_text->y = pos_button->y;
+
+      if (pos_text->width == -1)
+       pos_text->width = text_width;
+      if (pos_text->height == -1)
+       pos_text->height = text_height;
+    }
+
+    if (pos_input != NULL)
+    {
+      if (pos_input->x == -1 && pos_text != NULL)
+       pos_input->x = pos_text->x + pos_text->width;
+      if (pos_input->y == -1 && pos_text != NULL)
+       pos_input->y = pos_text->y;
+
+      if (pos_input->width == -1)
+       pos_input->width = input_width;
+      if (pos_input->height == -1)
+       pos_input->height = input_height;
+    }
+  }
+}
+
+static void DrawCursorAndText_Main(int pos, boolean active)
+{
+  int i;
+
+  for (i = 0; main_controls[i].nr != -1; i++)
+  {
+    if (main_controls[i].nr == pos)
+    {
+      struct Rect *pos_button = main_controls[i].pos_button;
+      struct Rect *pos_text   = main_controls[i].pos_text;
+      char *text              = main_controls[i].text;
+      int font_text           = main_controls[i].font_text;
+      int button_graphic      = main_controls[i].button_graphic;
+      int button_x = mSX + pos_button->x;
+      int button_y = mSY + pos_button->y;
+      int text_x   = mSX + pos_text->x;
+      int text_y   = mSY + pos_text->y;
+
+      if (active)
+      {
+       button_graphic = BUTTON_GRAPHIC_ACTIVE(button_graphic);
+       font_text = FONT_ACTIVE(font_text);
+      }
+
+      DrawBackground(button_x, button_y, pos_button->width, pos_button->height);
+      DrawGraphicThruMaskExt(drawto, button_x, button_y, button_graphic, 0);
+
+      DrawBackground(text_x, text_y, pos_text->width, pos_text->height);
+      DrawText(text_x, text_y, text, font_text);
+
+      break;
+    }
+  }
+}
+
+static boolean insideRect(struct Rect *rect, int x, int y)
+{
+  return (rect != NULL &&
+         x >= rect->x && x < rect->x + rect->width &&
+         y >= rect->y && y < rect->y + rect->height);
+}
+
+static void drawCursorExt(int xpos, int ypos, boolean active, int graphic)
 {
   static int cursor_array[SCR_FIELDY];
+  int x = mSX + TILEX * xpos;
+  int y = mSY + TILEY * (MENU_SCREEN_START_YPOS + ypos);
 
   if (xpos == 0)
   {
-    if (g != 0)
-      cursor_array[ypos] = g;
+    if (graphic != -1)
+      cursor_array[ypos] = graphic;
     else
-      g = cursor_array[ypos];
+      graphic = cursor_array[ypos];
   }
 
-  if (color == FC_RED)
-    g = (g == IMG_MENU_BUTTON_LEFT  ? IMG_MENU_BUTTON_LEFT_ACTIVE  :
-        g == IMG_MENU_BUTTON_RIGHT ? IMG_MENU_BUTTON_RIGHT_ACTIVE :
-        g == IMG_MENU_BUTTON_LEAVE_MENU ? IMG_MENU_BUTTON_LEAVE_MENU_ACTIVE :
-        g == IMG_MENU_BUTTON_ENTER_MENU ? IMG_MENU_BUTTON_ENTER_MENU_ACTIVE :
-        g == IMG_MENU_BUTTON_LAST_LEVEL ? IMG_MENU_BUTTON_LAST_LEVEL_ACTIVE :
-        g == IMG_MENU_BUTTON_NEXT_LEVEL ? IMG_MENU_BUTTON_NEXT_LEVEL_ACTIVE :
-        IMG_MENU_BUTTON_ACTIVE);
-
-  ypos += MENU_SCREEN_START_YPOS;
+  if (active)
+    graphic = BUTTON_GRAPHIC_ACTIVE(graphic);
 
-  DrawBackground(mSX + xpos * TILEX, mSY + ypos * TILEY, TILEX, TILEY);
-  DrawGraphicThruMaskExt(drawto, mSX + xpos * TILEX, mSY + ypos * TILEY, g, 0);
+  DrawBackground(x, y, TILEX, TILEY);
+  DrawGraphicThruMaskExt(drawto, x, y, graphic, 0);
 }
 
 static void initCursor(int ypos, int graphic)
 {
-  drawCursorExt(0, ypos, FC_BLUE, graphic);
+  drawCursorExt(0, ypos, FALSE, graphic);
 }
 
-static void drawCursor(int ypos, int color)
+static void drawCursor(int ypos, boolean active)
 {
-  drawCursorExt(0, ypos, color, 0);
+  drawCursorExt(0, ypos, active, -1);
 }
 
 static void drawCursorXY(int xpos, int ypos, int graphic)
 {
-  drawCursorExt(xpos, ypos, -1, graphic);
+  drawCursorExt(xpos, ypos, FALSE, graphic);
 }
 
-static void drawChooseTreeCursor(int ypos, int color)
+static void drawChooseTreeCursor(int ypos, boolean active)
 {
   int last_game_status = game_status;  /* save current game status */
 
   /* force LEVELS draw offset on artwork setup screen */
   game_status = GAME_MODE_LEVELS;
 
-  drawCursorExt(0, ypos, color, 0);
+  drawCursorExt(0, ypos, active, 0);
 
   game_status = last_game_status;      /* restore current game status */
 }
@@ -230,25 +509,27 @@ void DrawHeadline()
   DrawTextSCentered(MENU_TITLE2_YPOS, FONT_TITLE_2, PROGRAM_COPYRIGHT_STRING);
 }
 
-static int getLastLevelButtonPos()
+#if 0
+static int getPrevlevelButtonPos()
 {
   return 10;
 }
 
 static int getCurrentLevelTextPos()
 {
-  return (getLastLevelButtonPos() + 1);
+  return (getPrevlevelButtonPos() + 1);
 }
 
 static int getNextLevelButtonPos()
 {
-  return getLastLevelButtonPos() + 3 + 1;
+  return getPrevlevelButtonPos() + 3 + 1;
 }
 
 static int getLevelRangeTextPos()
 {
   return getNextLevelButtonPos() + 1;
 }
+#endif
 
 void DrawTitleScreenImage(int nr)
 {
@@ -304,9 +585,11 @@ void DrawMainMenuExt(int redraw_mask, boolean do_fading)
 {
   static LevelDirTree *leveldir_last_valid = NULL;
   boolean levelset_has_changed = FALSE;
-  char *name_text = (!options.network && setup.team_mode ? "Team:" : "Name:");
-  char *level_text = "Levelset";
+#if 0
+  boolean local_team_mode = (!options.network && setup.team_mode);
+  char *name_text = (local_team_mode ? "Team:" : "Name:");
   int name_width, level_width;
+#endif
   int i;
 
   UnmapAllGadgets();
@@ -376,8 +659,35 @@ void DrawMainMenuExt(int redraw_mask, boolean do_fading)
 
   DrawHeadline();
 
+#if 1
+  InitializeMainControls();
+
+  for (i = 0; main_controls[i].nr != -1; i++)
+  {
+    struct Rect *pos_button = main_controls[i].pos_button;
+    struct Rect *pos_text   = main_controls[i].pos_text;
+    struct Rect *pos_input  = main_controls[i].pos_input;
+    char *text              = main_controls[i].text;
+    char *input             = main_controls[i].input;
+    int button_graphic      = main_controls[i].button_graphic;
+    int font_text           = main_controls[i].font_text;
+    int font_input          = main_controls[i].font_input;
+
+    if (pos_button != NULL)
+      DrawGraphicThruMaskExt(drawto, mSX + pos_button->x, mSY + pos_button->y,
+                            button_graphic, 0);
+
+    if (pos_text != NULL && text != NULL)
+      DrawText(mSX + pos_text->x, mSY + pos_text->y, text, font_text);
+
+    if (pos_input != NULL && input != NULL)
+      DrawText(mSX + pos_input->x, mSY + pos_input->y, input, font_input);
+  }
+
+#else
+
   DrawText(mSX + 32, mSY + 2 * 32, name_text,       FONT_MENU_1);
-  DrawText(mSX + 32, mSY + 3 * 32, level_text,      FONT_MENU_1);
+  DrawText(mSX + 32, mSY + 3 * 32, "Levelset",      FONT_MENU_1);
   DrawText(mSX + 32, mSY + 4 * 32, "Hall Of Fame",  FONT_MENU_1);
   DrawText(mSX + 32, mSY + 5 * 32, "Level Creator", FONT_MENU_1);
   DrawText(mSX + 32, mSY + 6 * 32, "Info Screen",   FONT_MENU_1);
@@ -395,23 +705,24 @@ void DrawMainMenuExt(int redraw_mask, boolean do_fading)
   DrawText(mSX + getCurrentLevelTextPos() * 32, mSY + 3 * 32,
           int2str(level_nr, 3), FONT_VALUE_1);
 
-  DrawPreviewLevel(TRUE);
-
   {
     int text_height = getFontHeight(FONT_TEXT_3);
-    int xpos = getLevelRangeTextPos() * 32;
-    int ypos2 = -SY + 3 * 32 + 16;
+    int xpos = getLevelRangeTextPos() * 32 + 8;
+    int ypos2 = 3 * 32 + 16;
     int ypos1 = ypos2 - text_height;
 
-    DrawTextF(mSX + xpos, mSY + ypos1, FONT_TEXT_3,
+    DrawTextF(mSX - SX + xpos, mSY - SY + ypos1, FONT_TEXT_3,
              "%03d", leveldir_current->first_level);
-    DrawTextF(mSX + xpos, mSY + ypos2, FONT_TEXT_3,
+    DrawTextF(mSX - SX + xpos, mSY - SY + ypos2, FONT_TEXT_3,
              "%03d", leveldir_current->last_level);
   }
 
   for (i = 0; i < 8; i++)
     initCursor(i, (i == 1 || i == 4 || i == 6 ? IMG_MENU_BUTTON_ENTER_MENU :
                   IMG_MENU_BUTTON));
+#endif
+
+  DrawPreviewLevel(TRUE);
 
   DrawTextSCentered(326, FONT_TITLE_2, "A Game by Artsoft Entertainment");
 
@@ -635,6 +946,140 @@ void HandleMainMenu_SelectLevel(int step, int direction)
   }
 }
 
+#if 1
+
+void HandleMainMenu(int mx, int my, int dx, int dy, int button)
+{
+  static int choice = MAIN_CONTROL_GAME;
+  int pos = choice;
+  int i;
+
+  if (button == MB_MENU_INITIALIZE)
+  {
+    DrawCursorAndText_Main(choice, TRUE);
+
+    return;
+  }
+
+  if (mx || my)                /* mouse input */
+  {
+    pos = -1;
+
+    for (i = 0; main_controls[i].nr != -1; i++)
+    {
+      if (insideRect(main_controls[i].pos_button, mx - mSX, my - mSY) ||
+         insideRect(main_controls[i].pos_text,   mx - mSX, my - mSY) ||
+         insideRect(main_controls[i].pos_input,  mx - mSX, my - mSY))
+      {
+       pos = main_controls[i].nr;
+
+       break;
+      }
+    }
+  }
+  else if (dx || dy)   /* keyboard input */
+  {
+    if (dx > 0 && (choice == MAIN_CONTROL_INFO ||
+                  choice == MAIN_CONTROL_SETUP))
+      button = MB_MENU_CHOICE;
+    else if (dy)
+      pos = choice + dy;
+  }
+
+  if (pos == MAIN_CONTROL_LEVELS && dx != 0 && button)
+  {
+    HandleMainMenu_SelectLevel(1, dx < 0 ? -1 : +1);
+  }
+  else if (pos >= MAIN_CONTROL_NAME && pos <= MAIN_CONTROL_QUIT)
+  {
+    if (button)
+    {
+      if (pos != choice)
+      {
+       DrawCursorAndText_Main(choice, FALSE);
+       DrawCursorAndText_Main(pos, TRUE);
+
+       choice = pos;
+      }
+    }
+    else
+    {
+      if (pos == MAIN_CONTROL_NAME)
+      {
+       game_status = GAME_MODE_PSEUDO_TYPENAME;
+
+       HandleTypeName(strlen(setup.player_name), 0);
+      }
+      else if (pos == MAIN_CONTROL_LEVELS)
+      {
+       if (leveldir_first)
+       {
+         game_status = GAME_MODE_LEVELS;
+
+         SaveLevelSetup_LastSeries();
+         SaveLevelSetup_SeriesInfo();
+
+#if 0
+         gotoTopLevelDir();
+#endif
+
+         DrawChooseLevel();
+       }
+      }
+      else if (pos == MAIN_CONTROL_SCORES)
+      {
+       game_status = GAME_MODE_SCORES;
+
+       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);
+
+       game_status = GAME_MODE_EDITOR;
+
+       DrawLevelEd();
+      }
+      else if (pos == MAIN_CONTROL_INFO)
+      {
+       game_status = GAME_MODE_INFO;
+       info_mode = INFO_MODE_MAIN;
+
+       DrawInfoScreen();
+      }
+      else if (pos == MAIN_CONTROL_GAME)
+      {
+       StartGameActions(options.network, setup.autorecord, NEW_RANDOMIZE);
+      }
+      else if (pos == MAIN_CONTROL_SETUP)
+      {
+       game_status = GAME_MODE_SETUP;
+       setup_mode = SETUP_MODE_MAIN;
+
+       DrawSetupScreen();
+      }
+      else if (pos == MAIN_CONTROL_QUIT)
+      {
+       SaveLevelSetup_LastSeries();
+       SaveLevelSetup_SeriesInfo();
+
+        if (Request("Do you really want to quit ?", REQ_ASK | REQ_STAY_CLOSED))
+         game_status = GAME_MODE_QUIT;
+      }
+    }
+  }
+
+  if (game_status == GAME_MODE_MAIN)
+  {
+    DrawPreviewLevel(FALSE);
+    DoAnimation();
+  }
+}
+
+#else
+
 void HandleMainMenu(int mx, int my, int dx, int dy, int button)
 {
   static int choice = 5;
@@ -643,7 +1088,8 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
 
   if (button == MB_MENU_INITIALIZE)
   {
-    drawCursor(choice, FC_RED);
+    drawCursor(choice, TRUE);
+
     return;
   }
 
@@ -676,8 +1122,9 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
     {
       if (y != choice)
       {
-       drawCursor(y, FC_RED);
-       drawCursor(choice, FC_BLUE);
+       drawCursor(choice, FALSE);
+       drawCursor(y, TRUE);
+
        choice = y;
       }
     }
@@ -751,6 +1198,8 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
   }
 }
 
+#endif
+
 
 /* ========================================================================= */
 /* info screen functions                                                     */
@@ -815,6 +1264,21 @@ static struct TokenInfo info_info_main[] =
   { 0,                 NULL,                   NULL                    }
 };
 
+static void DrawCursorAndText_Info(int pos, boolean active)
+{
+  int xpos = MENU_SCREEN_START_XPOS;
+  int ypos = MENU_SCREEN_START_YPOS + pos;
+  int font_nr = FONT_MENU_1;
+
+  if (active)
+    font_nr = FONT_ACTIVE(font_nr);
+
+  DrawText(mSX + xpos * 32, mSY + ypos * 32, info_info[pos].text, font_nr);
+
+  if (info_info[pos].type & ~TYPE_SKIP_ENTRY)
+    drawCursor(pos, active);
+}
+
 static void DrawInfoScreen_Main(int redraw_mask, boolean do_fading)
 {
   int i;
@@ -831,11 +1295,11 @@ static void DrawInfoScreen_Main(int redraw_mask, boolean do_fading)
 
   for (i = 0; info_info[i].type != 0 && i < NUM_MENU_ENTRIES_ON_SCREEN; i++)
   {
+#if 0
     int xpos = MENU_SCREEN_START_XPOS;
     int ypos = MENU_SCREEN_START_YPOS + i;
     int font_nr = FONT_MENU_1;
-
-    DrawText(mSX + xpos * 32, mSY + ypos * 32, info_info[i].text, font_nr);
+#endif
 
     if (info_info[i].type & (TYPE_ENTER_MENU|TYPE_ENTER_LIST))
       initCursor(i, IMG_MENU_BUTTON_ENTER_MENU);
@@ -844,6 +1308,12 @@ static void DrawInfoScreen_Main(int redraw_mask, boolean do_fading)
     else if (info_info[i].type & ~TYPE_SKIP_ENTRY)
       initCursor(i, IMG_MENU_BUTTON);
 
+#if 1
+    DrawCursorAndText_Info(i, FALSE);
+#else
+    DrawText(mSX + xpos * 32, mSY + ypos * 32, info_info[i].text, font_nr);
+#endif
+
     num_info_info++;
   }
 
@@ -877,7 +1347,12 @@ void HandleInfoScreen_Main(int mx, int my, int dx, int dy, int button)
       choice++;
     choice_store[info_mode] = choice;
 
-    drawCursor(choice, FC_RED);
+#if 1
+    DrawCursorAndText_Info(choice, TRUE);
+#else
+    drawCursor(choice, TRUE);
+#endif
+
     return;
   }
   else if (button == MB_MENU_LEAVE)
@@ -889,6 +1364,7 @@ void HandleInfoScreen_Main(int mx, int my, int dx, int dy, int button)
        void (*menu_callback_function)(void) = info_info[y].value;
 
        menu_callback_function();
+
        break;  /* absolutely needed because function changes 'info_info'! */
       }
     }
@@ -928,8 +1404,14 @@ void HandleInfoScreen_Main(int mx, int my, int dx, int dy, int button)
     {
       if (y != choice)
       {
-       drawCursor(y, FC_RED);
-       drawCursor(choice, FC_BLUE);
+#if 1
+       DrawCursorAndText_Info(choice, FALSE);
+       DrawCursorAndText_Info(y, TRUE);
+#else
+       drawCursor(choice, FALSE);
+       drawCursor(y, TRUE);
+#endif
+
        choice = choice_store[info_mode] = y;
       }
     }
@@ -2651,6 +3133,26 @@ static struct TokenInfo setup_info_artwork[] =
   { 0,                 NULL,                   NULL                    }
 };
 
+static struct TokenInfo setup_info_input[] =
+{
+  { TYPE_SWITCH,       NULL,                   "Player:"               },
+  { TYPE_SWITCH,       NULL,                   "Device:"               },
+  { TYPE_ENTER_MENU,   NULL,                   ""                      },
+  { TYPE_EMPTY,                NULL,                   ""                      },
+  { TYPE_EMPTY,                NULL,                   ""                      },
+  { TYPE_EMPTY,                NULL,                   ""                      },
+  { TYPE_EMPTY,                NULL,                   ""                      },
+  { TYPE_EMPTY,                NULL,                   ""                      },
+  { TYPE_EMPTY,                NULL,                   ""                      },
+  { TYPE_EMPTY,                NULL,                   ""                      },
+  { TYPE_EMPTY,                NULL,                   ""                      },
+  { TYPE_EMPTY,                NULL,                   ""                      },
+  { TYPE_EMPTY,                NULL,                   ""                      },
+  { TYPE_LEAVE_MENU,   execSetupMain,          "Back"                  },
+
+  { 0,                 NULL,                   NULL                    }
+};
+
 static struct TokenInfo setup_info_shortcut_1[] =
 {
   { TYPE_KEYTEXT,      NULL,           "Quick Save Game to Tape:",     },
@@ -2867,6 +3369,24 @@ static void changeSetupValue(int pos)
   drawSetupValue(pos);
 }
 
+static void DrawCursorAndText_Setup(int pos, boolean active)
+{
+  int xpos = MENU_SCREEN_START_XPOS;
+  int ypos = MENU_SCREEN_START_YPOS + pos;
+  int font_nr = getSetupTextFont(setup_info[pos].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, setup_info[pos].text, font_nr);
+
+  if (setup_info[pos].type & ~TYPE_SKIP_ENTRY)
+    drawCursor(pos, active);
+}
+
 static void DrawSetupScreen_Generic()
 {
   char *title_string = NULL;
@@ -2924,9 +3444,12 @@ static void DrawSetupScreen_Generic()
   for (i = 0; setup_info[i].type != 0 && i < NUM_MENU_ENTRIES_ON_SCREEN; i++)
   {
     void *value_ptr = setup_info[i].value;
+#if 1
+#else
     int xpos = MENU_SCREEN_START_XPOS;
     int ypos = MENU_SCREEN_START_YPOS + i;
     int font_nr;
+#endif
 
     /* set some entries to "unchangeable" according to other variables */
     if ((value_ptr == &setup.sound_simple && !audio.sound_available) ||
@@ -2936,10 +3459,6 @@ static void DrawSetupScreen_Generic()
        (value_ptr == &screen_mode_text   && !video.fullscreen_available))
       setup_info[i].type |= TYPE_GHOSTED;
 
-    font_nr = getSetupTextFont(setup_info[i].type);
-
-    DrawText(mSX + xpos * 32, mSY + ypos * 32, setup_info[i].text, font_nr);
-
     if (setup_info[i].type & (TYPE_ENTER_MENU|TYPE_ENTER_LIST))
       initCursor(i, IMG_MENU_BUTTON_ENTER_MENU);
     else if (setup_info[i].type & (TYPE_LEAVE_MENU|TYPE_LEAVE_LIST))
@@ -2947,6 +3466,14 @@ static void DrawSetupScreen_Generic()
     else if (setup_info[i].type & ~TYPE_SKIP_ENTRY)
       initCursor(i, IMG_MENU_BUTTON);
 
+#if 1
+    DrawCursorAndText_Setup(i, FALSE);
+#else
+    font_nr = getSetupTextFont(setup_info[i].type);
+
+    DrawText(mSX + xpos * 32, mSY + ypos * 32, setup_info[i].text, font_nr);
+#endif
+
     if (setup_info[i].type & TYPE_VALUE)
       drawSetupValue(i);
 
@@ -2978,7 +3505,11 @@ void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button)
       choice++;
     choice_store[setup_mode] = choice;
 
-    drawCursor(choice, FC_RED);
+#if 1
+    DrawCursorAndText_Setup(choice, TRUE);
+#else
+    drawCursor(choice, TRUE);
+#endif
 
     return;
   }
@@ -3029,8 +3560,14 @@ void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button)
     {
       if (y != choice && setup_info[y].type & ~TYPE_SKIP_ENTRY)
       {
-       drawCursor(y, FC_RED);
-       drawCursor(choice, FC_BLUE);
+#if 1
+       DrawCursorAndText_Setup(choice, FALSE);
+       DrawCursorAndText_Setup(y, TRUE);
+#else
+       drawCursor(choice, FALSE);
+       drawCursor(y, TRUE);
+#endif
+
        choice = choice_store[setup_mode] = y;
       }
     }
@@ -3063,10 +3600,31 @@ void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button)
 
 void DrawSetupScreen_Input()
 {
+#if 1
+  int i;
+#endif
+
   ClearWindow();
 
+#if 1
+  setup_info = setup_info_input;
+#endif
+
   DrawTextSCentered(mSY - SY + 16, FONT_TITLE_1, "Setup Input");
 
+#if 1
+  for (i = 0; setup_info[i].type != 0 && i < NUM_MENU_ENTRIES_ON_SCREEN; i++)
+  {
+    if (setup_info[i].type & (TYPE_ENTER_MENU|TYPE_ENTER_LIST))
+      initCursor(i, IMG_MENU_BUTTON_ENTER_MENU);
+    else if (setup_info[i].type & (TYPE_LEAVE_MENU|TYPE_LEAVE_LIST))
+      initCursor(i, IMG_MENU_BUTTON_LEAVE_MENU);
+    else if (setup_info[i].type & ~TYPE_SKIP_ENTRY)
+      initCursor(i, IMG_MENU_BUTTON);
+
+    DrawCursorAndText_Setup(i, FALSE);
+  }
+#else
   initCursor(0,  IMG_MENU_BUTTON);
   initCursor(1,  IMG_MENU_BUTTON);
   initCursor(2,  IMG_MENU_BUTTON_ENTER_MENU);
@@ -3075,6 +3633,7 @@ void DrawSetupScreen_Input()
   DrawText(mSX + 32, mSY +  2 * 32, "Player:", FONT_MENU_1);
   DrawText(mSX + 32, mSY +  3 * 32, "Device:", FONT_MENU_1);
   DrawText(mSX + 32, mSY + 15 * 32, "Back",   FONT_MENU_1);
+#endif
 
 #if 0
   DeactivateJoystickForCalibration();
@@ -3117,7 +3676,7 @@ static void setJoystickDeviceToNr(char *device_name, int device_nr)
            strlen(device_name));
 }
 
-static void drawPlayerSetupInputInfo(int player_nr)
+static void drawPlayerSetupInputInfo(int player_nr, boolean active)
 {
   int i;
   static struct SetupKeyboardInfo custom_key;
@@ -3141,6 +3700,7 @@ static void drawPlayerSetupInputInfo(int player_nr)
     "Joystick3",
     "Joystick4"
   };
+  int text_font_nr = (active ? FONT_MENU_1_ACTIVE : FONT_MENU_1);
 
   InitJoysticks();
 
@@ -3161,19 +3721,21 @@ static void drawPlayerSetupInputInfo(int player_nr)
     int font_nr = (joystick.fd[player_nr] < 0 ? FONT_VALUE_OLD : FONT_VALUE_1);
 
     DrawText(mSX + 8 * 32, mSY + 3 * 32, text, font_nr);
-    DrawText(mSX + 32, mSY + 4 * 32, "Calibrate", FONT_MENU_1);
+    DrawText(mSX + 32, mSY + 4 * 32, "Calibrate", text_font_nr);
   }
   else
   {
     DrawText(mSX + 8 * 32, mSY + 3 * 32, "Keyboard ", FONT_VALUE_1);
-    DrawText(mSX + 1 * 32, mSY + 4 * 32, "Customize", FONT_MENU_1);
+    DrawText(mSX + 1 * 32, mSY + 4 * 32, "Customize", text_font_nr);
   }
 
   DrawText(mSX + 32, mSY + 5 * 32, "Actual Settings:", FONT_MENU_1);
+
   drawCursorXY(1, 4, IMG_MENU_BUTTON_LEFT);
   drawCursorXY(1, 5, IMG_MENU_BUTTON_RIGHT);
   drawCursorXY(1, 6, IMG_MENU_BUTTON_UP);
   drawCursorXY(1, 7, IMG_MENU_BUTTON_DOWN);
+
   DrawText(mSX + 2 * 32, mSY +  6 * 32, ":", FONT_VALUE_OLD);
   DrawText(mSX + 2 * 32, mSY +  7 * 32, ":", FONT_VALUE_OLD);
   DrawText(mSX + 2 * 32, mSY +  8 * 32, ":", FONT_VALUE_OLD);
@@ -3211,7 +3773,7 @@ void HandleSetupScreen_Input_Player(int step, int direction)
   {
     input_player_nr = new_player_nr;
 
-    drawPlayerSetupInputInfo(input_player_nr);
+    drawPlayerSetupInputInfo(input_player_nr, FALSE);
   }
 }
 
@@ -3227,8 +3789,13 @@ void HandleSetupScreen_Input(int mx, int my, int dx, int dy, int button)
 
   if (button == MB_MENU_INITIALIZE)
   {
-    drawPlayerSetupInputInfo(input_player_nr);
-    drawCursor(choice, FC_RED);
+    drawPlayerSetupInputInfo(input_player_nr, (choice == 2));
+
+#if 1
+    DrawCursorAndText_Setup(choice, TRUE);
+#else
+    drawCursor(choice, TRUE);
+#endif
 
     return;
   }
@@ -3273,8 +3840,16 @@ void HandleSetupScreen_Input(int mx, int my, int dx, int dy, int button)
     {
       if (y != choice)
       {
-       drawCursor(y, FC_RED);
-       drawCursor(choice, FC_BLUE);
+#if 1
+       DrawCursorAndText_Setup(choice, FALSE);
+       DrawCursorAndText_Setup(y, TRUE);
+
+       drawPlayerSetupInputInfo(input_player_nr, (y == 2));
+#else
+       drawCursor(choice, FALSE);
+       drawCursor(y, TRUE);
+#endif
+
        choice = y;
       }
     }
@@ -3302,7 +3877,7 @@ void HandleSetupScreen_Input(int mx, int my, int dx, int dy, int button)
            setJoystickDeviceToNr(device_name, new_device_nr);
        }
 
-       drawPlayerSetupInputInfo(input_player_nr);
+       drawPlayerSetupInputInfo(input_player_nr, FALSE);
       }
       else if (y == 2)
       {
@@ -3725,8 +4300,19 @@ static void getScreenMenuButtonPos(int *x, int *y, int gadget_id)
 {
   switch (gadget_id)
   {
-    case SCREEN_CTRL_ID_LAST_LEVEL:
-      *x = mSX + TILEX * getLastLevelButtonPos();
+#if 1
+    case SCREEN_CTRL_ID_PREV_LEVEL:
+      *x = mSX + menu.main.button.prev_level.x;
+      *y = mSY + 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;
+      break;
+#else
+    case SCREEN_CTRL_ID_PREV_LEVEL:
+      *x = mSX + TILEX * getPrevlevelButtonPos();
       *y = mSY + TILEY * (MENU_SCREEN_START_YPOS + 1);
       break;
 
@@ -3734,8 +4320,9 @@ static void getScreenMenuButtonPos(int *x, int *y, int gadget_id)
       *x = mSX + TILEX * getNextLevelButtonPos();
       *y = mSY + TILEY * (MENU_SCREEN_START_YPOS + 1);
       break;
+#endif
 
-    case SCREEN_CTRL_ID_LAST_PLAYER:
+    case SCREEN_CTRL_ID_PREV_PLAYER:
       *x = mSX + TILEX * 10;
       *y = mSY + TILEY * MENU_SCREEN_START_YPOS;
       break;
@@ -3760,9 +4347,9 @@ static struct
 } menubutton_info[NUM_SCREEN_MENUBUTTONS] =
 {
   {
-    IMG_MENU_BUTTON_LAST_LEVEL, IMG_MENU_BUTTON_LAST_LEVEL_ACTIVE,
+    IMG_MENU_BUTTON_PREV_LEVEL, IMG_MENU_BUTTON_PREV_LEVEL_ACTIVE,
     getScreenMenuButtonPos,
-    SCREEN_CTRL_ID_LAST_LEVEL,
+    SCREEN_CTRL_ID_PREV_LEVEL,
     SCREEN_MASK_MAIN,
     "last level"
   },
@@ -3776,7 +4363,7 @@ static struct
   {
     IMG_MENU_BUTTON_LEFT, IMG_MENU_BUTTON_LEFT_ACTIVE,
     getScreenMenuButtonPos,
-    SCREEN_CTRL_ID_LAST_PLAYER,
+    SCREEN_CTRL_ID_PREV_PLAYER,
     SCREEN_MASK_INPUT,
     "last player"
   },
@@ -4117,7 +4704,7 @@ static void HandleScreenGadgets(struct GadgetInfo *gi)
 
   switch (id)
   {
-    case SCREEN_CTRL_ID_LAST_LEVEL:
+    case SCREEN_CTRL_ID_PREV_LEVEL:
       HandleMainMenu_SelectLevel(step, -1);
       break;
 
@@ -4125,7 +4712,7 @@ static void HandleScreenGadgets(struct GadgetInfo *gi)
       HandleMainMenu_SelectLevel(step, +1);
       break;
 
-    case SCREEN_CTRL_ID_LAST_PLAYER:
+    case SCREEN_CTRL_ID_PREV_PLAYER:
       HandleSetupScreen_Input_Player(step, -1);
       break;