X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fjoystick.c;h=f092c11d677fa03a0beb7f868aff13efa41d903d;hb=30eb586d06bc4d1ee7388dced1c20e530292aa93;hp=a6a065cddc318a4322279fb8dd20b85d3328b973;hpb=cad3c0cde6926a8a379725b1ffc6fc657272a76d;p=rocksndiamonds.git

diff --git a/src/libgame/joystick.c b/src/libgame/joystick.c
index a6a065cd..f092c11d 100644
--- a/src/libgame/joystick.c
+++ b/src/libgame/joystick.c
@@ -24,7 +24,7 @@
 #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;
@@ -161,22 +194,22 @@ void CheckJoystickData()
 
 int JoystickExt(int player_nr, boolean use_as_joystick_nr)
 {
-  int joystick_fd = joystick.fd[player_nr];
+  int joystick_nr = joystick.nr[player_nr];
   int js_x, js_y;
   boolean js_b1, js_b2;
   int left, right, up, down;
   int result = JOY_NO_ACTION;
 
   if (use_as_joystick_nr)
-    joystick_fd = player_nr;
+    joystick_nr = player_nr;
 
   if (joystick.status != JOYSTICK_ACTIVATED)
     return JOY_NO_ACTION;
 
-  if (joystick_fd < 0)
+  if (joystick_nr < 0)
     return JOY_NO_ACTION;
 
-  if (!ReadJoystick(joystick_fd, &js_x, &js_y, &js_b1, &js_b2))
+  if (!ReadJoystick(joystick_nr, &js_x, &js_y, &js_b1, &js_b2))
   {
     Error(ERR_WARN, "cannot read joystick device '%s'",
 	  setup.input[player_nr].joy.device_name);
@@ -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,7 +318,7 @@ void DeactivateJoystick()
     joystick.status &= ~JOYSTICK_ACTIVE;
 }
 
-void ActivateJoystick()
+void ActivateJoystick(void)
 {
   /* reactivate temporarily deactivated joystick */