From 62af66f14a57bfb73c387f7c618aac0fad2bb695 Mon Sep 17 00:00:00 2001 From: Frank Praznik Date: Wed, 18 Mar 2026 11:13:33 -0400 Subject: [PATCH] x11: More XInput2 #define cleanups Fixes building on very old XInput2 versions (pre-2012) without smooth scrolling and multitouch. --- src/video/x11/SDL_x11xinput2.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/video/x11/SDL_x11xinput2.c b/src/video/x11/SDL_x11xinput2.c index 5cf75901f2..69b7e21546 100644 --- a/src/video/x11/SDL_x11xinput2.c +++ b/src/video/x11/SDL_x11xinput2.c @@ -34,11 +34,11 @@ #ifdef SDL_VIDEO_DRIVER_X11_XINPUT2 static bool xinput2_initialized; +static bool xinput2_grabbed_touch_raised; +static int xinput2_active_touch_count; #if defined(SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_SCROLLINFO) || defined(SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH) static bool xinput2_scrolling_supported; static bool xinput2_multitouch_supported; -static bool xinput2_grabbed_touch_raised; -static int xinput2_active_touch_count; #endif #ifdef SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_GESTURE static bool xinput2_gesture_supported; @@ -951,6 +951,7 @@ static bool HasDeviceID(Uint32 deviceID, const Uint32 *list, int count) return false; } +#ifdef SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH static void AddDeviceID64(Uint64 deviceID, Uint64 **list, int *count) { int new_count = (*count + 1); @@ -964,6 +965,7 @@ static void AddDeviceID64(Uint64 deviceID, Uint64 **list, int *count) *count = new_count; *list = new_list; } +#endif static bool HasDeviceID64(Uint64 deviceID, const Uint64 *list, int count) {