[maemo-commits] [maemo-commits] r18870 - in projects/haf/trunk/libmatchbox2: . matchbox/core

[From: subversion at stage.maemo.org]

Author: aendrodi
Date: 2009-07-17 16:33:27 +0300 (Fri, 17 Jul 2009)
New Revision: 18870

Modified:
   projects/haf/trunk/libmatchbox2/ChangeLog
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-base.c
Log:
	NB#128595 [RGBA GTK+/sapwood] modalblocker popping up without
		  a dialog locks the UI
	NB#128661 [RGBA GTK+/sapwood] Application windows not mapped,
		  only titlebar visible.

	* matchbox/core/mb-wm-client-base.c (mb_wm_client_base_realize):
	  Don't fail with the frame window creation if the client is argb32.


Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-07-17 13:07:25 UTC (rev 18869)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-07-17 13:33:27 UTC (rev 18870)
@@ -1,3 +1,13 @@
+2009-07-17  Adam Endrodi  <adam.endrodi at blumsoft.eu>
+
+	NB#128595 [RGBA GTK+/sapwood] modalblocker popping up without
+		  a dialog locks the UI
+	NB#128661 [RGBA GTK+/sapwood] Application windows not mapped,
+		  only titlebar visible.
+
+	* matchbox/core/mb-wm-client-base.c (mb_wm_client_base_realize):
+	  Don't fail with the frame window creation if the client is argb32.
+
 2009-07-17  Aapo Kojo  <aapo.kojo at nokia.com>
 
 	Release 0.2.47

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-base.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-base.c	2009-07-17 13:07:25 UTC (rev 18869)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-base.c	2009-07-17 13:33:27 UTC (rev 18870)
@@ -167,7 +167,7 @@
   /* create the frame window */
 
   attr.override_redirect = True;
-/*  attr.background_pixel  = BlackPixel(wm->xdpy, wm->xscreen);*/
+  attr.background_pixel = attr.border_pixel = BlackPixel(wm->xdpy, wm->xscreen);
 /*  attr.background_pixmap = None;*/
   attr.event_mask = MBWMChildMask|MBWMButtonMask|ExposureMask;
 
@@ -191,6 +191,7 @@
 	    {
 	      attr.colormap = client->window->colormap;
 
+              /* for some reason X wants us to define a BorderPixel */
 	      client->xwin_frame
 		= XCreateWindow(wm->xdpy, wm->root_win->xwindow,
 				client->frame_geometry.x,
@@ -201,9 +202,10 @@
 				32,
 				InputOutput,
 				client->window->visual,
-				CWOverrideRedirect|CWEventMask/*|CWBackPixel|
-				CWBorderPixel*/|CWColormap,
+				CWOverrideRedirect|CWEventMask|/*CWBackPixel|*/
+				CWBorderPixel|CWColormap,
 				&attr);
+              XSync(wm->xdpy, False);
 	      mb_wm_rename_window (wm, client->xwin_frame, "alphaframe");
 	    }
 	  else