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

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-05-15 14:06:57 +0300 (Fri, 15 May 2009)
New Revision: 18386

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/core/mb-wm-client-base.c
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client.c
Log:
apply Laszlo's patch for NB#103219


Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-05-15 10:51:28 UTC (rev 18385)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-05-15 11:06:57 UTC (rev 18386)
@@ -1,3 +1,13 @@
+2009-05-15  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
+
+	Patch from Laszlo Pere to fix NB#103219:
+	* matchbox/core/mb-wm-client-base.c (mb_wm_client_base_display_sync):
+	Update _NET_WORKAREA according to the window's geometry (minus the
+	frame). 
+
+	* matchbox/core/mb-wm-client.c (mb_wm_client_hide): Always update
+	'mapped' even if the hide virtual function is not implemented.
+
 2009-05-13  Thomas Thurman  <thomas.thurman at collabora.co.uk>
 
 	Tapping the screen during the split second a fullscreen application
@@ -13,7 +23,8 @@
 	instead of attempting to do the identical work ourselves.
 	* matchbox/core/mb-wm-client.c (mb_wm_client_deliver_message): returns
 	a gboolean to indicate success.
-	* matchbox/core/mb-wm-client.[ch] (mb_wm_client_get_next_focused_client):
+	* matchbox/core/mb-wm-client.[ch]
+	(mb_wm_client_get_next_focused_client):
 	removed loop, rewrote as equivalent single line.
 	* matchbox/core/mb-wm-props.[ch]: remove mb_wm_props_send_x_message()
 	which is redundant (does exactly the same as

Modified: projects/haf/trunk/libmatchbox2/debian/changelog
===================================================================
--- projects/haf/trunk/libmatchbox2/debian/changelog	2009-05-15 10:51:28 UTC (rev 18385)
+++ projects/haf/trunk/libmatchbox2/debian/changelog	2009-05-15 11:06:57 UTC (rev 18386)
@@ -1,6 +1,8 @@
 matchbox-window-manager-2 (0.2.39-1~unreleased) unstable; urgency=low
 
-  * foo
+  Laszlo:
+  * Fixes: NB#103219 - Could not select Block speed to 1 from the drop down
+    box.
 
  -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Mon, 11 May 2009 16:16:37 +0300
 

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-05-15 10:51:28 UTC (rev 18385)
+++ projects/haf/trunk/libmatchbox2/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c	2009-05-15 11:06:57 UTC (rev 18386)
@@ -812,11 +812,7 @@
 
 /* We ignore the DontUpdate flag for i386, as it uses the X11 Texture Pixmap
  * class, which requires damage events to keep its internal texture in sync.
- * We could store damage events and hook onto actor->paint to make sure we
- * update the texture correctly - but this is overkill as it only applies
- * to scratchbox where we're more interested in correctness than speed
- * in transitions. NOTE: This is useless in Rover anyway as the texture
- * updates regardless. */
+ */
       if (!cclient->priv->actor ||
 #ifdef __i386__
           FALSE

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-base.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-base.c	2009-05-15 10:51:28 UTC (rev 18385)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-base.c	2009-05-15 11:06:57 UTC (rev 18386)
@@ -705,6 +705,7 @@
 
   if (mb_wm_client_needs_decor_sync (client))
     {
+      unsigned int area[4];
       /*
        * First, we set the base shape mask, if needed, so that individual
        * decors can add themselves to it.
@@ -724,6 +725,17 @@
 				   0, 0, rects, 1, ShapeSet, 0 );
 	}
 #endif
+
+      area[0] = client->window->geometry.x - client->frame_geometry.x;
+      area[1] = client->window->geometry.y - client->frame_geometry.y;
+      area[2] = client->window->geometry.width;
+      area[3] = client->window->geometry.height;
+
+      XChangeProperty(wm->xdpy, wm->root_win->xwindow,  
+		      wm->atoms[MBWM_ATOM_NET_WORKAREA], 
+		      XA_CARDINAL, 32, PropModeReplace, 
+		      (unsigned char*)area, 4);
+
 #if 0
       /*
        * I don't think this part is doing any good...

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client.c	2009-05-15 10:51:28 UTC (rev 18385)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client.c	2009-05-15 11:06:57 UTC (rev 18386)
@@ -401,14 +401,12 @@
   klass = MB_WM_CLIENT_CLASS(mb_wm_object_get_class (MB_WM_OBJECT(client)));
 
   if (klass->hide)
-    {
-      klass->hide (client);
+    klass->hide (client);
 
-      client->priv->mapped = False;
+  client->priv->mapped = False;
 
-      mb_wm_unfocus_client (client->wmref, client);
-      mb_wm_client_visibility_mark_dirty (client);
-    }
+  mb_wm_unfocus_client (client->wmref, client);
+  mb_wm_client_visibility_mark_dirty (client);
 }
 
 /*