Changeset 31214 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jul 29, 2010 2:01:00 PM (14 years ago)

Author:

vboxsync

Message:

FE/Qt4-OSX: Quartz2D for scaling mode.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIFrameBufferQuartz2D.cpp (modified) (5 diffs)
• scale/Makefile.kup (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/runtime/Makefile.kup )
• scale/UIMachineViewScale.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferQuartz2D.cpp

@@ -158 +158 @@
      * Debug.app is a nice tool to see which parts of the screen are
      * updated.*/
-
     Assert(m_image);
 
@@ -167 +166 @@
     /* Get the context of this window from Qt */
     CGContextRef ctx = ::darwinToCGContextRef(viewport);
-    Assert(VALID_PTR (ctx));
+    Assert(VALID_PTR(ctx));
 
     /* Flip the context */
@@ -240 +239 @@
 #endif
     }
+    else if (   m_pMachineLogic->visualStateType() == UIVisualStateType_Scale
+             && m_scaledSize.isValid())
+    {
+        /* Here we paint if we didn't care about any masks */
+
+        /* Create a subimage of the current view in the size
+         * of the bounding box of the current paint event */
+        QRect qir = aEvent->rect();
+        CGRect ir = ::darwinToCGRect(qir);
+        CGRect is = CGRectMake(qir.x() + m_pMachineView->contentsX(), qir.y() + m_pMachineView->contentsY(), qir.width(), qir.height());
+        ir = ::darwinFlipCGRect(ir, CGRectGetHeight(viewRect));
+        double iw = 1.0;
+        double ih = 1.0;
+        CGImageRef subImage = 0;
+        if (!m_pMachineView->pauseShot().isNull())
+        {
+            /* The pause image is already scaled. Maybe we should change that,
+             * to have a more uniform behavior and the different
+             * implementations use there own scaling algorithm. */
+            CGImageRef pauseImg = ::darwinToCGImageRef(&m_pMachineView->pauseShot());
+            subImage = CGImageCreateWithImageInRect(pauseImg, is);
+            CGImageRelease(pauseImg);
+        }
+        else
+        {
+            /* Scale all values needed for the image drawing. */
+            iw = (double)CGImageGetWidth(m_image) / m_scaledSize.width();
+            ih = (double)CGImageGetHeight(m_image) / m_scaledSize.height();
+            is.origin.x = (double)(is.origin.x * iw);
+            is.origin.y = (double)(is.origin.y * ih);
+            is.size.width = (double)(is.size.width * iw);
+            is.size.height = (double)(is.size.height * ih);
+            ir.origin.x = (double)(ir.origin.x * iw);
+            ir.origin.y = (double)(ir.origin.y * ih);
+            ir.size.width = (double)(ir.size.width * iw);
+            ir.size.height = (double)(ir.size.height * ih);
+            subImage = CGImageCreateWithImageInRect(m_image, is);
+        }
+        if (subImage)
+        {
+            /* For more performance we set a clipping path of the regions given
+             * by this paint event. */
+            QVector<QRect> a = aEvent->region().rects();
+            if (!a.isEmpty())
+            {
+                CGContextBeginPath(ctx);
+                /* Add all region rects to the current context as path components */
+                for (int i = 0; i < a.size(); ++i)
+                    CGContextAddRect(ctx, ::darwinFlipCGRect(::darwinToCGRect(a.at(i)), CGRectGetHeight(viewRect)));
+                /* Now convert the path to a clipping path. */
+                CGContextClip(ctx);
+            }
+
+            /* In any case clip the drawing to the view window */
+            CGContextClipToRect(ctx, viewRect);
+            /* Turn the high interpolation quality on. */
+            CGContextSetInterpolationQuality(ctx, kCGInterpolationHigh);
+            CGContextScaleCTM(ctx, 1.0 / iw, 1.0 / ih);
+            /* Draw the image. */
+            CGContextDrawImage(ctx, ir, subImage);
+            CGImageRelease(subImage);
+        }
+    }
     else
     {
@@ -247 +309 @@
          * of the bounding box of the current paint event */
         QRect ir = aEvent->rect();
-        QRect is = QRect (ir.x() + m_pMachineView->contentsX(), ir.y() + m_pMachineView->contentsY(), ir.width(), ir.height());
-        CGImageRef subImage;
+        QRect is = QRect(ir.x() + m_pMachineView->contentsX(), ir.y() + m_pMachineView->contentsY(), ir.width(), ir.height());
+        CGImageRef subImage = 0;
         if (!m_pMachineView->pauseShot().isNull())
         {
@@ -257 +319 @@
         else
             subImage = CGImageCreateWithImageInRect(m_image, ::darwinToCGRect(is));
-        Assert(VALID_PTR(subImage));
-        /* Ok, for more performance we set a clipping path of the
-         * regions given by this paint event. */
-        QVector<QRect> a = aEvent->region().rects();
-        if (!a.isEmpty())
-        {
-            CGContextBeginPath (ctx);
-            /* Add all region rects to the current context as path components */
-            for (int i = 0; i < a.size(); ++i)
-                CGContextAddRect(ctx, ::darwinFlipCGRect(::darwinToCGRect(a[i]), viewRect.size.height));
-            /* Now convert the path to a clipping path. */
-            CGContextClip(ctx);
-        }
-
-        /* In any case clip the drawing to the view window */
-        CGContextClipToRect(ctx, viewRect);
-        /* At this point draw the real vm image */
-        CGContextDrawImage(ctx, ::darwinFlipCGRect(::darwinToCGRect (ir), viewRect.size.height), subImage);
-
-        CGImageRelease(subImage);
+        if (subImage)
+        {
+            /* Ok, for more performance we set a clipping path of the
+             * regions given by this paint event. */
+            QVector<QRect> a = aEvent->region().rects();
+            if (!a.isEmpty())
+            {
+                CGContextBeginPath (ctx);
+                /* Add all region rects to the current context as path components */
+                for (int i = 0; i < a.size(); ++i)
+                    CGContextAddRect(ctx, ::darwinFlipCGRect(::darwinToCGRect(a[i]), viewRect.size.height));
+                /* Now convert the path to a clipping path. */
+                CGContextClip(ctx);
+            }
+
+            /* In any case clip the drawing to the view window */
+            CGContextClipToRect(ctx, viewRect);
+
+            /* At this point draw the real vm image */
+            CGContextDrawImage(ctx, ::darwinFlipCGRect(::darwinToCGRect(ir), viewRect.size.height), subImage);
+            CGImageRelease(subImage);
+        }
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineViewScale.cpp

@@ -18 +18 @@
  */
 
-/* Global includes */
-#include <QDesktopWidget>
-#include <QMainWindow>
-#include <QTimer>
-
 /* Local includes */
 #include "VBoxGlobal.h"
@@ -31 +26 @@
 #include "UIFrameBuffer.h"
 #include "UIFrameBufferQImage.h"
+#ifdef VBOX_GUI_USE_QUARTZ2D
+# include "UIFrameBufferQuartz2D.h"
+#endif /* VBOX_GUI_USE_QUARTZ2D */
+
+/* Global includes */
+#include <QDesktopWidget>
+#include <QMainWindow>
+#include <QTimer>
 
 UIMachineViewScale::UIMachineViewScale(  UIMachineWindow *pMachineWindow
@@ -198 +201 @@
                                 (pPaintEvent->height() + 10 /* 10 pixels right to cover y shift */ + 10 /* 10 pixels right to cover yRatio*10 */) * yRatio);
 
+//            viewport()->repaint((int)(pPaintEvent->x()  /* 10 pixels left to cover xRatio*10 */ * xRatio),
+//                                (int)(pPaintEvent->y()  /* 10 pixels left to cover yRatio*10 */ * yRatio),
+//                                (int)(pPaintEvent->width()  /* 10 pixels right to cover x shift */  /* 10 pixels right to cover xRatio*10 */ * xRatio) + 2,
+//                                (int)(pPaintEvent->height()  /* 10 pixels right to cover y shift */  /* 10 pixels right to cover yRatio*10 */ * yRatio) + 2);
+            pEvent->accept();
             return true;
         }
@@ -255 +263 @@
     switch (vboxGlobal().vmRenderMode())
     {
+#ifdef VBOX_GUI_USE_QUARTZ2D
+        case VBoxDefs::Quartz2DMode:
+            /* Indicate that we are doing all drawing stuff ourself: */
+            viewport()->setAttribute(Qt::WA_PaintOnScreen);
+            m_pFrameBuffer = new UIFrameBufferQuartz2D(this);
+            break;
+#endif /* VBOX_GUI_USE_QUARTZ2D */
         default:
 #ifdef VBOX_GUI_USE_QIMAGE