Changeset 46020 in vbox

Timestamp:

May 13, 2013 3:09:16 PM (12 years ago)

Author:

vboxsync

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

85687

Message:

FE/Qt: 6749: Removing obsolete SDL support code.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIDefs.h (modified) (1 diff)
• globals/VBoxGlobal.cpp (modified) (2 diffs)
• main.cpp (modified) (1 diff)
• runtime/UIFrameBufferSDL.cpp (deleted)
• runtime/UIFrameBufferSDL.h (deleted)
• runtime/UIMachineView.cpp (modified) (5 diffs)
• runtime/UIMachineView.h (modified) (1 diff)
• runtime/UIMouseHandler.cpp (modified) (2 diffs)
• runtime/fullscreen/UIMachineViewFullscreen.cpp (modified) (3 diffs)
• runtime/fullscreen/UIMachineViewFullscreen.h (modified) (1 diff)
• runtime/normal/UIMachineViewNormal.cpp (modified) (4 diffs)
• runtime/normal/UIMachineViewNormal.h (modified) (1 diff)
• runtime/scale/UIMachineViewScale.h (modified) (1 diff)
• runtime/seamless/UIMachineViewSeamless.h (modified) (1 diff)

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

@@ -60 +60 @@
           InvalidRenderMode
         , QImageMode
-        , SDLMode
         , Quartz2DMode
     };

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

@@ -200 +200 @@
 #elif (defined (Q_WS_WIN32) || defined (Q_WS_PM) || defined (Q_WS_X11)) && defined (VBOX_GUI_USE_QIMAGE)
     mode = QImageMode;
-#elif defined (Q_WS_X11) && defined (VBOX_GUI_USE_SDL)
-    mode = SDLMode;
 #elif defined (VBOX_GUI_USE_QIMAGE)
     mode = QImageMode;
@@ -211 +209 @@
     {
         if (0) ;
-#if defined (VBOX_GUI_USE_QIMAGE)
+#ifdef VBOX_GUI_USE_QIMAGE
         else if (::strcmp (aModeStr, "image") == 0)
             mode = QImageMode;
-#endif
-#if defined (VBOX_GUI_USE_SDL)
-        else if (::strcmp (aModeStr, "sdl") == 0)
-            mode = SDLMode;
-#endif
-#if defined (VBOX_GUI_USE_QUARTZ2D)
+#endif /* VBOX_GUI_USE_QIMAGE */
+#ifdef VBOX_GUI_USE_QUARTZ2D
         else if (::strcmp (aModeStr, "quartz2d") == 0)
             mode = Quartz2DMode;
-#endif
+#endif /* VBOX_GUI_USE_QUARTZ2D */
     }
 

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

@@ -223 +223 @@
 {
     QString mode = "", dflt = "";
-#ifdef VBOX_GUI_USE_SDL
-    mode += "sdl";
-#endif
 #ifdef VBOX_GUI_USE_QIMAGE
     if (!mode.isEmpty())
         mode += "|";
     mode += "image";
-#endif
+#endif /* VBOX_GUI_USE_QIMAGE */
 #ifdef VBOX_GUI_USE_QUARTZ2D
     if (!mode.isEmpty())
         mode += "|";
     mode += "quartz2d";
-#endif
+#endif /* VBOX_GUI_USE_QUARTZ2D */
 #if defined (Q_WS_MAC) && defined (VBOX_GUI_USE_QUARTZ2D)
     dflt = "quartz2d";
-#elif (defined (Q_WS_WIN32) || defined (Q_WS_PM) || defined(Q_WS_X11)) && defined (VBOX_GUI_USE_QIMAGE)
+#elif (defined (Q_WS_WIN) || defined(Q_WS_X11)) && defined (VBOX_GUI_USE_QIMAGE)
     dflt = "image";
-#elif defined (Q_WS_X11) && defined (VBOX_GUI_USE_SDL)
-    dflt = "sdl";
 #else
     dflt = "image";

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

@@ -37 +37 @@
 #include "UIFrameBufferQImage.h"
 #include "UIFrameBufferQuartz2D.h"
-#include "UIFrameBufferSDL.h"
 #include "VBoxFBOverlay.h"
 #include "UISession.h"
@@ -333 +332 @@
         }
 #endif /* VBOX_GUI_USE_QIMAGE */
-
-#ifdef VBOX_GUI_USE_SDL
-        case SDLMode:
-        {
-            /* Indicate that we are doing all drawing stuff ourself: */
-            // TODO_NEW_CORE
-            viewport()->setAttribute(Qt::WA_PaintOnScreen);
-# ifdef Q_WS_X11
-            /* This is somehow necessary to prevent strange X11 warnings on i386 and segfaults on x86_64: */
-            XFlush(QX11Info::display());
-# endif /* Q_WS_X11 */
-            UIFrameBuffer* pFrameBuffer = uisession()->frameBuffer(screenId());
-            if (pFrameBuffer)
-                pFrameBuffer->setView(this);
-            else
-            {
-# if defined(VBOX_WITH_VIDEOHWACCEL) && defined(DEBUG_misha) /* not tested yet */
-                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<UIFrameBufferSDL, UIMachineView, UIResizeEvent>(this, &session(), (uint32_t)screenId());
-                }
-                else
-                    pFrameBuffer = new UIFrameBufferSDL(this);
-# else /* VBOX_WITH_VIDEOHWACCEL */
-                pFrameBuffer = new UIFrameBufferSDL(this);
-# endif /* !VBOX_WITH_VIDEOHWACCEL */
-                uisession()->setFrameBuffer(screenId(), pFrameBuffer);
-            }
-            m_pFrameBuffer = pFrameBuffer;
-            /* Disable scrollbars because we cannot correctly draw in a scrolled window using SDL: */
-            horizontalScrollBar()->setEnabled(false);
-            verticalScrollBar()->setEnabled(false);
-            break;
-        }
-#endif /* VBOX_GUI_USE_SDL */
 
 #ifdef VBOX_GUI_USE_QUARTZ2D
@@ -401 +362 @@
         }
 #endif /* VBOX_GUI_USE_QUARTZ2D */
+
         default:
             AssertReleaseMsgFailed(("Render mode must be valid: %d\n", vboxGlobal().vmRenderMode()));
@@ -536 +498 @@
 #ifdef VBOX_GUI_USE_QIMAGE
             || vboxGlobal().vmRenderMode() == QImageMode
-#endif
-#ifdef VBOX_GUI_USE_SDL
-            || vboxGlobal().vmRenderMode() == SDLMode
-#endif
+#endif /* VBOX_GUI_USE_QIMAGE */
 #ifdef VBOX_GUI_USE_QUARTZ2D
             || vboxGlobal().vmRenderMode() == Quartz2DMode
-#endif
+#endif /* VBOX_GUI_USE_QUARTZ2D */
 #ifdef VBOX_WITH_VIDEOHWACCEL
             || m_fAccelerate2DVideo
-#endif
+#endif /* VBOX_WITH_VIDEOHWACCEL */
            )
         {
@@ -908 +867 @@
         /* Perform machine-view resize: */
         resize(pResizeEvent->width(), pResizeEvent->height());
-
-        /* May be we have to restrict minimum size? */
-        maybeRestrictMinimumSize();
 
         /* Let our toplevel widget calculate its sizeHint properly: */

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

@@ -170 +170 @@
      * host screen. */
     virtual QSize calculateMaxGuestSize() const = 0;
-    virtual void maybeRestrictMinimumSize() = 0;
     virtual void updateSliders();
     QPoint viewportToContents(const QPoint &vp) const;

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

@@ -775 +775 @@
     else /* !uisession()->isMouseCaptured() */
     {
-#if 0 // TODO: Move that to fullscreen event-handler:
-        if (vboxGlobal().vmRenderMode() != SDLMode)
-        {
-            /* try to automatically scroll the guest canvas if the
-             * mouse is on the screen border */
-            /// @todo (r=dmik) better use a timer for autoscroll
-            QRect scrGeo = QApplication::desktop()->screenGeometry (this);
-            int iDx = 0, iDy = 0;
-            if (scrGeo.width() < contentsWidth())
-            {
-                if (scrGeo.left() == globalPos.x()) iDx = -1;
-                if (scrGeo.right() == globalPos.x()) iDx = +1;
-            }
-            if (scrGeo.height() < contentsHeight())
-            {
-                if (scrGeo.top() == globalPos.y()) iDy = -1;
-                if (scrGeo.bottom() == globalPos.y()) iDy = +1;
-            }
-            if (iDx || iDy)
-                scrollBy(iDx, iDy);
-        }
-#endif
-
         if (uisession()->isMouseSupportsAbsolute() && uisession()->isMouseIntegrated())
         {
@@ -803 +780 @@
             int iVw = m_views[uScreenId]->visibleWidth(), iVh = m_views[uScreenId]->visibleHeight();
 
-            if (vboxGlobal().vmRenderMode() != SDLMode)
-            {
-                /* Try to automatically scroll the guest canvas if the
-                 * mouse goes outside its visible part: */
-                int iDx = 0;
-                if (relativePos.x() > iVw) iDx = relativePos.x() - iVw;
-                else if (relativePos.x() < 0) iDx = relativePos.x();
-                int iDy = 0;
-                if (relativePos.y() > iVh) iDy = relativePos.y() - iVh;
-                else if (relativePos.y() < 0) iDy = relativePos.y();
-                if (iDx != 0 || iDy != 0) m_views[uScreenId]->scrollBy(iDx, iDy);
-            }
+            /* Try to automatically scroll the guest canvas if the
+             * mouse goes outside its visible part: */
+            int iDx = 0;
+            if (relativePos.x() > iVw) iDx = relativePos.x() - iVw;
+            else if (relativePos.x() < 0) iDx = relativePos.x();
+            int iDy = 0;
+            if (relativePos.y() > iVh) iDy = relativePos.y() - iVh;
+            else if (relativePos.y() < 0) iDy = relativePos.y();
+            if (iDx != 0 || iDy != 0) m_views[uScreenId]->scrollBy(iDx, iDy);
 
             /* Get mouse-pointer location: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineViewFullscreen.cpp

@@ -63 +63 @@
 void UIMachineViewFullscreen::sltAdditionsStateChanged()
 {
-    /* Check if we should restrict minimum size: */
-    maybeRestrictMinimumSize();
-
     /* Check if we should resize guest to fullscreen */
     if ((int)frameBuffer()->width() != workingArea().size().width() ||
@@ -150 +147 @@
         m_bIsGuestAutoresizeEnabled = fEnabled;
 
-        maybeRestrictMinimumSize();
-
         if (uisession()->isGuestSupportsGraphics())
             sltPerformGuestResize();
@@ -175 +170 @@
 }
 
-void UIMachineViewFullscreen::maybeRestrictMinimumSize()
-{
-    /* Sets the minimum size restriction depending on the auto-resize feature state and the current rendering mode.
-     * Currently, the restriction is set only in SDL mode and only when the auto-resize feature is inactive.
-     * We need to do that because we cannot correctly draw in a scrolled window in SDL mode.
-     * In all other modes, or when auto-resize is in force, this function does nothing. */
-    if (vboxGlobal().vmRenderMode() == SDLMode)
-    {
-        if (!uisession()->isGuestSupportsGraphics() || !m_bIsGuestAutoresizeEnabled)
-            setMinimumSize(sizeHint());
-        else
-            setMinimumSize(0, 0);
-    }
-}
-

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineViewFullscreen.h

@@ -68 +68 @@
     QRect workingArea() const;
     QSize calculateMaxGuestSize() const;
-    void maybeRestrictMinimumSize();
 
     /* Private variables: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.cpp

@@ -65 +65 @@
 void UIMachineViewNormal::sltAdditionsStateChanged()
 {
-    /* Check if we should restrict minimum size: */
-    maybeRestrictMinimumSize();
-
     /* Resend the last resize hint if there was a fullscreen or
      * seamless transition previously.  If we were not in graphical
@@ -205 +202 @@
         m_bIsGuestAutoresizeEnabled = fEnabled;
 
-        maybeRestrictMinimumSize();
-
         if (m_bIsGuestAutoresizeEnabled && uisession()->isGuestSupportsGraphics())
             sltPerformGuestResize();
@@ -245 +240 @@
             availableGeo = dwt->availableGeometry(pTopLevelWidget->pos());
 
-        frameGeo = VBoxGlobal::normalizeGeometry(frameGeo, availableGeo, vboxGlobal().vmRenderMode() != SDLMode /* can resize? */);
+        frameGeo = VBoxGlobal::normalizeGeometry(frameGeo, availableGeo);
     }
 
@@ -286 +281 @@
 }
 
-void UIMachineViewNormal::maybeRestrictMinimumSize()
-{
-    /* Sets the minimum size restriction depending on the auto-resize feature state and the current rendering mode.
-     * Currently, the restriction is set only in SDL mode and only when the auto-resize feature is inactive.
-     * We need to do that because we cannot correctly draw in a scrolled window in SDL mode.
-     * In all other modes, or when auto-resize is in force, this function does nothing. */
-    if (vboxGlobal().vmRenderMode() == SDLMode)
-    {
-        if (!uisession()->isGuestSupportsGraphics() || !m_bIsGuestAutoresizeEnabled)
-            setMinimumSize(sizeHint());
-        else
-            setMinimumSize(0, 0);
-    }
-}
-

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.h

@@ -80 +80 @@
     QRect workingArea() const;
     QSize calculateMaxGuestSize() const;
-    void maybeRestrictMinimumSize();
 
     /* Private members: */

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

@@ -69 +69 @@
     QRect workingArea() const;
     QSize calculateMaxGuestSize() const;
-    void maybeRestrictMinimumSize() {}
     void updateSliders();
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineViewSeamless.h

@@ -71 +71 @@
     QRect workingArea() const;
     QSize calculateMaxGuestSize() const;
-    void maybeRestrictMinimumSize() {}
 
     /* Private variables: */