Changeset 7867 in vbox

Timestamp:

Apr 10, 2008 12:24:19 PM (17 years ago)

Author:

vboxsync

Message:

FE/Qt4: Ported the Quartz2D framebuffer implementation (Seamless isn't fully working).

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/VBoxFrameBuffer.h (modified) (1 diff)
• include/VBoxUtils.h (modified) (2 diffs)
• src/VBoxConsoleView.cpp (modified) (1 diff)
• src/VBoxConsoleWnd.cpp (modified) (8 diffs)
• src/VBoxFBQuartz2D.cpp (modified) (10 diffs)
• src/darwin/VBoxUtils-darwin.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxFrameBuffer.h

@@ -453 +453 @@
 
 private:
-
-    inline CGRect QRectToCGRect (const QRect &aRect) const
-    {
-        return CGRectMake (aRect.x(), aRect.y(), aRect.width(), aRect.height());
-    }
-
-    inline QRect mapYOrigin (const QRect &aRect, int aHeight) const
-    {
-        /* The cgcontext has a fliped y-coord relative to the
-         * qt coord system. So we need some mapping here */
-        return QRect (aRect.x(), aHeight - (aRect.y() + aRect.height()),
-                      aRect.width(), aRect.height());
-    }
 
     void clean();

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxUtils.h

@@ -197 +197 @@
 # undef PAGE_SHIFT
 # include <Carbon/Carbon.h>
+
+#define AssertCarbonOSStatus(a) AssertMsg ((a) == noErr, ("Carbon OSStatus: %d\n", static_cast<int> (a)))
+
 class QImage;
 class QPixmap;
@@ -208 +211 @@
 void DarwinUpdateDockPreview (VBoxFrameBuffer *aFrameBuffer, CGImageRef aOverlayImage);
 OSStatus DarwinRegionHandler (EventHandlerCallRef aInHandlerCallRef, EventRef aInEvent, void *aInUserData);
+
+inline HIViewRef mapToHIViewRef (QWidget *aWidget)
+{
+    return HIViewRef(aWidget->winId());
+}
+
+inline WindowRef mapToWindowRef (HIViewRef aViewRef)
+{
+    return reinterpret_cast<WindowRef> (HIViewGetWindow(aViewRef)); 
+}
+
+inline WindowRef mapToWindowRef (QWidget *aWidget)
+{
+    return mapToWindowRef (mapToHIViewRef (aWidget));
+}
+
+inline CGContextRef mapToCGContextRef (QWidget *aWidget)
+{
+    return static_cast<CGContext *> (aWidget->macCGHandle());
+}
+
+inline HIRect mapToHIRect (const QRect &aRect)
+{
+    return CGRectMake (aRect.x(), aRect.y(), aRect.width(), aRect.height());
+}
+
 #endif /* Q_WS_MAC */
 

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

@@ -714 +714 @@
 #if defined (VBOX_GUI_USE_QUARTZ2D)
         case VBoxDefs::Quartz2DMode:
+            /* Indicate that we are doing all
+             * drawing stuff ourself */
+            pViewport->setAttribute (Qt::WA_PaintOnScreen);
             mFrameBuf = new VBoxQuartz2DFrameBuffer (this);
             break;

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

@@ -256 +256 @@
     else
     {
-        dbgStatisticsAction = NULL;
+        dbgStatisticsAction = NULL;osstatus
         dbgCommandLineAction = NULL;
     }
@@ -1160 +1160 @@
             break;
         }
+#ifdef Q_WS_MAC
+        case QEvent::Paint:
+        {
+            if (mIsSeamless)
+            {
+                /* Clear the background */
+                HIRect viewRect;
+                HIViewGetBounds (mapToHIViewRef (this), &viewRect);
+                CGContextClearRect (mapToCGContextRef (this), viewRect);
+            }
+            break;
+        }
+#endif
         case StatusTipEvent::Type:
         {
@@ -2106 +2119 @@
         palette.setColor (centralWidget()->backgroundRole(), Qt::black);
         centralWidget()->setPalette (palette);
-        centralWidget()->setAutoFillBackground (true);
+        centralWidget()->setAutoFillBackground (!aSeamless);
         console_style = console->frameStyle();
         console->setFrameStyle (QFrame::NoFrame);
@@ -2123 +2136 @@
         {
             OSStatus status;
-            WindowPtr WindowRef = reinterpret_cast<WindowPtr>(winId());
-            EventTypeSpec wNonCompositingEvent = { kEventClassWindow, kEventWindowGetRegion };
-            status = InstallWindowEventHandler (WindowRef, DarwinRegionHandler, GetEventTypeCount (wNonCompositingEvent), &wNonCompositingEvent, &mCurrRegion, &mDarwinRegionEventHandlerRef);
-            Assert (status == noErr);
-            status = ReshapeCustomWindow (WindowRef);
-            Assert (status == noErr);
+            HIViewRef viewRef = mapToHIViewRef (console->viewport());
+            Assert (VALID_PTR (viewRef));
+            WindowRef windowRef = mapToWindowRef (viewRef);
+            Assert (VALID_PTR (windowRef));
+            /* @todo=poetzsch: Currently this isn't necessary. I should
+             * investigate if we can/should use this. */
+            /*
+            EventTypeSpec wCompositingEvent = { kEventClassWindow, kEventWindowGetRegion };
+            status = InstallWindowEventHandler ((WindowPtr)winId(), DarwinRegionHandler, GetEventTypeCount (wCompositingEvent), &wCompositingEvent, &mCurrRegion, &mDarwinRegionEventHandlerRef);
+            AssertCarbonOSStatus (status);
+            HIViewRef contentView = 0;
+            status = HIViewFindByID(HIViewGetRoot(windowRef), kHIViewWindowContentID, &contentView);
+            AssertCarbonOSStatus (status);
+            EventTypeSpec drawEvent = { kEventClassControl, kEventControlDraw };
+            status = InstallControlEventHandler (contentView, DarwinRegionHandler, GetEventTypeCount (drawEvent), &drawEvent, &contentView, NULL);
+            AssertCarbonOSStatus (status);
+            */
             UInt32 features;
-            status = GetWindowFeatures (WindowRef, &features);
-            Assert (status == noErr);
+            status = GetWindowFeatures (windowRef, &features);
+            AssertCarbonOSStatus (status);
             if (( features & kWindowIsOpaque ) != 0)
             {
-                status = HIWindowChangeFeatures (WindowRef, 0, kWindowIsOpaque);
-                Assert(status == noErr);
+                status = HIWindowChangeFeatures (windowRef, 0, kWindowIsOpaque);
+                AssertCarbonOSStatus (status);
             }
-            status = SetWindowAlpha(WindowRef, 0.999);
-            Assert (status == noErr);
+            status = HIViewReshapeStructure (viewRef);
+            AssertCarbonOSStatus (status);
+            status = SetWindowAlpha(windowRef, 0.999);
+            AssertCarbonOSStatus (status);
             /* For now disable the shadow of the window. This feature cause errors
              * if a window in vbox looses focus, is reselected and than moved. */
             /** @todo Search for an option to enable this again. A shadow on every
              * window has a big coolness factor. */
-            ChangeWindowAttributes (WindowRef, kWindowNoShadowAttribute, 0);
+            status = ChangeWindowAttributes (windowRef, kWindowNoShadowAttribute, 0);
+            AssertCarbonOSStatus (status);
         }
 #else
@@ -2173 +2200 @@
 
 #ifdef Q_WS_MAC
-        if (!aSeamless)
-            SetSystemUIMode (kUIModeNormal, 0);
-
         if (aSeamless)
         {
             /* Undo all mac specific installations */
             OSStatus status;
-            WindowPtr WindowRef = reinterpret_cast<WindowPtr>(winId());
+            WindowRef windowRef = mapToWindowRef (this);
+            Assert (VALID_PTR (windowRef));
+            /* See above. 
             status = RemoveEventHandler (mDarwinRegionEventHandlerRef);
-            Assert (status == noErr);
-            status = ReshapeCustomWindow (WindowRef);
-            Assert (status == noErr);
-            status = SetWindowAlpha (WindowRef, 1);
-            Assert (status == noErr);
+            AssertCarbonOSStatus (status);
+            */
+            status = ReshapeCustomWindow (windowRef);
+            AssertCarbonOSStatus (status);
+            status = SetWindowAlpha (windowRef, 1.0);
+            AssertCarbonOSStatus (status);
         }
 #endif
@@ -2252 +2279 @@
         QRect aRect (aTargetRect);
         mMaskShift.scale (aTargetRect.left(), aTargetRect.top(), Qt::IgnoreAspectRatio);
-#ifdef Q_WS_MAC
-        /* On mac os x this isn't necessary cause the screen starts
-         * by y=0 always regardless if there is the global menubar or not. */
-        aRect.setRect (aRect.left(), 0, aRect.width(), aRect.height() + aRect.top());
-#endif // Q_WS_MAC
         /* Set the clipping mask */
         mStrictedRegion = aRect;
@@ -2713 +2735 @@
          * an repaint only. All the magic clipping stuff is done
          * in the paint engine. */
-        repaint();
-//        qApp->processEvents();
+        HIViewReshapeStructure (mapToHIViewRef (console->viewport()));
+//        ReshapeCustomWindow (mapToWindowRef (this));
     }
     else
@@ -2725 +2747 @@
         if (!region.isEmpty())
             region |= QRect (0, 0, 1, 1);
-        /* Save the current region for later processing in the darwin event handler. */
-        mCurrRegion = region;
-        /* We repaint the screen before the ReshapeCustomWindow command. Unfortunately
-         * this command flushes a copy of the backbuffer to the screen after the new
-         * mask is set. This leads into a missplaced drawing of the content. Currently
-         * no alternative to this and also this is not 100% perfect. */
-        repaint();
-        qApp->processEvents();
-        /* Now force the reshaping of the window. This is definitly necessary. */
-        ReshapeCustomWindow (reinterpret_cast <WindowPtr> (winId()));
+//        /* Save the current region for later processing in the darwin event handler. */
+//        mCurrRegion = region;
+//        /* We repaint the screen before the ReshapeCustomWindow command. Unfortunately
+//         * this command flushes a copy of the backbuffer to the screen after the new
+//         * mask is set. This leads into a missplaced drawing of the content. Currently
+//         * no alternative to this and also this is not 100% perfect. */
+//        repaint();
+//        qApp->processEvents();
+//        /* Now force the reshaping of the window. This is definitly necessary. */
+//        ReshapeCustomWindow (reinterpret_cast <WindowPtr> (winId()));
+        QMainWindow::setMask (region);
     }
 #else

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

@@ -23 +23 @@
 #include "VBoxProblemReporter.h"
 #include "VBoxGlobal.h"
+#include "VBoxUtils.h"
 /* Needed for checking against seamless mode */
 #include "VBoxConsoleWnd.h"
 #include "VBoxIChatTheaterWrapper.h"
 
-/* Qt includes */
-#include <qapplication.h>
-#include <q3mainwindow.h>
-#include <qstatusbar.h>
-//Added by qt3to4:
-#include <QPaintEvent>
-#include <Q3MemArray>
+//#define COMP_WITH_SHADOW
 
 /** @class VBoxQuartz2DFrameBuffer
@@ -150 +145 @@
 }
 
-void VBoxQuartz2DFrameBuffer::paintEvent (QPaintEvent *pe)
-{
-    /* Some general hints at the beginning:
-     * The console is not a real sub window of the main window. There is
-     * one real mac window only. This means all the drawing on the context has
-     * to pay attention to the statusbar, the scrollbars, the shifting spacers
-     * and any frame borders.
-     * Secondly the origin of the coordinate system is differently defined in
-     * Qt and Quartz2D. In Qt the point (0, 0) means top/left where this is
-     * bottom/left in Quartz2D. Use mapYOrigin to map from Qt to Quartz2D.
-     *
-     * For debugging /Developer/Applications/Performance Tools/Quartz Debug.app
-     * is a nice tool to see which parts of the screen are updated. */
+void VBoxQuartz2DFrameBuffer::paintEvent (QPaintEvent *aEvent)
+{
+    /* For debugging /Developer/Applications/Performance Tools/Quartz
+     * Debug.app is a nice tool to see which parts of the screen are
+     * updated.*/
 
     Assert (mImage);
 
     QWidget *pMain = qApp->mainWidget();
-    Assert (pMain);
-    /* Calculate the view rect to draw in */
-    QPoint p = mView->viewport()->mapTo (pMain, QPoint (0, 0));
-    QRect Q2DViewRect = mapYOrigin (QRect (p.x(), p.y(), mView->width(), mView->height()), pMain->height());
-    /* We have to pay special attention to the scrollbars */
-//    if (mView->horizontalScrollBar()->isVisible())
-//        Q2DViewRect.setY (Q2DViewRect.y() + (mView->horizontalScrollBar()->frameSize().height() + 2));
-//    if (mView->verticalScrollBar()->isVisible())
-//        Q2DViewRect.setWidth (Q2DViewRect.width() - (mView->verticalScrollBar()->frameSize().width() + 2));
-
-    /* Create the context to draw on */
-//    WindowPtr window = static_cast <WindowPtr> (mView->viewport()->handle());
-//    SetPortWindowPort (window);
-    CGContextRef ctx = static_cast<CGContext *> (mView->viewport()->macCGHandle());
-//    QDBeginCGContext (GetWindowPort (window), &ctx);
+    Assert (VALID_PTR (pMain));
+    QWidget* viewport = mView->viewport();
+    Assert (VALID_PTR (viewport));
+
+    HIViewRef viewRef = mapToHIViewRef (viewport);
+    Assert (VALID_PTR (viewRef));
+    /* Get the dimensions of this HIView */
+    HIRect viewRect;
+    HIViewGetBounds (viewRef, &viewRect);
+    /* Get the context of this window from qt */
+    CGContextRef ctx = mapToCGContextRef (viewport);
+    Assert (VALID_PTR (ctx));
     /* We handle the seamless mode as a special case. */
-    if (static_cast <VBoxConsoleWnd*> (pMain)->isTrueSeamless())
+    if (qobject_cast <VBoxConsoleWnd *> (pMain)->isTrueSeamless())
     {
         /* Here we paint the windows without any wallpaper.
@@ -191 +175 @@
          * Currently this subimage is the whole screen. */
         CGImageRef subImage = CGImageCreateWithImageInRect (mImage, CGRectMake (mView->contentsX(), mView->contentsY(), mView->visibleWidth(), mView->visibleHeight()));
-        Assert (subImage);
+        Assert (VALID_PTR (subImage));
         /* Clear the background (Make the rect fully transparent) */
-        Rect winRect;
-//        GetPortBounds (GetWindowPort (window), &winRect);
-        CGContextClearRect (ctx, CGRectMake (winRect.left, winRect.top, winRect.right - winRect.left, winRect.bottom - winRect.top));
+        CGContextClearRect (ctx, viewRect);
+#ifdef COMP_WITH_SHADOW
+        /* Enable shadows */
+        CGContextSetShadow (ctx, CGSizeMake (10, -10), 10);
+        CGContextBeginTransparencyLayer (ctx, NULL);
+#endif
         /* Grab the current visible region. */
         RegionRects *rgnRcts = (RegionRects *) ASMAtomicXchgPtr ((void * volatile *) &mRegion, NULL);
@@ -202 +189 @@
             if (rgnRcts->used > 0)
             {
-                /* Save state for display fliping */
-                CGContextSaveGState (ctx);
-                /* Flip the y-coord */
-                CGContextScaleCTM (ctx, 1.0, -1.0);
-                CGContextTranslateCTM (ctx, Q2DViewRect.x(), -Q2DViewRect.height() - Q2DViewRect.y());
                 /* Add the clipping rects all at once. They are defined in
                  * SetVisibleRegion. */
                 CGContextBeginPath (ctx);
                 CGContextAddRects (ctx, rgnRcts->rcts, rgnRcts->used);
-                /* Restore the context state. Note that the
-                 * current path isn't destroyed. */
-                CGContextRestoreGState (ctx);
                 /* Now convert the path to a clipping path. */
                 CGContextClip (ctx);
@@ -223 +202 @@
         }
         /* In any case clip the drawing to the view window */
-        CGContextClipToRect (ctx, QRectToCGRect (Q2DViewRect));
+        CGContextClipToRect (ctx, viewRect);
         /* At this point draw the real vm image */
-        CGContextDrawImage (ctx, QRectToCGRect (Q2DViewRect), subImage);
+        HIViewDrawCGImage (ctx, &viewRect, subImage);
+#ifdef COMP_WITH_SHADOW
+        CGContextEndTransparencyLayer (ctx);
+#endif
     }
     else
@@ -233 +215 @@
         /* Create a subimage of the current view in the size
          * of the bounding box of the current paint event */
-        QRect ir = pe->rect();
+        QRect ir = aEvent->rect();
         QRect is = QRect (ir.x() + mView->contentsX(), ir.y() + mView->contentsY(), ir.width(), ir.height());
-        CGImageRef subImage = CGImageCreateWithImageInRect (mImage, QRectToCGRect (is));
-        Assert (subImage);
-        /* Flip the y-coord */
-        CGContextScaleCTM (ctx, 1.0, -1.0);
-        CGContextTranslateCTM (ctx, Q2DViewRect.x(), -Q2DViewRect.height() - Q2DViewRect.y());
-
+        CGImageRef subImage = CGImageCreateWithImageInRect (mImage, mapToHIRect (is));
+        Assert (VALID_PTR (subImage));
         /* Ok, for more performance we set a clipping path of the
          * regions given by this paint event. */
-        Q3MemArray <QRect> a = pe->region().rects();
-//        if (a.size() > 0)
-        if (0)
+        QVector<QRect> a = aEvent->region().rects();
+        if (!a.isEmpty())
         {
-            /* Save state for display fliping */
-            CGContextSaveGState (ctx);
-            /* Flip the y-coord */
             CGContextBeginPath (ctx);
             /* Add all region rects to the current context as path components */
-            for (unsigned int i = 0; i < a.size(); ++i)
-                CGContextAddRect (ctx, QRectToCGRect (a[i]));
-            CGContextRestoreGState (ctx);
+            for (int i = 0; i < a.size(); ++i)
+                CGContextAddRect (ctx, mapToHIRect (a[i]));
             /* Now convert the path to a clipping path. */
             CGContextClip (ctx);
@@ -260 +233 @@
 
         /* In any case clip the drawing to the view window */
-        CGContextClipToRect (ctx, QRectToCGRect (Q2DViewRect));
-        /* Draw the sub image to the right position */
-        QPoint p = mView->viewport()->mapTo (pMain, QPoint (ir.x(), ir.y()));
-        QRect cr = mapYOrigin (QRect (p.x(), p.y(), ir.width(), ir.height()), pMain->height());
-        CGContextDrawImage (ctx, QRectToCGRect (cr), subImage);
-    }
-//    QDEndCGContext (GetWindowPort (window), &ctx);
-}
-/* Save for later shadow stuff ... */
-//        CGContextSetShadow (myContext, myShadowOffset, 10);
-//        CGContextBeginTransparencyLayer (myContext, NULL);
-//        CGContextSetShadow (myContext, CGSizeMake (10, 5), 1);
-//        CGContextClipToRect (myContext, rect);
-//        QRect ir = pe->rect();
-//        CGContextClipToRect (myContext, CGRectMake (ir.y(), ir.x(), ir.width(), ir.height()));
-//        CGContextEndTransparencyLayer (myContext);
-
-void VBoxQuartz2DFrameBuffer::resizeEvent (VBoxResizeEvent *re)
+        CGContextClipToRect (ctx, viewRect);
+        /* At this point draw the real vm image */
+        HIRect destRect = mapToHIRect (ir);
+        HIViewDrawCGImage (ctx, &destRect, subImage);
+    }
+}
+
+void VBoxQuartz2DFrameBuffer::resizeEvent (VBoxResizeEvent *aEvent)
 {
 #if 0
     printf ("fmt=%lu, vram=%X, bpp=%lu, bpl=%lu, width=%lu, height=%lu\n",
-           re->pixelFormat(), (unsigned int)re->VRAM(),
-           re->bitsPerPixel(), re->bytesPerLine(),
-           re->width(), re->height());
+           aEvent->pixelFormat(), (unsigned int)aEvent->VRAM(),
+           aEvent->bitsPerPixel(), aEvent->bytesPerLine(),
+           aEvent->width(), aEvent->height());
 #endif
 
@@ -289 +252 @@
     clean();
 
-    mWdt = re->width();
-    mHgt = re->height();
+    mWdt = aEvent->width();
+    mHgt = aEvent->height();
 
     bool remind = false;
@@ -299 +262 @@
      * Mac OS X supports 16 bit also but not in the 565 mode. So we could use
      * 32 bit only. */
-    if (   re->pixelFormat() == FramebufferPixelFormat_FOURCC_RGB
-        && re->bitsPerPixel() == 32)
+    if (   aEvent->pixelFormat() == FramebufferPixelFormat_FOURCC_RGB
+        && aEvent->bitsPerPixel() == 32)
     {
 //        printf ("VRAM\n");
         CGColorSpaceRef cs = CGColorSpaceCreateDeviceRGB();
         /* Create the image copy of the framebuffer */
-        CGDataProviderRef dp = CGDataProviderCreateWithData (NULL, re->VRAM(), re->bitsPerPixel() / 8 * mWdt * mHgt, NULL);
-        mImage = CGImageCreate (mWdt, mHgt, 8, re->bitsPerPixel(), re->bytesPerLine(), cs,
+        CGDataProviderRef dp = CGDataProviderCreateWithData (NULL, aEvent->VRAM(), aEvent->bitsPerPixel() / 8 * mWdt * mHgt, NULL);
+        mImage = CGImageCreate (mWdt, mHgt, 8, aEvent->bitsPerPixel(), aEvent->bytesPerLine(), cs,
                                 kCGImageAlphaNoneSkipFirst | kCGBitmapByteOrder32Little, dp, 0, false,
                                 kCGRenderingIntentDefault);
-        mDataAddress = re->VRAM();
+        mDataAddress = aEvent->VRAM();
         CGDataProviderRelease (dp);
     }
@@ -348 +311 @@
 //            }
 //        };
-//        (new RemindEvent (re->bitsPerPixel()))->post();
+//        (new RemindEvent (aEvent->bitsPerPixel()))->post();
 //    }
 }

trunk/src/VBox/Frontends/VirtualBox4/src/darwin/VBoxUtils-darwin.cpp

@@ -251 +251 @@
 }
 
+/* Currently not used! */
 OSStatus DarwinRegionHandler (EventHandlerCallRef aInHandlerCallRef, EventRef aInEvent, void *aInUserData)
 {
@@ -270 +271 @@
             if (code == kWindowOpaqueRgn)
             {
+                printf("test1\n");
                 GetEventParameter (aInEvent, kEventParamRgnHandle, typeQDRgnHandle, NULL, sizeof (rgn), NULL, &rgn);
                 SetEmptyRgn (rgn);
@@ -277 +279 @@
             else if (code == (kWindowStructureRgn))// || kWindowGlobalPortRgn || kWindowUpdateRgn))
             {
+                printf("test2\n");
                 GetEventParameter (aInEvent, kEventParamRgnHandle, typeQDRgnHandle, NULL, sizeof (rgn), NULL, &rgn);
                 QRegion *pRegion = static_cast <QRegion*> (aInUserData);
@@ -287 +290 @@
             break;
         }
+        case kEventControlDraw:
+        {
+            printf("test3\n");
+            CGContextRef ctx;
+            HIRect bounds;
+
+            GetEventParameter (aInEvent, kEventParamCGContextRef, typeCGContextRef, NULL, sizeof (ctx), NULL, &ctx);
+            HIViewGetBounds ((HIViewRef)aInUserData, &bounds);
+
+            CGContextClearRect (ctx, bounds);
+            status = noErr;
+            break;
+        }
     }