Changeset 37364 in vbox

Timestamp:

Jun 7, 2011 8:23:51 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

72134

Message:

FE/Qt: only grab the keyboard focus when a non-modifier key (or the host combination) is pressed

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIKeyboardHandler.cpp (modified) (9 diffs)
• UIKeyboardHandler.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp

@@ -491 +491 @@
                     if (pEvent->type == XFocusIn)
                     {
+#if 0
                         /* Capture keyboard by chosen view number: */
                         captureKeyboard(uScreenId);
@@ -496 +497 @@
                         if (isAutoCaptureDisabled())
                             setAutoCaptureDisabled(false);
+#endif
                     }
                     else
@@ -602 +604 @@
             break;
         }
+#if 0
         case KMachineState_Running:
         {
@@ -626 +629 @@
             break;
         }
+#endif
         default:
             break;
@@ -826 +830 @@
         switch (pEvent->type())
         {
+#if 0
             case QEvent::FocusIn:
                 if (isSessionRunning())
@@ -842 +847 @@
                 }
                 break;
+#endif
             case QEvent::FocusOut:
                 /* Release keyboard: */
@@ -1141 +1147 @@
 /**
  * Handle a non-special (C-A-D, pause, print) key press or release
- * @returns true if handling should stop here, false otherwise
+ * @returns true if handling should stop here (spurious event), false otherwise
  */
 bool UIKeyboardHandler::keyEventHandleNormal(int iKey, uint8_t uScan, int fFlags, LONG *pCodes, uint *puCodesCount)
@@ -1190 +1196 @@
         return true;
     return false;
+}
+
+/** Capture the keyboard if a non-modifier key was pressed. */
+void UIKeyboardHandler::keyEventHandleCapturing(uint8_t uScan, int fFlags,
+                                                ulong uScreenId)
+{
+    if (   (fFlags & KeyPressed)
+        && uScan != 0x1d /* ctrl */ && uScan != 0x2a /* left shift */
+        && uScan != 0x36 /* right shift */ && uScan != 0x38 /* alt */
+        && uScan != 0x5b /* left win */ && uScan != 0x5c /* right win */)
+    {
+        /* Capture keyboard by chosen view number: */
+        captureKeyboard(uScreenId);
+        /* Reset the single-time disable capture flag: */
+        if (isAutoCaptureDisabled())
+            setAutoCaptureDisabled(false);
+    }
 }
 
@@ -1393 +1416 @@
                 return true;
     }
+    
+    /* This must come before host key handling */
+    keyEventHandleCapturing(uScan, fFlags, uScreenId);
 
     /* Process the host-combo funtionality: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.h

@@ -126 +126 @@
     bool keyEventCADHandled(uint8_t uScan);
     bool keyEventHandleNormal(int iKey, uint8_t uScan, int fFlags, LONG *pCodes, uint *puCodesCount);
+    void keyEventHandleCapturing(uint8_t uScan, int fFlags, ulong uScreenId);
     bool keyEventHostComboHandled(int iKey, wchar_t *pUniKey, bool isHostComboStateChanged, bool *pfResult);
     void keyEventHandleHostComboRelease(ulong uScreenId);