Changeset 1391 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Mar 10, 2007 10:47:37 AM (18 years ago)

Author:

vboxsync

Message:

Darwin cursors (didn't get inverted cursors working right, so doing the same as X11).

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

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

trunk/src/VBox/Frontends/VirtualBox/Makefile

@@ -130 +130 @@
 
 VirtualBox_SOURCES.darwin = \
-        src/darwin/DarwinKeyboard.cpp
+        src/darwin/DarwinKeyboard.cpp \
+        src/darwin/DarwinCursor.cpp
 
 VirtualBox_DEFS           = VBOX_GUI_SEPARATE_VM_PROCESS

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

@@ -38 +38 @@
 #if defined (Q_WS_MAC)
 # include <Carbon/Carbon.h>
+# include "DarwinCursor.h"
 #endif
 
@@ -218 +219 @@
 
 #if defined(Q_WS_MAC)
+# ifndef VBOX_WITH_HACKED_QT
     /** Event handler reference. NULL if the handler isn't installed. */
     EventHandlerRef m_darwinEventHandlerRef;
+# endif
     /** The current modifier key mask. Used to figure out which modifier
      *  key was pressed when we get a kEventRawKeyModifiersChanged event. */
     UInt32 m_darwinKeyModifiers;
+    /** The darwin cursor handle (see DarwinCursor.h/.cpp). */
+    DARWINCURSOR m_darwinCursor;
 #endif
 

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

@@ -80 +80 @@
 #if defined (Q_WS_MAC)
 # include "DarwinKeyboard.h"
+# include "DarwinCursor.h"
 # ifdef VBOX_WITH_HACKED_QT
 #  include "QIApplication.h"
 # endif
+# include <VBox/err.h>
 #endif /* defined (Q_WS_MAC) */
 
@@ -419 +421 @@
 #endif
 #if defined(Q_WS_MAC)
+# ifndef VBOX_WITH_HACKED_QT
     , m_darwinEventHandlerRef (NULL)
+# endif
     , m_darwinKeyModifiers (0)
 #endif
@@ -535 +539 @@
 #if defined (Q_WS_WIN)
     g_view = this;
+#endif
+
+#ifdef Q_WS_MAC
+    DarwinCursorClearHandle (&m_darwinCursor);
 #endif
 }
@@ -1501 +1509 @@
     {
         ::DarwinReleaseKeyboard ();
+#ifndef VBOX_WITH_HACKED_QT
         if (m_darwinEventHandlerRef)
         {
@@ -1506 +1515 @@
             m_darwinEventHandlerRef = NULL;
         }
-#ifdef VBOX_WITH_HACKED_QT
+#else
         ((QIApplication *)qApp)->setEventFilter (NULL, NULL);
 #endif
@@ -2637 +2646 @@
         }
 
+#elif defined(Q_WS_MAC)
+
+        /*
+         * Qt3/Mac only supports black/white cursors and it offers no way
+         * to create your own cursors here unlike on X11 and Windows.
+         * Which means we're pretty much forced to do it our own way.
+         */
+        int rc;
+
+        /* dispose of the old cursor. */
+        if (!DarwinCursorIsNull (&m_darwinCursor))
+        {
+            rc = DarwinCursorDestroy (&m_darwinCursor);
+            AssertRC (rc);
+        }
+
+        /* create the new cursor */
+        rc = DarwinCursorCreate (me->width(), me->height(), me->xHot(), me->yHot(), me->hasAlpha(),
+                                 srcAndMaskPtr, srcShapePtr, &m_darwinCursor);
+        AssertRC (rc);
+        if (VBOX_SUCCESS (rc))
+        {
+            /** @todo check current mouse coordinates. */
+            rc = DarwinCursorSet (&m_darwinCursor);
+            AssertRC (rc);
+        }
+        ok = VBOX_SUCCESS (rc);
+        NOREF (srcShapePtrScan);
+
+#else
+
+# warning "port me"
+
 #endif
         if (!ok)