Changeset 45873 in vbox for trunk/src/VBox/Frontends

Timestamp:

May 2, 2013 10:48:59 AM (12 years ago)

Author:

vboxsync

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

85464

Message:

FE/Qt: hopefully support AltGr correctly in the host combination editor on Windows hosts.

File:

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

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHostComboEditor.cpp

@@ -393 +393 @@
  * RAlt key event matching this LCtrl event (i.e. both key up or both key down)
  * and if there is, we check whether the current layout has an AltGr key.  We
- * check this by looking to see if any of the number keys has a symbol
- * associated when AltGr is pressed.  Let's see how well this works!
+ * check this by looking to see if any of the layout-dependent keys has a symbol
+ * associated when AltGr is pressed.
  */
 static bool isSyntheticLCtrl(MSG *pMsg)
@@ -407 +407 @@
     if ((pMsg->lParam & 0x01FF0000) >> 16 != 0x1d /* LCtrl */)
         return false;
-    LogRel(("Got an LCtrl event.\n"));
+    if (!PeekMessage(&peekMsg, NULL, WM_KEYFIRST, WM_KEYLAST, PM_NOREMOVE))
+        return false;
+    if (   (pMsg->message == WM_KEYDOWN || pMsg->message == WM_SYSKEYDOWN)
+        && (peekMsg.message != WM_KEYDOWN && peekMsg.message != WM_SYSKEYDOWN))
+        return false;
+    if (   (pMsg->message == WM_KEYUP || pMsg->message == WM_SYSKEYUP)
+        && (peekMsg.message != WM_KEYUP && peekMsg.message != WM_SYSKEYUP))
+        return false;
+    if ((peekMsg.lParam & 0x01FF0000) >> 16 != 0x138 /* RAlt */)
+        return false;
     for (i = '0'; i <= VK_OEM_102; ++i)
     {
@@ -424 +433 @@
     if (i > VK_OEM_102)
         return false;
-    LogRel(("Virtual key %d has an AltGr state.\n", i));
-    if (!PeekMessage(&peekMsg, NULL, WM_KEYFIRST, WM_KEYLAST, PM_NOREMOVE))
-        return false;
-    LogRel(("Another keyboard event follows.\n"));
-    if (pMsg->time != peekMsg.time)
-       return false;
-    LogRel(("Both events have the same time stamp.\n"));
-    if (   (pMsg->message == WM_KEYDOWN || pMsg->message == WM_SYSKEYDOWN)
-        && (peekMsg.message != WM_KEYDOWN && peekMsg.message != WM_SYSKEYDOWN))
-        return false;
-    if (   (pMsg->message == WM_KEYUP || pMsg->message == WM_SYSKEYUP)
-        && (peekMsg.message != WM_KEYUP && peekMsg.message != WM_SYSKEYUP))
-        return false;
-    LogRel((  (pMsg->message == WM_KEYDOWN || pMsg->message == WM_SYSKEYDOWN)
-            ? "Both are KEYDOWN events.\n"
-            : "Both are KEYUP events.\n"));
-    if ((peekMsg.lParam & 0x01FF0000) >> 16 != 0x138 /* RAlt */)
-        return false;
-    LogRel(("The next keyboard event is RAlt.\n"));
     return true;
 }