From 9cd2e9ec8fc0127393dfce9c0359d500c8c238be Mon Sep 17 00:00:00 2001
From: Edward Rudd <urkle@outoforder.cc>
Date: Tue, 09 Apr 2019 02:22:50 +0000
Subject: [PATCH] updae source to 2.0.9 source
---
source/src/joystick/windows/SDL_windowsjoystick.c | 129 +++++++++++++++++++++++++-----------------
1 files changed, 76 insertions(+), 53 deletions(-)
diff --git a/source/src/joystick/windows/SDL_windowsjoystick.c b/source/src/joystick/windows/SDL_windowsjoystick.c
index 45cbea6..71b72e6 100644
--- a/source/src/joystick/windows/SDL_windowsjoystick.c
+++ b/source/src/joystick/windows/SDL_windowsjoystick.c
@@ -61,7 +61,6 @@
/* local variables */
static SDL_bool s_bDeviceAdded = SDL_FALSE;
static SDL_bool s_bDeviceRemoved = SDL_FALSE;
-static SDL_JoystickID s_nInstanceID = -1;
static SDL_cond *s_condJoystickThread = NULL;
static SDL_mutex *s_mutexJoyStickEnum = NULL;
static SDL_Thread *s_threadJoystick = NULL;
@@ -256,7 +255,7 @@
/* WM_DEVICECHANGE not working, no XINPUT, no point in keeping thread alive */
break;
#endif /* SDL_JOYSTICK_XINPUT */
- }
+ }
if (s_bWindowsDeviceChanged || bXInputChanged) {
s_bDeviceRemoved = SDL_TRUE;
@@ -271,30 +270,33 @@
return 1;
}
-void SDL_SYS_AddJoystickDevice(JoyStick_DeviceData *device)
+void WINDOWS_AddJoystickDevice(JoyStick_DeviceData *device)
{
device->send_add_event = SDL_TRUE;
- device->nInstanceID = ++s_nInstanceID;
+ device->nInstanceID = SDL_GetNextJoystickInstanceID();
device->pNext = SYS_Joystick;
SYS_Joystick = device;
s_bDeviceAdded = SDL_TRUE;
}
+static void WINDOWS_JoystickDetect(void);
+static void WINDOWS_JoystickQuit(void);
+
/* Function to scan the system for joysticks.
* Joystick 0 should be the system default joystick.
* It should return 0, or -1 on an unrecoverable fatal error.
*/
-int
-SDL_SYS_JoystickInit(void)
+static int
+WINDOWS_JoystickInit(void)
{
if (SDL_DINPUT_JoystickInit() < 0) {
- SDL_SYS_JoystickQuit();
+ WINDOWS_JoystickQuit();
return -1;
}
if (SDL_XINPUT_JoystickInit() < 0) {
- SDL_SYS_JoystickQuit();
+ WINDOWS_JoystickQuit();
return -1;
}
@@ -302,19 +304,19 @@
s_condJoystickThread = SDL_CreateCond();
s_bDeviceAdded = SDL_TRUE; /* force a scan of the system for joysticks this first time */
- SDL_SYS_JoystickDetect();
+ WINDOWS_JoystickDetect();
if (!s_threadJoystick) {
/* spin up the thread to detect hotplug of devices */
s_bJoystickThreadQuit = SDL_FALSE;
s_threadJoystick = SDL_CreateThreadInternal(SDL_JoystickThread, "SDL_joystick", 64 * 1024, NULL);
}
- return SDL_SYS_NumJoysticks();
+ return 0;
}
/* return the number of joysticks that are connected right now */
-int
-SDL_SYS_NumJoysticks(void)
+static int
+WINDOWS_JoystickGetCount(void)
{
int nJoysticks = 0;
JoyStick_DeviceData *device = SYS_Joystick;
@@ -327,8 +329,8 @@
}
/* detect any new joysticks being inserted into the system */
-void
-SDL_SYS_JoystickDetect(void)
+static void
+WINDOWS_JoystickDetect(void)
{
JoyStick_DeviceData *pCurList = NULL;
@@ -383,7 +385,7 @@
SDL_DINPUT_MaybeAddDevice(&pNewJoystick->dxdevice);
}
- SDL_PrivateJoystickAdded(device_index);
+ SDL_PrivateJoystickAdded(pNewJoystick->nInstanceID);
pNewJoystick->send_add_event = SDL_FALSE;
}
@@ -394,8 +396,8 @@
}
/* Function to get the device-dependent name of a joystick */
-const char *
-SDL_SYS_JoystickNameForDeviceIndex(int device_index)
+static const char *
+WINDOWS_JoystickGetDeviceName(int device_index)
{
JoyStick_DeviceData *device = SYS_Joystick;
@@ -405,9 +407,34 @@
return device->joystickname;
}
+static int
+WINDOWS_JoystickGetDevicePlayerIndex(int device_index)
+{
+ JoyStick_DeviceData *device = SYS_Joystick;
+ int index;
+
+ for (index = device_index; index > 0; index--)
+ device = device->pNext;
+
+ return device->bXInputDevice ? (int)device->XInputUserId : -1;
+}
+
+/* return the stable device guid for this device index */
+static SDL_JoystickGUID
+WINDOWS_JoystickGetDeviceGUID(int device_index)
+{
+ JoyStick_DeviceData *device = SYS_Joystick;
+ int index;
+
+ for (index = device_index; index > 0; index--)
+ device = device->pNext;
+
+ return device->guid;
+}
+
/* Function to perform the mapping between current device instance and this joysticks instance id */
-SDL_JoystickID
-SDL_SYS_GetInstanceIdOfDeviceIndex(int device_index)
+static SDL_JoystickID
+WINDOWS_JoystickGetDeviceInstanceID(int device_index)
{
JoyStick_DeviceData *device = SYS_Joystick;
int index;
@@ -423,8 +450,8 @@
This should fill the nbuttons and naxes fields of the joystick structure.
It returns 0, or -1 if there is an error.
*/
-int
-SDL_SYS_JoystickOpen(SDL_Joystick * joystick, int device_index)
+static int
+WINDOWS_JoystickOpen(SDL_Joystick * joystick, int device_index)
{
JoyStick_DeviceData *joystickdevice = SYS_Joystick;
@@ -448,17 +475,20 @@
}
}
-/* return true if this joystick is plugged in right now */
-SDL_bool
-SDL_SYS_JoystickAttached(SDL_Joystick * joystick)
+static int
+WINDOWS_JoystickRumble(SDL_Joystick * joystick, Uint16 low_frequency_rumble, Uint16 high_frequency_rumble, Uint32 duration_ms)
{
- return joystick->hwdata && !joystick->hwdata->removed;
+ if (joystick->hwdata->bXInputDevice) {
+ return SDL_XINPUT_JoystickRumble(joystick, low_frequency_rumble, high_frequency_rumble, duration_ms);
+ } else {
+ return SDL_DINPUT_JoystickRumble(joystick, low_frequency_rumble, high_frequency_rumble, duration_ms);
+ }
}
-void
-SDL_SYS_JoystickUpdate(SDL_Joystick * joystick)
+static void
+WINDOWS_JoystickUpdate(SDL_Joystick * joystick)
{
- if (!joystick->hwdata || joystick->hwdata->removed) {
+ if (!joystick->hwdata) {
return;
}
@@ -467,15 +497,11 @@
} else {
SDL_DINPUT_JoystickUpdate(joystick);
}
-
- if (joystick->hwdata->removed) {
- joystick->force_recentering = SDL_TRUE;
- }
}
/* Function to close a joystick after use */
-void
-SDL_SYS_JoystickClose(SDL_Joystick * joystick)
+static void
+WINDOWS_JoystickClose(SDL_Joystick * joystick)
{
if (joystick->hwdata->bXInputDevice) {
SDL_XINPUT_JoystickClose(joystick);
@@ -487,8 +513,8 @@
}
/* Function to perform any system-specific joystick related cleanup */
-void
-SDL_SYS_JoystickQuit(void)
+static void
+WINDOWS_JoystickQuit(void)
{
JoyStick_DeviceData *device = SYS_Joystick;
@@ -524,24 +550,21 @@
s_bDeviceRemoved = SDL_FALSE;
}
-/* return the stable device guid for this device index */
-SDL_JoystickGUID
-SDL_SYS_JoystickGetDeviceGUID(int device_index)
+SDL_JoystickDriver SDL_WINDOWS_JoystickDriver =
{
- JoyStick_DeviceData *device = SYS_Joystick;
- int index;
-
- for (index = device_index; index > 0; index--)
- device = device->pNext;
-
- return device->guid;
-}
-
-SDL_JoystickGUID
-SDL_SYS_JoystickGetGUID(SDL_Joystick * joystick)
-{
- return joystick->hwdata->guid;
-}
+ WINDOWS_JoystickInit,
+ WINDOWS_JoystickGetCount,
+ WINDOWS_JoystickDetect,
+ WINDOWS_JoystickGetDeviceName,
+ WINDOWS_JoystickGetDevicePlayerIndex,
+ WINDOWS_JoystickGetDeviceGUID,
+ WINDOWS_JoystickGetDeviceInstanceID,
+ WINDOWS_JoystickOpen,
+ WINDOWS_JoystickRumble,
+ WINDOWS_JoystickUpdate,
+ WINDOWS_JoystickClose,
+ WINDOWS_JoystickQuit,
+};
#endif /* SDL_JOYSTICK_DINPUT || SDL_JOYSTICK_XINPUT */
--
Gitblit v1.9.3