Changeset 12410 in vbox for trunk/src/VBox/Frontends

Timestamp:

Sep 11, 2008 7:21:51 PM (16 years ago)

Author:

vboxsync

Message:

FE/Qt: attempt to fix bogus reports about keyboard layout mismatches

File:

• trunk/src/VBox/Frontends/VirtualBox4/src/linux/keyboard-new.c (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox4/src/linux/keyboard-new.c

@@ -335 +335 @@
                 /* got it */
                 scan = main_key_scan[keyn - 1];
-                ++matches;
+                if (keyn != 48) /* don't count the 102nd key */
+                    ++matches;
               }
               if (0 == scan) {
@@ -364 +365 @@
         keyc2scan[keyc] = scan;
     } /* for */
-    /* Did we find a match for all keys in the layout?  Count them first. */
+    /* Did we find a match for all keys in the layout?  Count them first.
+     * Note that we skip the 102nd key, so that owners of 101 key keyboards
+     * don't get bogus messages about bad matches. */
     for (entries = 0, keyn = 0; keyn < MAIN_LEN; ++keyn) {
         if (   (0 != (*lkey)[keyn][0])
             && (0 != (*lkey)[keyn][1])
+            && (keyn != 48) /* don't count the 102nd key */
            ) {
             ++entries;