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

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-05-05 15:25:08 +0300 (Tue, 05 May 2009)
New Revision: 18238

Modified:
   projects/haf/trunk/libmatchbox2/ChangeLog
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-base.c
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-window.c
Log:
fixed patch from Laszlo


Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-05-05 12:21:33 UTC (rev 18237)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-05-05 12:25:08 UTC (rev 18238)
@@ -1,5 +1,11 @@
 2009-05-05  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
 
+	Applied a fixed patch from Laszlo for NB#110527:
+	* matchbox/core/mb-wm-client-window.c (mb_wm_client_window_init):
+	Remove the XSelectInput call.
+	* matchbox/core/mb-wm-client-base.c (mb_wm_client_base_realize): Call
+	XSelectInput here and read the transiency property also.
+
 	* matchbox/core/mb-wm-client-window.c
 	(mb_wm_client_window_sync_properties): Remove the 'monster hack' for
 	800x480 windows, everything seems to work without it.

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-05 12:21:33 UTC (rev 18237)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-base.c	2009-05-05 12:25:08 UTC (rev 18238)
@@ -274,6 +274,14 @@
     }
 
   XSetWindowBorderWidth(wm->xdpy, MB_WM_CLIENT_XWIN(client), 0);
+  
+  XSelectInput(wm->xdpy,
+	       MB_WM_CLIENT_XWIN(client),
+	       PropertyChangeMask);
+  mb_wm_client_window_sync_properties (
+		  client->window, 
+		  MBWM_WINDOW_PROP_TRANSIENCY);
+  
 
   XAddToSaveSet(wm->xdpy, MB_WM_CLIENT_XWIN(client));
 }

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-window.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-window.c	2009-05-05 12:21:33 UTC (rev 18237)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-window.c	2009-05-05 12:25:08 UTC (rev 18238)
@@ -125,20 +125,6 @@
   win->xwindow = xwin;
   win->wm = wm;
 
-  /*
-   * We need to call XSelectInput() early so we are going to be notified about
-   * the WM_TRANSIENT_FOR changes. However we don't want to XSelectInput() for
-   * override redirect windows, so we need to know if the window is an override
-   * redirect window before calling XSelectInput(). To avoid race condition we
-   * also need to call the XSelectInput() before reading the current transient
-   * parent settings.
-   */
-  mb_wm_client_window_sync_properties (win, MBWM_WINDOW_PROP_ATTR);
-  if (!win->override_redirect) 
-    XSelectInput(wm->xdpy,
-	       xwin,
-	       PropertyChangeMask);
-
   /* TODO: handle properties after discovering them. E.g. fullscreen.
    * See NB#97342 */
   return mb_wm_client_window_sync_properties (win, MBWM_WINDOW_PROP_ALL);