Changeset 32874 in vbox for trunk/src/VBox/Frontends/Common

Timestamp:

Oct 1, 2010 4:50:10 PM (15 years ago)

Author:

vboxsync

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

66352

Message:

FE/Common/VBoxKeyboard: try to use XKB to determine the keyboard layout as well, and by default

Location:

trunk/src/VBox/Frontends/Common/VBoxKeyboard

Files:

• keyboard-tables.h (modified) (1 diff)
• keyboard.c (modified) (4 diffs)
• xkbtoscan.h (added)

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

@@ -237 +237 @@
 };
 
+#include "xkbtoscan.h"
+
 #endif /* !___VBox_keyboard_tables_h */
 

trunk/src/VBox/Frontends/Common/VBoxKeyboard/keyboard.c

@@ -42 +42 @@
 #include <X11/Xatom.h>
 #include <X11/keysym.h>
+#include <X11/XKBlib.h>
 #include <X11/Xlib.h>
 #include <X11/Xresource.h>
@@ -545 +546 @@
 
 /**
+ * Checks for the XKB extension, and if it is found initialises the X11 keycode
+ * to XT scan code mapping by looking at the XKB names for each keycode.
+ */
+static unsigned
+X11DRV_InitKeyboardByXkb(Display *pDisplay)
+{
+    int major = XkbMajorVersion, minor = XkbMinorVersion;
+    XkbDescPtr pKBDesc;
+    if (!XkbLibraryVersion(&major, &minor))
+        return 0;
+    if (!XkbQueryExtension(pDisplay, NULL, NULL, &major, &minor, NULL))
+        return 0;
+    pKBDesc = XkbGetKeyboard(pDisplay, XkbAllComponentsMask, XkbUseCoreKbd);
+    if (!pKBDesc)
+        return 0;
+    if (XkbGetNames(pDisplay, XkbKeyNamesMask, pKBDesc) != Success)
+        return 0;
+    {
+        unsigned i, j;
+
+        memset(keyc2scan, 0, sizeof(keyc2scan));
+        for (i = pKBDesc->min_key_code; i < pKBDesc->max_key_code; ++i)
+            for (j = 0; j < sizeof(xkbMap) / sizeof(xkbMap[0]); ++j)
+                if (!memcmp(xkbMap[j].cszName,
+                            &pKBDesc->names->keys->name[i * XKB_NAME_SIZE],
+                            XKB_NAME_SIZE))
+                {
+                    keyc2scan[i] = xkbMap[j].uScan;
+                    break;
+                }
+    }
+    XkbFreeNames(pKBDesc, XkbKeyNamesMask, True);
+    XkbFreeKeyboard(pKBDesc, XkbAllComponentsMask, True);
+    return 1;
+}
+
+/**
  * Initialise the X11 keyboard driver by finding which X11 keycodes correspond
  * to which PC scan codes.  If the keyboard being used is not a PC keyboard,
@@ -567 +605 @@
  * @param   byTypeOK         diagnostic - set to one if detection by type
  *                           succeeded, and to 0 otherwise
+ * @param   byXkbOK          diagnostic - set to one if detection using XKB
+ *                           succeeded, and to 0 otherwise
  * @param   remapScancode    array of tuples that remap the keycode (first
  *                           part) to a scancode (second part)
  */
-unsigned X11DRV_InitKeyboard(Display *display, unsigned *byLayoutOK, unsigned *byTypeOK, int (*remapScancodes)[2])
-{
-    unsigned byLayout;
-    unsigned byType;
+unsigned X11DRV_InitKeyboard(Display *display, unsigned *byLayoutOK,
+                             unsigned *byTypeOK, unsigned *byXkbOK,
+                             int (*remapScancodes)[2])
+{
+    unsigned byLayout, byType, byXkb;
 
     byLayout = X11DRV_InitKeyboardByLayout(display);
@@ -582 +623 @@
     if (byTypeOK)
         *byTypeOK = byType;
+
+    byXkb = X11DRV_InitKeyboardByXkb(display);
+    if (byXkbOK)
+        *byXkbOK = byXkb;
 
     /* Remap keycodes after initialization. Remapping stops after an