X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Fjoystick.c;h=0c61c57ad056bd75e16c4ec828504ce257e4a673;hp=61d0a113970302c70e1337d20096cab32b5102b9;hb=b641818c787e48bbf03ce2a0cd5b542c4c21e523;hpb=cea8726203188984c5d94dc15934d1e186d18c37

diff --git a/src/libgame/joystick.c b/src/libgame/joystick.c
index 61d0a113..0c61c57a 100644
--- a/src/libgame/joystick.c
+++ b/src/libgame/joystick.c
@@ -4,7 +4,7 @@
 // (c) 1995-2014 by Artsoft Entertainment
 //     		    Holger Schemel
 //		    info@artsoft.org
-//		    http://www.artsoft.org/
+//		    https://www.artsoft.org/
 // ----------------------------------------------------------------------------
 // joystick.c
 // ============================================================================
@@ -17,14 +17,14 @@
 #include "misc.h"
 
 
-/* ========================================================================= */
-/* platform independent joystick functions                                   */
-/* ========================================================================= */
+// ============================================================================
+// platform independent joystick functions
+// ============================================================================
 
 #define TRANSLATE_JOYSYMBOL_TO_JOYNAME	0
 #define TRANSLATE_JOYNAME_TO_JOYSYMBOL	1
 
-void translate_joyname(int *joysymbol, char **name, int mode)
+static void translate_joyname(int *joysymbol, char **name, int mode)
 {
   static struct
   {
@@ -119,6 +119,39 @@ char *getDeviceNameFromJoystickNr(int joystick_nr)
 	  joystick_device_name[joystick_nr] : "");
 }
 
+char *getFormattedJoystickName(const char *name_raw)
+{
+  static char name[MAX_JOYSTICK_NAME_LEN + 1];
+  boolean name_skip_space = TRUE;
+  int i, j;
+
+  if (name_raw == NULL)
+    name_raw = "(unknown joystick)";
+
+  // copy joystick name, cutting leading and multiple spaces
+  for (i = 0, j = 0; i < strlen(name_raw) && i < MAX_JOYSTICK_NAME_LEN; i++)
+  {
+    if (name_raw[i] != ' ')
+    {
+      name[j++] = name_raw[i];
+      name_skip_space = FALSE;
+    }
+    else if (!name_skip_space)
+    {
+      name[j++] = name_raw[i];
+      name_skip_space = TRUE;
+    }
+  }
+
+  // cut trailing space
+  if (j > 0 && name[j - 1] == ' ')
+    j--;
+
+  name[j] = '\0';
+
+  return name;
+}
+
 static int JoystickPositionPercent(int center, int border, int actual)
 {
   int range, position;
@@ -140,7 +173,7 @@ static int JoystickPositionPercent(int center, int border, int actual)
   return percent;
 }
 
-void CheckJoystickData()
+void CheckJoystickData(void)
 {
   int i;
   int distance = 100;
@@ -216,7 +249,7 @@ int Joystick(int player_nr)
   return JoystickExt(player_nr, FALSE);
 }
 
-int JoystickButtonExt(int player_nr, boolean use_as_joystick_nr)
+static int JoystickButtonExt(int player_nr, boolean use_as_joystick_nr)
 {
   static int last_joy_button[MAX_PLAYERS] = { 0, 0, 0, 0 };
   int joy_button = (JoystickExt(player_nr, use_as_joystick_nr) & JOY_BUTTON);
@@ -246,7 +279,7 @@ int JoystickButton(int player_nr)
   return JoystickButtonExt(player_nr, FALSE);
 }
 
-int AnyJoystick()
+int AnyJoystick(void)
 {
   int i;
   int result = 0;
@@ -257,7 +290,7 @@ int AnyJoystick()
   return result;
 }
 
-int AnyJoystickButton()
+int AnyJoystickButton(void)
 {
   int i;
   int result = JOY_BUTTON_NOT_PRESSED;
@@ -272,7 +305,7 @@ int AnyJoystickButton()
   return result;
 }
 
-void DeactivateJoystick()
+void DeactivateJoystick(void)
 {
   /* Temporarily deactivate joystick. This is needed for calibration
      screens, where the player has to select a joystick device that
@@ -285,9 +318,9 @@ void DeactivateJoystick()
     joystick.status &= ~JOYSTICK_ACTIVE;
 }
 
-void ActivateJoystick()
+void ActivateJoystick(void)
 {
-  /* reactivate temporarily deactivated joystick */
+  // reactivate temporarily deactivated joystick
 
   if (joystick.status & JOYSTICK_AVAILABLE)
     joystick.status |= JOYSTICK_ACTIVE;