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

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-06-26 13:28:41 +0300 (Fri, 26 Jun 2009)
New Revision: 18796

Modified:
   projects/haf/trunk/libmatchbox2/ChangeLog
   projects/haf/trunk/libmatchbox2/debian/changelog
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client.c
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client.h
Log:
Patch from Laszlo related to NB#121902



Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-06-26 09:50:40 UTC (rev 18795)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-06-26 10:28:41 UTC (rev 18796)
@@ -1,3 +1,13 @@
+2009-06-26  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
+
+	Patch from Laszlo Pere.
+
+	* matchbox/core/mb-wm-client.[ch] (mb_wm_client_is_map_confirmed,
+	mb_wm_client_set_map_confirmed): New functions to track if a client
+	has received MapNotify yet.  Related to NB#121902
+	* matchbox/core/mb-window-manager.c (mb_wm_handle_unmap_notify,
+	mb_wm_handle_map_notify): Track if client has received MapNotify.
+
 2009-06-23  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
 
 	Release 0.2.44

Modified: projects/haf/trunk/libmatchbox2/debian/changelog
===================================================================
--- projects/haf/trunk/libmatchbox2/debian/changelog	2009-06-26 09:50:40 UTC (rev 18795)
+++ projects/haf/trunk/libmatchbox2/debian/changelog	2009-06-26 10:28:41 UTC (rev 18796)
@@ -1,6 +1,8 @@
 matchbox-window-manager-2 (0.2.45-1~unreleased) unstable; urgency=low
 
-  * foo
+  Laszlo:
+  * Add new API: mb_wm_client_is_map_confirmed,
+    mb_wm_client_set_map_confirmed.
 
  -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Tue, 23 Jun 2009 09:57:06 +0300
 

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c	2009-06-26 09:50:40 UTC (rev 18795)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c	2009-06-26 10:28:41 UTC (rev 18796)
@@ -488,6 +488,7 @@
 	   * If the client is not iconizing and is not alreadly in a hidden
 	   * state, we unmange it and destroy all the associated resources.
 	   */
+          mb_wm_client_set_map_confirmed (client, False);
 	  if (mb_wm_client_is_iconizing (client))
 	    {
 	      MBWM_DBG ("iconizing client %p\n", client);
@@ -834,6 +835,8 @@
 
           if (wm->non_redirection)
             mb_wm_unredirect_client (wm, client);
+      
+	  mb_wm_client_set_map_confirmed (client, True);
 	}
 
       return True;
@@ -883,6 +886,7 @@
   if (wm->non_redirection)
     mb_wm_unredirect_client (wm, client);
 
+  mb_wm_client_set_map_confirmed (client, True);
   return True;
 }
 #endif

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client.c	2009-06-26 09:50:40 UTC (rev 18795)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client.c	2009-06-26 10:28:41 UTC (rev 18796)
@@ -37,6 +37,7 @@
 {
   Bool          realized;
   Bool          mapped;
+  Bool          map_confirmed;
   Bool          iconizing;
   Bool          hiding_from_desktop;
   MBWMSyncType  sync_state;
@@ -480,7 +481,21 @@
   return client->priv->mapped;
 }
 
+Bool
+mb_wm_client_is_map_confirmed (MBWindowManagerClient *client)
+{
+  return client->priv->map_confirmed;
+}
+
 void
+mb_wm_client_set_map_confirmed (MBWindowManagerClient *client,
+		Bool confirmed)
+{
+  client->priv->map_confirmed = confirmed;
+}
+
+
+void
 mb_wm_client_display_sync (MBWindowManagerClient *client)
 {
   MBWindowManagerClientClass *klass;

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client.h
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client.h	2009-06-26 09:50:40 UTC (rev 18795)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client.h	2009-06-26 10:28:41 UTC (rev 18796)
@@ -282,7 +282,14 @@
 Bool
 mb_wm_client_is_mapped (MBWindowManagerClient *client);
 
+Bool
+mb_wm_client_is_map_confirmed (MBWindowManagerClient *client);
+
 void
+mb_wm_client_set_map_confirmed (MBWindowManagerClient *client,
+		Bool confirmed);
+
+void
 mb_wm_client_get_coverage (MBWindowManagerClient *client,
                            MBGeometry            *coverage);