diff -Naur xfwm4-r22409/src/client.c xfwm4-mouse-grab-fix/src/client.c
--- xfwm4-r22409/src/client.c	2006-07-11 23:47:05.000000000 +0200
+++ xfwm4-mouse-grab-fix/src/client.c	2006-07-12 09:24:35.000000000 +0200
@@ -3732,7 +3732,7 @@
     }
     clientConfigure (c, &wc, changes, NO_CFG_FLAG);
 
-    myScreenUngrabKeyboard (screen_info, myDisplayGetCurrentTime (display_info));
+    myScreenUngrabKeyboard (screen_info, CurrentTime);
     if (!passdata.released)
     {
         /* If this is a drag-move, wait for the button to be released.
@@ -3742,7 +3742,7 @@
         gtk_main ();
         eventFilterPop (display_info->xfilter);
     }
-    myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime (display_info));
+    myScreenUngrabPointer (screen_info, CurrentTime);
     if (passdata.grab && screen_info->params->box_move)
     {
         myDisplayUngrabServer (display_info);
@@ -4243,7 +4243,7 @@
     wc.height = c->height;
     clientConfigure (c, &wc, CWX | CWY | CWHeight | CWWidth, CFG_NOTIFY);
 
-    myScreenUngrabKeyboard (screen_info, myDisplayGetCurrentTime (display_info));
+    myScreenUngrabKeyboard (screen_info, CurrentTime);
     if (!passdata.released)
     {
         /* If this is a drag-resize, wait for the button to be released.
@@ -4253,7 +4253,7 @@
         gtk_main ();
         eventFilterPop (display_info->xfilter);
     }
-    myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime (display_info));
+    myScreenUngrabPointer (screen_info, CurrentTime);
     if (passdata.grab && screen_info->params->box_resize)
     {
         myDisplayUngrabServer (display_info);
@@ -4445,8 +4445,8 @@
         tabwinDestroy (passdata.tabwin);
         g_free (passdata.tabwin);
     }
-    myScreenUngrabKeyboard (screen_info, myDisplayGetCurrentTime (display_info));
-    myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime (display_info));
+    myScreenUngrabKeyboard (screen_info, CurrentTime);
+    myScreenUngrabPointer (screen_info, CurrentTime);
 
     if (passdata.c)
     {