XGrabKeyboard needs to use CurrentTime rather than

fl_event_time. Otherwise, the second delayed grab attempt will often
fail.

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4598 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/vncviewer/DesktopWindow.cxx b/vncviewer/DesktopWindow.cxx
index 14f720cfa32da27340281341489af012a0d85bce..b4b2ae9d307fb1712081742ca14d76cf3d73db16 100644 (file)
--- a/vncviewer/DesktopWindow.cxx
+++ b/vncviewer/DesktopWindow.cxx
@@ -291,7 +291,7 @@ void DesktopWindow::grabKeyboard()
   int ret;
 
   ret = XGrabKeyboard(fl_display, fl_xid(this), True,
-                      GrabModeAsync, GrabModeAsync, fl_event_time);
+                      GrabModeAsync, GrabModeAsync, CurrentTime);
   if (ret) {
     if (ret == AlreadyGrabbed) {
       // It seems like we can race with the WM in some cases.