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

[From: www-data at stage.maemo.org]

Author: kusalone
Date: 2006-11-29 12:45:40 +0200 (Wed, 29 Nov 2006)
New Revision: 8443

Modified:
   projects/haf/trunk/libsdl1.2/debian/changelog
   projects/haf/trunk/libsdl1.2/debian/rules
   projects/haf/trunk/libsdl1.2/src/video/x11/SDL_x11modes.c
   projects/haf/trunk/libsdl1.2/src/video/x11/SDL_x11video.c
Log:
- Bugfix for window refocusing bug.
- Joystick enabled again in the SVN.


Modified: projects/haf/trunk/libsdl1.2/debian/changelog
===================================================================
--- projects/haf/trunk/libsdl1.2/debian/changelog	2006-11-29 10:28:19 UTC (rev 8442)
+++ projects/haf/trunk/libsdl1.2/debian/changelog	2006-11-29 10:45:40 UTC (rev 8443)
@@ -1,3 +1,10 @@
+libsdl1.2 (1.2.8-15) unstable; urgency=low
+
+  * src/video/x11/: Both windows get WM classname and unused is unmapped.
+    Fixes: NB#47798
+
+ -- Kuisma Salonen <kuisma.salonen at nokia.com>  Wed, 29 Nov 2006 12:28:32 +0200
+
 libsdl1.2 (1.2.8-14) unstable; urgency=low
 
   * src/video/SDL_video.c: SDL_UpdateRect() clips now the rect to the screen.

Modified: projects/haf/trunk/libsdl1.2/debian/rules
===================================================================
--- projects/haf/trunk/libsdl1.2/debian/rules	2006-11-29 10:28:19 UTC (rev 8442)
+++ projects/haf/trunk/libsdl1.2/debian/rules	2006-11-29 10:45:40 UTC (rev 8443)
@@ -38,7 +38,7 @@
 	aclocal-1.8
 #	autoconf-1.8
 	# Add here commands to configure the package.
-	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --disable-video-x11-vm --disable-nasm --disable-oss --enable-alsa --disable-arts --disable-nas --disable-diskaudio --disable-mintaudio --enable-esd --disable-video-fbcon --disable-joystick
+	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --disable-video-x11-vm --disable-nasm --disable-oss --enable-alsa --disable-arts --disable-nas --disable-diskaudio --disable-mintaudio --enable-esd --disable-video-fbcon
 
 
 build: build-stamp

Modified: projects/haf/trunk/libsdl1.2/src/video/x11/SDL_x11modes.c
===================================================================
--- projects/haf/trunk/libsdl1.2/src/video/x11/SDL_x11modes.c	2006-11-29 10:28:19 UTC (rev 8442)
+++ projects/haf/trunk/libsdl1.2/src/video/x11/SDL_x11modes.c	2006-11-29 10:45:40 UTC (rev 8443)
@@ -751,6 +751,8 @@
     if ( ! okay ) {
         X11_LeaveFullScreen(this);
     }
+
+    XUnmapWindow(SDL_Display, WMwindow);
     /* Set the colormap */
     if ( SDL_XColorMap ) {
         XInstallColormap(SDL_Display, SDL_XColorMap);
@@ -813,6 +815,9 @@
      */
     X11_GrabInputNoLock(this, this->input_grab & ~SDL_GRAB_FULLSCREEN);
 
+    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. */
     if ( this->screen ) {

Modified: projects/haf/trunk/libsdl1.2/src/video/x11/SDL_x11video.c
===================================================================
--- projects/haf/trunk/libsdl1.2/src/video/x11/SDL_x11video.c	2006-11-29 10:28:19 UTC (rev 8442)
+++ projects/haf/trunk/libsdl1.2/src/video/x11/SDL_x11video.c	2006-11-29 10:45:40 UTC (rev 8443)
@@ -371,6 +371,7 @@
 	    classhints->res_name = classname;
 	    classhints->res_class = classname;
 	    XSetClassHint(SDL_Display, WMwindow, classhints);
+            XSetClassHint(SDL_Display, FSwindow, classhints);
 	    XFree(classhints);
 	}
     }