Changeset 5512 in vbox for trunk

Timestamp:

Oct 26, 2007 1:19:46 PM (17 years ago)

Author:

vboxsync

Message:

GUI/Linux host: if the user`s keyboard match does not fully match one in our list, dump their map to the release log with a request to send it to us

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/XKeyboard.h (modified) (1 diff)
• src/VBoxConsoleWnd.cpp (modified) (2 diffs)
• src/linux/XKeyboard-new.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/XKeyboard.h

@@ -35 +35 @@
 // returns the number of keysyms per keycode (only valid after initXKeyboard())
 int getKeysymsPerKeycode();
+// Called after release logging is started, in case initXKeyboard wishes to log
+// anything
+void doXKeyboardLogging(Display *dpy);
 
 #endif // __XKeyboard_h__

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp

@@ -45 +45 @@
 #if defined(Q_WS_X11)
 #include <X11/Xlib.h>
+#include <XKeyboard.h>
 #endif
 
@@ -2993 +2994 @@
                     break;
                 }
+#ifdef Q_WS_X11
+                case CEnums::Starting:
+                {
+                    /* The keyboard handler may wish to do some release logging
+                       on startup.  Tell it that the logger is now active. */
+                    doXKeyboardLogging(this->x11Display());
+                    break;
+                }
+#endif
                 default:
                     break;

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

@@ -23 +23 @@
 #include <VBox/log.h>
 #include "keyboard.h"
+
+static bool gInitStatus = false;
 
 /**
@@ -76 +78 @@
 static void dumpLayout(Display *display)
 {
-    LogRel(("\nYour keyboard layout does not appear to fully supported by VirtualBox.  "
+    LogRel(("Your keyboard layout does not appear to fully supported by VirtualBox.  "
             "If you would like to help us improve the product, please submit a "
             "bug report and attach this logfile.  Please note that the following "
@@ -134 +136 @@
 bool initXKeyboard(Display *dpy)
 {
-    int rc = X11DRV_InitKeyboard(dpy);
-//    if (0 == rc)
+    if (0 != X11DRV_InitKeyboard(dpy))
+    {
+        /* The layout found was optimal. */
+        gInitStatus = true;
+    }
+    return true;
+}
+
+/**
+ * Do deferred logging after initialisation
+ */
+void doXKeyboardLogging(Display *dpy)
+{
+    if (!gInitStatus)
     {
         dumpLayout(dpy);
     }
-    return true;
 }