Relintai/sdl2_frt
1
0
Fork 0
mirror of https://github.com/Relintai/sdl2_frt.git synced 2024-12-25 09:17:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

x11: prevent a synthetic mouse event when using a touchscreen

Browse Source 
With multitouch, register to receive XI_Motion (which desctivates MotionNotify),
so that we can distinguish real mouse motions from synthetic one.

(bug 4690)
This commit is contained in:
Sylvain Becker 2019-07-10 10:06:28 +02:00
parent 6ef01e5236
commit 86965eecd3
1 changed files with 53 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/video/x11/SDL_x11xinput2.c
View File

@ -75,31 +75,39 @@ xinput2_version_atleast(const int version, const int wantmajor, const int wantmi
} }
#if SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH #if SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH
static void static SDL_Window *
xinput2_normalize_touch_coordinates(SDL_VideoData *videodata, Window window, xinput2_get_sdlwindow(SDL_VideoData *videodata, Window window)
double in_x, double in_y, float *out_x, float *out_y)
{ {
int i; int i;
for (i = 0; i < videodata->numwindows; i++) { for (i = 0; i < videodata->numwindows; i++) {
SDL_WindowData *d = videodata->windowlist[i]; SDL_WindowData *d = videodata->windowlist[i];
if (d->xwindow == window) { if (d->xwindow == window) {
if (d->window->w == 1) { return d->window;
}
}
return NULL;
}
static void
xinput2_normalize_touch_coordinates(SDL_Window *window, double in_x, double in_y, float *out_x, float *out_y)
{
if (window) {
if (window->w == 1) {
*out_x = 0.5f; *out_x = 0.5f;
} else { } else {
*out_x = in_x / (d->window->w - 1); *out_x = in_x / (window->w - 1);
} }
if (d->window->h == 1) { if (window->h == 1) {
*out_y = 0.5f; *out_y = 0.5f;
} else { } else {
*out_y = in_y / (d->window->h - 1); *out_y = in_y / (window->h - 1);
}
return;
}
} }
} else {
// couldn't find the window... // couldn't find the window...
*out_x = in_x; *out_x = in_x;
*out_y = in_y; *out_y = in_y;
} }
}
#endif /* SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH */ #endif /* SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH */
#endif /* SDL_VIDEO_DRIVER_X11_XINPUT2 */ #endif /* SDL_VIDEO_DRIVER_X11_XINPUT2 */
@ -198,11 +206,30 @@ X11_HandleXinput2Event(SDL_VideoData *videodata,XGenericEventCookie *cookie)
break; break;
#if SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH #if SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH
/* With multitouch, register to receive XI_Motion (which desctivates MotionNotify),
* so that we can distinguish real mouse motions from synthetic one. */
case XI_Motion: {
const XIDeviceEvent *xev = (const XIDeviceEvent *) cookie->data;
int pointer_emulated = (xev->flags & XIPointerEmulated);
if (! pointer_emulated) {
SDL_Mouse *mouse = SDL_GetMouse();
if(!mouse->relative_mode || mouse->relative_mode_warp) {
SDL_Window *window = xinput2_get_sdlwindow(videodata, xev->event);
if (window) {
SDL_SendMouseMotion(window, 0, 0, xev->event_x, xev->event_y);
}
}
}
return 1;
}
break;
case XI_TouchBegin: { case XI_TouchBegin: {
const XIDeviceEvent *xev = (const XIDeviceEvent *) cookie->data; const XIDeviceEvent *xev = (const XIDeviceEvent *) cookie->data;
float x, y; float x, y;
xinput2_normalize_touch_coordinates(videodata, xev->event, SDL_Window *window = xinput2_get_sdlwindow(videodata, xev->event);
xev->event_x, xev->event_y, &x, &y); xinput2_normalize_touch_coordinates(window, xev->event_x, xev->event_y, &x, &y);
SDL_SendTouch(xev->sourceid,xev->detail, SDL_TRUE, x, y, 1.0); SDL_SendTouch(xev->sourceid,xev->detail, SDL_TRUE, x, y, 1.0);
return 1; return 1;
} }
@ -210,8 +237,8 @@ X11_HandleXinput2Event(SDL_VideoData *videodata,XGenericEventCookie *cookie)
case XI_TouchEnd: { case XI_TouchEnd: {
const XIDeviceEvent *xev = (const XIDeviceEvent *) cookie->data; const XIDeviceEvent *xev = (const XIDeviceEvent *) cookie->data;
float x, y; float x, y;
xinput2_normalize_touch_coordinates(videodata, xev->event, SDL_Window *window = xinput2_get_sdlwindow(videodata, xev->event);
xev->event_x, xev->event_y, &x, &y); xinput2_normalize_touch_coordinates(window, xev->event_x, xev->event_y, &x, &y);
SDL_SendTouch(xev->sourceid,xev->detail, SDL_FALSE, x, y, 1.0); SDL_SendTouch(xev->sourceid,xev->detail, SDL_FALSE, x, y, 1.0);
return 1; return 1;
} }
@ -219,8 +246,8 @@ X11_HandleXinput2Event(SDL_VideoData *videodata,XGenericEventCookie *cookie)
case XI_TouchUpdate: { case XI_TouchUpdate: {
const XIDeviceEvent *xev = (const XIDeviceEvent *) cookie->data; const XIDeviceEvent *xev = (const XIDeviceEvent *) cookie->data;
float x, y; float x, y;
xinput2_normalize_touch_coordinates(videodata, xev->event, SDL_Window *window = xinput2_get_sdlwindow(videodata, xev->event);
xev->event_x, xev->event_y, &x, &y); xinput2_normalize_touch_coordinates(window, xev->event_x, xev->event_y, &x, &y);
SDL_SendTouchMotion(xev->sourceid,xev->detail, x, y, 1.0); SDL_SendTouchMotion(xev->sourceid,xev->detail, x, y, 1.0);
return 1; return 1;
} }
@ -272,7 +299,7 @@ X11_Xinput2SelectTouch(_THIS, SDL_Window *window)
#if SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH #if SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH
SDL_VideoData *data = NULL; SDL_VideoData *data = NULL;
XIEventMask eventmask; XIEventMask eventmask;
unsigned char mask[3] = { 0,0,0 }; unsigned char mask[4] = { 0, 0, 0, 0 };
SDL_WindowData *window_data = NULL; SDL_WindowData *window_data = NULL;
if (!X11_Xinput2IsMultitouchSupported()) { if (!X11_Xinput2IsMultitouchSupported()) {
@ -289,6 +316,7 @@ X11_Xinput2SelectTouch(_THIS, SDL_Window *window)
XISetMask(mask, XI_TouchBegin); XISetMask(mask, XI_TouchBegin);
XISetMask(mask, XI_TouchUpdate); XISetMask(mask, XI_TouchUpdate);
XISetMask(mask, XI_TouchEnd); XISetMask(mask, XI_TouchEnd);
XISetMask(mask, XI_Motion);
X11_XISelectEvents(data->display,window_data->xwindow,&eventmask,1); X11_XISelectEvents(data->display,window_data->xwindow,&eventmask,1);
#endif #endif