Changeset 23984 in vbox

Timestamp:

Oct 22, 2009 1:55:41 PM (15 years ago)

Author:

vboxsync

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

53817

Message:

FE/Qt: take keyboard layouts which use shift to cancel CapsLock into account

File:

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

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

@@ -2094 +2094 @@
     /* These special keys have to be handled by Windows as well to update the
      * internal modifier state and to enable/disable the keyboard LED */
-    if (vkey == VK_NUMLOCK || vkey == VK_CAPITAL)
+    if (vkey == VK_NUMLOCK || vkey == VK_CAPITAL || vkey == VK_SHIFT)
         return false;
 
@@ -2573 +2573 @@
         codes[(*count)++] = 0x3a;
         codes[(*count)++] = 0x3a | 0x80;
+        /* Some keyboard layouts require shift to be pressed to break
+         * capslock.  For simplicity, only do this if shift is not
+         * already held down. */
+        if (mCapsLock && !(mPressedKeys [0x2a] & IsKeyPressed))
+        {
+            codes[(*count)++] = 0x2a;
+            codes[(*count)++] = 0x2a | 0x80;
+        }
     }
 
@@ -2588 +2596 @@
         codes[(*count)++] = 0x3a;
         codes[(*count)++] = 0x3a | 0x80;
+        /* Some keyboard layouts require shift to be pressed to break
+         * capslock.  For simplicity, only do this if shift is not
+         * already held down. */
+        if (mCapsLock && !(mPressedKeys [0x2a] & IsKeyPressed))
+        {
+            codes[(*count)++] = 0x2a;
+            codes[(*count)++] = 0x2a | 0x80;
+        }
     }
 
@@ -2598 +2614 @@
         codes[(*count)++] = 0x3a;
         codes[(*count)++] = 0x3a | 0x80;
+        /* Some keyboard layouts require shift to be pressed to break
+         * capslock.  For simplicity, only do this if shift is not
+         * already held down. */
+        if (mCapsLock && !(mPressedKeys [0x2a] & IsKeyPressed))
+        {
+            codes[(*count)++] = 0x2a;
+            codes[(*count)++] = 0x2a | 0x80;
+        }
     }