Changeset 32875 in vbox

Timestamp:

Oct 1, 2010 4:54:27 PM (15 years ago)

Author:

vboxsync

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

66353

Message:

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

File:

• trunk/src/VBox/Frontends/VirtualBox/src/X11/XKeyboard-new.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/X11/XKeyboard-new.cpp

@@ -30 +30 @@
 static unsigned gfByLayoutOK = 1;
 static unsigned gfByTypeOK = 1;
+static unsigned gfByXkbOK = 1;
 
 /**
@@ -188 +189 @@
 bool initXKeyboard(Display *dpy, int (*remapScancodes)[2])
 {
-    X11DRV_InitKeyboard(dpy, &gfByLayoutOK, &gfByTypeOK, remapScancodes);
+    X11DRV_InitKeyboard(dpy, &gfByLayoutOK, &gfByTypeOK, &gfByXkbOK,
+                        remapScancodes);
     /* It will almost always work to some extent */
     return true;
@@ -198 +200 @@
 void doXKeyboardLogging(Display *dpy)
 {
-    if ((gfByLayoutOK != 1) && (1 == gfByTypeOK))
+    if (((1 == gfByTypeOK) || (1 == gfByXkbOK)) && (gfByLayoutOK != 1))
         dumpLayout(dpy);
-    if ((1 == gfByLayoutOK) && (gfByTypeOK != 1))
+    if (((1 == gfByLayoutOK) || (1 == gfByXkbOK)) && (gfByTypeOK != 1))
         dumpType(dpy);
-    if ((gfByLayoutOK != 1) && (gfByTypeOK != 1))
+    if ((gfByLayoutOK != 1) && (gfByTypeOK != 1) && (gfByXkbOK != 1))
     {
         LogRel(("Failed to recognize the keyboard mapping or to guess it based on\n"