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

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-08-28 20:18:23 +0300 (Fri, 28 Aug 2009)
New Revision: 19247

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
   projects/haf/trunk/libmatchbox2/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.h
Log:
releasing


Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-08-28 16:50:31 UTC (rev 19246)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-08-28 17:18:23 UTC (rev 19247)
@@ -1,3 +1,11 @@
+2009-08-28  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
+
+	Release 0.2.59
+
+	* matchbox/comp-mgr/mb-wm-comp-mgr-clutter.[ch]: Add unredirected
+	member to track unredirection of more than one client.
+	(mb_wm_comp_mgr_clutter_client_is_unredirected): New.
+
 2009-08-26  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
 
 	Release 0.2.58

Modified: projects/haf/trunk/libmatchbox2/debian/changelog
===================================================================
--- projects/haf/trunk/libmatchbox2/debian/changelog	2009-08-28 16:50:31 UTC (rev 19246)
+++ projects/haf/trunk/libmatchbox2/debian/changelog	2009-08-28 17:18:23 UTC (rev 19247)
@@ -1,8 +1,9 @@
-matchbox-window-manager-2 (0.2.59-1~unreleased) unstable; urgency=low
+matchbox-window-manager-2 (0.2.59-1) unstable; urgency=low
 
-  * foo
+  * Add mb_wm_comp_mgr_clutter_client_is_unredirected to track unredirection
+    of more than one client.
 
- -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Wed, 26 Aug 2009 18:54:09 +0300
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Fri, 28 Aug 2009 20:16:25 +0300
 
 matchbox-window-manager-2 (0.2.58-1) unstable; urgency=low
 

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-28 16:50:31 UTC (rev 19246)
+++ projects/haf/trunk/libmatchbox2/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c	2009-08-28 17:18:23 UTC (rev 19247)
@@ -76,6 +76,7 @@
   Bool                    fullscreen;
   Damage                  window_damage;
   Bool                    damage_handling_off;
+  Bool                    unredirected;
   Bool                    bound;
 
   /* have we been unmapped - if so we need to re-create our texture when
@@ -161,6 +162,13 @@
     }
 }
 
+Bool
+mb_wm_comp_mgr_clutter_client_is_unredirected (MBWMCompMgrClient *client)
+{
+  MBWMCompMgrClutterClient *cclient = MB_WM_COMP_MGR_CLUTTER_CLIENT(client);
+  return cclient->priv->unredirected;
+}
+
 /* Clutter sets XComposite redirection for windows corresponding to textures;
  * this function is used to toggle redirection within Clutter. */
 void
@@ -177,13 +185,24 @@
           setting);
 
   if (setting && client->wm_client)
-    XCompositeRedirectSubwindows (client->wm->xdpy,
+  {
+    if (client->wm_client->xwin_frame)
+      XCompositeRedirectSubwindows (client->wm->xdpy,
                                   client->wm_client->xwin_frame,
                                   CompositeRedirectManual);
+    else
+      g_warning ("%s: %p has no frame\n", __func__, client);
+  }
   else if (client->wm_client)
-    XCompositeUnredirectSubwindows (client->wm->xdpy,
+  {
+    if (client->wm_client->xwin_frame)
+      XCompositeUnredirectSubwindows (client->wm->xdpy,
                                     client->wm_client->xwin_frame,
                                     CompositeRedirectManual);
+    else
+      g_warning ("%s: %p has no frame\n", __func__, client);
+  }
+  cclient->priv->unredirected = setting ? False : True;
   XSync (client->wm->xdpy, False);
   XUngrabServer (client->wm->xdpy);
   mb_wm_util_untrap_x_errors ();

Modified: projects/haf/trunk/libmatchbox2/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.h
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.h	2009-08-28 16:50:31 UTC (rev 19246)
+++ projects/haf/trunk/libmatchbox2/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.h	2009-08-28 17:18:23 UTC (rev 19247)
@@ -127,4 +127,7 @@
 mb_wm_comp_mgr_clutter_set_client_redirection (MBWMCompMgrClient *client,
                                                gboolean setting);
 
+Bool
+mb_wm_comp_mgr_clutter_client_is_unredirected (MBWMCompMgrClient *client);
+
 #endif