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

[From: subversion at stage.maemo.org]

Author: kusalone
Date: 2007-01-22 14:05:53 +0200 (Mon, 22 Jan 2007)
New Revision: 9226

Added:
   projects/haf/trunk/libsdl1.2/kuisma_todo.txt
Modified:
   projects/haf/trunk/libsdl1.2/debian/changelog
   projects/haf/trunk/libsdl1.2/src/video/x11/SDL_x11video.c
Log:
Fixed external application crashing.


Modified: projects/haf/trunk/libsdl1.2/debian/changelog
===================================================================
--- projects/haf/trunk/libsdl1.2/debian/changelog	2007-01-22 11:40:57 UTC (rev 9225)
+++ projects/haf/trunk/libsdl1.2/debian/changelog	2007-01-22 12:05:53 UTC (rev 9226)
@@ -1,10 +1,11 @@
-libsdl1.2 (1.2.8-16un) unstable; urgency=low
+libsdl1.2 (1.2.8-16) unstable; urgency=low
 
   * src/SDL_fatal.c: fatals will raise invoking signal after SDL_Quit().
     Fixes: NB#48789
-  * UNRELEASED
+  * src/video/x11/SDL_x11video.c: windowed window will be unmapped when
+    destroying the window from fullscreen.
 
- -- Kuisma Salonen <kuisma.salonen at nokia.com>  Mon, 18 Dec 2006 19:08:21 +0200
+ -- Kuisma Salonen <kuisma.salonen at nokia.com>  Mon, 22 Jan 2007 14:05:18 +0200
 
 libsdl1.2 (1.2.8-15) unstable; urgency=low
 

Added: projects/haf/trunk/libsdl1.2/kuisma_todo.txt
===================================================================
--- projects/haf/trunk/libsdl1.2/kuisma_todo.txt	2007-01-22 11:40:57 UTC (rev 9225)
+++ projects/haf/trunk/libsdl1.2/kuisma_todo.txt	2007-01-22 12:05:53 UTC (rev 9226)
@@ -0,0 +1,2 @@
+* Add into X11_LeaveFullscreen() option to NOT remap windowed window, in the
+ case of destroying the window.

Modified: projects/haf/trunk/libsdl1.2/src/video/x11/SDL_x11video.c
===================================================================
--- projects/haf/trunk/libsdl1.2/src/video/x11/SDL_x11video.c	2007-01-22 11:40:57 UTC (rev 9225)
+++ projects/haf/trunk/libsdl1.2/src/video/x11/SDL_x11video.c	2007-01-22 12:05:53 UTC (rev 9226)
@@ -491,12 +491,13 @@
 
 	if ( ! SDL_windowid ) {
 		/* Hide the managed window */
-		if ( WMwindow ) {
+		if ( !( screen && (screen->flags & SDL_FULLSCREEN) ) && WMwindow ) {
 			XUnmapWindow(SDL_Display, WMwindow);
 		}
 		if ( screen && (screen->flags & SDL_FULLSCREEN) ) {
 			screen->flags &= ~SDL_FULLSCREEN;
 			X11_LeaveFullScreen(this);
+			XUnmapWindow(SDL_Display, WMwindow);
 		}
 
 		/* Destroy the output window */