儲存庫 vbox 的更動 12495

時間撮記:

2008-9-16 下午03:43:14 (16 年 以前)

作者:

vboxsync

訊息:

FE/Qt: X11 keyboard: look up keys which don't change in different layouts on the fly

位置:

trunk/src/VBox/Frontends/VirtualBox4/src/linux

檔案:

• XKeyboard-new.cpp (修改) (3 筆差異)
• keyboard-new.c (修改) (4 筆差異)
• keyboard.h (修改) (1 筆差異)

trunk/src/VBox/Frontends/VirtualBox4/src/linux/XKeyboard-new.cpp

@@ -92 +92 @@
     XDisplayKeycodes(display, &minKey, &maxKey);
     for (int i = minKey; i < maxKey; ++i)
-        scanToKeycode[X11DRV_KeyEvent(i)] = i;
+        scanToKeycode[X11DRV_KeyEvent(display, i)] = i;
     LogRel(("\""));
     printKey(display, scanToKeycode[0x29]); /* `~ */
@@ -149 +149 @@
     for (unsigned i = 0; i < 256; ++i)
     {
-        LogRel(("0x%x", X11DRV_KeyEvent(i)));
+        LogRel(("0x%x", X11DRV_KeyEvent(display, i)));
         if (i < 255)
             LogRel((", "));
@@ -218 +218 @@
 {
     // call the WINE event handler
-    return X11DRV_KeyEvent(event->xkey.keycode);
+    return X11DRV_KeyEvent(event->xkey.display, event->xkey.keycode);
 }
 

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

@@ -95 +95 @@
 
 /**
-  * Translate a keycode in a key event to a scan code, using the lookup table
-  * which we constructed earlier or a well-known mapping from our mapping
-  * table.
+  * Translate a keycode in a key event to a scan code.  If the keycode maps
+  * to a key symbol which is in the same place on all PC keyboards, look it
+  * up by symbol in one of our hard-coded translation tables.  It it maps to
+  * a symbol which can be in a different place on different PC keyboards, look
+  * it up by keycode using either the lookup table which we constructed
+  * earlier, or using a hard-coded table if we know what type of keyboard is
+  * in use.
   *
   * @returns the scan code number, with 0x100 added for extended scan codes
@@ -103 +107 @@
   */
 
-unsigned X11DRV_KeyEvent(KeyCode code)
+unsigned X11DRV_KeyEvent(Display *display, KeyCode code)
 {
-    unsigned key;
-    if (use_builtin_table != 0)
-        key = main_keyboard_type_scans[builtin_table_number][code];
-    else
-        key = keyc2scan[code];
-    return key;
+    unsigned scan;
+    KeySym keysym = XKeycodeToKeysym(display, code, 0);
+    scan = 0;
+    if (keysym)  /* otherwise, keycode not used */
+    {
+        if ((keysym >> 8) == 0xFF)          /* non-character key */
+            scan = nonchar_key_scan[keysym & 0xff];
+        else if ((keysym >> 8) == 0x1008FF) /* XFree86 vendor keys */
+            scan = xfree86_vendor_key_scan[keysym & 0xff];
+        else if ((keysym >> 8) == 0x1005FF) /* Sun keys */
+            scan = sun_key_scan[keysym & 0xff];
+        else if (keysym == 0x20)            /* Spacebar */
+            scan = 0x39;
+        else if (keysym == 0xFE03)          /* ISO level3 shift, aka AltGr */
+            scan = 0x138;
+        else if (use_builtin_table != 0)
+            scan = main_keyboard_type_scans[builtin_table_number][code];
+        else
+            scan = keyc2scan[code];
+    }
+    return scan;
 }
 
@@ -304 +323 @@
         if (keysym)  /* otherwise, keycode not used */
         {
-            if ((keysym >> 8) == 0xFF)         /* non-character key */
-            {
-                scan = nonchar_key_scan[keysym & 0xff];
-                /* set extended bit when necessary */
-            } else if ((keysym >> 8) == 0x1008FF) { /* XFree86 vendor keys */
-/* VirtualBox FIX - multimedia/internet keys */
-                scan = xfree86_vendor_key_scan[keysym & 0xff];
-            } else if ((keysym >> 8) == 0x1005FF) { /* Sun keys */
-                scan = sun_key_scan[keysym & 0xff];
-            } else if (keysym == 0x20) {                 /* Spacebar */
-                scan = 0x39;
-/* VirtualBox FIX - AltGr support */
-            } else if (keysym == 0xFE03) {               /* ISO level3 shift, aka AltGr */
-                scan = 0x138;
-            } else {
+          /* Skip over keysyms which we look up on the fly */
+          if (   (0xFF != (keysym >> 8))     /* Non-character key */
+              && (0x1008FF != (keysym >> 8)) /* XFree86 vendor keys */
+              && (0x1005FF != (keysym >> 8)) /* Sun keys */
+              && (0x20 != keysym)            /* Spacebar */
+              && (0xFE03 != keysym)          /* ISO level3 shift, aka AltGr */
+             ) {
               unsigned found = 0;
 
@@ -335 +346 @@
                 /* got it */
                 scan = main_key_scan[keyn - 1];
-                if (keyn != 48) /* don't count the 102nd key */
+                /* We keep track of the number of keys that we found a
+                 * match for to see if the layout is optimal or not.
+                 * We ignore the 102nd key though (key number 48), since
+                 * not all keyboards have it. */
+                if (keyn != 48)
                     ++matches;
               }

trunk/src/VBox/Frontends/VirtualBox4/src/linux/keyboard.h

@@ -45 +45 @@
 #ifdef VBOX_HAVE_VISIBILITY_HIDDEN
 extern CCALL __attribute__((visibility("default"))) unsigned X11DRV_InitKeyboard(Display *dpy, unsigned *byLayoutOK, unsigned *byTypeOK);
-extern CCALL __attribute__((visibility("default"))) unsigned X11DRV_KeyEvent(KeyCode code);
+extern CCALL __attribute__((visibility("default"))) unsigned X11DRV_KeyEvent(Display *dpy, KeyCode code);
 #else
 extern CCALL unsigned X11DRV_InitKeyboard(Display *dpy, unsigned *byLayoutOK, unsigned *byTypeOK);
-extern CCALL unsigned X11DRV_KeyEvent(KeyCode code);
+extern CCALL unsigned X11DRV_KeyEvent(Display *dpy, KeyCode code);
 #endif