Use timestamp provided by NET_ACTIVE_WINDOW and NET_CURRENT_DESKTOP messages from EWMH version 1.3 and above, fix focus transition with NET_CURRENT_DESKTOP messages causing either flickering or wrong restacking on workspace switch (bug #2654), fix serious bug introduced with previous commit causing xfwm4 to quit on any selection MESSAGE notify.

(Old svn revision: 24096)

1 files changed, 5 insertions, 2 deletions

diff --git a/src/hints.c b/src/hints.c
index 79b95e316..2daa64f11 100644
--- a/src/hints.c
+++ b/src/hints.c
@@ -1196,19 +1196,22 @@ getXServerTime (DisplayInfo *display_info)
 
     g_return_val_if_fail (display_info, (Time) CurrentTime);
     timestamp = myDisplayGetCurrentTime (display_info);
-    if (timestamp == CurrentTime)
+    if (timestamp == (Time) CurrentTime)
     {
         screen_info = myDisplayGetDefaultScreen (display_info);
         g_return_val_if_fail (screen_info,  (Time) CurrentTime);
 
+        TRACE ("getXServerTime: Using X server roundtrip");
         XChangeProperty (display_info->dpy, screen_info->xfwm4_win, 
                          display_info->atoms[XFWM4_TIMESTAMP_PROP],
                          display_info->atoms[XFWM4_TIMESTAMP_PROP],
                          8, PropModeReplace, (unsigned char *) &c, 1);
         XIfEvent (display_info->dpy, &xevent, checkPropEvent, (XPointer) display_info);
 
-        timestamp = (Time) xevent.xproperty.time;
+        timestamp = (Time) myDisplayUpdateCurrentTime (display_info, &xevent);
     }
+
+    TRACE ("getXServerTime gives timestamp=%u", timestamp);
     return timestamp;
 }