Changeset 16610 in vbox for trunk/src

Timestamp:

Feb 10, 2009 12:32:12 AM (16 years ago)

Author:

vboxsync

Message:

Qt/Cocoa: Subclass NSApplication to catch keyboard events passing thru -[NSApplication sendEvent:(NSEvent *)theEvent]. Adopted QIHotKeyEdit to make use of this.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• include/QIHotKeyEdit.h (modified) (3 diffs)
• src/QIHotKeyEdit.cpp (modified) (6 diffs)
• src/darwin/VBoxCocoaApplication.h (added)
• src/darwin/VBoxCocoaApplication.m (added)
• src/main.cpp (modified) (2 diffs)

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

@@ -206 +206 @@
 # r=bird: what is -lz doing here? it belongs in LIBS.
 VirtualBox_LDFLAGS.darwin = -lz \
-        -framework IOKit -framework AppKit -framework ApplicationServices -framework Foundation -framework Carbon -framework QuickTime \
+        -framework IOKit -framework AppKit -framework ApplicationServices -framework Foundation -framework Carbon \
         $(if $(VBOX_WITH_HARDENING),-install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VirtualBox.dylib)
+VirtualBox_LDFLAGS.darwin.x86 = -framework QuickTime
 ifdef VBOX_WITH_ICHAT_THEATER
  VirtualBox_LDFLAGS.darwin += -framework InstantMessage -framework QuartzCore
@@ -391 +392 @@
 ifdef VBOX_WITH_ICHAT_THEATER
  VirtualBox_SOURCES.darwin += \
-         src/darwin/VBoxIChatTheaterWrapper.m
-endif
+        src/darwin/VBoxIChatTheaterWrapper.m
+endif
+
+VirtualBox_SOURCES.darwin.amd64 += \
+        src/darwin/VBoxCocoaApplication.m
 
 # The Qt modules we're using.

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

@@ -28 +28 @@
 #include <QMap>
 #endif
-#if defined (Q_WS_MAC) && !defined (QT_MAC_USE_COCOA)
+#if defined (Q_WS_MAC)
 # include <Carbon/Carbon.h>
 #endif
@@ -82 +82 @@
 #elif defined (Q_WS_X11)
     bool x11Event (XEvent *event);
-#elif defined (Q_WS_MAC) && !defined (QT_MAC_USE_COCOA)
-    static pascal OSStatus darwinEventHandlerProc (EventHandlerCallRef inHandlerCallRef,
-                                                   EventRef inEvent, void *inUserData);
+#elif defined (Q_WS_MAC)
+# ifdef QT_MAC_USE_COCOA
+    static bool darwinEventHandlerProc (const void *pvCocoaEvent, const void *pvCarbonEvent, void *pvUser);
+# else
+    static pascal OSStatus darwinEventHandlerProc (EventHandlerCallRef inHandlerCallRef, EventRef inEvent, void *inUserData);
+# endif
     bool darwinKeyboardEvent (EventRef inEvent);
 #endif
@@ -106 +109 @@
 #endif
 
-#if defined (Q_WS_MAC) && !defined (QT_MAC_USE_COCOA)
+#if defined (Q_WS_MAC)
+# ifndef QT_MAC_USE_COCOA
     /** Event handler reference. NULL if the handler isn't installed. */
     EventHandlerRef mDarwinEventHandlerRef;
+# endif
     /** The current modifier key mask. Used to figure out which modifier
      *  key was pressed when we get a kEventRawKeyModifiersChanged event. */

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

@@ -71 +71 @@
 # include "DarwinKeyboard.h"
 # include <Carbon/Carbon.h>
+# ifdef QT_MAC_USE_COCOA
+#  include "darwin/VBoxCocoaApplication.h"
+# endif
 #endif
 
@@ -133 +136 @@
 
 #ifdef Q_WS_MAC
+    mDarwinKeyModifiers = GetCurrentEventKeyModifiers();
 # ifdef QT_MAC_USE_COCOA
-/** @todo Carbon -> Cocoa */
+    ::VBoxCocoaApplication_setCallback(UINT32_MAX, QIHotKeyEdit::darwinEventHandlerProc, this);
 # else  /* !QT_MAC_USE_COCOA */
-    mDarwinKeyModifiers = GetCurrentEventKeyModifiers();
-
     EventTypeSpec eventTypes [4];
     eventTypes [0].eventClass = kEventClassKeyboard;
@@ -164 +166 @@
     ::DarwinReleaseKeyboard();
 # ifdef QT_MAC_USE_COCOA
-    /** @todo Carbon -> Cocoa */
+    ::VBoxCocoaApplication_unsetCallback(UINT32_MAX, QIHotKeyEdit::darwinEventHandlerProc, this);
 # else
     ::RemoveEventHandler (mDarwinEventHandlerRef);
@@ -667 +669 @@
 #elif defined (Q_WS_MAC)
 # ifdef QT_MAC_USE_COCOA
-/** @todo Carbon -> Cocoa */
-# else /* !QT_MAC_USE_COCOA */
-
+/* static */
+bool QIHotKeyEdit::darwinEventHandlerProc (const void *pvCocoaEvent, const void *pvCarbonEvent, void *pvUser)
+{
+    QIHotKeyEdit *edit = (QIHotKeyEdit *) pvUser;
+    EventRef inEvent = (EventRef)pvCarbonEvent;
+    UInt32 EventClass = ::GetEventClass (inEvent);
+    if (EventClass == kEventClassKeyboard)
+        return edit->darwinKeyboardEvent (inEvent);
+    return false;
+}
+
+# else  /* !QT_MAC_USE_COCOA */
 /* static */
 pascal OSStatus QIHotKeyEdit::darwinEventHandlerProc (EventHandlerCallRef inHandlerCallRef,
@@ -683 +694 @@
     return CallNextEventHandler (inHandlerCallRef, inEvent);
 }
+# endif /* !QT_MAC_USE_COCOA */
 
 bool QIHotKeyEdit::darwinKeyboardEvent (EventRef inEvent)
@@ -725 +737 @@
     return false;
 }
-# endif /* !QT_MAC_USE_COCOA */
 
 #else

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

@@ -25 +25 @@
 #include "VBoxSelectorWnd.h"
 #include "VBoxConsoleWnd.h"
-#ifdef Q_WS_MAC
+#include "VBoxUtils.h"
+#if defined(Q_WS_MAC) && !defined(QT_MAC_USE_COCOA)
 # include "QIApplication.h"
-# include "VBoxUtils.h"
 #else
 # define QIApplication QApplication
+#endif
+#ifdef QT_MAC_USE_COCOA
+# include "darwin/VBoxCocoaApplication.h"
 #endif
 
@@ -234 +237 @@
     sigaction (SIGBUS, &sa, NULL);
     sigaction (SIGUSR1, &sa, NULL);
+#endif
+
+#ifdef QT_MAC_USE_COCOA
+    /* Instantiate our NSApplication derivative before QApplication
+     * forces NSApplication to be instantiated. */
+    VBoxCocoaApplication_sharedApplication();
 #endif