[SDL/f13/master] Fix left button press event in windowed mode

Petr Pisar ppisar at fedoraproject.org
Thu Aug 12 16:29:28 UTC 2010


commit 316ec95afa59e871979fcbd7099402d59c04655b
Author: Petr Písař <ppisar at redhat.com>
Date:   Thu Aug 12 17:48:37 2010 +0200

    Fix left button press event in windowed mode
    
    rh556608, sdl894
    Patch is part of SDL develeopment tree.

 SDL-1.2.14-x11_grab_down_button.patch |   24 ++++++++++++++++++++++++
 SDL.spec                              |    8 +++++++-
 2 files changed, 31 insertions(+), 1 deletions(-)
---
diff --git a/SDL-1.2.14-x11_grab_down_button.patch b/SDL-1.2.14-x11_grab_down_button.patch
new file mode 100644
index 0000000..a6ee926
--- /dev/null
+++ b/SDL-1.2.14-x11_grab_down_button.patch
@@ -0,0 +1,24 @@
+changeset:   4557:4aa31b9207f2
+branch:      SDL-1.2
+parent:      4554:4deaba8b1b42
+user:        Sam Lantinga <slouken at libsdl.org>
+date:        Tue Jul 20 00:01:26 2010 -0700
+summary:     Finally fixed bug 894 without breaking bug 716.  Yay! :)
+
+diff -r 4deaba8b1b42 -r 4aa31b9207f2 src/video/x11/SDL_x11events.c
+--- a/src/video/x11/SDL_x11events.c	Sun Jul 18 11:37:12 2010 -0700
++++ b/src/video/x11/SDL_x11events.c	Tue Jul 20 00:01:26 2010 -0700
+@@ -441,8 +441,10 @@
+ if ( xevent.xcrossing.mode == NotifyUngrab )
+ printf("Mode: NotifyUngrab\n");
+ #endif
+-		if ( xevent.xcrossing.detail != NotifyInferior ) {
+-			if ( this->input_grab == SDL_GRAB_OFF ) {
++		if ( (xevent.xcrossing.mode != NotifyGrab) &&
++		     (xevent.xcrossing.mode != NotifyUngrab) &&
++		     (xevent.xcrossing.detail != NotifyInferior) ) {
++               		if ( this->input_grab == SDL_GRAB_OFF ) {
+ 				posted = SDL_PrivateAppActive(0, SDL_APPMOUSEFOCUS);
+ 			} else {
+ 				posted = SDL_PrivateMouseMotion(0, 0,
+
diff --git a/SDL.spec b/SDL.spec
index 67d75fe..c95acee 100644
--- a/SDL.spec
+++ b/SDL.spec
@@ -1,7 +1,7 @@
 Summary: A cross-platform multimedia library
 Name: SDL
 Version: 1.2.14
-Release: 6%{?dist}
+Release: 7%{?dist}
 # Source: http://www.libsdl.org/release/%%{name}-%%{version}.tar.gz
 # To create the repackaged archive use ./repackage.sh %%{version}
 Source0: %{name}-%{version}_repackaged.tar.gz
@@ -16,6 +16,8 @@ Patch2: SDL-1.2.12-disable_yasm.patch
 Patch3: SDL-1.2.14-audiodriver.patch
 # Submitted upstream: http://bugzilla.libsdl.org/show_bug.cgi?id=1009
 Patch4: SDL-1.2.14-xio_error-rh603984.patch
+# From upstream <http://bugzilla.libsdl.org/show_bug.cgi?id=894>, rh556608
+Patch5: SDL-1.2.14-x11_grab_down_button.patch
 
 URL: http://www.libsdl.org/
 License: LGPLv2+
@@ -74,6 +76,7 @@ static SDL applications.
 %patch2 -p1 -b .disable_yasm
 %patch3 -p1 -b .audiodriver
 %patch4 -p1 -b .xio_error
+%patch5 -p1 -b .x11_grab_down_button
 for F in CREDITS; do 
     iconv -f iso8859-1 -t utf-8 < "$F" > "${F}.utf"
     touch --reference "$F" "${F}.utf"
@@ -138,6 +141,9 @@ rm -rf %{buildroot}
 %{_libdir}/lib*.a
 
 %changelog
+* Thu Aug 12 2010 Petr Pisar <ppisar at redhat.com> - 1.2.14-7
+- Fix left button press event in windowed mode (rh556608, sdl894)
+
 * Mon Aug 02 2010 Petr Pisar <ppisar at redhat.com> - 1.2.14-6
 - Make repacked source tar ball relative
 - Remove useless src/joystick/darwin/10.3.9-FIX/IOHIDLib.h because of APSL-2.0


More information about the scm-commits mailing list