[maemo-commits] [maemo-commits] r18978 - in projects/haf/trunk/libsdl1.2/debian: . patches

[From: subversion at stage.maemo.org]

Author: csaavedra
Date: 2009-07-24 17:57:00 +0300 (Fri, 24 Jul 2009)
New Revision: 18978

Added:
   projects/haf/trunk/libsdl1.2/debian/patches/320_no_fullscreen_grab.diff
Modified:
   projects/haf/trunk/libsdl1.2/debian/changelog
   projects/haf/trunk/libsdl1.2/debian/patches/series
Log:
libsdl1.2 (1:1.2.13-2maemo4) unstable; urgency=low

  * debian/patches/320_no_fullscreen_grab.diff
    + Added (?\195?\129dam Endrodi)
    + Fixes: NB#122967 (Not able to adjust vol with HW key if Song is
    playing in background and Playing Marbles in foreground)

 -- Claudio Saavedra <csaavedra at igalia.com>  Fri, 24 Jul 2009 14:18:48 +0200



Modified: projects/haf/trunk/libsdl1.2/debian/changelog
===================================================================
--- projects/haf/trunk/libsdl1.2/debian/changelog	2009-07-24 12:58:23 UTC (rev 18977)
+++ projects/haf/trunk/libsdl1.2/debian/changelog	2009-07-24 14:57:00 UTC (rev 18978)
@@ -1,3 +1,12 @@
+libsdl1.2 (1:1.2.13-2maemo4) unstable; urgency=low
+
+  * debian/patches/320_no_fullscreen_grab.diff
+    + Added (Ádam Endrodi)
+    + Fixes: NB#122967 (Not able to adjust vol with HW key if Song is
+    playing in background and Playing Marbles in foreground)
+
+ -- Claudio Saavedra <csaavedra at igalia.com>  Fri, 24 Jul 2009 14:18:48 +0200
+
 libsdl1.2 (1:1.2.13-2maemo3) unstable; urgency=low
 
   * debian/patches/310_fix_marbles.diff:

Added: projects/haf/trunk/libsdl1.2/debian/patches/320_no_fullscreen_grab.diff
===================================================================
--- projects/haf/trunk/libsdl1.2/debian/patches/320_no_fullscreen_grab.diff	2009-07-24 12:58:23 UTC (rev 18977)
+++ projects/haf/trunk/libsdl1.2/debian/patches/320_no_fullscreen_grab.diff	2009-07-24 14:57:00 UTC (rev 18978)
@@ -0,0 +1,31 @@
+--- SDL-1.2.13/src/video/SDL_video.c.orig	2009-07-22 11:12:08.000000000 +0300
++++ SDL-1.2.13/src/video/SDL_video.c	2009-07-22 11:12:22.000000000 +0300
+@@ -1863,13 +1863,9 @@
+ #ifdef DEBUG_GRAB
+   printf("SDL_WM_GrabInput(%d) ... ", mode);
+ #endif
+-	/* If the video surface is fullscreen, we always grab */
+ 	if ( mode >= SDL_GRAB_FULLSCREEN ) {
+ 		mode -= SDL_GRAB_FULLSCREEN;
+ 	}
+-	if ( SDL_VideoSurface && (SDL_VideoSurface->flags & SDL_FULLSCREEN) ) {
+-		mode += SDL_GRAB_FULLSCREEN;
+-	}
+ 	return(SDL_WM_GrabInputRaw(mode));
+ }
+ static SDL_GrabMode SDL_WM_GrabInputOff(void)
+--- SDL-1.2.13/src/video/x11/SDL_x11events.c.orig	2009-07-22 11:02:57.000000000 +0300
++++ SDL-1.2.13/src/video/x11/SDL_x11events.c	2009-07-22 11:13:58.000000000 +0300
+@@ -481,6 +481,12 @@
+ #ifdef DEBUG_XEVENTS
+ printf("FocusOut!\n");
+ #endif
++
++                /* Someone's (possibly the volume plugin's) passive key grab
++                 * may have activated, ignore it. */
++                if (xevent.xfocus.mode == NotifyGrab)
++                  break;
++
+ 		posted = SDL_PrivateAppActive(0, SDL_APPINPUTFOCUS);
+ 
+ #ifdef X_HAVE_UTF8_STRING

Modified: projects/haf/trunk/libsdl1.2/debian/patches/series
===================================================================
--- projects/haf/trunk/libsdl1.2/debian/patches/series	2009-07-24 12:58:23 UTC (rev 18977)
+++ projects/haf/trunk/libsdl1.2/debian/patches/series	2009-07-24 14:57:00 UTC (rev 18978)
@@ -21,4 +21,4 @@
 220_std_cld.diff
 300_dont_propagate_lpthread.diff
 310_fix_marbles.diff
-
+320_no_fullscreen_grab.diff