[maemo-commits] [maemo-commits] r19271 - in projects/haf/trunk/libmatchbox2: . debian matchbox/comp-mgr

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-08-31 16:24:35 +0300 (Mon, 31 Aug 2009)
New Revision: 19271

Modified:
   projects/haf/trunk/libmatchbox2/ChangeLog
   projects/haf/trunk/libmatchbox2/debian/changelog
   projects/haf/trunk/libmatchbox2/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c
Log:

        * matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c
        (mb_wm_comp_mgr_clutter_set_client_redirection): Use
        CompositeRedirectAutomatic instead of CompositeRedirectManual when
        (un)redirecting subwindows, it fixes the problem with black browser
        thumbnails when in task switcher.



Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-08-31 11:24:31 UTC (rev 19270)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-08-31 13:24:35 UTC (rev 19271)
@@ -1,5 +1,13 @@
 2009-08-31  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
 
+	Release 0.2.61
+
+	* matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c
+	(mb_wm_comp_mgr_clutter_set_client_redirection): Use
+	CompositeRedirectAutomatic instead of CompositeRedirectManual when
+	(un)redirecting subwindows, it fixes the problem with black browser
+	thumbnails when in task switcher.
+
 	Release 0.2.60
 
 	* matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c

Modified: projects/haf/trunk/libmatchbox2/debian/changelog
===================================================================
--- projects/haf/trunk/libmatchbox2/debian/changelog	2009-08-31 11:24:31 UTC (rev 19270)
+++ projects/haf/trunk/libmatchbox2/debian/changelog	2009-08-31 13:24:35 UTC (rev 19271)
@@ -1,3 +1,11 @@
+matchbox-window-manager-2 (0.2.61-1) unstable; urgency=low
+
+  Kimmo:
+  * Fix the problem with black browser thumbnails in task switcher when the
+    browser window was non-composited.
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Mon, 31 Aug 2009 16:18:47 +0300
+
 matchbox-window-manager-2 (0.2.60-1) unstable; urgency=low
 
   Kimmo:

Modified: projects/haf/trunk/libmatchbox2/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c	2009-08-31 11:24:31 UTC (rev 19270)
+++ projects/haf/trunk/libmatchbox2/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c	2009-08-31 13:24:35 UTC (rev 19271)
@@ -184,17 +184,18 @@
           CLUTTER_X11_TEXTURE_PIXMAP (cclient->priv->texture),
           setting);
 
-  /*
-  g_printerr("%s: %s %p %s win %lx frame %lx\n", __func__,
+  if (client->wm_client)
+    {
+      MBWMClientType c_type = MB_WM_CLIENT_CLIENT_TYPE (client->wm_client);
+
+      /*
+      g_printerr("%s: %s %p %s win %lx frame %lx\n", __func__,
              setting ? "redirecting" : "unredirecting", client->wm_client,
              mb_wm_client_get_name (client->wm_client),
              client->wm_client->window->xwindow,
              client->wm_client->xwin_frame);
              */
 
-  if (client->wm_client)
-    {
-      MBWMClientType c_type = MB_WM_CLIENT_CLIENT_TYPE (client->wm_client);
       if ((client->wm_client->window->ewmh_state &
             MBWMClientWindowEWMHStateFullscreen) ||
           client->wm_client->xwin_frame == 0 ||
@@ -205,12 +206,15 @@
         xwin = client->wm_client->window->xwindow;
       else
         xwin = client->wm_client->xwin_frame;
+      /*
+      g_printerr("%s: chosen xwin %lx\n", __func__, xwin);
+      */
     }
 
   if (setting && xwin != None)
     {
       XCompositeRedirectSubwindows (client->wm->xdpy, xwin,
-                                    CompositeRedirectManual);
+                                    CompositeRedirectAutomatic);
       XCompositeRedirectWindow (client->wm->xdpy, xwin,
                                 CompositeRedirectManual);
     }
@@ -219,7 +223,7 @@
       XCompositeUnredirectWindow (client->wm->xdpy, xwin,
                                   CompositeRedirectManual);
       XCompositeUnredirectSubwindows (client->wm->xdpy, xwin,
-                                      CompositeRedirectManual);
+                                      CompositeRedirectAutomatic);
     }
   cclient->priv->unredirected = setting ? False : True;
   XSync (client->wm->xdpy, False);