From 62a562dea20728726a497b4af49d591a2fa385de Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 12 May 2021 23:37:18 +0200 Subject: [PATCH] X11: use x11sym loaded functions (see bug #3978) --- src/video/x11/SDL_x11sym.h | 2 ++ src/video/x11/SDL_x11xinput2.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/video/x11/SDL_x11sym.h b/src/video/x11/SDL_x11sym.h index a550dc2e9..b6e3a8726 100644 --- a/src/video/x11/SDL_x11sym.h +++ b/src/video/x11/SDL_x11sym.h @@ -276,6 +276,8 @@ SDL_X11_MODULE(XINPUT2) SDL_X11_SYM(XIDeviceInfo*,XIQueryDevice,(Display *a,int b,int *c),(a,b,c),return) SDL_X11_SYM(void,XIFreeDeviceInfo,(XIDeviceInfo *a),(a),) SDL_X11_SYM(int,XISelectEvents,(Display *a,Window b,XIEventMask *c,int d),(a,b,c,d),return) +SDL_X11_SYM(int,XIGrabTouchBegin,(Display *a,int b,Window c,int d,XIEventMask *e,int f,XIGrabModifiers *g),(a,b,c,d,e,f,g),return) +SDL_X11_SYM(int,XIUngrabTouchBegin, (Display *a,int b,Window c, int d,XIGrabModifiers *e),(a, b, c, d, e),return) SDL_X11_SYM(Status,XIQueryVersion,(Display *a,int *b,int *c),(a,b,c),return) SDL_X11_SYM(XIEventMask*,XIGetSelectedEvents,(Display *a,Window b,int *c),(a,b,c),return) #endif diff --git a/src/video/x11/SDL_x11xinput2.c b/src/video/x11/SDL_x11xinput2.c index 9f30da4b6..33685d80d 100644 --- a/src/video/x11/SDL_x11xinput2.c +++ b/src/video/x11/SDL_x11xinput2.c @@ -366,7 +366,7 @@ X11_Xinput2GrabTouch(_THIS, SDL_Window *window) XISetMask(eventmask.mask, XI_TouchEnd); XISetMask(eventmask.mask, XI_Motion); - XIGrabTouchBegin(display, XIAllDevices, data->xwindow, True, &eventmask, 1, &mods); + X11_XIGrabTouchBegin(display, XIAllDevices, data->xwindow, True, &eventmask, 1, &mods); #endif } @@ -382,7 +382,7 @@ X11_Xinput2UngrabTouch(_THIS, SDL_Window *window) mods.modifiers = XIAnyModifier; mods.status = 0; - XIUngrabTouchBegin(display, XIAllDevices, data->xwindow, 1, &mods); + X11_XIUngrabTouchBegin(display, XIAllDevices, data->xwindow, 1, &mods); #endif }