Changeset 40133 in vbox for trunk/src/VBox/Devices/Input

Timestamp:

Feb 14, 2012 9:54:44 PM (13 years ago)

Author:

vboxsync

Message:

Improved Num Lock handling.

File:

• trunk/src/VBox/Devices/Input/PS2K.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/Input/PS2K.cpp

@@ -345 +345 @@
     /* 51 */ {0x50, 0x72, 0x60, KF_GK, T_T }, /* Key  84: Down Arrow (Note 1) */
     /* 52 */ {0x48, 0x75, 0x63, KF_GK, T_T }, /* Key  83: Up Arrow (Note 1) */
-    /* 53 */ {0x45, 0x77, 0x76,     0, T_M }, /* Key  90: Num Lock */
+    /* 53 */ {0x45, 0x77, 0x76, KF_NL, T_M }, /* Key  90: Num Lock */
     /* 54 */ {0x35, 0x4A, 0x77, KF_NS, T_M }, /* Key  95: Keypad / (Note 1) */
     /* 55 */ {0x37, 0x7C, 0x7E,     0, T_M }, /* Key 100: Keypad * */
@@ -917 +917 @@
                 {
                     if (pThis->u8Modifiers & MOD_LSHIFT)
-                        strcpy((char *)abCodes, "\xE0\xF0\x12");
+                        strcat((char *)abCodes, "\xE0\xF0\x12");
                     if (pThis->u8Modifiers & MOD_RSHIFT)
-                        strcpy((char *)abCodes, "\xE0\xF0\x59");
+                        strcat((char *)abCodes, "\xE0\xF0\x59");
                 }
             }
@@ -969 +969 @@
                     else
                     {
+                        if (pThis->u8Modifiers & MOD_RSHIFT)
+                            strcat((char *)abCodes, "\xE0\x59");
                         if (pThis->u8Modifiers & MOD_LSHIFT)
-                            strcpy((char *)abCodes, "\xE0\x12");
-                        if (pThis->u8Modifiers & MOD_RSHIFT)
-                            strcpy((char *)abCodes, "\xE0\x59");
+                            strcat((char *)abCodes, "\xE0\x12");
                     }
                 }