Commit 7b7828a46ee4e313a3fb57ad51cd19f3d2909219
2014-06-21T21:30:49
You shouldn't get axis and hat events when your application doesn't have focus (unless you use the SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS hint)
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
diff --git a/src/joystick/SDL_joystick.c b/src/joystick/SDL_joystick.c
index b9924f3..ac71587 100644
--- a/src/joystick/SDL_joystick.c
+++ b/src/joystick/SDL_joystick.c
@@ -502,21 +502,22 @@ SDL_PrivateJoystickAxis(SDL_Joystick * joystick, Uint8 axis, Sint16 value)
return 0;
}
- /* Update internal joystick state */
- if (value == joystick->axes[axis]) {
- return 0;
- }
- joystick->axes[axis] = value;
-
/* We ignore events if we don't have keyboard focus, except for centering
* events.
*/
if (SDL_PrivateJoystickShouldIgnoreEvent()) {
- if (!(joystick->closed && joystick->uncentered)) {
+ if ((value > 0 && value >= joystick->axes[axis]) ||
+ (value < 0 && value <= joystick->axes[axis])) {
return 0;
}
}
+ /* Update internal joystick state */
+ if (value == joystick->axes[axis]) {
+ return 0;
+ }
+ joystick->axes[axis] = value;
+
/* Post the event, if desired */
posted = 0;
#if !SDL_EVENTS_DISABLED
@@ -542,18 +543,20 @@ SDL_PrivateJoystickHat(SDL_Joystick * joystick, Uint8 hat, Uint8 value)
return 0;
}
- /* Update internal joystick state */
- joystick->hats[hat] = value;
-
/* We ignore events if we don't have keyboard focus, except for centering
* events.
*/
if (SDL_PrivateJoystickShouldIgnoreEvent()) {
- if (!(joystick->closed && joystick->uncentered)) {
+ if (value != SDL_HAT_CENTERED) {
return 0;
}
}
+ /* Update internal joystick state */
+ if (value == joystick->hats[hat]) {
+ return 0;
+ }
+ joystick->hats[hat] = value;
/* Post the event, if desired */
posted = 0;
@@ -633,11 +636,16 @@ SDL_PrivateJoystickButton(SDL_Joystick * joystick, Uint8 button, Uint8 state)
/* We ignore events if we don't have keyboard focus, except for button
* release. */
- if (state == SDL_PRESSED && SDL_PrivateJoystickShouldIgnoreEvent()) {
- return 0;
+ if (SDL_PrivateJoystickShouldIgnoreEvent()) {
+ if (state == SDL_PRESSED) {
+ return 0;
+ }
}
/* Update internal joystick state */
+ if (state == joystick->buttons[button]) {
+ return 0;
+ }
joystick->buttons[button] = state;
/* Post the event, if desired */