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

[From: subversion at stage.maemo.org]

Author: tthurman
Date: 2009-03-26 00:00:35 +0200 (Thu, 26 Mar 2009)
New Revision: 17801

Modified:
   projects/haf/trunk/libmatchbox2/ChangeLog
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-main-context.c
Log:
	Step-by-step inclusion of reverted patch.
	* matchbox/core/mb-wm-main-context.c: move debugging messages into
	the same part of the function.



Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-03-25 16:37:24 UTC (rev 17800)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-03-25 22:00:35 UTC (rev 17801)
@@ -1,3 +1,10 @@
+2009-03-25  Thomas Thurman  <thomas.thurman at collabora.co.uk>
+
+	Step-by-step inclusion of reverted patch.
+
+	* matchbox/core/mb-wm-main-context.c: move debugging messages into
+	the same part of the function.
+
 2009-03-25  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
 
 	Release 0.2.23

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-main-context.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-main-context.c	2009-03-25 16:37:24 UTC (rev 17800)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-main-context.c	2009-03-25 22:00:35 UTC (rev 17801)
@@ -178,23 +178,71 @@
   Window           xwin = xev->xany.window;
 
 #if (MBWM_WANT_DEBUG)
-  {
-   if (mbwm_debug_flags & MBWM_DEBUG_EVENT)
-     {
-       MBWindowManagerClient *ev_client;
+  if (mbwm_debug_flags & MBWM_DEBUG_EVENT)
+    {
+      MBWindowManagerClient *ev_client;
+      
+      ev_client = mb_wm_managed_client_from_xwindow(wm, xev->xany.window);
 
-       ev_client = mb_wm_managed_client_from_xwindow(wm, xev->xany.window);
+      printf ("  @ XEvent: '%s:%i' for %lx %s%s\n",
+	      xev->type < sizeof (MBWMDEBUGEvents)/sizeof(MBWMDEBUGEvents[0])
+	      ? MBWMDEBUGEvents[xev->type] : "unknown",
+	      xev->type,
+	      xev->xany.window,
+	      xev->xany.window == wm->root_win->xwindow ? "(root)" : "",
+	      ev_client ? ev_client->name : ""
+	      );
 
-       printf ("  @ XEvent: '%s:%i' for %lx %s%s\n",
-	       xev->type < sizeof (MBWMDEBUGEvents)/sizeof(MBWMDEBUGEvents[0])
-	       ? MBWMDEBUGEvents[xev->type] : "unknown",
-	       xev->type,
-	       xev->xany.window,
-	       xev->xany.window == wm->root_win->xwindow ? "(root)" : "",
-	       ev_client ? ev_client->name : ""
-	       );
-     }
-  }
+      switch (xev->type)
+	{
+	case UnmapNotify:
+	  {
+	    XUnmapEvent * uev = & xev->xunmap;
+	    printf ("    window %x, event %x, %d\n",
+		    uev->window,
+		    uev->event,
+		    uev->from_configure);
+	  }
+	  break;
+	case ConfigureNotify:
+	  {
+	    XConfigureEvent * cev = & xev->xconfigure;
+	    printf ("    window %x, event %x, [%d,%d;%dx%d]\n",
+		    cev->window,
+		    cev->event,
+		    cev->x,
+		    cev->y,
+		    cev->width,
+		    cev->height);
+	  }
+	  break;
+	case ConfigureRequest:
+	  {
+	    XConfigureRequestEvent * cev = & xev->xconfigurerequest;
+	    printf ("    window %x, parent %x, [%d,%d;%dx%d]\n",
+		    cev->window,
+		    cev->parent,
+		    cev->x,
+		    cev->y,
+		    cev->width,
+		    cev->height);
+	  }
+	  break;
+	case PropertyNotify:
+	  {
+	    XPropertyEvent * pev = & xev->xproperty;
+	    char * prop = XGetAtomName (wm->xdpy, pev->atom);
+	    printf ("    window %x, prop %s, state %d\n",
+		    pev->window,
+		    prop,
+		    pev->state);
+	    
+	    if (prop)
+	      XFree (prop);
+	  }
+	  break;
+	}
+    }
 #endif
 
 #define XE_ITER_GET_FUNC(i) (((MBWMXEventFuncInfo *)((i)->data))->func)
@@ -250,6 +298,7 @@
 	}
       break;
     case Expose:
+      /* we do nothing */
       break;
     case MapRequest:
       iter = ctx->event_funcs.map_request;
@@ -290,16 +339,6 @@
 	}
       break;
     case UnmapNotify:
-#if MBWM_WANT_DEBUG
-   if (mbwm_debug_flags & MBWM_DEBUG_EVENT)
-     {
-       XUnmapEvent * uev = & xev->xunmap;
-       printf ("    window %x, event %x, %d\n",
-	       uev->window,
-	       uev->event,
-	       uev->from_configure);
-     }
-#endif
       xwin = xev->xunmap.window;
       iter = ctx->event_funcs.unmap_notify;
 
@@ -339,19 +378,6 @@
 	}
       break;
     case ConfigureNotify:
-#if MBWM_WANT_DEBUG
-   if (mbwm_debug_flags & MBWM_DEBUG_EVENT)
-     {
-       XConfigureEvent * cev = & xev->xconfigure;
-       printf ("    window %x, event %x, [%d,%d;%dx%d]\n",
-	       cev->window,
-	       cev->event,
-	       cev->x,
-	       cev->y,
-	       cev->width,
-	       cev->height);
-     }
-#endif
       xwin = xev->xconfigure.window;
       iter = ctx->event_funcs.configure_notify;
 
@@ -372,19 +398,6 @@
 	}
       break;
     case ConfigureRequest:
-#if MBWM_WANT_DEBUG
-   if (mbwm_debug_flags & MBWM_DEBUG_EVENT)
-     {
-       XConfigureRequestEvent * cev = & xev->xconfigurerequest;
-       printf ("    window %x, parent %x, [%d,%d;%dx%d]\n",
-	       cev->window,
-	       cev->parent,
-	       cev->x,
-	       cev->y,
-	       cev->width,
-	       cev->height);
-      }
-#endif
       xwin = xev->xconfigurerequest.window;
       iter = ctx->event_funcs.configure_request;
 
@@ -424,20 +437,6 @@
 	}
       break;
     case PropertyNotify:
-#if MBWM_WANT_DEBUG
-   if (mbwm_debug_flags & MBWM_DEBUG_EVENT)
-     {
-       XPropertyEvent * pev = & xev->xproperty;
-       char * prop = XGetAtomName (wm->xdpy, pev->atom);
-       printf ("    window %x, prop %s, state %d\n",
-	       pev->window,
-	       prop,
-	       pev->state);
-
-       if (prop)
-	 XFree (prop);
-     }
-#endif
       xwin = xev->xproperty.window;
       iter = ctx->event_funcs.property_notify;