Changeset 3908 in vbox

Timestamp:

Jul 27, 2007 4:48:00 PM (18 years ago)

Author:

vboxsync

Message:

Reverted to the (updated) Wine code for the Qt front end in Linux

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• src/linux/XKeyboard.cpp (modified) (3 diffs)
• src/linux/XKeyboardNew.cpp (deleted)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -19 +19 @@
 # license agreement apply instead of the previous paragraph.
 #
-
-ifeq ($(BUILD_TARGET),linux)
-XKEYBOARD_NEW := 1
-endif
 
 # include qmake project file
@@ -150 +146 @@
 VirtualBox_SOURCES.linux = \
         src/linux/XKeyboard.cpp \
-        src/linux/keyboard.c \
-        src/linux/XKeyboardNew.cpp
+        src/linux/keyboard.c
 
 VirtualBox_SOURCES.darwin = \

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

@@ -48 +48 @@
 
 /*
- * This needs to be called to initialize the WINE keyboard subsystem
- * within our environment.
+ * This function builds a table mapping the X server's scan codes to PC
+ * keyboard scan codes.  The logic of the function is that while the
+ * X server may be using a different set of scan codes (if for example
+ * it is running on a non-PC machine), the keyboard layout should be similar
+ * to a PC layout.  So we look at the symbols attached to each key on the
+ * X server, find the PC layout which is closest to it and remember the
+ * mappings.
  */
-bool initXKeyboardSafe(Display *dpy)
+bool initXKeyboard(Display *dpy)
 {
     // update the global display pointer
@@ -60 +65 @@
 
 /*
- * our custom X keyboard event handler with the goal to try everything
- * possible to undo the dreaded scancode to X11 conversion. Sigh!
+ * Translate an X server scancode to a PC keyboard scancode.
  */
-void handleXKeyEventSafe(Display *dpy, XEvent *event, WINEKEYBOARDINFO *wineKbdInfo)
+void handleXKeyEvent(Display *dpy, XEvent *event, WINEKEYBOARDINFO *wineKbdInfo)
 {
     // update the global display pointer
@@ -71 +75 @@
 }
 
-int getKeysymsPerKeycodeSafe()
+int getKeysymsPerKeycode()
 {
     return X11DRV_GetKeysymsPerKeycode();