[SM-Commit] GIT changes to master grimoire by Robin Cook (11db66f9eeb43d00f6fa4b113d3055e1a4e6734d)

Robin Cook scm at sourcemage.org
Mon Oct 18 17:42:58 EDT 2010


GIT changes to master grimoire by Robin Cook <rcook at wyrms.net>:

 libs/sdl/HISTORY         |    4 ++++
 libs/sdl/PRE_BUILD       |    1 +
 libs/sdl/mouse-fix.patch |   15 +++++++++++++++
 3 files changed, 20 insertions(+)

New commits:
commit 11db66f9eeb43d00f6fa4b113d3055e1a4e6734d
Author: Robin Cook <rcook at wyrms.net>
Commit: Robin Cook <rcook at wyrms.net>

    sdl: apply patch to fix mouse problem

diff --git a/libs/sdl/HISTORY b/libs/sdl/HISTORY
index 0a6dae6..b0f17f2 100644
--- a/libs/sdl/HISTORY
+++ b/libs/sdl/HISTORY
@@ -1,3 +1,7 @@
+2010-10-18 Robin Cook <rcook at wyrms.net>
+	* PRE_BUILD: apply mouse fix patch
+	  http://bugzilla.libsdl.org/show_bug.cgi?id=894
+
 2009-10-21 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.2.14
 
diff --git a/libs/sdl/PRE_BUILD b/libs/sdl/PRE_BUILD
index 74b2580..04554fb 100755
--- a/libs/sdl/PRE_BUILD
+++ b/libs/sdl/PRE_BUILD
@@ -1,5 +1,6 @@
 default_pre_build                  &&
 cd $SOURCE_DIRECTORY               &&
+patch -p1 < $SCRIPT_DIRECTORY/mouse-fix.patch &&
 mkdir -p smgl                      &&
 cp $SCRIPT_DIRECTORY/sdl smgl/     &&
 cp $SCRIPT_DIRECTORY/sdl.sh smgl/
diff --git a/libs/sdl/mouse-fix.patch b/libs/sdl/mouse-fix.patch
new file mode 100644
index 0000000..1fe0241
--- /dev/null
+++ b/libs/sdl/mouse-fix.patch
@@ -0,0 +1,15 @@
+--- SDL-1.2.14/src/video/x11/SDL_x11events.c	2009-10-12 16:07:15.000000000 -0700
++++ SDL-1.2/src/video/x11/SDL_x11events.c	2010-07-19 23:57:48.365397095 -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,



More information about the SM-Commit mailing list