summaryrefslogtreecommitdiff
path: root/libre/sdl/SDL-1.2.10-GrabNotViewable.patch
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-09-28 21:30:21 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-09-28 21:30:21 -0300
commit149a85dff3e7fd908c2935a6ba8784e848d53110 (patch)
tree663e7c4560c0acfb639100af5d0403bcab157f7e /libre/sdl/SDL-1.2.10-GrabNotViewable.patch
parent680eb08892d1e6f49e7f5dad41908075fd943156 (diff)
downloadabslibre-149a85dff3e7fd908c2935a6ba8784e848d53110.tar.gz
abslibre-149a85dff3e7fd908c2935a6ba8784e848d53110.tar.bz2
abslibre-149a85dff3e7fd908c2935a6ba8784e848d53110.zip
sdl-1.2.15-7.parabola1: import most of Fedora's patches (FS#39227 -> https://bugs.archlinux.org/task/39227)
Diffstat (limited to 'libre/sdl/SDL-1.2.10-GrabNotViewable.patch')
-rw-r--r--libre/sdl/SDL-1.2.10-GrabNotViewable.patch22
1 files changed, 22 insertions, 0 deletions
diff --git a/libre/sdl/SDL-1.2.10-GrabNotViewable.patch b/libre/sdl/SDL-1.2.10-GrabNotViewable.patch
new file mode 100644
index 000000000..128cf3510
--- /dev/null
+++ b/libre/sdl/SDL-1.2.10-GrabNotViewable.patch
@@ -0,0 +1,22 @@
+Makes SDL-1.2 SDL_WM_GrabInput() non-blocking in case of SDL window is not
+viewable. Patch provided by <pbonzini@redhat.com>.
+See <http://bugzilla.libsdl.org/show_bug.cgi?id=1155>.
+
+--- ./src/video/x11/SDL_x11wm.c 2007-12-31 04:48:13.000000000 +0000
++++ ./src/video/x11/SDL_x11wm.c 2009-01-15 10:27:14.000000000 +0000
+@@ -351,13 +351,14 @@ SDL_GrabMode X11_GrabInputNoLock(_THIS,
+ result = XGrabPointer(SDL_Display, SDL_Window, True, 0,
+ GrabModeAsync, GrabModeAsync,
+ SDL_Window, None, CurrentTime);
+- if ( result == GrabSuccess ) {
++ if ( result == GrabSuccess || result == GrabNotViewable ) {
+ break;
+ }
+ SDL_Delay(100);
+ }
+ if ( result != GrabSuccess ) {
+ /* Uh, oh, what do we do here? */ ;
++ return(SDL_GRAB_OFF);
+ }
+ /* Now grab the keyboard */
+ XGrabKeyboard(SDL_Display, WMwindow, True,