We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

Patch illustrating workaround

touchpatch.txt (text/plain), 2.37 KB, created by Brett Ernst on 2013-10-30 02:48:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brett Ernst

Created: 2013-10-30 02:48:05 UTC

Size: 2.37 KB

patch

obsolete

>diff -Naurp SDL2-2.0.1/src/video/x11/SDL_x11xinput2.c SDL2-2.0.1.new/src/video/x11/SDL_x11xinput2.c
>--- SDL2-2.0.1/src/video/x11/SDL_x11xinput2.c	2013-10-23 21:05:30.000000000 -0700
>+++ SDL2-2.0.1.new/src/video/x11/SDL_x11xinput2.c	2013-10-29 06:28:31.396638661 -0700
>@@ -147,6 +147,11 @@ X11_HandleXinput2Event(SDL_VideoData *vi
> #if SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH
>         case XI_TouchBegin: {
>             const XIDeviceEvent *xev = (const XIDeviceEvent *) cookie->data;
>+            SDL_Touch* touch = SDL_GetTouch(xev->sourceid);
>+            if (!touch) {
>+                // device may be newly detected, so add it now
>+                X11_AddXinput2Multitouch(videodata, xev->sourceid);               
>+            }
>             SDL_SendTouch(xev->sourceid,xev->detail,
>                       SDL_TRUE, xev->event_x, xev->event_y, 1.0);
>             return 1;
>@@ -173,6 +178,29 @@ X11_HandleXinput2Event(SDL_VideoData *vi
> }
> 
> void
>+X11_AddXinput2Multitouch(SDL_VideoData *videodata, int sourceid)
>+{
>+#if SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH
>+    int ndevices, i;
>+    XIDeviceInfo *dev = X11_XIQueryDevice(videodata->display, sourceid, &ndevices);
>+    if(ndevices == 1) {
>+        for(i = 0; i < dev->num_classes; i++) {
>+            SDL_TouchID touchId;
>+            XIAnyClassInfo *class = dev->classes[i];
>+            XITouchClassInfo *t = (XITouchClassInfo*)class;
>+            if(class->type != XITouchClass)
>+                continue;
>+            touchId = t->sourceid;
>+            if(!SDL_GetTouch(touchId)) {
>+                SDL_AddTouch(touchId, dev->name);
>+            }
>+        }
>+    }
>+    X11_XIFreeDeviceInfo(dev);
>+#endif
>+}
>+
>+void
> X11_InitXinput2Multitouch(_THIS)
> {
> #if SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH
>diff -Naurp SDL2-2.0.1/src/video/x11/SDL_x11xinput2.h SDL2-2.0.1.new/src/video/x11/SDL_x11xinput2.h
>--- SDL2-2.0.1/src/video/x11/SDL_x11xinput2.h	2013-10-23 21:05:30.000000000 -0700
>+++ SDL2-2.0.1.new/src/video/x11/SDL_x11xinput2.h	2013-10-29 06:28:31.396638661 -0700
>@@ -31,6 +31,7 @@ typedef struct XGenericEventCookie XGene
> #endif
> 
> extern void X11_InitXinput2(_THIS);
>+extern void X11_AddXinput2Multitouch(SDL_VideoData *videodata, int sourceid);
> extern void X11_InitXinput2Multitouch(_THIS);
> extern int X11_HandleXinput2Event(SDL_VideoData *videodata,XGenericEventCookie *cookie);
> extern int X11_Xinput2IsInitialized(void);

Actions: View

Attachments on bug 2196: 1398

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.