[maemo-commits] [maemo-commits] r11512 - in projects/haf/trunk/libsdl1.2: . debian src/video/x11

[From: subversion at stage.maemo.org]

Author: kusalone
Date: 2007-05-08 11:51:04 +0300 (Tue, 08 May 2007)
New Revision: 11512

Modified:
   projects/haf/trunk/libsdl1.2/README-SDL.txt
   projects/haf/trunk/libsdl1.2/debian/changelog
   projects/haf/trunk/libsdl1.2/debian/control
   projects/haf/trunk/libsdl1.2/src/video/x11/SDL_x11events.c
   projects/haf/trunk/libsdl1.2/src/video/x11/SDL_x11wm.c
Log:
-19 version


Modified: projects/haf/trunk/libsdl1.2/README-SDL.txt
===================================================================
--- projects/haf/trunk/libsdl1.2/README-SDL.txt	2007-05-08 08:37:24 UTC (rev 11511)
+++ projects/haf/trunk/libsdl1.2/README-SDL.txt	2007-05-08 08:51:04 UTC (rev 11512)
@@ -9,5 +9,5 @@
 http://www.libsdl.org/
 
 This library is distributed under the terms of the GNU LGPL license:
-http://www.gnu.org/copyleft/lesser.html
+http://www.gnu.org/licenses/lgpl.txt
 

Modified: projects/haf/trunk/libsdl1.2/debian/changelog
===================================================================
--- projects/haf/trunk/libsdl1.2/debian/changelog	2007-05-08 08:37:24 UTC (rev 11511)
+++ projects/haf/trunk/libsdl1.2/debian/changelog	2007-05-08 08:51:04 UTC (rev 11512)
@@ -1,3 +1,15 @@
+libsdl1.2 (1.2.8-19) unstable; urgency=low
+
+  * debian/changelog: replaced xlibs-dev build dependancy
+  * debian/changelog: added osso-esd-dev build dependancy
+  * video/X11/SDL_x11events: Focus will be set back to SDL_Window if parent
+    window will get it.
+  * video/X11/SDL_x11wm.c: FSwindow and WMwindow are automatically appended to
+    the WM info struct as maemo SDK provides SDL 1.2.8 (there was a bug which
+    prevented those from being appended).
+
+ -- Kuisma Salonen <kuisma.salonen at nokia.com>  Mon,  5 Feb 2007 14:49:56 +0200
+
 libsdl1.2 (1.2.8-18) unstable; urgency=low
 
   * remove from the source tree the svn-commit-file

Modified: projects/haf/trunk/libsdl1.2/debian/control
===================================================================
--- projects/haf/trunk/libsdl1.2/debian/control	2007-05-08 08:37:24 UTC (rev 11511)
+++ projects/haf/trunk/libsdl1.2/debian/control	2007-05-08 08:51:04 UTC (rev 11512)
@@ -1,7 +1,7 @@
 Source: libsdl1.2
 Priority: optional
 Maintainer: Kuisma Salonen <kuisma.salonen at nokia.com>
-Build-Depends: debhelper (>= 4.0.0), xlibs-dev, automake1.8, libasound2-dev
+Build-Depends: debhelper (>= 4.0.0), libx11-dev, libsm-dev, libxpm-dev, libxext-dev, libxmu-dev, libxmuu-dev, libxi-dev, libxrandr-dev, x-dev, automake1.8, libasound2-dev, osso-esd-dev
 Standards-Version: 3.6.0
 
 Package: libsdl1.2-dev

Modified: projects/haf/trunk/libsdl1.2/src/video/x11/SDL_x11events.c
===================================================================
--- projects/haf/trunk/libsdl1.2/src/video/x11/SDL_x11events.c	2007-05-08 08:37:24 UTC (rev 11511)
+++ projects/haf/trunk/libsdl1.2/src/video/x11/SDL_x11events.c	2007-05-08 08:51:04 UTC (rev 11512)
@@ -158,6 +158,8 @@
 {
 	int posted;
 	XEvent xevent;
+	Window win;
+	int tmp;
 
 	XNextEvent(SDL_Display, &xevent);
 
@@ -198,12 +200,20 @@
 		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);
+			win = 0;
+			tmp = 0;
+			XGetInputFocus(SDL_Display, &win, &tmp);
+
+			if (win == (currently_fullscreen ? FSwindow : WMwindow)) {
+				XSetInputFocus(SDL_Display, SDL_Window, RevertToPointerRoot, CurrentTime);
 			} else {
-				posted = SDL_PrivateMouseMotion(0, 0,
-						xevent.xcrossing.x,
-						xevent.xcrossing.y);
+				if ( this->input_grab == SDL_GRAB_OFF ) {
+					posted = SDL_PrivateAppActive(0, SDL_APPMOUSEFOCUS);
+				} else {
+					posted = SDL_PrivateMouseMotion(0, 0,
+							xevent.xcrossing.x,
+							xevent.xcrossing.y);
+				}
 			}
 		}
 	    }

Modified: projects/haf/trunk/libsdl1.2/src/video/x11/SDL_x11wm.c
===================================================================
--- projects/haf/trunk/libsdl1.2/src/video/x11/SDL_x11wm.c	2007-05-08 08:37:24 UTC (rev 11511)
+++ projects/haf/trunk/libsdl1.2/src/video/x11/SDL_x11wm.c	2007-05-08 08:51:04 UTC (rev 11512)
@@ -381,12 +381,10 @@
 		info->subsystem = SDL_SYSWM_X11;
 		info->info.x11.display = SDL_Display;
 		info->info.x11.window = SDL_Window;
-		if ( SDL_VERSIONNUM(info->version.major,
-		                    info->version.minor,
-		                    info->version.patch) >= 1002 ) {
-			info->info.x11.fswindow = FSwindow;
-			info->info.x11.wmwindow = WMwindow;
-		}
+
+		info->info.x11.fswindow = FSwindow;
+		info->info.x11.wmwindow = WMwindow;
+
 		info->info.x11.lock_func = lock_display;
 		info->info.x11.unlock_func = unlock_display;
 		return(1);