Changeset 2378 in vbox

Timestamp:

Apr 27, 2007 2:49:26 AM (18 years ago)

Author:

vboxsync

Message:

Fixed 2-3 host key issues on darwin.

File:

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

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

@@ -699 +699 @@
             vboxProblem().cannotResumeMachine (cconsole);
     }
-#ifdef Q_WS_MAC /* A quick hack to prevent getting the typing-while-paused on Host-Q. */
-    else if (on)
-        darwinGrabKeyboardEvents (false);
-#endif
 
     return ok;
@@ -1406 +1402 @@
             AssertCompileSize (wchar_t, 2);
             AssertCompileSize (UniChar, 2);
-            wchar_t ucs[32];
+            UInt32 cbWritten = 0;
+            wchar_t ucs[8];
             if (::GetEventParameter (inEvent, kEventParamKeyUnicodes, typeUnicodeText, NULL,
-                                     sizeof (ucs), NULL, &ucs[0]) != 0)
-                ucs[0] = 0;
+                                     sizeof (ucs), &cbWritten, &ucs[0]) != 0)
+                cbWritten = 0;
+            ucs[cbWritten / sizeof(wchar_t)] = 0; /* The api doesn't terminate it. */
 
             ret = keyEvent (keyCode, scanCode, flags, ucs[0] ? ucs : NULL);
@@ -1422 +1420 @@
         newMask = ::DarwinAdjustModifierMask (newMask);
         UInt32 changed = newMask ^ m_darwinKeyModifiers;
-        ret = kbd_captured;
         if (changed)
         {
@@ -1449 +1446 @@
                         flags |= KeyExtended;
                     scanCode &= VBOXKEY_SCANCODE_MASK;
-                    ret |= keyEvent (keyCode, scanCode, flags | KeyPressed);
-                    ret |= keyEvent (keyCode, scanCode, flags);
+                    keyEvent (keyCode, scanCode, flags | KeyPressed);
+                    keyEvent (keyCode, scanCode, flags);
                 }
             }
@@ -1456 +1453 @@
 
         m_darwinKeyModifiers = newMask;
+
+        /* Always return true here because we'll otherwise getting a Qt event 
+           we don't want and that will only cause the Pause warning to pop up. */
+        ret = true;
     }
 
@@ -1666 +1667 @@
     LONG *codes = buf;
     uint count = 0;
+    uint8_t what_pressed = 0;
 
     if (!is_hostkey)
@@ -1701 +1703 @@
 
             // process the scancode and update the table of pressed keys
-            uint8_t what_pressed = IsKeyPressed;
+            what_pressed = IsKeyPressed;
 
             if (flags & KeyExtended)
@@ -1846 +1848 @@
         }
 #elif defined (Q_WS_MAC)
-        if (aUniKey && aUniKey[0] && !aUniKey[1])
+        if (aUniKey && aUniKey [0] && !aUniKey [1])
             processed = processHotKey (QKeySequence (UNICODE_ACCEL +
-                                            QChar (aUniKey [0]).upper().unicode()),
+                                                     QChar (aUniKey [0]).upper().unicode()),
                                        mainwnd->menuBar());
-#endif
+
+        /* Don't consider the hot key as pressed since the guest never saw it. (probably a generic thing) */
+        keys_pressed [scan] &= ~what_pressed;
+#endif
+
         // grab the key from Qt if processed, or pass it to Qt otherwise
         // in order to process non-alphanumeric keys in event(), after they are
@@ -1874 +1880 @@
 
 //    LogFlow (("*** Putting scan codes: "));
-//    for (int i = 0; i < count; i++)
+//    for (unsigned i = 0; i < count; i++)
 //        LogFlow (("%02x ", codes [i]));
 //    LogFlow (("\n"));
@@ -2280 +2286 @@
     if (capture)
     {
-# if 0
-        ::DarwinReleaseKeyboard ();
-        ::DarwinGrabKeyboard (true);
-# else
         ::DarwinDisableGlobalHotKeys (true);
-# endif
         grabKeyboard();
     }
     else
     {
-# if 0
-        ::DarwinReleaseKeyboard ();
-        ::DarwinGrabKeyboard (false);
-# else
         ::DarwinDisableGlobalHotKeys (false);
-# endif
         releaseKeyboard();
     }
@@ -2427 +2423 @@
     // Note, that it's just a guess that sending RESEND will give the desired
     // effect :), but at least it works with NT and W2k guests.
+    /** @todo This seems to causes linux guests (in console mode) to cough a bit. 
+     * We need to check if this is the cause of #1944 and/or #1949. --bird */
     codes [0] = 0xFE;
     keyboard.PutScancodes (codes, 1);
@@ -2445 +2443 @@
     if (release_hostkey)
         hostkey_pressed = false;
+
+#ifdef Q_WS_MAC
+    /* clear most of the modifiers. */
+    m_darwinKeyModifiers &= alphaLock | kEventKeyModifierNumLockMask
+                          | (release_hostkey ? 0 : ::DarwinKeyCodeToDarwinModifierMask (gs.hostKey()));
+#endif 
 
     emitKeyboardStateChanged ();