Changeset 16695 in vbox for trunk

Timestamp:

Feb 11, 2009 8:33:48 PM (16 years ago)

Author:

vboxsync

Message:

FE/Qt: attempt to fix key repeat on Linux host, Windows guest - again

File:

• trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleView.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleView.cpp

@@ -2104 +2104 @@
 
 /**
+ * This function is a "predicate" for XCheckIfEvent().  It will check
+ * the XEvent passed to it to see if it is a keypress event matching
+ * the keyrelease event in @a pvArg.
+ * @returns True if the event matches, False otherwise
+ * @param   pEvent    the event to compare, taken from the event queue
+ * @param   pvArg     the keyrelease event we would like to compare against
+ */
+static Bool VBoxConsoleViewCompEvent(Display *, XEvent *pEvent,
+                                     XPointer pvArg)
+{
+    XEvent *pKeyEvent = (XEvent *) pvArg;
+    if ((pEvent->type == XKeyPress) &&
+        (pEvent->xkey.keycode == pKeyEvent->xkey.keycode))
+        return True;
+    else
+        return False;
+}
+
+/**
  *  This routine gets X11 events before they are processed by Qt. This is
  *  used for our platform specific keyboard implementation. A return value
@@ -2147 +2166 @@
     /* Fix for http://www.virtualbox.org/ticket/1296:
      * when X11 sends events for repeated keys, it always inserts an
-     * XKeyRelease before the XKeyPress.  Since it nearly always
-     * (always?) uses the same time stamp for both, we can spot the
-     * unwanted event and discard it.  Of course, if we do miss one it
-     * isn't fatal for our purposes. */
+     * XKeyRelease before the XKeyPress. */
+    XEvent returnEvent;
+    if ((event->type == XKeyRelease) &&
+        (XCheckIfEvent(event->xkey.display, &returnEvent,
+                       VBoxConsoleViewCompEvent, (XPointer) event) == True)) {
+        XPutBackEvent(event->xkey.display, &returnEvent);
+        return true;
+    }
+#if 0
     if ((XKeyRelease == event->type) && XPending(event->xkey.display))
     {
@@ -2157 +2181 @@
         XPeekEvent(event->xkey.display, &nextEvent);
         if ((XKeyPress == nextEvent.type) &&
-            (event->xkey.keycode == nextEvent.xkey.keycode) &&
-            (event->xkey.time == nextEvent.xkey.time))
+            (event->xkey.keycode == nextEvent.xkey.keycode))
             /* Discard it, don't pass it to Qt. */
             return true;
     }
+#endif
 
     KeySym ks = ::XKeycodeToKeysym (event->xkey.display, event->xkey.keycode, 0);