Changeset 44765 in vbox for trunk/src/VBox/Frontends/Common/VBoxKeyboard/keyboard.c

Timestamp:

Feb 20, 2013 3:25:56 PM (12 years ago)

Author:

vboxsync

Message:

FE/Common/VBoxKeyboard: only use XKB if it really returns the data we need.

File:

• trunk/src/VBox/Frontends/Common/VBoxKeyboard/keyboard.c (modified) (4 diffs)

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

@@ -548 +548 @@
 /**
  * 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.
+ * to XT scan code mapping by looking at the XKB names for each keycode.  As it
+ * turns out that XKB can return an empty list we make sure that the list holds
+ * enough data to be useful to us.
  */
 static unsigned
@@ -555 +557 @@
     int major = XkbMajorVersion, minor = XkbMinorVersion;
     XkbDescPtr pKBDesc;
+    unsigned cFound = 0;
+
     if (!XkbLibraryVersion(&major, &minor))
         return 0;
@@ -575 +579 @@
                 {
                     keyc2scan[i] = xkbMap[j].uScan;
+                    ++cFound;
                     break;
                 }
@@ -580 +585 @@
     XkbFreeNames(pKBDesc, XkbKeyNamesMask, True);
     XkbFreeKeyboard(pKBDesc, XkbAllComponentsMask, True);
-    return 1;
+    return cFound >= 45 ? 1 : 0;
 }