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

[From: subversion at stage.maemo.org]

Author: kusalone
Date: 2007-01-23 16:04:11 +0200 (Tue, 23 Jan 2007)
New Revision: 9269

Modified:
   projects/haf/trunk/libsdl1.2/debian/changelog
   projects/haf/trunk/libsdl1.2/kuisma_todo.txt
   projects/haf/trunk/libsdl1.2/src/video/x11/SDL_x11events.c
   projects/haf/trunk/libsdl1.2/src/video/x11/SDL_x11modes.c
   projects/haf/trunk/libsdl1.2/src/video/x11/SDL_x11modes_c.h
   projects/haf/trunk/libsdl1.2/src/video/x11/SDL_x11video.c
Log:
src/video/x11/: X11_LeaveFullScreen won't remap windowed window upon quit.


Modified: projects/haf/trunk/libsdl1.2/debian/changelog
===================================================================
--- projects/haf/trunk/libsdl1.2/debian/changelog	2007-01-23 13:59:42 UTC (rev 9268)
+++ projects/haf/trunk/libsdl1.2/debian/changelog	2007-01-23 14:04:11 UTC (rev 9269)
@@ -1,3 +1,10 @@
+libsdl1.2 (1.2.8-17) unstable; urgency=low
+
+  * src/video/x11/: X11_LeaveFullScreen() won't remap the WM window when
+    destroying SDL window in fullscreen mode.
+
+ -- Kuisma Salonen <kuisma.salonen at nokia.com>  Tue, 23 Jan 2007 16:03:54 +0200
+
 libsdl1.2 (1.2.8-16) unstable; urgency=low
 
   * src/SDL_fatal.c: fatals will raise invoking signal after SDL_Quit().

Modified: projects/haf/trunk/libsdl1.2/kuisma_todo.txt
===================================================================
--- projects/haf/trunk/libsdl1.2/kuisma_todo.txt	2007-01-23 13:59:42 UTC (rev 9268)
+++ projects/haf/trunk/libsdl1.2/kuisma_todo.txt	2007-01-23 14:04:11 UTC (rev 9269)
@@ -1,2 +1 @@
-* Add into X11_LeaveFullscreen() option to NOT remap windowed window, in the
- case of destroying the window.
+[todolist empty]

Modified: projects/haf/trunk/libsdl1.2/src/video/x11/SDL_x11events.c
===================================================================
--- projects/haf/trunk/libsdl1.2/src/video/x11/SDL_x11events.c	2007-01-23 13:59:42 UTC (rev 9268)
+++ projects/haf/trunk/libsdl1.2/src/video/x11/SDL_x11events.c	2007-01-23 14:04:11 UTC (rev 9269)
@@ -489,7 +489,7 @@
 				if ( go_fullscreen ) {
 					X11_EnterFullScreen(this);
 				} else {
-					X11_LeaveFullScreen(this);
+					X11_LeaveFullScreen(this, 0);
 				}
 			}
 			/* Handle focus in/out when grabbed */

Modified: projects/haf/trunk/libsdl1.2/src/video/x11/SDL_x11modes.c
===================================================================
--- projects/haf/trunk/libsdl1.2/src/video/x11/SDL_x11modes.c	2007-01-23 13:59:42 UTC (rev 9268)
+++ projects/haf/trunk/libsdl1.2/src/video/x11/SDL_x11modes.c	2007-01-23 14:04:11 UTC (rev 9269)
@@ -749,7 +749,7 @@
     /* Set the new resolution */
     okay = X11_ResizeFullScreen(this);
     if ( ! okay ) {
-        X11_LeaveFullScreen(this);
+        X11_LeaveFullScreen(this, 0);
     }
 
     XUnmapWindow(SDL_Display, WMwindow);
@@ -773,7 +773,7 @@
     return(okay);
 }
 
-int X11_LeaveFullScreen(_THIS)
+int X11_LeaveFullScreen(_THIS, int destroy)
 {
     if ( currently_fullscreen ) {
         XReparentWindow(SDL_Display, SDL_Window, WMwindow, 0, 0);
@@ -815,8 +815,10 @@
      */
     X11_GrabInputNoLock(this, this->input_grab & ~SDL_GRAB_FULLSCREEN);
 
-    XMapWindow(SDL_Display, WMwindow);
-    X11_WaitMapped(this, WMwindow);
+    if ( !destroy ) {
+        XMapWindow(SDL_Display, WMwindow);
+        X11_WaitMapped(this, WMwindow);
+    }
 
     /* We may need to refresh the screen at this point (no backing store)
        We also don't get an event, which is why we explicitly refresh. */

Modified: projects/haf/trunk/libsdl1.2/src/video/x11/SDL_x11modes_c.h
===================================================================
--- projects/haf/trunk/libsdl1.2/src/video/x11/SDL_x11modes_c.h	2007-01-23 13:59:42 UTC (rev 9268)
+++ projects/haf/trunk/libsdl1.2/src/video/x11/SDL_x11modes_c.h	2007-01-23 14:04:11 UTC (rev 9269)
@@ -44,4 +44,4 @@
 extern void X11_WaitUnmapped(_THIS, Window win);
 extern void X11_QueueEnterFullScreen(_THIS);
 extern int X11_EnterFullScreen(_THIS);
-extern int X11_LeaveFullScreen(_THIS);
+extern int X11_LeaveFullScreen(_THIS, int destroy);

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-23 13:59:42 UTC (rev 9268)
+++ projects/haf/trunk/libsdl1.2/src/video/x11/SDL_x11video.c	2007-01-23 14:04:11 UTC (rev 9269)
@@ -496,8 +496,7 @@
 		}
 		if ( screen && (screen->flags & SDL_FULLSCREEN) ) {
 			screen->flags &= ~SDL_FULLSCREEN;
-			X11_LeaveFullScreen(this);
-			XUnmapWindow(SDL_Display, WMwindow);
+			X11_LeaveFullScreen(this, 1);
 		}
 
 		/* Destroy the output window */
@@ -929,7 +928,7 @@
 		} else {
 			if ( screen->flags & SDL_FULLSCREEN ) {
 				screen->flags &= ~SDL_FULLSCREEN;
-				X11_LeaveFullScreen(this);
+				X11_LeaveFullScreen(this, 0);
 			}
 		}
 		XResizeWindow(SDL_Display, SDL_Window, w, h);
@@ -1013,7 +1012,7 @@
 		X11_EnterFullScreen(this);
 	} else {
 		this->screen->flags &= ~SDL_FULLSCREEN;
-		X11_LeaveFullScreen(this);
+		X11_LeaveFullScreen(this, 0);
 	}
 	X11_RefreshDisplay(this);
 	if ( event_thread ) {