Changeset 29749 in vbox

Timestamp:

May 21, 2010 9:55:12 PM (15 years ago)

Author:

vboxsync

Message:

Devices and FE/Common: keyboard table cleanup and a hack to support Sun keys on the emulated USB keyboard (Solaris host only)

Location:

trunk/src/VBox

Files:

• Devices/Input/UsbKbd.cpp (modified) (1 diff)
• Frontends/Common/VBoxKeyboard/keyboard-tables.h (modified) (3 diffs)

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

@@ -385 +385 @@
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 28-2F */
     0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x00, 0x46, /* 30-37 */
-    0xe6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 38-3F */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x00, 0x4a, /* 40-47 */
+                   /* 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 */
     0x52, 0x4b, 0x00, 0x50, 0x00, 0x4f, 0x00, 0x4d, /* 48-4F */
     0x51, 0x4e, 0x49, 0x4c, 0x00, 0x00, 0x00, 0x00, /* 50-57 */

trunk/src/VBox/Frontends/Common/VBoxKeyboard/keyboard-tables.h

@@ -83 +83 @@
     /* Sun Menu, additional Japanese keys */
 #ifdef sun
-    0x15d, 0x79, 0x00, 0x29, 0x00, 0x00, 0x00, 0x00,             /* FF20 */
+    0x15D, 0x79, 0x00, 0x29, 0x00, 0x00, 0x00, 0x00,             /* FF20 */
     0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,              /* FF28 */
 #else
-    0x15d, 0x00, 0x7b, 0x79, 0x00, 0x00, 0x00, 0x70,             /* FF20 */
+    0x15D, 0x00, 0x7B, 0x79, 0x00, 0x00, 0x00, 0x70,             /* FF20 */
     0x00, 0x00, 0x29, 0x00, 0x00, 0x00, 0x00, 0x00,              /* FF28 */
 #endif /* sun */
     /* additional Korean keys */
-    0x00, 0xf2, 0x00, 0x00, 0xf1, 0x00, 0x00, 0x00,              /* FF30 */
+    0x00, 0xF2, 0x00, 0x00, 0xF1, 0x00, 0x00, 0x00,              /* FF30 */
     /* unused */
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              /* FF38 */
@@ -99 +99 @@
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              /* FF58 */
     /* misc keys */
-                                    /* SunUndo SunAgain Menu */
+                                                /* Menu */
 #ifdef sun
-    /*?*/ 0, 0x137, 0x7b, 0x152, 0x00, 0x107,  0x105,   0x15D,   /* FF60 */
+    /*?*/ 0, 0x137, 0x7b, 0x152, 0x00, 0x00, 0x00, 0x15D,        /* FF60 */
 #else
-    /*?*/ 0, 0x137, 0, 0x152, 0x00,    0x107,  0x105,   0x15D,   /* FF60 */
+    /*?*/ 0, 0x137, 0, 0x152, 0x00, 0x00, 0x00,    0x15D,        /* FF60 */
 #endif /* sun */
- /* SunFind SunStop SunHelp */
-    0x141,  0x168,  0x175, 0x146, 0x00, 0x00, 0x00, 0x00,        /* FF68 */
+             /* Help */
+    0x00, 0x00, 0x13B, 0x146, 0x00, 0x00, 0x00, 0x00,            /* FF68 */
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              /* FF70 */
     /* keypad keys */
@@ -118 +118 @@
     0x52, 0x4F, 0x50, 0x51, 0x4B, 0x4C, 0x4D, 0x47,              /* FFB0 */
     0x48, 0x49, 0x00, 0x00, 0x00, 0x00,                          /* FFB8 */
-    /* function keys (F1 to F24) */
+    /* function keys (F1 to F12) */
                                         0x3B, 0x3C,
     0x3D, 0x3E, 0x3F, 0x40, 0x41, 0x42, 0x43, 0x44,              /* FFC0 */
-    0x57, 0x58, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69,              /* FFC8 */
-    0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x76, 0x00, 0x00,              /* FFD0 */
+#ifdef sun
+    /* On Solaris, F11 to F20 are actually keys on the left function block.
+     * Since just one of them has a set 1 PS/2 scan code, we arbitrarily assign
+     * the rest scan codes which are extended versions of F2 to F10.  With
+     * the emulated PS/2 keyboard this will not help anyone, but with the
+     * emulated USB one we can translate them to the proper USB scan codes. */
+    0x13C, 0x13D, 0x72, 0x13E, 0x13F, 0x140, 0x141, 0x142,       /* FFC8 */
+    0x143, 0x144, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,            /* FFD0 */
+#else
+    0x57, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              /* FFC8 */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              /* FFD0 */
+#endif
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              /* FFD8 */
     /* modifier keys */