Changeset 8916 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

May 19, 2008 1:11:43 PM (17 years ago)

Author:

vboxsync

Message:

Frontends/VirtualBox and VirtualBox4: experimental - updated the X11 keyboard driver to handle Sun X server keycodes

Location:

trunk/src/VBox/Frontends/VirtualBox/src/linux

Files:

• keyboard-new.c (modified) (2 diffs)
• keyboard-tables.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/linux/keyboard-new.c

@@ -121 +121 @@
       if (   (0xFF != (keysym >> 8))     /* Non-character key */
           && (0x1008FF != (keysym >> 8)) /* XFree86 vendor keys */
+          && (0x1005FF != (keysym >> 8)) /* Sun keys */
           && (0x20 != keysym)            /* Spacebar */
           && (0xFE03 != keysym)          /* ISO level3 shift, aka AltGr */
@@ -263 +264 @@
 /* VirtualBox FIX - multimedia/internet keys */
                 scan = xfree86_vendor_key_scan[keysym & 0xff];
+            } else if ((keysym >> 8) == 0x1005FF) { /* Sun keys */
+                scan = sun_key_scan[keysym & 0xff];
             } else if (keysym == 0x20) {                 /* Spacebar */
                 scan = 0x39;

trunk/src/VBox/Frontends/VirtualBox/src/linux/keyboard-tables.h

@@ -72 +72 @@
     0x00, 0x00, 0x00, 0x45, 0x46, 0x00, 0x00, 0x00,              /* FF10 */
     0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,              /* FF18 */
-    /* additional Japanese keys */
-    0x00, 0x00, 0x7b, 0x79, 0x00, 0x00, 0x00, 0x70,              /* FF20 */
+    /* Sun Menu, additional Japanese keys */
+    0x15d, 0x00, 0x7b, 0x79, 0x00, 0x00, 0x00, 0x70,             /* FF20 */
     0x00, 0x00, 0x29, 0x00, 0x00, 0x00, 0x00, 0x00,              /* FF28 */
     /* additional Korean keys */
@@ -86 +86 @@
     /* misc keys */
 /* VirtualBox FIX */
-    /*?*/ 0, 0x137, /*?*/ 0, 0x152, 0x00, 0x00, 0x00, 0x15D,     /* FF60 */
-    /*?*/ 0, /*?*/ 0, 0x38, 0x146, 0x00, 0x00, 0x00, 0x00,       /* FF68 */
+                                       /* SunUndo SunAgain WinR */
+    /*?*/ 0, 0x137, /*?*/ 0, 0x152, 0x00, 0x107,  0x105,   0x15D,/* FF60 */
+ /* SunFind SunStop SunHelp */
+    0x141,  0x168,  0x175, 0x146, 0x00, 0x00, 0x00, 0x00,        /* FF68 */
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              /* FF70 */
     /* keypad keys */
@@ -168 +170 @@
 };
 
+/* VirtualBox FIX */
+/* This list was put together using /usr/include/X11/Sunkeysym.h and
+   comparing the scancodes produced by a Sun type 7 USB keyboard.  Note that
+   Sun call F11 and F12 F36 and F37 respectively, as they already had 35
+   function keys when those two physical keys were added. */
+static const unsigned sun_key_scan[256] =
+{
+ /* FAGrav, FACirc, FATild, FAAcut, FADiae, FACed */
+    0,      0,      0,      0,      0,      0, 0, 0,            /* 1005FF00 */
+    0, 0, 0, 0, 0, 0, 0, 0,                                     /* 1005FF08 */
+ /* SunF36, SunF37 */
+    0x57,   0x58, 0, 0, 0, 0, 0, 0,                             /* 1005FF10 */
+    0, 0, 0, 0, 0, 0, 0, 0,                                     /* 1005FF18 */
+    0, 0, 0, 0, 0, 0, 0, 0,                                     /* 1005FF20 */
+    0, 0, 0, 0, 0, 0, 0, 0,                                     /* 1005FF28 */
+    0, 0, 0, 0, 0, 0, 0, 0,                                     /* 1005FF30 */
+    0, 0, 0, 0, 0, 0, 0, 0,                                     /* 1005FF38 */
+    0, 0, 0, 0, 0, 0, 0, 0,                                     /* 1005FF40 */
+    0, 0, 0, 0, 0, 0, 0, 0,                                     /* 1005FF48 */
+    0, 0, 0, 0, 0, 0, 0, 0,                                     /* 1005FF50 */
+    0, 0, 0, 0, 0, 0, 0, 0,                                     /* 1005FF58 */
+ /* SysReq */
+    0,     0, 0, 0, 0, 0, 0, 0,                                 /* 1005FF60 */
+    0, 0, 0, 0, 0, 0, 0, 0,                                     /* 1005FF68 */
+ /* Props  Front  Copy   Paste Cut    Power  Vol-   Mute */
+    0x106, 0x10c, 0x178, 0x65, 0x13c, 0x15e, 0x12e, 0x120,      /* 1005FF70 */
+ /* Vol+ */
+    0x130, 0, 0, 0, 0, 0, 0, 0,                                 /* 1005FF78 */
+    0, 0, 0, 0, 0, 0, 0, 0,                                     /* 1005FF80 */
+    0, 0, 0, 0, 0, 0, 0, 0,                                     /* 1005FF88 */
+    0, 0, 0, 0, 0, 0, 0, 0,                                     /* 1005FF90 */
+    0, 0, 0, 0, 0, 0, 0, 0,                                     /* 1005FF98 */
+    0, 0, 0, 0, 0, 0, 0, 0,                                     /* 1005FFA0 */
+    0, 0, 0, 0, 0, 0, 0, 0,                                     /* 1005FFA8 */
+    0, 0, 0, 0, 0, 0, 0, 0,                                     /* 1005FFB0 */
+    0, 0, 0, 0, 0, 0, 0, 0,                                     /* 1005FFB8 */
+    0, 0, 0, 0, 0, 0, 0, 0,                                     /* 1005FFC0 */
+    0, 0, 0, 0, 0, 0, 0, 0,                                     /* 1005FFC8 */
+    0, 0, 0, 0, 0, 0, 0, 0,                                     /* 1005FFD0 */
+    0, 0, 0, 0, 0, 0, 0, 0,                                     /* 1005FFD8 */
+    0, 0, 0, 0, 0, 0, 0, 0,                                     /* 1005FFE0 */
+    0, 0, 0, 0, 0, 0, 0, 0,                                     /* 1005FFE8 */
+    0, 0, 0, 0, 0, 0, 0, 0,                                     /* 1005FFF0 */
+    0, 0, 0, 0, 0, 0, 0, 0                                      /* 1005FFF8 */
+};
+
 #endif /* ___VBox_keyboard_tables_h */