merge r5716,r5717 from trunk

diff --git a/openbox/grab.c b/openbox/grab.c
index 991956da622b291e9ab4a05f5a02a10f086a9de5..e92722a6a48e1c0daab0cca054ea9f292bac0fa7 100644 (file)
--- a/openbox/grab.c
+++ b/openbox/grab.c
@@ -41,8 +41,16 @@ static Time  grab_time = CurrentTime;
 static Time ungrab_time()
 {
     Time t = event_curtime;
-    if (!(t == 0 || event_time_after(t, grab_time)))
-        t = grab_time;
+    if (!(t == CurrentTime || event_time_after(t, grab_time)))
+        /* When the time moves backward on the server, then we can't use
+           the grab time because that will be in the future. So instead we
+           have to use CurrentTime.
+
+           "XUngrabPointer does not release the pointer if the specified time
+           is earlier than the last-pointer-grab time or is later than the
+           current X server time."
+        */
+        t = CurrentTime; /*grab_time;*/
     return t;
 }