Changeset 6674 in vbox

Timestamp:

Jan 31, 2008 7:23:08 PM (17 years ago)

Author:

vboxsync

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

27747

Message:

FE/Qt: OS/2: Let key events reach Qt when the keyboard is not captured (e.g. a Close dialog is shown); provide special hot keys (Host+`, Host+1, Host+2) for system combinations (Ctrl+Esc, Alt+Tab, Alt+Shift+Tab).

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxConsoleView.h (modified) (1 diff)
• src/VBoxConsoleView.cpp (modified) (11 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxConsoleView.h

@@ -34 +34 @@
 #if defined (Q_WS_PM)
 #include "src/os2/VBoxHlp.h"
+#define UM_PREACCEL_CHAR WM_USER
 #endif
 

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

@@ -96 +96 @@
 #if defined (Q_WS_WIN32)
 
-static HHOOK g_kbdhook = NULL;
-static VBoxConsoleView *g_view = 0;
+static HHOOK gKbdHook = NULL;
+static VBoxConsoleView *gView = 0;
 
 LRESULT CALLBACK VBoxConsoleView::lowLevelKeyboardProc (int nCode,
                                                         WPARAM wParam, LPARAM lParam)
 {
-    Assert (g_view);
-    if (g_view && nCode == HC_ACTION &&
-            g_view->winLowKeyboardEvent (wParam, *(KBDLLHOOKSTRUCT *) lParam))
+    Assert (gView);
+    if (gView && nCode == HC_ACTION &&
+            gView->winLowKeyboardEvent (wParam, *(KBDLLHOOKSTRUCT *) lParam))
         return 1;
 
@@ -753 +753 @@
 
 #if defined (Q_WS_WIN)
-    g_view = this;
+    gView = this;
 #endif
 
 #if defined (Q_WS_PM)
-    bool ok = VBoxHlpInstallKbdHook (0, winId(), WM_CHAR);
+    bool ok = VBoxHlpInstallKbdHook (0, winId(), UM_PREACCEL_CHAR);
     Assert (ok);
     NOREF (ok);
@@ -770 +770 @@
 {
 #if defined (Q_WS_PM)
-    bool ok = VBoxHlpUninstallKbdHook (0, winId(), WM_CHAR);
+    bool ok = VBoxHlpUninstallKbdHook (0, winId(), UM_PREACCEL_CHAR);
     Assert (ok);
     NOREF (ok);
@@ -776 +776 @@
 
 #if defined (Q_WS_WIN)
-    if (g_kbdhook)
-        UnhookWindowsHookEx (g_kbdhook);
-    g_view = 0;
+    if (gKbdHook)
+        UnhookWindowsHookEx (gKbdHook);
+    gView = 0;
     if (mAlphaCursor)
         DestroyIcon (mAlphaCursor);
@@ -1269 +1269 @@
 
             case QEvent::KeyPress:
-            {
+#ifdef Q_WS_PM
+            case QEvent::KeyRelease:
+            {
+                /// @todo temporary solution to send Alt+Tab and friends to
+                //  the guest. The proper solution is to write a keyboard
+                //  driver that will steal these combos from the host (it's
+                //  impossible to do so using hooks on OS/2).
+
                 QKeyEvent *ke = (QKeyEvent *) e;
+                if (mIsHostkeyPressed)
+                {
+                    bool pressed = e->type() == QEvent::KeyPress;
+                    CKeyboard keyboard = mConsole.GetKeyboard();
+
+                    /* whether the host key is Shift so that it will modify
+                     * the hot key values? Note that we don't distinguish
+                     * between left and right shift here (too much hassle) */
+                    const bool kShift = (gs.hostKey() == VK_SHIFT ||
+                                        gs.hostKey() == VK_LSHIFT) &&
+                                        (ke->state() & ShiftButton);
+                    /* define hot keys according to the Shift state */
+                    const int kAltTab      = kShift ? Key_Exclam     : Key_1;
+                    const int kAltShiftTab = kShift ? Key_At         : Key_2;
+                    const int kCtrlEsc     = kShift ? Key_AsciiTilde : Key_QuoteLeft;
+
+                    /* Simulate Alt+Tab on Host+1 and Alt+Shift+Tab on Host+2 */
+                    if (ke->key() == kAltTab || ke->key() == kAltShiftTab)
+                    {
+                        if (pressed)
+                        {
+                            /* Send the Alt press to the guest */
+                            if (!(mPressedKeysCopy [0x38] & IsKeyPressed))
+                            {
+                                /* store the press in *Copy to have it automatically
+                                 * released when the Host key is released */
+                                mPressedKeysCopy [0x38] |= IsKeyPressed;
+                                keyboard.PutScancode (0x38);
+                            }
+
+                            /* Make sure Shift is pressed if it's Key_2 and released
+                             * if it's Key_1 */
+                            if (ke->key() == kAltTab &&
+                                (mPressedKeysCopy [0x2A] & IsKeyPressed))
+                            {
+                                mPressedKeysCopy [0x2A] &= ~IsKeyPressed;
+                                keyboard.PutScancode (0xAA);
+                            }
+                            else
+                            if (ke->key() == kAltShiftTab &&
+                                !(mPressedKeysCopy [0x2A] & IsKeyPressed))
+                            {
+                                mPressedKeysCopy [0x2A] |= IsKeyPressed;
+                                keyboard.PutScancode (0x2A);
+                            }
+                        }
+
+                        keyboard.PutScancode (pressed ? 0x0F : 0x8F);
+
+                        ke->accept();
+                        return true;
+                    }
+
+                    /* Simulate Ctrl+Esc on Host+Tilde */
+                    if (ke->key() == kCtrlEsc)
+                    {
+                        /* Send the Ctrl press to the guest */
+                        if (pressed && !(mPressedKeysCopy [0x1d] & IsKeyPressed))
+                        {
+                            /* store the press in *Copy to have it automatically
+                             * released when the Host key is released */
+                            mPressedKeysCopy [0x1d] |= IsKeyPressed;
+                            keyboard.PutScancode (0x1d);
+                        }
+
+                        keyboard.PutScancode (pressed ? 0x01 : 0x81);
+
+                        ke->accept();
+                        return true;
+                    }
+                }
+                if (e->type() == QEvent::KeyRelease)
+                    break;
+
+                /* fall through for normal processing of KeyPress */
+#else
+            {
+                QKeyEvent *ke = (QKeyEvent *) e;
+#endif
                 if (mIsHostkeyPressed)
                 {
@@ -1295 +1381 @@
 
                         CKeyboard keyboard = mConsole.GetKeyboard();
-                        Assert (!keyboard.isNull());
                         keyboard.PutScancodes (combo, 6);
                     }
@@ -1416 +1501 @@
             case QEvent::WindowActivate:
             {
-                g_kbdhook = SetWindowsHookEx (WH_KEYBOARD_LL, lowLevelKeyboardProc,
+                gKbdHook = SetWindowsHookEx (WH_KEYBOARD_LL, lowLevelKeyboardProc,
                                               GetModuleHandle (NULL), 0);
-                AssertMsg (g_kbdhook, ("SetWindowsHookEx(): err=%d", GetLastError()));
+                AssertMsg (gKbdHook, ("SetWindowsHookEx(): err=%d", GetLastError()));
                 break;
             }
             case QEvent::WindowDeactivate:
             {
-                if (g_kbdhook)
+                if (gKbdHook)
                 {
-                    UnhookWindowsHookEx (g_kbdhook);
-                    g_kbdhook = NULL;
+                    UnhookWindowsHookEx (gKbdHook);
+                    gKbdHook = NULL;
                 }
                 break;
@@ -1559 +1644 @@
 
     /* check for the special flag possibly set at the end of this function */
-    if ((msg->lParam >> 25) & 0x1)
+    if (msg->lParam & (0x1 << 25))
+    {
+        msg->lParam &= ~(0x1 << 25);
         return false;
+    }
 
 #if 0
@@ -1661 +1749 @@
 bool VBoxConsoleView::pmEvent (QMSG *aMsg)
 {
-    if (!mAttached || aMsg->msg != WM_CHAR)
+    if (!mAttached)
+        return false;
+
+    if (aMsg->msg == UM_PREACCEL_CHAR)
+    {
+        /* we are inside the input hook */
+
+        /* let the message go through the normal system pipeline */
+        if (!mKbdCaptured)
+            return false;
+    }
+
+    if (aMsg->msg != WM_CHAR &&
+        aMsg->msg != UM_PREACCEL_CHAR)
         return false;
 
     /* check for the special flag possibly set at the end of this function */
     if (SHORT2FROMMP (aMsg->mp2) & 0x8000)
+    {
+        aMsg->mp2 = MPFROM2SHORT (SHORT1FROMMP (aMsg->mp2),
+                                  SHORT2FROMMP (aMsg->mp2) & ~0x8000);
         return false;
+    }
 
 #if 0
     {
         char buf [256];
-        sprintf (buf, "*** WM_CHAR: f=%04X rep=%03d scan=%02X ch=%04X vk=%04X",
+        sprintf (buf, "*** %s: f=%04X rep=%03d scan=%02X ch=%04X vk=%04X",
+                 (aMsg->msg == WM_CHAR ? "WM_CHAR" : "UM_PREACCEL_CHAR"),
                  SHORT1FROMMP (aMsg->mp1), CHAR3FROMMP (aMsg->mp1),
                  CHAR4FROMMP (aMsg->mp1), SHORT1FROMMP (aMsg->mp2),
@@ -1742 +1848 @@
          * shortcuts for example). So send it direcltly to the window with the
          * special flag in the reserved area of lParam (to avoid recursion). */
-        ::WinSendMsg (aMsg->hwnd, aMsg->msg,
+        ::WinSendMsg (aMsg->hwnd, WM_CHAR,
                       aMsg->mp1,
                       MPFROM2SHORT (SHORT1FROMMP (aMsg->mp2),
@@ -2349 +2455 @@
         emitKeyboardStateChanged();
 
-    /* process HOST+<key> shortcuts. currently, <key> is limited to
-     * alphanumeric chars. */
+    /* Process Host+<key> shortcuts. currently, <key> is limited to
+     * alphanumeric chars. Other Host+<key> combinations are handled in
+     * event(). */
     if (hotkey)
     {