Fix X11 compilation if XI2 Gesture are not supported

Author: 1bsyl

cmake/sdlchecks.cmake

@@ -408,6 +408,23 @@ macro(CheckX11)
         if(HAVE_XINPUT2_MULTITOUCH)
           set(SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH 1)
         endif()
+
+        # Check for gesture
+        check_c_source_compiles("
+            #include <X11/Xlib.h>
+            #include <X11/Xproto.h>
+            #include <X11/extensions/XInput2.h>
+            int event_type = XI_GesturePinchBegin;
+            XITouchClassInfo *t;
+            Status XIAllowTouchEvents(Display *a,int b,unsigned int c,Window d,int f) {
+              return (Status)0;
+            }
+            int main(int argc, char **argv) { return 0; }" HAVE_XINPUT2_GESTURE)
+        if(HAVE_XINPUT2_GESTURE)
+          set(SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_GESTURE 1)
+        endif()
+
+
       endif()
 
       # check along with XInput2.h because we use Xfixes with XIBarrierReleasePointer

include/build_config/SDL_build_config.h.cmake

@@ -406,6 +406,7 @@
 #cmakedefine SDL_VIDEO_DRIVER_X11_XFIXES @SDL_VIDEO_DRIVER_X11_XFIXES@
 #cmakedefine SDL_VIDEO_DRIVER_X11_XINPUT2 @SDL_VIDEO_DRIVER_X11_XINPUT2@
 #cmakedefine SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH @SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH@
+#cmakedefine SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_GESTURE @SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_GESTURE@
 #cmakedefine SDL_VIDEO_DRIVER_X11_XRANDR @SDL_VIDEO_DRIVER_X11_XRANDR@
 #cmakedefine SDL_VIDEO_DRIVER_X11_XSCRNSAVER @SDL_VIDEO_DRIVER_X11_XSCRNSAVER@
 #cmakedefine SDL_VIDEO_DRIVER_X11_XSHAPE @SDL_VIDEO_DRIVER_X11_XSHAPE@

src/video/x11/SDL_x11xinput2.c

@@ -37,6 +37,8 @@ static int xinput2_initialized = 0;
 
 #ifdef SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH
 static int xinput2_multitouch_supported = 0;
+#endif
+#ifdef SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_GESTURE
 static int xinput2_pinch_swipe_supported = 0;
 #endif
 
@@ -157,6 +159,8 @@ SDL_bool X11_InitXinput2(SDL_VideoDevice *_this)
 #ifdef SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH
     /* Multitouch needs XInput 2.2 */
     xinput2_multitouch_supported = xinput2_version_atleast(version, 2, 2);
+#endif
+#ifdef SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_GESTURE
     /* Gesture and Swipe needs XInput 2.4 */
     xinput2_pinch_swipe_supported = xinput2_version_atleast(version, 2, 4);
 #endif
@@ -482,7 +486,7 @@ void X11_HandleXinput2Event(SDL_VideoDevice *_this, XGenericEventCookie *cookie)
     {
         const XIDeviceEvent *xev = (const XIDeviceEvent *)cookie->data;
         const SDL_Pen *pen = SDL_GetPenPtr(X11_PenIDFromDeviceID(xev->deviceid));
-#if SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH
+#ifdef SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH
         SDL_bool pointer_emulated = ((xev->flags & XIPointerEmulated) != 0);
 #else
         SDL_bool pointer_emulated = SDL_FALSE;
@@ -525,7 +529,7 @@ void X11_HandleXinput2Event(SDL_VideoDevice *_this, XGenericEventCookie *cookie)
         }
     } break;
 
-#if SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH
+#ifdef SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH
     case XI_TouchBegin:
     {
         const XIDeviceEvent *xev = (const XIDeviceEvent *)cookie->data;
@@ -552,7 +556,9 @@ void X11_HandleXinput2Event(SDL_VideoDevice *_this, XGenericEventCookie *cookie)
         xinput2_normalize_touch_coordinates(window, xev->event_x, xev->event_y, &x, &y);
         SDL_SendTouchMotion(0, xev->sourceid, xev->detail, window, x, y, 1.0);
     } break;
+#endif /* SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH */
 
+#ifdef SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_GESTURE
     case XI_GesturePinchBegin:
     case XI_GesturePinchUpdate:
     case XI_GesturePinchEnd:
@@ -584,7 +590,7 @@ void X11_HandleXinput2Event(SDL_VideoDevice *_this, XGenericEventCookie *cookie)
         SDL_SendSwipe(0, window, x, y);
     } break;
 
-#endif /* SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH */
+#endif /* SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_GESTURE */
     }
 #endif /* SDL_VIDEO_DRIVER_X11_XINPUT2 */
 }
@@ -617,15 +623,19 @@ void X11_Xinput2SelectTouch(SDL_VideoDevice *_this, SDL_Window *window)
     XISetMask(mask, XI_TouchEnd);
     XISetMask(mask, XI_Motion);
 
+
     if (X11_Xinput2IsPinchSwipeSupported()) {
+#ifdef SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_GESTURE
         XISetMask(mask, XI_GesturePinchBegin);
         XISetMask(mask, XI_GesturePinchUpdate);
         XISetMask(mask, XI_GesturePinchEnd);
         XISetMask(mask, XI_GestureSwipeBegin);
         XISetMask(mask, XI_GestureSwipeUpdate);
         XISetMask(mask, XI_GestureSwipeEnd);
+#endif
     }
 
+
     X11_XISelectEvents(data->display, window_data->xwindow, &eventmask, 1);
 #endif
 }
@@ -699,7 +709,7 @@ int X11_Xinput2IsMultitouchSupported(void)
 
 int X11_Xinput2IsPinchSwipeSupported(void)
 {
-#ifdef SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH
+#ifdef SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_GESTURE
     return xinput2_initialized && xinput2_pinch_swipe_supported;
 #else
     return 0;