Changeset 46058 in vbox for trunk

Timestamp:

May 14, 2013 11:14:14 AM (12 years ago)

Author:

vboxsync

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

85731

Message:

FE/Qt: 6749: Some code cleanup related to Quartz2D frame-buffer.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (1 diff)
• src/globals/UIDefs.h (modified) (1 diff)
• src/globals/VBoxGlobal.cpp (modified) (2 diffs)
• src/main.cpp (modified) (1 diff)
• src/runtime/UIFrameBufferQuartz2D.cpp (modified) (2 diffs)
• src/runtime/UIFrameBufferQuartz2D.h (modified) (2 diffs)
• src/runtime/UIMachineView.cpp (modified) (3 diffs)
• src/runtime/UIMachineView.h (modified) (2 diffs)
• src/runtime/seamless/UIMachineWindowSeamless.cpp (modified) (1 diff)

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

@@ -83 +83 @@
 VirtualBox_DEFS           =
 VirtualBox_DEFS.debug     = VBOX_CHECK_STATE # QT_FATAL_ASSERT
-VirtualBox_DEFS.darwin    = VBOX_GUI_USE_QUARTZ2D VBOX_GUI_USE_QIMAGE
+VirtualBox_DEFS.darwin    = VBOX_GUI_USE_QIMAGE VBOX_GUI_USE_QUARTZ2D
 VirtualBox_DEFS.freebsd   = VBOX_GUI_USE_QIMAGE
 VirtualBox_DEFS.linux     = VBOX_GUI_USE_QIMAGE

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.h

@@ -60 +60 @@
           InvalidRenderMode
         , QImageMode
+#ifdef VBOX_GUI_USE_QUARTZ2D
         , Quartz2DMode
+#endif /* VBOX_GUI_USE_QUARTZ2D */
     };
 

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -196 +196 @@
     RenderMode mode = InvalidRenderMode;
 
-#if defined (Q_WS_MAC) && defined (VBOX_GUI_USE_QUARTZ2D)
+#if defined(Q_WS_MAC) && defined(VBOX_GUI_USE_QUARTZ2D)
     mode = Quartz2DMode;
-#elif (defined (Q_WS_WIN32) || defined (Q_WS_PM) || defined (Q_WS_X11)) && defined (VBOX_GUI_USE_QIMAGE)
-    mode = QImageMode;
-#elif defined (VBOX_GUI_USE_QIMAGE)
+#elif defined(VBOX_GUI_USE_QIMAGE)
     mode = QImageMode;
 #else
@@ -210 +208 @@
         if (0) ;
 #ifdef VBOX_GUI_USE_QIMAGE
-        else if (::strcmp (aModeStr, "image") == 0)
+        else if (::strcmp(aModeStr, "image") == 0)
             mode = QImageMode;
 #endif /* VBOX_GUI_USE_QIMAGE */
 #ifdef VBOX_GUI_USE_QUARTZ2D
-        else if (::strcmp (aModeStr, "quartz2d") == 0)
+        else if (::strcmp(aModeStr, "quartz2d") == 0)
             mode = Quartz2DMode;
 #endif /* VBOX_GUI_USE_QUARTZ2D */

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

@@ -233 +233 @@
     mode += "quartz2d";
 #endif /* VBOX_GUI_USE_QUARTZ2D */
-#if defined (Q_WS_MAC) && defined (VBOX_GUI_USE_QUARTZ2D)
+#if defined(Q_WS_MAC) && defined(VBOX_GUI_USE_QUARTZ2D)
     dflt = "quartz2d";
-#elif (defined (Q_WS_WIN) || defined(Q_WS_X11)) && defined (VBOX_GUI_USE_QIMAGE)
+#elif defined(VBOX_GUI_USE_QIMAGE)
     dflt = "image";
 #else
-    dflt = "image";
+# error "Cannot determine the default render mode!"
 #endif
 

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

@@ -18 +18 @@
  */
 
-#if defined (VBOX_GUI_USE_QUARTZ2D)
+#ifdef VBOX_GUI_USE_QUARTZ2D
 
 #ifdef VBOX_WITH_PRECOMPILED_HEADERS
@@ -508 +508 @@
 #endif
 
-#endif /* defined (VBOX_GUI_USE_QUARTZ2D) */
-
+#endif /* VBOX_GUI_USE_QUARTZ2D */
+

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

@@ -17 +17 @@
  */
 
+#ifdef VBOX_GUI_USE_QUARTZ2D
+
 #ifndef ___UIFrameBufferQuartz2D_h___
 #define ___UIFrameBufferQuartz2D_h___
 
 #include <QtGlobal>
-
-#if defined (Q_WS_MAC) && defined (VBOX_GUI_USE_QUARTZ2D)
 
 #include "UIFrameBuffer.h"
@@ -91 +91 @@
 
 };
-#endif /* Q_WS_MAC && VBOX_GUI_USE_QUARTZ2D */
 
-#endif // !___UIFrameBufferQuartz2D_h___
+#endif /* !___UIFrameBufferQuartz2D_h___ */
 
+#endif /* VBOX_GUI_USE_QUARTZ2D */
+

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

@@ -36 +36 @@
 #include "UIFrameBuffer.h"
 #include "UIFrameBufferQImage.h"
-#include "UIFrameBufferQuartz2D.h"
+#ifdef VBOX_GUI_USE_QUARTZ2D
+# include "UIFrameBufferQuartz2D.h"
+#endif /* VBOX_GUI_USE_QUARTZ2D */
 #include "VBoxFBOverlay.h"
 #include "UISession.h"
@@ -303 +305 @@
 {
     /* Prepare frame-buffer depending on render-mode: */
-    switch (getRenderMode())
+    switch (vboxGlobal().vmRenderMode())
     {
 #ifdef VBOX_GUI_USE_QIMAGE
@@ -910 +912 @@
 }
 
-RenderMode UIMachineView::getRenderMode() const
-{
-    if (visualStateType() != UIVisualStateType_Scale)
-        return vboxGlobal().vmRenderMode();
-    /* This part of the method is temporary since not all of our framebuffer
-     * modes currently support scale view mode.  Once they do it will be
-     * removed. */
-    /** @note this could have been a mini-class which would be easier to
-     * unit test. */
-    /* Prepare frame-buffer depending on render-mode: */
-    switch (vboxGlobal().vmRenderMode())
-    {
-#ifdef VBOX_GUI_USE_QUARTZ2D
-        case Quartz2DMode:
-            return Quartz2DMode;
-#endif /* VBOX_GUI_USE_QUARTZ2D */
-        default:
-#ifdef VBOX_GUI_USE_QIMAGE
-        case QImageMode:
-            return QImageMode;
-#endif /* VBOX_GUI_USE_QIMAGE */
-        break;
-    }
-    AssertReleaseMsgFailed(("Scale-mode currently does NOT supporting render-mode %d\n", vboxGlobal().vmRenderMode()));
-    qApp->exit(1);
-}
-
 bool UIMachineView::event(QEvent *pEvent)
 {

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

@@ -188 +188 @@
      * virtual monitor.  Used for storing monitor-specific extra data. */
     QString makeExtraDataKeyPerMonitor(QString base) const;
-    /** Returns the current rendering mode.
-     * @note contains special case logic for scale mode. */
-    RenderMode getRenderMode() const;
 
     /* Cross-platforms event processors: */
@@ -253 +250 @@
     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/seamless/UIMachineWindowSeamless.cpp

@@ -357 +357 @@
     // UIMachineWindow::setMask(region);
     // HIWindowInvalidateShadow(::darwinToWindowRef(mConsole->viewport()));
+# else /* This code is disabled for a long time already, need analisys... */
+    UIMachineWindow::setMask(constRegion);
 # endif /* This code is disabled for a long time already, need analisys... */
 #else /* !Q_WS_MAC */