Changeset 2722 in vbox for trunk/src

Timestamp:

May 18, 2007 4:27:19 PM (18 years ago)

Author:

vboxsync

Message:

FE/Qt: Fixed ​http://www.virtualbox.org/ticket/346: extended keys were not released in the guest when the console window lost focus.

File:

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

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

@@ -2490 +2490 @@
     AssertMsg (attached, ("Console must be attached"));
 
-    LONG codes[2];
+    LONG codes [2];
     CKeyboard keyboard = cconsole.GetKeyboard();
 
@@ -2505 +2505 @@
     for (uint i = 0; i < SIZEOF_ARRAY (keys_pressed); i++)
     {
-        if ( keys_pressed[i] & IsKeyPressed )
+        if (keys_pressed [i] & IsKeyPressed)
+        {
             keyboard.PutScancode (i | 0x80);
-        if ( keys_pressed[i] & IsKeyPressed )
+        }
+        else if (keys_pressed [i] & IsExtKeyPressed)
         {
             codes[0] = 0xE0;
@@ -2513 +2515 @@
             keyboard.PutScancodes (codes, 2);
         }
-        keys_pressed[i] = 0;
+        keys_pressed [i] = 0;
     }
 
@@ -2521 +2523 @@
 #ifdef Q_WS_MAC
     /* clear most of the modifiers. */
-    m_darwinKeyModifiers &= alphaLock | kEventKeyModifierNumLockMask
-                          | (release_hostkey ? 0 : ::DarwinKeyCodeToDarwinModifierMask (gs.hostKey()));
+    m_darwinKeyModifiers &=
+        alphaLock | kEventKeyModifierNumLockMask |
+        (release_hostkey ? 0 : ::DarwinKeyCodeToDarwinModifierMask (gs.hostKey()));
 #endif
 
@@ -2540 +2543 @@
     AssertMsg (attached, ("Console must be attached"));
 
-    LONG codes[2];
+    LONG codes [2];
     CKeyboard keyboard = cconsole.GetKeyboard();
-    for ( uint i = 0; i < SIZEOF_ARRAY( keys_pressed ); i++ ) {
-        uint8_t os = keys_pressed_copy[i];
-        uint8_t ns = keys_pressed[i];
-        if ( (os & IsKeyPressed) != (ns & IsKeyPressed) ) {
-            codes[0] = i;
-            if ( !(ns & IsKeyPressed) )
+    for (uint i = 0; i < SIZEOF_ARRAY (keys_pressed); ++ i)
+    {
+        uint8_t os = keys_pressed_copy [i];
+        uint8_t ns = keys_pressed [i];
+        if ((os & IsKeyPressed) != (ns & IsKeyPressed))
+        {
+            codes [0] = i;
+            if (!(ns & IsKeyPressed))
                 codes[0] |= 0x80;
             keyboard.PutScancode (codes[0]);
         }
-        if ( (os & IsExtKeyPressed) != (ns & IsExtKeyPressed) ) {
-            codes[0] = 0xE0;
-            codes[1] = i;
-            if ( !(ns & IsExtKeyPressed) )
-                codes[1] |= 0x80;
+        else if ((os & IsExtKeyPressed) != (ns & IsExtKeyPressed))
+        {
+            codes [0] = 0xE0;
+            codes [1] = i;
+            if (!(ns & IsExtKeyPressed))
+                codes [1] |= 0x80;
             keyboard.PutScancodes (codes, 2);
         }