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

Timestamp:

Jan 23, 2008 9:24:21 PM (17 years ago)

Author:

vboxsync

Message:

FE/Qt: OS/2: Added low level keyboard hook to intercept keys like Alt+F4 when the VM window is in foreground.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• include/VBoxConsoleView.h (modified) (1 diff)
• src/VBoxConsoleView.cpp (modified) (3 diffs)

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

@@ -56 +56 @@
 endif
 INSTALLS = VirtualBox.nls
+
+ifeq ($(BUILD_TARGET),os2)
+ DLLS += VBoxHlp
+ ifneq ($(strip $(VBOX_DLL_QT)),)
+  INSTALLS += qt.dll
+  qt.dll_INST = $(INST_BIN)
+  qt.dll_SOURCES += \
+        $(VBOX_DLL_QT)=>$(not-dir $(VBOX_DLL_QT))
+ endif
+endif
+
+
+#
+# VBoxHlp - helper DLL for OS/2.
+#
+VBoxHlp_ASTOOL      = NASM
+VBoxHlp_ASFLAGS     = -f obj
+VBoxHlp_DEFS        = IN_RING3 IN_VBOXHLP
+VBoxHlp_CXXFLAGS    = -fno-exceptions
+VBoxHlp_LDFLAGS     = -nostdlib -los2
+VBoxHlp_LDFLAGS    += -Zlinker option -Zlinker manyautodata
+VBoxHlp_SOURCES     = \
+        src/os2/VBoxHlp.asm \
+        src/os2/VBoxHlp.cpp
 
 
@@ -279 +303 @@
         $(PATH_SDK_DXSDK_LIB)/ddraw.lib \
         $(PATH_SDK_DXSDK_LIB)/dxguid.lib
+VirtualBox_LIBS.os2      += $(PATH_DLL)/VBoxHlp$(VBOX_SUFF_DLL)
 ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(BUILD_TARGET)),) # X11
 VirtualBox_LIBS          += $(PATH_DLL)/VBoxKeyboard$(VBOX_SUFF_DLL)

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

@@ -32 +32 @@
 #include <qkeysequence.h>
 
+#if defined (Q_WS_PM)
+#include "src/os2/VBoxHlp.h"
+#endif
+
 #if defined (Q_WS_MAC)
 # include <Carbon/Carbon.h>

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

@@ -751 +751 @@
 #endif
 
+#if defined (Q_WS_PM)
+    bool ok = VBoxHlpInstallKbdHook (0, winId(), WM_CHAR);
+    Assert (ok);
+    NOREF (ok);
+#endif
+
 #ifdef Q_WS_MAC
     DarwinCursorClearHandle (&mDarwinCursor);
@@ -758 +764 @@
 VBoxConsoleView::~VBoxConsoleView()
 {
+#if defined (Q_WS_PM)
+    bool ok = VBoxHlpUninstallKbdHook (0, winId(), WM_CHAR);
+    Assert (ok);
+    NOREF (ok);
+#endif
+
 #if defined (Q_WS_WIN)
     if (g_kbdhook)
@@ -2017 +2029 @@
  *  @param  count  pointer to the keycodes counter
  */
-void VBoxConsoleView::fixModifierState(LONG *codes, uint *count)
+void VBoxConsoleView::fixModifierState (LONG *codes, uint *count)
 {
 #if defined(Q_WS_X11)