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

From: subversion at stage.maemo.org subversion at stage.maemo.org
Date: Thu Jul 16 14:24:30 EEST 2009 
Author: aendrodi
Date: 2009-07-16 14:24:11 +0300 (Thu, 16 Jul 2009)
New Revision: 18858

Modified:
   projects/haf/trunk/libmatchbox2/ChangeLog
   projects/haf/trunk/libmatchbox2/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-base.c
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-base.h
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-debug.h
Log:
	Debug macro and hooks to trace window moves and resizes.

	* matchbox/core/mb-wm-debug.h:
	  Added MB_WM_DBG_MOVE_RESIZE().
	* matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c
	* matchbox/core/mb-wm-client-base.h
	* matchbox/core/mb-wm-client-base.c
	* matchbox/core/mb-window-manager.c:
	  Use it.


Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-07-15 15:53:11 UTC (rev 18857)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-07-16 11:24:11 UTC (rev 18858)
@@ -1,3 +1,15 @@
+2009-07-16  Adam Endrodi  <adam.endrodi at blumsoft.eu>
+
+	Debug macro and hooks to trace window moves and resizes.
+
+	* matchbox/core/mb-wm-debug.h:
+	  Added MB_WM_DBG_MOVE_RESIZE().
+	* matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c
+	* matchbox/core/mb-wm-client-base.h
+	* matchbox/core/mb-wm-client-base.c
+	* matchbox/core/mb-window-manager.c:
+	  Use it.
+
 2009-07-08  Aapo Kojo <aapo.kojo at nokia.com>
 
 	Release 0.2.46

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-07-15 15:53:11 UTC (rev 18857)
+++ projects/haf/trunk/libmatchbox2/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c	2009-07-16 11:24:11 UTC (rev 18858)
@@ -673,6 +673,8 @@
        * actual size.  Necessary if the screen is rotated. */
       priv->overlay_window =
 	XCompositeGetOverlayWindow (wm->xdpy, wm->root_win->xwindow);
+      MB_WM_DBG_MOVE_RESIZE ("overlay", priv->overlay_window,
+                (&(MBGeometry){0, 0, wm->xdpy_width, wm->xdpy_height}));
       XResizeWindow (wm->xdpy, priv->overlay_window,
                      wm->xdpy_width, wm->xdpy_height);
 
@@ -718,6 +720,8 @@
 {
   MBWMCompMgrClutterPrivate *priv = MB_WM_COMP_MGR_CLUTTER (mgr)->priv;
 
+  MB_WM_DBG_MOVE_RESIZE ("overlay", priv->overlay_window,
+                         (&(MBGeometry){0, 0, w, h}));
   clutter_actor_set_size (clutter_stage_get_default (), w, h);
   XResizeWindow (mgr->wm->xdpy, priv->overlay_window, w, h);
 }

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c	2009-07-15 15:53:11 UTC (rev 18857)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c	2009-07-16 11:24:11 UTC (rev 18858)
@@ -696,6 +696,7 @@
       xwc.sibling    = xev->above;
       xwc.stack_mode = xev->detail;
 
+      MB_WM_DBG_MOVE_RESIZE ("noclient", xev->window, &xwc);
       XConfigureWindow (wm->xdpy, xev->window, xev->value_mask, &xwc);
 
       return True;
@@ -724,7 +725,7 @@
        * needed.
        */
       mb_wm_client_configure_request_ack_queue (client);
-
+      MB_WM_DBG_MOVE_RESIZE ("request", client->window->xwindow, &req_geom);
       mb_wm_client_request_geometry (client,
 				     &req_geom,
 				     MBWMClientReqGeomIsViaConfigureReq);

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-base.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-base.c	2009-07-15 15:53:11 UTC (rev 18857)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-base.c	2009-07-16 11:24:11 UTC (rev 18858)
@@ -473,6 +473,8 @@
     }
   else
     {
+      MB_WM_DBG_MOVE_RESIZE ("client", MB_WM_CLIENT_XWIN(client),
+                             (&(MBGeometry){x, y, w, h}));
       XMoveResizeWindow(wm->xdpy, MB_WM_CLIENT_XWIN(client),
 			x, y, w, h);
       client->window->x_geometry.x = x;
@@ -610,6 +612,8 @@
 	}
       else
 	{
+          MB_WM_DBG_MOVE_RESIZE ("frame", client->xwin_frame,
+                                 &client->frame_geometry);
 	  XMoveResizeWindow(wm->xdpy,
 			    client->xwin_frame,
 			    client->frame_geometry.x,

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-base.h
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-base.h	2009-07-15 15:53:11 UTC (rev 18857)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-base.h	2009-07-16 11:24:11 UTC (rev 18858)
@@ -25,14 +25,6 @@
 #define MB_WM_CLIENT_BASE_CLASS(c) ((MBWMClientBaseClass*)(c))
 #define MB_WM_TYPE_CLIENT_BASE (mb_wm_client_base_class_type ())
 
-#if 0
-# define MB_WM_DBG_SKIP_UNMAPS(c) \
-  g_debug("%s:%u SKIP_UNMAPS c=%p, skip_unmaps=%d, skip_maps=%d", \
-          __FUNCTION__, __LINE__, (c), (c)->skip_unmaps, (c)->skip_maps)
-#else
-# define MB_WM_DBG_SKIP_UNMAPS(c) /* NOP */
-#endif
-
 /**
  * A MBWindowManagerClient which exists to be the superclass of all classes
  * representing particular types of client.

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-debug.h
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-debug.h	2009-07-15 15:53:11 UTC (rev 18857)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-debug.h	2009-07-16 11:24:11 UTC (rev 18858)
@@ -25,6 +25,22 @@
  * printf("%dx%d%+d%+d"). */
 #define MBWM_GEOMETRY(geo) (geo)->width, (geo)->height, (geo)->x, (geo)->y
 
+#if 0
+# define MB_WM_DBG_SKIP_UNMAPS(c) \
+  g_debug("%s:%u SKIP_UNMAPS c=%p, skip_unmaps=%d, skip_maps=%d", \
+          __FUNCTION__, __LINE__, (c), (c)->skip_unmaps, (c)->skip_maps)
+#else
+# define MB_WM_DBG_SKIP_UNMAPS(c) /* NOP */
+#endif
+
+#if 0
+# define MB_WM_DBG_MOVE_RESIZE(what, win, geo) \
+  g_debug("%s:%u MOVE %s 0x%lx -> %dx%d%+d%+d", __FUNCTION__, __LINE__, \
+          what, win, MBWM_GEOMETRY(geo))
+#else
+# define MB_WM_DBG_MOVE_RESIZE(what, win, geo) /* NOP */
+#endif
+
 #if MBWM_WANT_DEBUG
 
 typedef enum {
More information about the maemo-commits mailing list