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

Timestamp:

Feb 13, 2012 4:54:33 PM (13 years ago)

Author:

vboxsync

Message:

Improved PrtSc/Pause key handling.

File:

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

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

@@ -246 +246 @@
 
 /* Special key values. */
-#define NONE         0x90    /* No PS/2 scan code returned. */
-#define UNAS         0x91    /* No PS/2 scan assigned to key. */
-#define RSVD         0x92    /* Reserved, do not use. */
-#define UNKN         0x93    /* Translation unknown. */
+#define NONE         0x93    /* No PS/2 scan code returned. */
+#define UNAS         0x94    /* No PS/2 scan assigned to key. */
+#define RSVD         0x95    /* Reserved, do not use. */
+#define UNKN         0x96    /* Translation unknown. */
 
 /* Key definition structure. */
@@ -488 +488 @@
     /* Sun-specific keys.  Most of the XT codes are made up  */
     0xe6, 0x00, 0x00, 0x75, 0x76, 0x77, 0xA3, 0x78, /* 38-3F */
-    0x80, 0x81, 0x82, 0x79, 0x00, 0x48, 0x00, 0x4a, /* 40-47 */
+    0x80, 0x81, 0x82, 0x79, 0x00, 0x00, 0x48, 0x4a, /* 40-47 */
     0x52, 0x4b, 0x00, 0x50, 0x00, 0x4f, 0x00, 0x4d, /* 48-4F */
     0x51, 0x4e, 0x49, 0x4c, 0x00, 0x00, 0x00, 0x00, /* 50-57 */
@@ -857 +857 @@
     pKeyDef = u8HidCode >= HID_MODIFIER_FIRST ? &aPS2ModKeys[u8HidCode - HID_MODIFIER_FIRST] : &aPS2Keys[u8HidCode];
 
+    /* Some keys are not processed at all; early return. */
+    if (pKeyDef->makeS1 == NONE)
+    {
+        LogFlow(("Skipping key processing.\n"));
+        return VINF_SUCCESS;
+    }
+
     /* Handle modifier keys (Ctrl/Alt/Shift/GUI). We need to keep track
      * of their state in addition to sending the scan code.
@@ -881 +888 @@
         if (fKeyDown)
         {
+            /* Process key down event. */
             if (pKeyDef->keyFlags & KF_PB)
             {
@@ -913 +921 @@
                         strcpy((char *)abCodes, "\xE0\xF0\x59");
                 }
-
             }
             /* Feed the bytes to the queue if there is room. */
@@ -921 +928 @@
             Assert(i < sizeof(abCodes));
 
-            if (pKeyDef->keyFlags & (KF_E0 | KF_GK | KF_NS | KF_PS))
-                PS2InsertQueue((GeneriQ *)&pThis->keyQ, 0xE0);
-            PS2InsertQueue((GeneriQ *)&pThis->keyQ, pKeyDef->makeS2);
+            /* Standard processing for regular keys only. */
+            if (!(pKeyDef->keyFlags & (KF_PB | KF_PS)))
+            {
+                if (pKeyDef->keyFlags & (KF_E0 | KF_GK | KF_NS))
+                    PS2InsertQueue((GeneriQ *)&pThis->keyQ, 0xE0);
+                PS2InsertQueue((GeneriQ *)&pThis->keyQ, pKeyDef->makeS2);
+            }
         }
         else if (!(pKeyDef->keyFlags & (KF_NB | KF_PB)))
         {
-
-            /* Process base scan code. */
-            if (pKeyDef->keyFlags & (KF_E0 | KF_GK | KF_NS | KF_PS))
-                PS2InsertQueue((GeneriQ *)&pThis->keyQ, 0xE0);
-            PS2InsertQueue((GeneriQ *)&pThis->keyQ, 0xF0);
-            PS2InsertQueue((GeneriQ *)&pThis->keyQ, pKeyDef->makeS2);
-
-            /* Restore shift state for gray keys. */
-            if (pKeyDef->keyFlags & KF_GK)
+            /* Process key up event except for keys which produce none. */
+
+            /* Handle Print Screen release. */
+            if (pKeyDef->keyFlags & KF_PS)
             {
-                if (pThis->fNumLockOn)
+                /* Undo faked Print Screen state as needed. */
+                if (pThis->u8Modifiers & (MOD_LALT | MOD_RALT))
+                    strcpy((char *)abCodes, "\xF0\x84");
+                else if (pThis->u8Modifiers & (MOD_LSHIFT | MOD_RSHIFT))
+                    strcpy((char *)abCodes, "\xE0\xF0\x7C");
+                else
+                    strcpy((char *)abCodes, "\xE0\xF0\x7C\xE0\xF0\x12");
+            }
+            else
+            {
+                /* Process base scan code for less unusual keys. */
+                if (pKeyDef->keyFlags & (KF_E0 | KF_GK | KF_NS))
+                    PS2InsertQueue((GeneriQ *)&pThis->keyQ, 0xE0);
+                PS2InsertQueue((GeneriQ *)&pThis->keyQ, 0xF0);
+                PS2InsertQueue((GeneriQ *)&pThis->keyQ, pKeyDef->makeS2);
+    
+                /* Restore shift state for gray keys. */
+                if (pKeyDef->keyFlags & KF_GK)
                 {
-                    if ((pThis->u8Modifiers & (MOD_LSHIFT | MOD_RSHIFT)) == 0)
-                        strcpy((char *)abCodes, "\xE0\xF0\x12");
-                }
-                else
-                {
-                    if (pThis->u8Modifiers & MOD_LSHIFT)
-                        strcpy((char *)abCodes, "\xE0\x12");
-                    if (pThis->u8Modifiers & MOD_RSHIFT)
-                        strcpy((char *)abCodes, "\xE0\x59");
+                    if (pThis->fNumLockOn)
+                    {
+                        if ((pThis->u8Modifiers & (MOD_LSHIFT | MOD_RSHIFT)) == 0)
+                            strcpy((char *)abCodes, "\xE0\xF0\x12");
+                    }
+                    else
+                    {
+                        if (pThis->u8Modifiers & MOD_LSHIFT)
+                            strcpy((char *)abCodes, "\xE0\x12");
+                        if (pThis->u8Modifiers & MOD_RSHIFT)
+                            strcpy((char *)abCodes, "\xE0\x59");
+                    }
                 }
             }
-            /* Feed the bytes to the queue if there is room. */
+
+            /* Feed any additional bytes to the queue if there is room. */
             //@todo: check empty space!
             while (abCodes[i])
@@ -1165 +1192 @@
     uint32_t    u32Usage = 0;
 
+    LogFlowFunc(("key code %02X\n", u8KeyCode ));
     pThis->XlatState = ScancodeToHidUsage(pThis->XlatState, u8KeyCode, &u32Usage);