Changeset 11926 in vbox for trunk/src/VBox/Frontends/VirtualBox4

Timestamp:

Sep 1, 2008 3:23:56 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

35802

Message:

FE/Qt4-OSX: Try to fix annoying mouse cursor problems on the mac. Switch to Qt4 cursor handling for the mac.

File:

• trunk/src/VBox/Frontends/VirtualBox4/src/VBoxConsoleView.cpp (modified) (5 diffs)

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

@@ -39 +39 @@
 #include <QStatusBar>
 #include <QPainter>
+#include <QBitmap>
 
 #ifdef Q_WS_WIN
@@ -827 +828 @@
 
 #ifdef Q_WS_MAC
-    DarwinCursorClearHandle (&mDarwinCursor);
+//    DarwinCursorClearHandle (&mDarwinCursor);
 #endif
 }
@@ -2816 +2817 @@
 #ifdef Q_WS_MAC /** @todo Christian, can you look at this. It causes flickering and IIRC is really a Qt3 workaround which probably isn't needed. If it is needed it needs to be redone. */
         /* Update the mouse cursor; this is a bit excessive really... */
-        if (!DarwinCursorIsNull (&mDarwinCursor))
-            DarwinCursorSet (&mDarwinCursor);
+//        if (!DarwinCursorIsNull (&mDarwinCursor))
+//            DarwinCursorSet (&mDarwinCursor);
 #endif
         if (mMainWnd->isTrueFullscreen())
@@ -3505 +3506 @@
 #elif defined(Q_WS_MAC)
 
+        /* Create a ARGB image out of the shape data. */
+        QImage image  (me->width(), me->height(), QImage::Format_ARGB32);
+        unsigned char alpha;
+        for (unsigned int y = 0; y < me->height(); ++y)
+            for (unsigned int x = 0; x < me->width(); ++x)
+            {
+               unsigned int color = ((unsigned int*)srcShapePtr)[y*me->width()+x];
+               if (me->hasAlpha())
+                   alpha = qAlpha (color);
+               else
+                   alpha = 0xff;
+               image.setPixel (x, y, qRgba (qRed (color), qGreen (color), qBlue (color), alpha));
+            }
+        /* Invert the mask channel if there is one */
+        QPixmap pixmap (QPixmap::fromImage (image));
+        if (!me->hasAlpha())
+        {
+            uchar* pu8DstData = (uchar*)alloca(me->width() * me->height());
+            unsigned int i = 0;
+            while (i < me->width() * me->height())
+            {
+                pu8DstData[i] = 0xff-srcAndMaskPtr[i];
+                ++i;
+            }
+            QBitmap bitmap = QBitmap::fromData (QSize (me->width(), me->height()),
+                                                pu8DstData, QImage::Format_Mono);
+            /* Set the mask to the pixmap */
+            pixmap.setMask (bitmap);
+        }
+//        printf ("has alpha %d- %d %d\n", me->hasAlpha(), me->width(), me->height());
+        /* Set the new cursor */
+        QCursor cursor (pixmap,
+                        me->xHot(), me->yHot());
+        viewport()->setCursor (cursor);
+        ok = true;
         /*
          * Qt3/Mac only supports black/white cursors and it offers no way
@@ -3510 +3546 @@
          * Which means we're pretty much forced to do it our own way.
          */
-        int rc;
-
-        /* dispose of the old cursor. */
-        if (!DarwinCursorIsNull (&mDarwinCursor))
-        {
-            rc = DarwinCursorDestroy (&mDarwinCursor);
-            AssertRC (rc);
-        }
-
-        /* create the new cursor */
-        rc = DarwinCursorCreate (me->width(), me->height(), me->xHot(), me->yHot(), me->hasAlpha(),
-                                 srcAndMaskPtr, srcShapePtr, &mDarwinCursor);
-        AssertRC (rc);
-        if (VBOX_SUCCESS (rc))
-        {
-            /** @todo check current mouse coordinates. */
-            rc = DarwinCursorSet (&mDarwinCursor);
-            AssertRC (rc);
-        }
-        ok = VBOX_SUCCESS (rc);
+//        int rc;
+//
+//        /* dispose of the old cursor. */
+//        if (!DarwinCursorIsNull (&mDarwinCursor))
+//        {
+//            rc = DarwinCursorDestroy (&mDarwinCursor);
+//            AssertRC (rc);
+//        }
+//
+//        /* create the new cursor */
+//        rc = DarwinCursorCreate (me->width(), me->height(), me->xHot(), me->yHot(), me->hasAlpha(),
+//                                 srcAndMaskPtr, srcShapePtr, &mDarwinCursor);
+//        AssertRC (rc);
+//        if (VBOX_SUCCESS (rc))
+//        {
+//            /** @todo check current mouse coordinates. */
+//            rc = DarwinCursorSet (&mDarwinCursor);
+//            AssertRC (rc);
+//        }
+//        ok = VBOX_SUCCESS (rc);
         NOREF (srcShapePtrScan);