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] Adds a reset of the X11 touch devices when they are lost

SDL2-XInputReset.patch (text/plain), 9.27 KB, created by Volumetric on 2017-02-10 21:56:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Volumetric

Created: 2017-02-10 21:56:03 UTC

Size: 9.27 KB

patch

obsolete

>diff -ru SDL2-2.0.5.orig/src/events/SDL_touch.c SDL2-2.0.5.build/src/events/SDL_touch.c
>--- SDL2-2.0.5.orig/src/events/SDL_touch.c	2016-10-19 22:56:26.000000000 -0500
>+++ SDL2-2.0.5.build/src/events/SDL_touch.c	2017-02-10 15:33:01.237744064 -0600
>@@ -25,6 +25,7 @@
> #include "SDL_assert.h"
> #include "SDL_events.h"
> #include "SDL_events_c.h"
>+#include "../video/SDL_sysvideo.h"
> 
> 
> static int SDL_num_touch = 0;
>@@ -48,7 +49,7 @@
> SDL_GetTouchDevice(int index)
> {
>     if (index < 0 || index >= SDL_num_touch) {
>-        SDL_SetError("Unknown touch device");
>+        SDL_SetError("Unknown touch device index %d", index);
>         return 0;
>     }
>     return SDL_touchDevices[index]->id;
>@@ -74,7 +75,13 @@
> {
>     int index = SDL_GetTouchIndex(id);
>     if (index < 0 || index >= SDL_num_touch) {
>-        SDL_SetError("Unknown touch device");
>+        if (SDL_GetVideoDevice()->ResetTouch != NULL) {
>+            SDL_SetError("Unknown touch device id %d, resetting", (int) id);
>+            (SDL_GetVideoDevice()->ResetTouch)(SDL_GetVideoDevice());
>+        }
>+        else {
>+            SDL_SetError("Unknown touch device id %d, cannot reset", (int) id);
>+        }
>         return NULL;
>     }
>     return SDL_touchDevices[index];
>diff -ru SDL2-2.0.5.orig/src/video/android/SDL_androidvideo.c SDL2-2.0.5.build/src/video/android/SDL_androidvideo.c
>--- SDL2-2.0.5.orig/src/video/android/SDL_androidvideo.c	2016-10-19 22:56:26.000000000 -0500
>+++ SDL2-2.0.5.build/src/video/android/SDL_androidvideo.c	2017-02-10 15:40:27.456774181 -0600
>@@ -116,6 +116,7 @@
>     /* Set the function pointers */
>     device->VideoInit = Android_VideoInit;
>     device->VideoQuit = Android_VideoQuit;
>+    device->ResetTouch = NULL;
>     device->PumpEvents = Android_PumpEvents;
> 
>     device->CreateWindow = Android_CreateWindow;
>diff -ru SDL2-2.0.5.orig/src/video/directfb/SDL_DirectFB_video.c SDL2-2.0.5.build/src/video/directfb/SDL_DirectFB_video.c
>--- SDL2-2.0.5.orig/src/video/directfb/SDL_DirectFB_video.c	2016-10-19 22:56:26.000000000 -0500
>+++ SDL2-2.0.5.build/src/video/directfb/SDL_DirectFB_video.c	2017-02-10 15:40:35.626774732 -0600
>@@ -112,6 +112,7 @@
>     /* Set the function pointers */
>     device->VideoInit = DirectFB_VideoInit;
>     device->VideoQuit = DirectFB_VideoQuit;
>+    device->ResetTouch = NULL;
>     device->GetDisplayModes = DirectFB_GetDisplayModes;
>     device->SetDisplayMode = DirectFB_SetDisplayMode;
>     device->PumpEvents = DirectFB_PumpEventsWindow;
>diff -ru SDL2-2.0.5.orig/src/video/dummy/SDL_nullvideo.c SDL2-2.0.5.build/src/video/dummy/SDL_nullvideo.c
>--- SDL2-2.0.5.orig/src/video/dummy/SDL_nullvideo.c	2016-10-19 22:56:27.000000000 -0500
>+++ SDL2-2.0.5.build/src/video/dummy/SDL_nullvideo.c	2017-02-10 15:40:43.755775281 -0600
>@@ -88,6 +88,7 @@
>     /* Set the function pointers */
>     device->VideoInit = DUMMY_VideoInit;
>     device->VideoQuit = DUMMY_VideoQuit;
>+    device->ResetTouch = NULL;
>     device->SetDisplayMode = DUMMY_SetDisplayMode;
>     device->PumpEvents = DUMMY_PumpEvents;
>     device->CreateWindowFramebuffer = SDL_DUMMY_CreateWindowFramebuffer;
>diff -ru SDL2-2.0.5.orig/src/video/emscripten/SDL_emscriptenvideo.c SDL2-2.0.5.build/src/video/emscripten/SDL_emscriptenvideo.c
>--- SDL2-2.0.5.orig/src/video/emscripten/SDL_emscriptenvideo.c	2016-10-19 22:56:26.000000000 -0500
>+++ SDL2-2.0.5.build/src/video/emscripten/SDL_emscriptenvideo.c	2017-02-10 15:40:56.342776130 -0600
>@@ -86,6 +86,7 @@
>     /* Set the function pointers */
>     device->VideoInit = Emscripten_VideoInit;
>     device->VideoQuit = Emscripten_VideoQuit;
>+    device->ResetTouch = NULL;
>     device->SetDisplayMode = Emscripten_SetDisplayMode;
> 
> 
>diff -ru SDL2-2.0.5.orig/src/video/mir/SDL_mirvideo.c SDL2-2.0.5.build/src/video/mir/SDL_mirvideo.c
>--- SDL2-2.0.5.orig/src/video/mir/SDL_mirvideo.c	2016-10-19 22:56:26.000000000 -0500
>+++ SDL2-2.0.5.build/src/video/mir/SDL_mirvideo.c	2017-02-10 15:41:08.922776979 -0600
>@@ -148,6 +148,7 @@
>     /* mirvideo */
>     device->VideoInit        = MIR_VideoInit;
>     device->VideoQuit        = MIR_VideoQuit;
>+    device->ResetTouch       = NULL;
>     device->GetDisplayBounds = MIR_GetDisplayBounds;
>     device->GetDisplayModes  = MIR_GetDisplayModes;
>     device->SetDisplayMode   = MIR_SetDisplayMode;
>diff -ru SDL2-2.0.5.orig/src/video/nacl/SDL_naclvideo.c SDL2-2.0.5.build/src/video/nacl/SDL_naclvideo.c
>--- SDL2-2.0.5.orig/src/video/nacl/SDL_naclvideo.c	2016-10-19 22:56:26.000000000 -0500
>+++ SDL2-2.0.5.build/src/video/nacl/SDL_naclvideo.c	2017-02-10 15:41:22.678777908 -0600
>@@ -105,6 +105,7 @@
>     /* Set the function pointers */
>     device->VideoInit = NACL_VideoInit;
>     device->VideoQuit = NACL_VideoQuit;
>+    device->ResetTouch = NULL;
>     device->PumpEvents = NACL_PumpEvents;
>     
>     device->CreateWindow = NACL_CreateWindow;
>diff -ru SDL2-2.0.5.orig/src/video/psp/SDL_pspvideo.c SDL2-2.0.5.build/src/video/psp/SDL_pspvideo.c
>--- SDL2-2.0.5.orig/src/video/psp/SDL_pspvideo.c	2016-10-19 22:56:26.000000000 -0500
>+++ SDL2-2.0.5.build/src/video/psp/SDL_pspvideo.c	2017-02-10 15:41:26.363778157 -0600
>@@ -111,6 +111,7 @@
>     /* Setup all functions which we can handle */
>     device->VideoInit = PSP_VideoInit;
>     device->VideoQuit = PSP_VideoQuit;
>+    device->ResetTouch = NULL;
>     device->GetDisplayModes = PSP_GetDisplayModes;
>     device->SetDisplayMode = PSP_SetDisplayMode;
>     device->CreateWindow = PSP_CreateWindow;
>diff -ru SDL2-2.0.5.orig/src/video/raspberry/SDL_rpivideo.c SDL2-2.0.5.build/src/video/raspberry/SDL_rpivideo.c
>--- SDL2-2.0.5.orig/src/video/raspberry/SDL_rpivideo.c	2016-10-19 22:56:26.000000000 -0500
>+++ SDL2-2.0.5.build/src/video/raspberry/SDL_rpivideo.c	2017-02-10 15:41:35.950778804 -0600
>@@ -98,6 +98,7 @@
>     /* Setup all functions which we can handle */
>     device->VideoInit = RPI_VideoInit;
>     device->VideoQuit = RPI_VideoQuit;
>+    device->ResetTouch = NULL;
>     device->GetDisplayModes = RPI_GetDisplayModes;
>     device->SetDisplayMode = RPI_SetDisplayMode;
>     device->CreateWindow = RPI_CreateWindow;
>diff -ru SDL2-2.0.5.orig/src/video/SDL_sysvideo.h SDL2-2.0.5.build/src/video/SDL_sysvideo.h
>--- SDL2-2.0.5.orig/src/video/SDL_sysvideo.h	2016-10-19 22:56:26.000000000 -0500
>+++ SDL2-2.0.5.build/src/video/SDL_sysvideo.h	2017-02-10 15:25:07.096712063 -0600
>@@ -163,6 +163,11 @@
>      */
>     void (*VideoQuit) (_THIS);
> 
>+    /*
>+     * Reinitialize the touch devices -- called if an unknown touch ID occurs.
>+     */
>+    void (*ResetTouch) (_THIS);
>+
>     /* * * */
>     /*
>      * Display functions
>diff -ru SDL2-2.0.5.orig/src/video/vivante/SDL_vivantevideo.c SDL2-2.0.5.build/src/video/vivante/SDL_vivantevideo.c
>--- SDL2-2.0.5.orig/src/video/vivante/SDL_vivantevideo.c	2016-10-19 22:56:26.000000000 -0500
>+++ SDL2-2.0.5.build/src/video/vivante/SDL_vivantevideo.c	2017-02-10 15:41:41.319779166 -0600
>@@ -86,6 +86,7 @@
>     /* Setup all functions which we can handle */
>     device->VideoInit = VIVANTE_VideoInit;
>     device->VideoQuit = VIVANTE_VideoQuit;
>+    device->ResetTouch = NULL;
>     device->GetDisplayModes = VIVANTE_GetDisplayModes;
>     device->SetDisplayMode = VIVANTE_SetDisplayMode;
>     device->CreateWindow = VIVANTE_CreateWindow;
>diff -ru SDL2-2.0.5.orig/src/video/wayland/SDL_waylandvideo.c SDL2-2.0.5.build/src/video/wayland/SDL_waylandvideo.c
>--- SDL2-2.0.5.orig/src/video/wayland/SDL_waylandvideo.c	2016-10-19 22:56:26.000000000 -0500
>+++ SDL2-2.0.5.build/src/video/wayland/SDL_waylandvideo.c	2017-02-10 15:41:45.713779463 -0600
>@@ -150,6 +150,7 @@
>     /* Set the function pointers */
>     device->VideoInit = Wayland_VideoInit;
>     device->VideoQuit = Wayland_VideoQuit;
>+    device->ResetTouch = NULL;
>     device->SetDisplayMode = Wayland_SetDisplayMode;
>     device->GetDisplayModes = Wayland_GetDisplayModes;
>     device->GetWindowWMInfo = Wayland_GetWindowWMInfo;
>diff -ru SDL2-2.0.5.orig/src/video/windows/SDL_windowsvideo.c SDL2-2.0.5.build/src/video/windows/SDL_windowsvideo.c
>--- SDL2-2.0.5.orig/src/video/windows/SDL_windowsvideo.c	2016-10-19 22:56:26.000000000 -0500
>+++ SDL2-2.0.5.build/src/video/windows/SDL_windowsvideo.c	2017-02-10 15:41:50.990779819 -0600
>@@ -123,6 +123,7 @@
>     /* Set the function pointers */
>     device->VideoInit = WIN_VideoInit;
>     device->VideoQuit = WIN_VideoQuit;
>+    device->ResetTouch = NULL;
>     device->GetDisplayBounds = WIN_GetDisplayBounds;
>     device->GetDisplayUsableBounds = WIN_GetDisplayUsableBounds;
>     device->GetDisplayDPI = WIN_GetDisplayDPI;
>diff -ru SDL2-2.0.5.orig/src/video/x11/SDL_x11video.c SDL2-2.0.5.build/src/video/x11/SDL_x11video.c
>--- SDL2-2.0.5.orig/src/video/x11/SDL_x11video.c	2016-10-19 22:56:26.000000000 -0500
>+++ SDL2-2.0.5.build/src/video/x11/SDL_x11video.c	2017-02-10 15:25:07.096712063 -0600
>@@ -46,6 +46,7 @@
> /* Initialization/Query functions */
> static int X11_VideoInit(_THIS);
> static void X11_VideoQuit(_THIS);
>+static void X11_ResetTouch(_THIS);
> 
> /* Find out what class name we should use */
> static char *
>@@ -220,6 +221,7 @@
>     /* Set the function pointers */
>     device->VideoInit = X11_VideoInit;
>     device->VideoQuit = X11_VideoQuit;
>+    device->ResetTouch = X11_ResetTouch;
>     device->GetDisplayModes = X11_GetDisplayModes;
>     device->GetDisplayBounds = X11_GetDisplayBounds;
>     device->GetDisplayUsableBounds = X11_GetDisplayUsableBounds;
>@@ -528,6 +530,13 @@
> #endif
> }
> 
>+void
>+X11_ResetTouch(_THIS)
>+{
>+    X11_QuitTouch(_this);
>+    X11_InitTouch(_this);
>+}
>+
> SDL_bool
> X11_UseDirectColorVisuals(void)
> {

Actions: View | Diff

Attachments on bug 3583: 2697

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.