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

[From: subversion at stage.maemo.org]

Author: aendrodi
Date: 2009-04-28 18:22:26 +0300 (Tue, 28 Apr 2009)
New Revision: 18187

Modified:
   projects/haf/trunk/libmatchbox2/ChangeLog
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c
Log:
	* matchbox/core/mb-window-manager.c (mb_wm_handle_map_notify):
	  Only notify the cmgr if the mapped window is the client's,
	  and don't try to be smart about fullscreenness.  Fixes the
	  problem remaining after NB#113103 ie. that a ghost thumbnail
	  remained in the switcher.  In the described use case the
	  main window got unfullscreened.  We ignored the unmaps and
	  maps as usual but later on we got a map for the frame window
	  and notified the cmgr about it -- but we didn't have an
	  intermediate unmap.


Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-04-28 10:09:14 UTC (rev 18186)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-04-28 15:22:26 UTC (rev 18187)
@@ -1,3 +1,15 @@
+2009-04-28  Adam Endrodi  <adam.endrodi at blumsoft.eu>
+
+	* matchbox/core/mb-window-manager.c (mb_wm_handle_map_notify):
+	  Only notify the cmgr if the mapped window is the client's,
+	  and don't try to be smart about fullscreenness.  Fixes the
+	  problem remaining after NB#113103 ie. that a ghost thumbnail
+	  remained in the switcher.  In the described use case the
+	  main window got unfullscreened.  We ignored the unmaps and
+	  maps as usual but later on we got a map for the frame window
+	  and notified the cmgr about it -- but we didn't have an
+	  intermediate unmap.
+
 2009-04-28  Thomas Thurman  <thomas.thurman at collabora.co.uk>
 
 	* matchbox/client-types/mb-wm-client-menu.c:

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c	2009-04-28 10:09:14 UTC (rev 18186)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c	2009-04-28 15:22:26 UTC (rev 18187)
@@ -804,19 +804,11 @@
         client->skip_maps--;
       else if (client)
 	{
-	  /* If the client is undecorated or fullscreen use
-           * client->window->xwindow as top, client->xwin_frame else */
-	  Window xwin_top = 
-	    client->xwin_frame == None ||
-	    mb_wm_client_window_is_state_set (client->window,
-                                       MBWMClientWindowEWMHStateFullscreen) ?
-                        client->window->xwindow : client->xwin_frame;
-
 	  /*
 	   * Only notify the CM when the top-level window maps, not for the
 	   * decors, etc.
 	   */
-	  if (xev->window == xwin_top && wm->comp_mgr)
+	  if (xev->window == client->window->xwindow && wm->comp_mgr)
 	    {
 	      MBWM_NOTE (COMPOSITOR, "@@@@ client %p @@@@\n", client);
 	      mb_wm_comp_mgr_map_notify (wm->comp_mgr, client);