Changeset 51484 in vbox for trunk/src/VBox

Timestamp:

Jun 2, 2014 10:41:25 AM (11 years ago)

Author:

vboxsync

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

94086

Message:

FE/Qt: Runtime UI: Removing Quartz2D frame-buffer code; also removing code related to render-mode definition.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (3 diffs)
• src/VBoxAboutDlg.cpp (modified) (1 diff)
• src/converter/UIConverterBackend.h (modified) (2 diffs)
• src/converter/UIConverterBackendGlobal.cpp (modified) (2 diffs)
• src/extradata/UIExtraDataDefs.cpp (modified) (1 diff)
• src/extradata/UIExtraDataDefs.h (modified) (2 diffs)
• src/extradata/UIExtraDataManager.cpp (modified) (1 diff)
• src/extradata/UIExtraDataManager.h (modified) (1 diff)
• src/runtime/UIMachineView.cpp (modified) (4 diffs)
• src/runtime/UIMachineView.h (modified) (1 diff)
• src/runtime/scale/UIMachineViewScale.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -80 +80 @@
 VirtualBox_DEFS           =
 VirtualBox_DEFS.debug     = VBOX_CHECK_STATE # QT_FATAL_ASSERT
-VirtualBox_DEFS.darwin    = VBOX_GUI_USE_QUARTZ2D VBOX_WITH_TRANSLUCENT_SEAMLESS
+VirtualBox_DEFS.darwin    = VBOX_WITH_TRANSLUCENT_SEAMLESS
 VirtualBox_DEFS.win       = UNICODE QT_DLL
 ifdef VBOX_WITH_ICHAT_THEATER
@@ -729 +729 @@
         src/platform/darwin/UICocoaDockIconPreview.mm \
         src/platform/darwin/UIWindowMenuManager.cpp \
-        src/runtime/UIFrameBufferQuartz2D.cpp
 
 if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) # X11
@@ -974 +973 @@
                 '-DMAC_OS_X_VERSION_MIN_REQUIRED=1050' \
                 '-DMAC_OS_X_VERSION_MAX_ALLOWED=1050' \
-                '-DVBOX_GUI_USE_QUARTZ2D' \
                 '-o' $@ $<
 endif

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

@@ -109 +109 @@
     setWindowTitle(tr("VirtualBox - About"));
     QString strAboutText =  tr("VirtualBox Graphical User Interface");
-#ifdef DEBUG
-    strAboutText += QString(" (%1)").arg(gpConverter->toInternalString(gEDataManager->renderMode(vboxGlobal().managedVMUuid())));
-#endif /* DEBUG */
 #ifdef VBOX_BLEEDING_EDGE
     QString strVersionText = "EXPERIMENTAL build %1 - " + QString(VBOX_BLEEDING_EDGE);

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackend.h

@@ -72 +72 @@
 #endif /* VBOX_WITH_DEBUGGER_GUI */
 template<> bool canConvert<RuntimeMenuHelpActionType>();
-template<> bool canConvert<RenderMode>();
 template<> bool canConvert<UIVisualStateType>();
 template<> bool canConvert<DetailsElementType>();
@@ -129 +128 @@
 template<> QString toInternalString(const RuntimeMenuHelpActionType &runtimeMenuHelpActionType);
 template<> RuntimeMenuHelpActionType fromInternalString<RuntimeMenuHelpActionType>(const QString &strRuntimeMenuHelpActionType);
-template<> QString toInternalString(const RenderMode &renderMode);
-template<> RenderMode fromInternalString<RenderMode>(const QString &strRenderMode);
 template<> QString toInternalString(const UIVisualStateType &visualStateType);
 template<> UIVisualStateType fromInternalString<UIVisualStateType>(const QString &strVisualStateType);

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp

@@ -45 +45 @@
 #endif /* VBOX_WITH_DEBUGGER_GUI */
 template<> bool canConvert<RuntimeMenuHelpActionType>() { return true; }
-template<> bool canConvert<RenderMode>() { return true; }
 template<> bool canConvert<UIVisualStateType>() { return true; }
 template<> bool canConvert<DetailsElementType>() { return true; }
@@ -677 +676 @@
 }
 
-/* QString <= RenderMode: */
-template<> QString toInternalString(const RenderMode &renderMode)
-{
-    QString strResult;
-    switch (renderMode)
-    {
-        case RenderMode_QImage:   strResult = "QImage"; break;
-#ifdef VBOX_GUI_USE_QUARTZ2D
-        case RenderMode_Quartz2D: strResult = "Quartz2D"; break;
-#endif /* VBOX_GUI_USE_QUARTZ2D */
-        default:
-        {
-            AssertMsgFailed(("No text for render-mode=%d", renderMode));
-            break;
-        }
-    }
-    return strResult;
-}
-
-/* RenderMode <= QString: */
-template<> RenderMode fromInternalString<RenderMode>(const QString &strRenderMode)
-{
-    /* Here we have some fancy stuff allowing us
-     * to search through the keys using 'case-insensitive' rule: */
-    QStringList keys;   QList<RenderMode> values;
-    keys << "QImage";   values << RenderMode_QImage;
-#ifdef VBOX_GUI_USE_QUARTZ2D
-    keys << "Quartz2D"; values << RenderMode_Quartz2D;
-#endif /* VBOX_GUI_USE_QUARTZ2D */
-    /* QImage mode for unknown words: */
-    if (!keys.contains(strRenderMode, Qt::CaseInsensitive))
-        return RenderMode_QImage;
-    /* Corresponding mode for known words: */
-    return values.at(keys.indexOf(QRegExp(strRenderMode, Qt::CaseInsensitive)));
-}
-
 /* QString <= UIVisualStateType: */
 template<> QString toInternalString(const UIVisualStateType &visualStateType)

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp

@@ -64 +64 @@
 
 /* Runtime UI definitions: */
-const char* UIExtraDataDefs::GUI_RenderMode = "GUI/RenderMode";
 #ifndef Q_WS_MAC
 const char* UIExtraDataDefs::GUI_MachineWindowIcons = "GUI/MachineWindowIcons";

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h

@@ -72 +72 @@
 
     /* Runtime UI declarations: */
-    extern const char* GUI_RenderMode;
 #ifndef Q_WS_MAC
     extern const char* GUI_MachineWindowIcons;
@@ -338 +337 @@
 };
 
-/** Runtime UI: Rendering modes. */
-enum RenderMode
-{
-    RenderMode_Invalid,
-    RenderMode_QImage,
-#ifdef VBOX_GUI_USE_QUARTZ2D
-    RenderMode_Quartz2D
-#endif /* VBOX_GUI_USE_QUARTZ2D */
-};
-
 /** Runtime UI: Visual-state types. */
 enum UIVisualStateType

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp

@@ -311 +311 @@
 }
 
-RenderMode UIExtraDataManager::renderMode(const QString &strId) const
-{
-    return gpConverter->fromInternalString<RenderMode>(extraDataString(GUI_RenderMode, strId));
-}
-
 QRect UIExtraDataManager::selectorWindowGeometry(QWidget *pHintWidget /* = 0 */)
 {

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h

@@ -137 +137 @@
     /** Defines selector-window geometry to passed @a geometry which is @a fMaximized. */
     void setSelectorWindowGeometry(const QRect &geometry, bool fMaximized);
-
-    /** Returns render-mode for machine with passed @a strId. */
-    RenderMode renderMode(const QString &strId) const;
 
     /** Returns whether this machine started for the first time. */

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

@@ -36 +36 @@
 #include "UIFrameBuffer.h"
 #include "UIFrameBufferQImage.h"
-#ifdef VBOX_GUI_USE_QUARTZ2D
-# include "UIFrameBufferQuartz2D.h"
-#endif /* VBOX_GUI_USE_QUARTZ2D */
 #include "VBoxFBOverlay.h"
 #include "UISession.h"
@@ -466 +463 @@
 void UIMachineView::prepareFrameBuffer()
 {
-    /* Prepare frame-buffer depending on render-mode: */
-    RenderMode rm = gEDataManager->renderMode(vboxGlobal().managedVMUuid());
-    switch (rm)
-    {
-        case RenderMode_QImage:
-        {
-            UIFrameBuffer *pFrameBuffer = uisession()->frameBuffer(screenId());
-            if (pFrameBuffer)
-            {
-                pFrameBuffer->setView(this);
-                /* Mark framebuffer as used again: */
-                LogRelFlow(("UIMachineView::prepareFrameBuffer: Start EMT callbacks accepting for screen: %d.\n", screenId()));
-                pFrameBuffer->setMarkAsUnused(false);
-                uisession()->setFrameBuffer(screenId(), pFrameBuffer);
-            }
-            else
-            {
+    /* Prepare frame-buffer: */
+    UIFrameBuffer *pFrameBuffer = uisession()->frameBuffer(screenId());
+    if (pFrameBuffer)
+    {
+        pFrameBuffer->setView(this);
+        /* Mark framebuffer as used again: */
+        LogRelFlow(("UIMachineView::prepareFrameBuffer: Start EMT callbacks accepting for screen: %d.\n", screenId()));
+        pFrameBuffer->setMarkAsUnused(false);
+        uisession()->setFrameBuffer(screenId(), pFrameBuffer);
+    }
+    else
+    {
 # ifdef VBOX_WITH_VIDEOHWACCEL
-                if (m_fAccelerate2DVideo)
-                {
-                    /** these two additional template args is a workaround to
-                     * this [VBox|UI] duplication
-                     * @todo: they are to be removed once VBox stuff is gone */
-                    pFrameBuffer = new VBoxOverlayFrameBuffer<UIFrameBufferQImage, UIMachineView, UIResizeEvent>(this, &session(), (uint32_t)screenId());
-                }
-                else
-                    pFrameBuffer = new UIFrameBufferQImage(this);
+        if (m_fAccelerate2DVideo)
+        {
+            /** these two additional template args is a workaround to
+             * this [VBox|UI] duplication
+             * @todo: they are to be removed once VBox stuff is gone */
+            pFrameBuffer = new VBoxOverlayFrameBuffer<UIFrameBufferQImage, UIMachineView, UIResizeEvent>(this, &session(), (uint32_t)screenId());
+        }
+        else
+            pFrameBuffer = new UIFrameBufferQImage(this);
 # else /* VBOX_WITH_VIDEOHWACCEL */
-                pFrameBuffer = new UIFrameBufferQImage(this);
+        pFrameBuffer = new UIFrameBufferQImage(this);
 # endif /* !VBOX_WITH_VIDEOHWACCEL */
-                pFrameBuffer->setHiDPIOptimizationType(uisession()->hiDPIOptimizationType());
-                uisession()->setFrameBuffer(screenId(), pFrameBuffer);
-            }
-            m_pFrameBuffer = pFrameBuffer;
-            break;
-        }
-
-#ifdef VBOX_GUI_USE_QUARTZ2D
-        case RenderMode_Quartz2D:
-        {
-            /* Indicate that we are doing all drawing stuff ourself: */
-            viewport()->setAttribute(Qt::WA_PaintOnScreen);
-            UIFrameBuffer *pFrameBuffer = uisession()->frameBuffer(screenId());
-            if (pFrameBuffer)
-            {
-                pFrameBuffer->setView(this);
-                /* Mark framebuffer as used again: */
-                LogRelFlow(("UIMachineView::prepareFrameBuffer: Start EMT callbacks accepting for screen: %d.\n", screenId()));
-                pFrameBuffer->setMarkAsUnused(false);
-                uisession()->setFrameBuffer(screenId(), pFrameBuffer);
-            }
-            else
-            {
-# ifdef VBOX_WITH_VIDEOHWACCEL
-                if (m_fAccelerate2DVideo)
-                {
-                    /** these two additional template args is a workaround to
-                     * this [VBox|UI] duplication
-                     * @todo: they are to be removed once VBox stuff is gone */
-                    pFrameBuffer = new VBoxOverlayFrameBuffer<UIFrameBufferQuartz2D, UIMachineView, UIResizeEvent>(this, &session(), (uint32_t)screenId());
-                }
-                else
-                    pFrameBuffer = new UIFrameBufferQuartz2D(this);
-# else /* VBOX_WITH_VIDEOHWACCEL */
-                pFrameBuffer = new UIFrameBufferQuartz2D(this);
-# endif /* !VBOX_WITH_VIDEOHWACCEL */
-                uisession()->setFrameBuffer(screenId(), pFrameBuffer);
-            }
-            m_pFrameBuffer = pFrameBuffer;
-            break;
-        }
-#endif /* VBOX_GUI_USE_QUARTZ2D */
-
-        default:
-            AssertReleaseMsgFailed(("Render mode must be valid: %d\n", rm));
-            LogRel(("Invalid render mode: %d\n", rm));
-            qApp->exit(1);
-            break;
-    }
+        pFrameBuffer->setHiDPIOptimizationType(uisession()->hiDPIOptimizationType());
+        uisession()->setFrameBuffer(screenId(), pFrameBuffer);
+    }
+    m_pFrameBuffer = pFrameBuffer;
 
     /* If frame-buffer was prepared: */
@@ -952 +899 @@
 CGImageRef UIMachineView::vmContentImage()
 {
+    /* Use pause-image if exists: */
     if (!m_pauseShot.isNull())
-    {
-        CGImageRef pauseImg = ::darwinToCGImageRef(&m_pauseShot);
-        /* Use the pause image as background */
-        return pauseImg;
-    }
-    else
-    {
-# ifdef VBOX_GUI_USE_QUARTZ2D
-        if (gEDataManager->renderMode(vboxGlobal().managedVMUuid()) == RenderMode_Quartz2D)
-        {
-            /* If the render mode is Quartz2D we could use the CGImageRef
-             * of the framebuffer for the dock icon creation. This saves
-             * some conversion time. */
-            CGImageRef image = static_cast<UIFrameBufferQuartz2D*>(m_pFrameBuffer)->imageRef();
-            CGImageRetain(image); /* Retain it, cause the consumer will release it. */
-            return image;
-        }
-# endif /* VBOX_GUI_USE_QUARTZ2D */
-        /* In image mode we have to create the image ref out of the
-         * framebuffer */
-        return frameBuffertoCGImageRef(m_pFrameBuffer);
-    }
-    return 0;
+        return darwinToCGImageRef(&m_pauseShot);
+
+    /* Create the image ref out of the frame-buffer: */
+    return frameBuffertoCGImageRef(m_pFrameBuffer);
 }
 
@@ -1124 +1053 @@
 void UIMachineView::paintEvent(QPaintEvent *pPaintEvent)
 {
-    if (m_pauseShot.isNull())
-    {
-        /* Delegate the paint function to the VBoxFrameBuffer interface: */
-        if (m_pFrameBuffer)
-            m_pFrameBuffer->paintEvent(pPaintEvent);
+    /* Use pause-image if exists: */
+    if (!m_pauseShot.isNull())
+    {
+        /* We have a snapshot for the paused state: */
+        QRect rect = pPaintEvent->rect().intersect(viewport()->rect());
+        /* We have to disable paint on screen if we are using the regular painter: */
+        bool fPaintOnScreen = viewport()->testAttribute(Qt::WA_PaintOnScreen);
+        viewport()->setAttribute(Qt::WA_PaintOnScreen, false);
+        QPainter painter(viewport());
+        painter.drawPixmap(rect, m_pauseShot, QRect(rect.x() + contentsX(), rect.y() + contentsY(),
+                                                    rect.width(), rect.height()));
+        /* Restore the attribute to it's previous state: */
+        viewport()->setAttribute(Qt::WA_PaintOnScreen, fPaintOnScreen);
 #ifdef Q_WS_MAC
-        /* Update the dock icon if we are in the running state */
-        if (uisession()->isRunning())
-            updateDockIcon();
+        /* Update the dock icon: */
+        updateDockIcon();
 #endif /* Q_WS_MAC */
         return;
     }
 
-#ifdef VBOX_GUI_USE_QUARTZ2D
-    if (gEDataManager->renderMode(vboxGlobal().managedVMUuid()) == RenderMode_Quartz2D && m_pFrameBuffer)
-    {
+    /* Delegate the paint function to the UIFrameBuffer interface: */
+    if (m_pFrameBuffer)
         m_pFrameBuffer->paintEvent(pPaintEvent);
-        updateDockIcon();
-    }
-    else
-#endif /* VBOX_GUI_USE_QUARTZ2D */
-    {
-        /* We have a snapshot for the paused state: */
-        QRect r = pPaintEvent->rect().intersect(viewport()->rect());
-        /* We have to disable paint on screen if we are using the regular painter: */
-        bool paintOnScreen = viewport()->testAttribute(Qt::WA_PaintOnScreen);
-        viewport()->setAttribute(Qt::WA_PaintOnScreen, false);
-        QPainter pnt(viewport());
-        pnt.drawPixmap(r, m_pauseShot, QRect(r.x() + contentsX(), r.y() + contentsY(), r.width(), r.height()));
-        /* Restore the attribute to its previous state: */
-        viewport()->setAttribute(Qt::WA_PaintOnScreen, paintOnScreen);
 #ifdef Q_WS_MAC
+    /* Update the dock icon if we are in the running state: */
+    if (uisession()->isRunning())
         updateDockIcon();
 #endif /* Q_WS_MAC */
-    }
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.h

@@ -269 +269 @@
     friend class UIFrameBuffer;
     friend class UIFrameBufferQImage;
-#ifdef VBOX_GUI_USE_QUARTZ2D
-    friend class UIFrameBufferQuartz2D;
-#endif /* VBOX_GUI_USE_QUARTZ2D */
     template<class, class, class> friend class VBoxOverlayFrameBuffer;
 };

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

@@ -31 +31 @@
 #include "UIFrameBuffer.h"
 #include "UIFrameBufferQImage.h"
-#ifdef VBOX_GUI_USE_QUARTZ2D
-# include "UIFrameBufferQuartz2D.h"
-#endif /* VBOX_GUI_USE_QUARTZ2D */
 
 /* COM includes: */