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

[From: subversion at stage.maemo.org]

Author: gw
Date: 2009-08-10 17:20:04 +0300 (Mon, 10 Aug 2009)
New Revision: 19098

Modified:
   projects/haf/trunk/libmatchbox2/ChangeLog
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-atoms.c
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client.c
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-types.h
Log:
	Fixes regression NB#131580 on new Gtk - Solid home applets

	* matchbox/core/mb-wm-types.h
        * matchbox/core/mb-wm-atoms.c
	* matchbox/core/mb-wm-client.c: 
	Revert RGBA Sapwood changes that search for the MAEMO_IGNORE_ALPHA
	property on windows. It seems GTK is unable to tell if a window is
	supposed to be transparent or not any more and just sets the property
	even for transparent windows. We must go back to the old method of
	making sure apps and dialogs are solid, while allowing anything else
	to be transparent.


Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-08-10 14:09:21 UTC (rev 19097)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-08-10 14:20:04 UTC (rev 19098)
@@ -1,3 +1,17 @@
+2009-08-10  Gordon Williams <gordon.williams at collabora.co.uk>
+	
+	Fixes NB#131580 - Solid home applets
+
+	* matchbox/core/mb-wm-types.h
+        * matchbox/core/mb-wm-atoms.c
+	* matchbox/core/mb-wm-client.c: 
+	Revert RGBA Sapwood changes that search for the MAEMO_IGNORE_ALPHA
+	property on windows. It seems GTK is unable to tell if a window is
+	supposed to be transparent or not any more and just sets the property
+	even for transparent windows. We must go back to the old method of
+	making sure apps and dialogs are solid, while allowing anything else
+	to be transparent.
+
 2009-08-10  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
 
 	Release 0.2.55

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-atoms.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-atoms.c	2009-08-10 14:09:21 UTC (rev 19097)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-atoms.c	2009-08-10 14:20:04 UTC (rev 19098)
@@ -109,12 +109,10 @@
     "_HILDON_WM_WINDOW_TYPE_LEGACY_MENU",
 
     "_MAEMO_SUPPRESS_ROOT_RECONFIGURATION",
-
-    "_MAEMO_IGNORE_ALPHA",
   };
 
   /* FIXME: Error Traps */
-
+  
   MBWM_ASSERT (MBWM_ATOM_COUNT == sizeof (atom_names) / sizeof (char*));
 
   XInternAtoms (wm->xdpy,

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client.c	2009-08-10 14:09:21 UTC (rev 19097)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client.c	2009-08-10 14:20:04 UTC (rev 19098)
@@ -99,42 +99,7 @@
   return False;
 }
 
-#if ENABLE_COMPOSITE
-static Bool
-mb_wm_client_ignore_alpha(MBWindowManagerClient *client)
-{
-  MBWindowManager *wm;
-  Atom actual_type_return;
-  int actual_format_return;
-  unsigned long nitems_return;
-  unsigned long bytes_after_return;
-  unsigned char* prop_return = NULL;
-  int result = 0;
 
-  wm = client->wmref;
-
-  mb_wm_util_trap_x_errors ();
-  XGetWindowProperty (wm->xdpy, client->window->xwindow,
-                      wm->atoms[WBWM_ATOM_MAEMO_IGNORE_ALPHA],
-                      0, G_MAXLONG,
-                      False,
-                      AnyPropertyType,
-                      &actual_type_return,
-                      &actual_format_return,
-                      &nitems_return,
-                      &bytes_after_return,
-                      &prop_return);
-  if (prop_return)
-    {
-      result = prop_return[0];
-      XFree (prop_return);
-    }
-  mb_wm_util_untrap_x_errors();
-
-  return result;
-}
-#endif
-
 static int
 mb_wm_client_init (MBWMObject *obj, va_list vap)
 {
@@ -204,7 +169,9 @@
     if (format && format->type == PictTypeDirect &&
 	format->direct.alphaMask)
       {
-        if (!mb_wm_client_ignore_alpha(client))
+        MBWMClientType ctype = MB_WM_CLIENT_CLIENT_TYPE (client);
+        if (ctype != MBWMClientTypeApp &&
+            ctype != MBWMClientTypeDialog)
           client->is_argb32 = True;
       }
   }

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-types.h
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-types.h	2009-08-10 14:09:21 UTC (rev 19097)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-types.h	2009-08-10 14:20:04 UTC (rev 19098)
@@ -314,13 +314,6 @@
    */
   MBWM_ATOM_MAEMO_SUPPRESS_ROOT_RECONFIGURATION,
 
-  /* This flag is set on a window (currently by GTK) if the window
-   * itself contains an alpha channel, but we are supposed to ignore it.
-   * This is useful for RGBA sapwood, and gives us a performance boost by
-   * allowing our visibility detection (and SGX's) to know that the window
-   * is totally opaque. */
-  WBWM_ATOM_MAEMO_IGNORE_ALPHA,
-
   MBWM_ATOM_COUNT
 
 } MBWMAtom;