Changeset 36335 in vbox for trunk/src/VBox

Timestamp:

Mar 21, 2011 9:58:58 PM (14 years ago)

Author:

vboxsync

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

70667

Message:

FE/Common/VBoxKeyboard: some release logging

Location:

trunk/src/VBox/Frontends

Files:

• Common/VBoxKeyboard/keyboard.c (modified) (1 diff)
• VirtualBox/src/platform/x11/XKeyboard-new.cpp (modified) (2 diffs)

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

@@ -610 +610 @@
  * @param   remapScancode    array of tuples that remap the keycode (first
  *                           part) to a scancode (second part)
+ * @note  Xkb takes precedence over byType takes precedence over byLayout,
+ *        for anyone who wants to log information about which method is in
+ *        use.  byLayout is the fallback, as it is likely to be partly usable
+ *        even if it doesn't initialise correctly.
  */
 unsigned X11DRV_InitKeyboard(Display *display, unsigned *byLayoutOK,

trunk/src/VBox/Frontends/VirtualBox/src/platform/x11/XKeyboard-new.cpp

@@ -220 +220 @@
         LogRel(("\n"));
     }
+    LogRel(("Using %s for keycode to scan code conversion\n",
+              gfByXkbOK ? "XKB"
+            : gfByTypeOK ? "known keycode mapping"
+            : "host keyboard layout detection"));
 }
 
@@ -228 +232 @@
 {
     // call the WINE event handler
-    return X11DRV_KeyEvent(event->xkey.display, event->xkey.keycode);
+    unsigned key = X11DRV_KeyEvent(event->xkey.display, event->xkey.keycode);
+    LogRel3(("VBoxKeyboard: converting keycode %d to scancode %s0x%x\n",
+          event->xkey.keycode, key > 0x100 ? "0xe0 " : "", key & 0xff));
+    return key;
 }