Changeset 7455 in vbox

Timestamp:

Mar 14, 2008 10:33:04 AM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

28893

Message:

Frontends/VirtualBox4: remove some legacy from the X11 keyboard code

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/XKeyboard.h (modified) (1 diff)
• src/VBoxConsoleView.cpp (modified) (3 diffs)
• src/linux/XKeyboard-new.cpp (modified) (1 diff)
• src/linux/keyboard-tables.h (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox4/include/XKeyboard.h ¶

@@ -20 +20 @@
 #define __XKeyboard_h__
 
-// our structure used to return keyboard event information
-typedef struct _WINEKEYBOARDINFO
-{
-    unsigned short wVk;
-    unsigned short wScan;
-    unsigned long dwFlags;
-    unsigned long time;
-} WINEKEYBOARDINFO;
-
 // initialize the X keyboard subsystem
 bool initXKeyboard(Display *dpy);
 // our custom keyboard handler
-void handleXKeyEvent(Display *dpy, XEvent *event, WINEKEYBOARDINFO *wineKbdInfo);
+unsigned handleXKeyEvent(XEvent *event);
 // returns the number of keysyms per keycode (only valid after initXKeyboard())
 int getKeysymsPerKeycode();

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxConsoleView.cpp ¶

@@ -1883 +1883 @@
 bool VBoxConsoleView::x11Event (XEvent *event)
 {
-    static WINEKEYBOARDINFO wineKeyboardInfo;
-
     switch (event->type)
     {
@@ -1900 +1898 @@
                 break;
             /*  else fall through */
-        /// @todo (AH) later, we might want to handle these as well
-        case KeymapNotify:
-        case MappingNotify:
         default:
             return false; /* pass the event to Qt */
     }
 
-    /* perform the mega-complex translation using the wine algorithms */
-    handleXKeyEvent (QX11Info::display(), event, &wineKeyboardInfo);
+    /* Translate the keycode to a PC scan code. */
+    unsigned scan = handleXKeyEvent (event);
 
 #if 0
     char buf [256];
-    sprintf (buf, "pr=%d kc=%08X st=%08X fl=%08lX scan=%04X",
+    sprintf (buf, "pr=%d kc=%08X st=%08X extended=%s scan=%04X",
              event->type == XKeyPress ? 1 : 0, event->xkey.keycode,
-             event->xkey.state, wineKeyboardInfo.dwFlags, wineKeyboardInfo.wScan);
+             event->xkey.state, scan >> 8 ? "true" : "false", scan & 0x7F);
     mMainWnd->statusBar()->message (buf);
     LogFlow (("### %s\n", buf));
 #endif
 
-    int scan = wineKeyboardInfo.wScan & 0x7F;
     // scancodes 0x00 (no valid translation) and 0x80 are ignored
-    if (!scan)
+    if (!scan & 0x7F)
         return true;
 
@@ -1927 +1921 @@
 
     int flags = 0;
-    if (wineKeyboardInfo.dwFlags & 0x0001)
+    if (scan >> 8)
         flags |= KeyExtended;
     if (event->type == XKeyPress)
         flags |= KeyPressed;
 
+    /* Remove the extended flag */
+    scan &= 0x7F;
+
     switch (ks)
     {
-        case XK_Num_Lock:
-            // Wine sets the extended bit for the NumLock key. Reset it.
-            flags &= ~KeyExtended;
-            break;
         case XK_Print:
             flags |= KeyPrint;

trunk/src/VBox/Frontends/VirtualBox4/src/linux/XKeyboard-new.cpp ¶

@@ -158 +158 @@
  * Translate an X server scancode to a PC keyboard scancode.
  */
-void handleXKeyEvent(Display *, XEvent *event, WINEKEYBOARDINFO *wineKbdInfo)
+unsigned handleXKeyEvent(XEvent *event)
 {
     // call the WINE event handler
-    XKeyEvent *keyEvent = &event->xkey;
-    unsigned scan = X11DRV_KeyEvent(keyEvent->keycode);
-    wineKbdInfo->wScan = scan & 0xFF;
-    wineKbdInfo->dwFlags = scan >> 8;
+    return X11DRV_KeyEvent(event->xkey.keycode);
 }
 

trunk/src/VBox/Frontends/VirtualBox4/src/linux/keyboard-tables.h ¶

@@ -82 +82 @@
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              /* FF58 */
     /* misc keys */
-/* innotek FIX */
     /*?*/ 0, 0x137, /*?*/ 0, 0x152, 0x00, 0x00, 0x00, 0x15D,     /* FF60 */
     /*?*/ 0, /*?*/ 0, 0x38, 0x146, 0x00, 0x00, 0x00, 0x00,       /* FF68 */
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              /* FF70 */
     /* keypad keys */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x138, 0x145,            /* FF78 */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x138, 0x45,             /* FF78 */
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              /* FF80 */
     0x00, 0x00, 0x00, 0x00, 0x00, 0x11C, 0x00, 0x00,             /* FF88 */
@@ -93 +92 @@
     0x4D, 0x50, 0x49, 0x51, 0x4F, 0x4C, 0x52, 0x53,              /* FF98 */
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              /* FFA0 */
-/* innotek FIX */
     0x00, 0x00, 0x37, 0x4E, 0x53, 0x4A, 0x7e, 0x135,             /* FFA8 */
     0x52, 0x4F, 0x50, 0x51, 0x4B, 0x4C, 0x4D, 0x47,              /* FFB0 */
@@ -105 +103 @@
     /* modifier keys */
     0x00, 0x2A, 0x36, 0x1D, 0x11D, 0x3A, 0x00, 0x38,             /* FFE0 */
-/* innotek FIX */
     0x138, 0x38, 0x138, 0x15B, 0x15C, 0x00, 0x00, 0x00,          /* FFE8 */
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              /* FFF0 */
@@ -111 +108 @@
 };
 
-/* innotek FIX */
 /* This list was put together using /usr/include/X11/XF86keysym.h and
    http://www.win.tue.nl/~aeb/linux/kbd/scancodes-6.html.  It has not yet