Changeset 7412 in vbox

Timestamp:

Mar 10, 2008 3:14:36 PM (17 years ago)

Author:

vboxsync

Message:

FE/Qt4: Some Mac OS X fixes for the quartz2d framebuffer.

Location:

trunk/src/VBox/Frontends/VirtualBox4/src

Files:

• VBoxConsoleWnd.cpp (modified) (1 diff)
• VBoxFBQuartz2D.cpp (modified) (4 diffs)
• darwin/VBoxUtils-darwin.cpp (modified) (1 diff)

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

@@ -598 +598 @@
 # endif
     /* prepare the dock images */
-    dockImgStatePaused    = ::DarwinCreateDockBadge ("state_paused_16px.png");
-    dockImgStateSaving    = ::DarwinCreateDockBadge ("state_saving_16px.png");
-    dockImgStateRestoring = ::DarwinCreateDockBadge ("state_restoring_16px.png");
-    dockImgBack100x75     = ::DarwinCreateDockBadge ("dock_1.png");
+    dockImgStatePaused    = ::DarwinCreateDockBadge (":/state_paused_16px.png");
+    dockImgStateSaving    = ::DarwinCreateDockBadge (":/state_saving_16px.png");
+    dockImgStateRestoring = ::DarwinCreateDockBadge (":/state_restoring_16px.png");
+    dockImgBack100x75     = ::DarwinCreateDockBadge (":/dock_1.png");
     SetApplicationDockTileImage (dockImgOS);
 #endif

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

@@ -178 +178 @@
 
     /* Create the context to draw on */
-    WindowPtr window = static_cast <WindowPtr> (mView->viewport()->handle());
-    SetPortWindowPort (window);
-    CGContextRef ctx;
-    QDBeginCGContext (GetWindowPort (window), &ctx);
+//    WindowPtr window = static_cast <WindowPtr> (mView->viewport()->handle());
+//    SetPortWindowPort (window);
+    CGContextRef ctx = static_cast<CGContext *> (mView->viewport()->macCGHandle());
+//    QDBeginCGContext (GetWindowPort (window), &ctx);
     /* We handle the seamless mode as a special case. */
     if (static_cast <VBoxConsoleWnd*> (pMain)->isTrueSeamless())
@@ -194 +194 @@
         /* Clear the background (Make the rect fully transparent) */
         Rect winRect;
-        GetPortBounds (GetWindowPort (window), &winRect);
+//        GetPortBounds (GetWindowPort (window), &winRect);
         CGContextClearRect (ctx, CGRectMake (winRect.left, winRect.top, winRect.right - winRect.left, winRect.bottom - winRect.top));
         /* Grab the current visible region. */
@@ -237 +237 @@
         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());
 
         /* 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 (a.size() > 0)
+        if (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());
             CGContextBeginPath (ctx);
             /* Add all region rects to the current context as path components */
@@ -264 +266 @@
         CGContextDrawImage (ctx, QRectToCGRect (cr), subImage);
     }
-    QDEndCGContext (GetWindowPort (window), &ctx);
+//    QDEndCGContext (GetWindowPort (window), &ctx);
 }
 /* Save for later shadow stuff ... */

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

@@ -20 +20 @@
 #include "VBoxUtils.h"
 #include "VBoxFrameBuffer.h"
-#include <qimage.h>
-#include <qpixmap.h>
 
 #include <iprt/assert.h>
 #include <iprt/mem.h>
 
+/* Qt includes */
+#include <QImage>
+#include <QPixmap>
 
 /**