X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=f68b9d24172e6b8ed4ed1e9742bcd055c6553c7d;hb=c9d4e622c3cb9860ad8e8d95c67a36fdf1f48e0f;hp=098939eb62383223979920ef043e15be49c30d07;hpb=19cd4a9462d25ebbe9ea5e9a07eb33496f05754f;p=rocksndiamonds.git

diff --git a/src/screens.c b/src/screens.c
index 098939eb..f68b9d24 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -6255,7 +6255,19 @@ static void drawPlayerSetupInputInfo(int player_nr, boolean active)
     "Joystick3",
     "Joystick4"
   };
-  int text_font_nr = (active ? FONT_MENU_1_ACTIVE : FONT_MENU_1);
+  int font_nr_menu = (active ? FONT_MENU_1_ACTIVE : FONT_MENU_1);
+  int font_nr_info = FONT_MENU_1;
+  int font_nr_name = FONT_VALUE_OLD;
+  int font_nr_on   = FONT_VALUE_1;
+  int font_nr_off  = FONT_VALUE_OLD;
+  int pos = 4;
+
+  if (SCR_FIELDX < SCR_FIELDX_DEFAULT)
+  {
+    font_nr_info = FONT_MENU_2;
+    font_nr_on   = FONT_VALUE_NARROW;
+    font_nr_off  = FONT_VALUE_OLD_NARROW;
+  }
 
   custom_key = setup.input[player_nr].key;
 
@@ -6273,41 +6285,41 @@ static void drawPlayerSetupInputInfo(int player_nr, boolean active)
     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);
+    int font_nr = (joystick_active ? font_nr_on : font_nr_off);
 
     DrawText(mSX + 8 * 32, mSY + 3 * 32, text, font_nr);
-    DrawText(mSX + 32, mSY + 4 * 32, "Configure", text_font_nr);
+    DrawText(mSX + 32, mSY + 4 * 32, "Configure", font_nr_menu);
   }
   else
   {
-    DrawText(mSX + 8 * 32, mSY + 3 * 32, "Keyboard ", FONT_VALUE_1);
-    DrawText(mSX + 1 * 32, mSY + 4 * 32, "Customize", text_font_nr);
+    DrawText(mSX + 8 * 32, mSY + 3 * 32, "Keyboard ", font_nr_on);
+    DrawText(mSX + 1 * 32, mSY + 4 * 32, "Customize", font_nr_menu);
   }
 
-  DrawText(mSX + 32, mSY + 5 * 32, "Actual Settings:", FONT_MENU_1);
+  DrawText(mSX + 32, mSY + 5 * 32, "Actual Settings:", font_nr_info);
 
-  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);
+  drawCursorXY(1, pos + 0, IMG_MENU_BUTTON_LEFT);
+  drawCursorXY(1, pos + 1, IMG_MENU_BUTTON_RIGHT);
+  drawCursorXY(1, pos + 2, IMG_MENU_BUTTON_UP);
+  drawCursorXY(1, pos + 3, IMG_MENU_BUTTON_DOWN);
 
-  DrawText(mSX + 2 * 32, mSY +  6 * 32, ":", FONT_VALUE_OLD);
-  DrawText(mSX + 2 * 32, mSY +  7 * 32, ":", FONT_VALUE_OLD);
-  DrawText(mSX + 2 * 32, mSY +  8 * 32, ":", FONT_VALUE_OLD);
-  DrawText(mSX + 2 * 32, mSY +  9 * 32, ":", FONT_VALUE_OLD);
-  DrawText(mSX + 1 * 32, mSY + 10 * 32, "Snap Field:", FONT_VALUE_OLD);
-  DrawText(mSX + 1 * 32, mSY + 12 * 32, "Drop Element:", FONT_VALUE_OLD);
+  DrawText(mSX + 2 * 32, mSY + (pos + 2) * 32, ":", font_nr_name);
+  DrawText(mSX + 2 * 32, mSY + (pos + 3) * 32, ":", font_nr_name);
+  DrawText(mSX + 2 * 32, mSY + (pos + 4) * 32, ":", font_nr_name);
+  DrawText(mSX + 2 * 32, mSY + (pos + 5) * 32, ":", font_nr_name);
+  DrawText(mSX + 1 * 32, mSY + (pos + 6) * 32, "Snap Field:", font_nr_name);
+  DrawText(mSX + 1 * 32, mSY + (pos + 8) * 32, "Drop Element:", font_nr_name);
 
   for (i = 0; i < 6; i++)
   {
-    int ypos = 6 + i + (i > 3 ? i-3 : 0);
+    int ypos = (pos + 2) + i + (i > 3 ? i - 3 : 0);
 
     DrawText(mSX + 3 * 32, mSY + ypos * 32,
-	     "              ", FONT_VALUE_1);
+	     "              ", font_nr_on);
     DrawText(mSX + 3 * 32, mSY + ypos * 32,
 	     (setup.input[player_nr].use_joystick ?
 	      custom[i].text :
-	      getKeyNameFromKey(*custom[i].key)), FONT_VALUE_1);
+	      getKeyNameFromKey(*custom[i].key)), font_nr_on);
   }
 }
 
@@ -6444,7 +6456,7 @@ void HandleSetupScreen_Input(int mx, int my, int dx, int dy, int button)
   }
 }
 
-void CustomizeKeyboard(int player_nr)
+static boolean CustomizeKeyboardMain(int player_nr)
 {
   int i;
   int step_nr;
@@ -6463,6 +6475,15 @@ void CustomizeKeyboard(int player_nr)
     { &custom_key.snap,  "Snap Field"	},
     { &custom_key.drop,  "Drop Element"	}
   };
+  int font_nr_old = FONT_VALUE_OLD;
+  int font_nr_new = FONT_VALUE_1;
+  int success = FALSE;
+
+  if (SCR_FIELDX < SCR_FIELDX_DEFAULT)
+  {
+    font_nr_old = FONT_VALUE_OLD_NARROW;
+    font_nr_new = FONT_VALUE_NARROW;
+  }
 
   /* read existing key bindings from player setup */
   custom_key = setup.input[player_nr].key;
@@ -6480,7 +6501,7 @@ void CustomizeKeyboard(int player_nr)
   DrawText(mSX, mSY + (2 + 2 * step_nr + 1) * 32,
 	   "Key:", FONT_INPUT_1_ACTIVE);
   DrawText(mSX + 4 * 32, mSY + (2 + 2 * step_nr + 1) * 32,
-	   getKeyNameFromKey(*customize_step[step_nr].key), FONT_VALUE_OLD);
+	   getKeyNameFromKey(*customize_step[step_nr].key), font_nr_old);
 
   FadeIn(REDRAW_FIELD);
 
@@ -6496,18 +6517,15 @@ void CustomizeKeyboard(int player_nr)
 	  {
 	    Key key = GetEventKey((KeyEvent *)&event, FALSE);
 
-	    if (key == KSYM_Escape || (key == KSYM_Return && step_nr == 6))
+	    /* press 'Escape' to abort and keep the old key bindings */
+	    if (key == KSYM_Escape)
 	    {
-	      if (key == KSYM_Escape)
-		FadeSkipNextFadeIn();
+	      FadeSkipNextFadeIn();
 
 	      finished = TRUE;
-	      break;
-	    }
 
-	    /* all keys configured -- wait for "Escape" or "Return" key */
-	    if (step_nr == 6)
 	      break;
+	    }
 
 	    /* press 'Enter' to keep the existing key binding */
 	    if (key == KSYM_Return)
@@ -6523,9 +6541,9 @@ void CustomizeKeyboard(int player_nr)
 	    /* got new key binding */
 	    *customize_step[step_nr].key = key;
 	    DrawText(mSX + 4 * 32, mSY + (2 + 2 * step_nr + 1) * 32,
-		     "             ", FONT_VALUE_1);
+		     "             ", font_nr_new);
 	    DrawText(mSX + 4 * 32, mSY + (2 + 2 * step_nr + 1) * 32,
-		     getKeyNameFromKey(key), FONT_VALUE_1);
+		     getKeyNameFromKey(key), font_nr_new);
 	    step_nr++;
 
 	    /* un-highlight last query */
@@ -6534,11 +6552,12 @@ void CustomizeKeyboard(int player_nr)
 	    DrawText(mSX, mSY + (2 + 2 * (step_nr - 1) + 1) * 32,
 		     "Key:", FONT_MENU_1);
 
-	    /* press 'Enter' to leave */
+	    /* all keys configured */
 	    if (step_nr == 6)
 	    {
-	      DrawText(mSX + 16, mSY + 15 * 32 + 16,
-		       "Press Enter", FONT_TITLE_1);
+	      finished = TRUE;
+	      success = TRUE;
+
 	      break;
 	    }
 
@@ -6549,7 +6568,7 @@ void CustomizeKeyboard(int player_nr)
 		     "Key:", FONT_INPUT_1_ACTIVE);
 	    DrawText(mSX + 4 * 32, mSY + (2 + 2 * step_nr + 1) * 32,
 		     getKeyNameFromKey(*customize_step[step_nr].key),
-		     FONT_VALUE_OLD);
+		     font_nr_old);
 	  }
 	  break;
 
@@ -6566,8 +6585,38 @@ void CustomizeKeyboard(int player_nr)
     BackToFront();
   }
 
-  /* write new key bindings back to player setup */
-  setup.input[player_nr].key = custom_key;
+  /* write new key bindings back to player setup, if successfully finished */
+  if (success)
+    setup.input[player_nr].key = custom_key;
+
+  return success;
+}
+
+void CustomizeKeyboard(int player_nr)
+{
+  boolean success = CustomizeKeyboardMain(player_nr);
+
+  if (success)
+  {
+    int font_nr = FONT_TITLE_1;
+    int font_height = getFontHeight(font_nr);
+    int ypos1 = SYSIZE / 2 - font_height * 2;
+    int ypos2 = SYSIZE / 2 - font_height * 1;
+    unsigned int wait_frame_delay = 0;
+    unsigned int wait_frame_delay_value = 2000;
+
+    ResetDelayCounter(&wait_frame_delay);
+
+    ClearField();
+
+    DrawTextSCentered(ypos1, font_nr, "Keyboard");
+    DrawTextSCentered(ypos2, font_nr, "configured!");
+
+    while (!DelayReached(&wait_frame_delay, wait_frame_delay_value))
+      BackToFront();
+
+    ClearEventQueue();
+  }
 
   DrawSetupScreen_Input();
 }
@@ -6979,11 +7028,14 @@ void ConfigureJoystick(int player_nr)
   if (state != JOYSTICK_NOT_CONFIGURED)
   {
     boolean success = (state == JOYSTICK_CONFIGURED);
-    char *message = (success ? " IS CONFIGURED! " : " NOT AVAILABLE! ");
+    char message1[MAX_OUTPUT_LINESIZE + 1];
+    char *message2 = (success ? "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;
+    int font_nr = FONT_TITLE_1;
+    int font_height = getFontHeight(font_nr);
+    int ypos1 = SYSIZE / 2 - font_height * 2;
+    int ypos2 = SYSIZE / 2 - font_height * 1;
     unsigned int wait_frame_delay = 0;
     unsigned int wait_frame_delay_value = 2000;
 
@@ -6991,8 +7043,10 @@ void ConfigureJoystick(int player_nr)
 
     ClearField();
 
-    DrawTextF(xpos + 16, ypos + 6 * 32, FONT_TITLE_1, "   JOYSTICK %d   ", nr);
-    DrawTextF(xpos + 16, ypos + 7 * 32, FONT_TITLE_1, message);
+    sprintf(message1, "Joystick %d", nr);
+
+    DrawTextSCentered(ypos1, font_nr, message1);
+    DrawTextSCentered(ypos2, font_nr, message2);
 
     while (!DelayReached(&wait_frame_delay, wait_frame_delay_value))
       BackToFront();