(SDL2) Added joypad driver

Makefile

@@ -214,7 +214,9 @@ ifeq ($(HAVE_SDL), 1)
 endif
 
 ifeq ($(HAVE_SDL2), 1)
-   OBJ += gfx/sdl2_gfx.o input/sdl2_input.o
+   OBJ += gfx/sdl2_gfx.o input/sdl2_input.o input/sdl2_joypad.o
+   JOYCONFIG_OBJ += input/sdl2_joypad.o
+   JOYCONFIG_LIBS += $(SDL2_LIBS)
    DEFINES += $(SDL2_CFLAGS) $(BSD_LOCAL_INC)
    LIBS += $(SDL2_LIBS)
 endif

input/input_common.c

@@ -77,6 +77,9 @@ static const rarch_joypad_driver_t *joypad_drivers[] = {
 #ifdef HAVE_SDL
    &sdl_joypad,
 #endif
+#ifdef HAVE_SDL2
+   &sdl2_joypad,
+#endif
 #ifdef __MACH__
    &apple_joypad,
 #endif

input/sdl2_input.c

@@ -40,7 +40,7 @@ static void *sdl2_input_init(void)
    if (!sdl)
       return NULL;
 
-   sdl->joypad = NULL;//input_joypad_init_driver(g_settings.input.joypad_driver);
+   sdl->joypad = input_joypad_init_driver(g_settings.input.joypad_driver);
    return sdl;
 }
 

input/sdl2_joypad.c

@@ -0,0 +1,274 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ * 
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "input_common.h"
+#include "SDL.h"
+#include "../general.h"
+
+typedef struct _sdl2_joypad
+{
+   SDL_Joystick *joypad;
+   SDL_Haptic *haptic;
+   int rumble_effect; // -1 = not initialized, -2 = error/unsupported
+   unsigned num_axes;
+   unsigned num_buttons;
+   unsigned num_hats;
+   unsigned num_balls;
+} sdl2_joypad_t;
+
+static sdl2_joypad_t g_pads[MAX_PLAYERS];
+
+static void sdl2_joypad_destroy(void)
+{
+   unsigned i;
+   for (i = 0; i < MAX_PLAYERS; i++)
+   {
+      if (g_pads[i].haptic)
+         SDL_HapticClose(g_pads[i].haptic);
+
+      if (g_pads[i].joypad)
+         SDL_JoystickClose(g_pads[i].joypad);
+   }
+
+   SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
+   memset(g_pads, 0, sizeof(g_pads));
+}
+
+static bool sdl2_joypad_init(void)
+{
+   unsigned i;
+   bool has_haptic = false;
+
+   if (SDL_Init(SDL_INIT_JOYSTICK) < 0)
+   {
+      RARCH_WARN("[SDL]: Failed to initialize joystick interface: %s\n",
+                 SDL_GetError());
+      return false;
+   }
+
+   // TODO: Add SDL_GameController support.
+//   if (SDL_Init(SDL_INIT_GAMECONTROLLER) < 0)
+//      RARCH_LOG("[SDL]: Failed to initialize game controller interface: %s\n",
+//                SDL_GetError());
+
+   if (SDL_Init(SDL_INIT_HAPTIC) < 0)
+      RARCH_WARN("[SDL]: Failed to initialize haptic device support: %s\n",
+                 SDL_GetError());
+   else
+      has_haptic = true;
+
+   unsigned num_sticks = SDL_NumJoysticks();
+   if (num_sticks > MAX_PLAYERS)
+      num_sticks = MAX_PLAYERS;
+
+   for (i = 0; i < num_sticks; i++)
+   {
+      sdl2_joypad_t *pad = &g_pads[i];
+      pad->joypad = SDL_JoystickOpen(i);
+      if (!pad->joypad)
+      {
+         RARCH_ERR("[SDL]: Couldn't open SDL joystick #%u.\n", i);
+         goto error;
+      }
+
+      RARCH_LOG("[SDL]: Opened Joystick: %s (#%u).\n",
+                SDL_JoystickName(pad->joypad), i);
+
+      pad->haptic = has_haptic ? SDL_HapticOpenFromJoystick(pad->joypad) : NULL;
+
+      if (has_haptic && !pad->haptic)
+         RARCH_WARN("[SDL]: Couldn't open haptic device of the joypad #%u: %s\n",
+                    i, SDL_GetError());
+
+      pad->rumble_effect = -1;
+
+      if (pad->haptic)
+      {
+         SDL_HapticLeftRight efx;
+         efx.type = SDL_HAPTIC_LEFTRIGHT;
+         efx.large_magnitude = efx.large_magnitude = 0x4000;
+         efx.length = 5000;
+
+         if (SDL_HapticEffectSupported(pad->haptic, &efx) == SDL_FALSE)
+         {
+            pad->rumble_effect = -2;
+            RARCH_WARN("[SDL]: Joypad #%u does not support rumble.\n", i);
+         }
+      }
+
+
+      pad->num_axes    = SDL_JoystickNumAxes(pad->joypad);
+      pad->num_buttons = SDL_JoystickNumButtons(pad->joypad);
+      pad->num_hats    = SDL_JoystickNumHats(pad->joypad);
+      pad->num_balls   = SDL_JoystickNumBalls(pad->joypad);
+
+      RARCH_LOG("[SDL]: Joypad #%u has: %u axes, %u buttons, %u hats and %u trackballs.\n",
+                i, pad->num_axes, pad->num_buttons, pad->num_hats, pad->num_balls);
+   }
+
+   return true;
+
+error:
+   sdl2_joypad_destroy();
+   return false;
+}
+
+static bool sdl2_joypad_button(unsigned port, uint16_t joykey)
+{
+   if (joykey == NO_BTN)
+      return false;
+
+   const sdl2_joypad_t *pad = &g_pads[port];
+   if (!pad->joypad)
+      return false;
+
+   // Check hat.
+   if (GET_HAT_DIR(joykey))
+   {
+      uint16_t hat = GET_HAT(joykey);
+      if (hat >= pad->num_hats)
+         return false;
+
+      Uint8 dir = SDL_JoystickGetHat(pad->joypad, hat);
+      switch (GET_HAT_DIR(joykey))
+      {
+         case HAT_UP_MASK:
+            return dir & SDL_HAT_UP;
+         case HAT_DOWN_MASK:
+            return dir & SDL_HAT_DOWN;
+         case HAT_LEFT_MASK:
+            return dir & SDL_HAT_LEFT;
+         case HAT_RIGHT_MASK:
+            return dir & SDL_HAT_RIGHT;
+         default:
+            return false;
+      }
+   }
+   else // Check the button
+   {
+      if (joykey < pad->num_buttons && SDL_JoystickGetButton(pad->joypad, joykey))
+         return true;
+
+      return false;
+   }
+}
+
+static int16_t sdl2_joypad_axis(unsigned port, uint32_t joyaxis)
+{
+   if (joyaxis == AXIS_NONE)
+      return 0;
+
+   const sdl2_joypad_t *pad = &g_pads[port];
+   if (!pad->joypad)
+      return false;
+
+   Sint16 val = 0;
+   if (AXIS_NEG_GET(joyaxis) < pad->num_axes)
+   {
+      val = SDL_JoystickGetAxis(pad->joypad, AXIS_NEG_GET(joyaxis));
+
+      if (val > 0)
+         val = 0;
+      else if (val < -0x7fff) // -0x8000 can cause trouble if we later abs() it.
+         val = -0x7fff;
+   }
+   else if (AXIS_POS_GET(joyaxis) < pad->num_axes)
+   {
+      val = SDL_JoystickGetAxis(pad->joypad, AXIS_POS_GET(joyaxis));
+
+      if (val < 0)
+         val = 0;
+   }
+
+   return val;
+}
+
+static void sdl2_joypad_poll(void)
+{
+   SDL_JoystickUpdate();
+}
+
+static bool sdl2_joypad_set_rumble(unsigned pad, enum retro_rumble_effect effect, uint16_t strength)
+{
+   SDL_HapticLeftRight efx;
+   memset(&efx, 0, sizeof(efx));
+
+   sdl2_joypad_t *joypad = &g_pads[pad];
+
+   if (!joypad->joypad || !joypad->haptic)
+      return;
+
+   efx.type = SDL_HAPTIC_LEFTRIGHT;
+   efx.length = 5000;
+
+   switch (effect)
+   {
+      case RETRO_RUMBLE_STRONG: efx.large_magnitude = strength; break;
+      case RETRO_RUMBLE_WEAK: efx.small_magnitude = strength; break;
+      default: return false;
+   }
+
+   if (joypad->rumble_effect == -1)
+   {
+      joypad->rumble_effect = SDL_HapticNewEffect(g_pads[pad].haptic, &efx);
+      if (joypad->rumble_effect < 0)
+      {
+         RARCH_WARN("[SDL]: Failed to create rumble effect for joypad %u: %s\n",
+                    pad, SDL_GetError());
+         joypad->rumble_effect = -2;
+         return false;
+      }
+   }
+   else if (joypad->rumble_effect >= 0)
+      SDL_HapticUpdateEffect(joypad->haptic, joypad->rumble_effect, &efx);
+
+   if (joypad->rumble_effect < 0)
+      return false;
+
+   if (SDL_HapticRunEffect(joypad->haptic, joypad->rumble_effect, 1) < 0)
+   {
+      RARCH_WARN("[SDL]: Failed to set rumble effect on joypad %u: %s\n",
+                          pad, SDL_GetError());
+      return false;
+   }
+
+   return true;
+}
+
+static bool sdl2_joypad_query_pad(unsigned pad)
+{
+   return pad < MAX_PLAYERS && g_pads[pad].joypad;
+}
+
+static const char *sdl2_joypad_name(unsigned pad)
+{
+   if (pad >= MAX_PLAYERS)
+      return NULL;
+
+   return SDL_JoystickName(g_pads[pad].joypad);
+}
+
+const rarch_joypad_driver_t sdl2_joypad = {
+   sdl2_joypad_init,
+   sdl2_joypad_query_pad,
+   sdl2_joypad_destroy,
+   sdl2_joypad_button,
+   sdl2_joypad_axis,
+   sdl2_joypad_poll,
+   sdl2_joypad_set_rumble,
+   sdl2_joypad_name,
+   "sdl2",
+};
+