Changeset 5238 in vbox for trunk

Timestamp:

Oct 11, 2007 3:24:13 PM (17 years ago)

Author:

vboxsync

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

25189

Message:

Linux host keyboard: ignore more than two keyboard symbols, as using three or more causes problems in many setups

File:

• trunk/src/VBox/Frontends/VirtualBox/src/linux/keyboard.c (modified) (3 diffs)

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

@@ -1816 +1816 @@
 #endif
 
+#ifndef OUTOFWINE
   syms = keysyms_per_keycode;
   if (syms > 4) {
@@ -1821 +1822 @@
     syms = 4;
   }
+#else
+/* innotek FIX */
+  /* Not all setups really produce all four keysyms, and two are enough
+     for identification anyway. */
+  syms = keysyms_per_keycode;
+  if (syms > 2) {
+    WARN("%d keysyms per keycode not supported, set to 2\n", syms);
+    syms = 2;
+  }
+#endif
 
   memset( ckey, 0, sizeof(ckey) );
@@ -2012 +2023 @@
 #endif
     lkey = main_key_tab[kbd_layout].key;
+#ifndef OUTOFWINE
     syms = (keysyms_per_keycode > 4) ? 4 : keysyms_per_keycode;
+#else
+/* innotek FIX */
+  /* Not all setups really produce all four keysyms, and two are enough
+     for identification anyway. */
+    syms = (keysyms_per_keycode > 2) ? 2 : keysyms_per_keycode;
+#endif
 
     /* Now build two conversion arrays :