Commit 6dc172d093d46f528be802bbf06a54d3f9921d37
2020-01-23T12:53:39
Turn off rumble on drivers which don't respect the replay.length value
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81
diff --git a/src/joystick/linux/SDL_sysjoystick.c b/src/joystick/linux/SDL_sysjoystick.c
index cb7ffad..eecb460 100644
--- a/src/joystick/linux/SDL_sysjoystick.c
+++ b/src/joystick/linux/SDL_sysjoystick.c
@@ -803,16 +803,30 @@ LINUX_JoystickOpen(SDL_Joystick * joystick, int device_index)
return (0);
}
+#define MAX_KERNEL_RUMBLE_DURATION_MS 0xFFFF
+
static int
LINUX_JoystickRumble(SDL_Joystick * joystick, Uint16 low_frequency_rumble, Uint16 high_frequency_rumble, Uint32 duration_ms)
{
struct input_event event;
+ if (duration_ms > MAX_KERNEL_RUMBLE_DURATION_MS) {
+ duration_ms = MAX_KERNEL_RUMBLE_DURATION_MS;
+ }
+ if ((low_frequency_rumble || high_frequency_rumble) && duration_ms) {
+ joystick->hwdata->effect_expiration = SDL_GetTicks() + duration_ms;
+ if (!joystick->hwdata->effect_expiration) {
+ joystick->hwdata->effect_expiration = 1;
+ }
+ } else {
+ joystick->hwdata->effect_expiration = 0;
+ }
+
if (joystick->hwdata->ff_rumble) {
struct ff_effect *effect = &joystick->hwdata->effect;
effect->type = FF_RUMBLE;
- effect->replay.length = SDL_min(duration_ms, 32767);
+ effect->replay.length = duration_ms;
effect->u.rumble.strong_magnitude = low_frequency_rumble;
effect->u.rumble.weak_magnitude = high_frequency_rumble;
} else if (joystick->hwdata->ff_sine) {
@@ -821,7 +835,7 @@ LINUX_JoystickRumble(SDL_Joystick * joystick, Uint16 low_frequency_rumble, Uint1
struct ff_effect *effect = &joystick->hwdata->effect;
effect->type = FF_PERIODIC;
- effect->replay.length = SDL_min(duration_ms, 32767);
+ effect->replay.length = duration_ms;
effect->u.periodic.waveform = FF_SINE;
effect->u.periodic.magnitude = magnitude;
} else {
@@ -1038,6 +1052,13 @@ LINUX_JoystickUpdate(SDL_Joystick * joystick)
SDL_PrivateJoystickBall(joystick, (Uint8) i, xrel, yrel);
}
}
+
+ if (joystick->hwdata->effect_expiration) {
+ Uint32 now = SDL_GetTicks();
+ if (SDL_TICKS_PASSED(now, joystick->hwdata->effect_expiration)) {
+ LINUX_JoystickRumble(joystick, 0, 0, 0);
+ }
+ }
}
/* Function to close a joystick after use */
@@ -1045,6 +1066,9 @@ static void
LINUX_JoystickClose(SDL_Joystick * joystick)
{
if (joystick->hwdata) {
+ if (joystick->hwdata->effect_expiration) {
+ LINUX_JoystickRumble(joystick, 0, 0, 0);
+ }
if (joystick->hwdata->effect.id >= 0) {
ioctl(joystick->hwdata->fd, EVIOCRMFF, joystick->hwdata->effect.id);
joystick->hwdata->effect.id = -1;
diff --git a/src/joystick/linux/SDL_sysjoystick_c.h b/src/joystick/linux/SDL_sysjoystick_c.h
index 1238ad5..a92429b 100644
--- a/src/joystick/linux/SDL_sysjoystick_c.h
+++ b/src/joystick/linux/SDL_sysjoystick_c.h
@@ -37,6 +37,7 @@ struct joystick_hwdata
SDL_bool ff_rumble;
SDL_bool ff_sine;
struct ff_effect effect;
+ Uint32 effect_expiration;
/* The current Linux joystick driver maps hats to two axes */
struct hwdata_hat