[Pkg-sdl-commits] r265 - in unstable/libsdl1.2/debian: . patches

[Barry deFreese]

Author: bdefreese
Date: 2010-04-16 21:47:54 +0000 (Fri, 16 Apr 2010)
New Revision: 265

Added:
   unstable/libsdl1.2/debian/patches/310_fixmouseclicks
Modified:
   unstable/libsdl1.2/debian/changelog
   unstable/libsdl1.2/debian/patches/series
Log:
  * Add 310_fixmouseclicks.diff to fix problems with left-mouse clicks
      not working in Wesnoth in windowed mode.  Partially reverts the fix
      for upstream bug #716 (r4872).  (Closes: #565788).
      Thanks to Adam D. Barratt for the fix.



Modified: unstable/libsdl1.2/debian/changelog
===================================================================
--- unstable/libsdl1.2/debian/changelog	2010-02-11 14:12:57 UTC (rev 264)
+++ unstable/libsdl1.2/debian/changelog	2010-04-16 21:47:54 UTC (rev 265)
@@ -1,3 +1,12 @@
+libsdl1.2 (1.2.14-5) unstable; urgency=low
+
+  * Add 310_fixmouseclicks.diff to fix problems with left-mouse clicks
+      not working in Wesnoth in windowed mode.  Partially reverts the fix
+      for upstream bug #716 (r4872).  (Closes: #565788).
+      Thanks to Adam D. Barratt for the fix.
+
+ -- Barry deFreese <bdefreese at debian.org>  Fri, 16 Apr 2010 09:26:29 -0400
+
 libsdl1.2 (1.2.14-4) unstable; urgency=low
 
   * Move -dev Recommends back to Depends, as other packages may want to 

Added: unstable/libsdl1.2/debian/patches/310_fixmouseclicks
===================================================================
--- unstable/libsdl1.2/debian/patches/310_fixmouseclicks	                        (rev 0)
+++ unstable/libsdl1.2/debian/patches/310_fixmouseclicks	2010-04-16 21:47:54 UTC (rev 265)
@@ -0,0 +1,25 @@
+Index: libsdl1.2-1.2.14/src/video/x11/SDL_x11events.c
+===================================================================
+--- libsdl1.2-1.2.14.orig/src/video/x11/SDL_x11events.c	2010-04-06 19:29:05.000000000 +0100
++++ libsdl1.2-1.2.14/src/video/x11/SDL_x11events.c	2010-04-06 19:29:46.000000000 +0100
+@@ -423,12 +423,15 @@
+ if ( xevent.xcrossing.mode == NotifyUngrab )
+ printf("Mode: NotifyUngrab\n");
+ #endif
+-		if ( this->input_grab == SDL_GRAB_OFF ) {
+-			posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS);
++		if ( (xevent.xcrossing.mode != NotifyGrab) &&
++		     (xevent.xcrossing.mode != NotifyUngrab) ) {
++			if ( this->input_grab == SDL_GRAB_OFF ) {
++				posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS);
++			}
++			posted = SDL_PrivateMouseMotion(0, 0,
++					xevent.xcrossing.x,
++					xevent.xcrossing.y);
+ 		}
+-		posted = SDL_PrivateMouseMotion(0, 0,
+-				xevent.xcrossing.x,
+-				xevent.xcrossing.y);
+ 	    }
+ 	    break;
+ 

Modified: unstable/libsdl1.2/debian/patches/series
===================================================================
--- unstable/libsdl1.2/debian/patches/series	2010-02-11 14:12:57 UTC (rev 264)
+++ unstable/libsdl1.2/debian/patches/series	2010-04-16 21:47:54 UTC (rev 265)
@@ -15,3 +15,4 @@
 221_check_SDL_NOKBD_environment_variable.diff
 222_joystick_crash.diff
 300_dont_propagate_lpthread.diff
+310_fixmouseclicks