Changeset 3807 in vbox for trunk/src

Timestamp:

Jul 24, 2007 11:17:40 AM (17 years ago)

Author:

vboxsync

Message:

FE/Qt: Don't use guest VRAM directly in QImage mode when color depth is other than 32, 8, or 1 bit and show a reminder if color depth is not 32 bit in the guest OS.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxConsoleView.h (modified) (2 diffs)
• include/VBoxProblemReporter.h (modified) (2 diffs)
• src/VBoxConsoleView.cpp (modified) (19 diffs)
• src/VBoxFrameBuffer.cpp (modified) (5 diffs)
• src/VBoxProblemReporter.cpp (modified) (7 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxConsoleView.h

@@ -210 +210 @@
     bool hostkey_in_capture : 1;
 
-    bool ignore_mainwnd_resize : 1;
+    bool mIgnoreMainwndResize : 1;
     bool mAutoresizeGuest : 1;
 
@@ -248 +248 @@
 #endif
 
-    VBoxFrameBuffer *fb;
-    CConsoleCallback callback;
+    VBoxFrameBuffer *mFrameBuf;
+    CConsoleCallback mCallback;
 
     friend class VBoxConsoleCallback;

trunk/src/VBox/Frontends/VirtualBox/include/VBoxProblemReporter.h

@@ -54 +54 @@
     // helpers
 
-    int message (
-        QWidget *parent, Type type, const QString &msg,
-        const QString &details = QString::null,
-        const char *autoConfirmId = 0,
-        int b1 = 0, int b2 = 0, int b3 = 0,
-        const char *name = 0
-    );
-
-    int message (
-        QWidget *parent, Type type, const QString &msg,
-        const char *autoConfirmId,
-        int b1 = 0, int b2 = 0, int b3 = 0,
-        const char *name = 0
-    ) {
+    int message (QWidget *parent, Type type, const QString &msg,
+                 const QString &details = QString::null,
+                 const char *autoConfirmId = NULL,
+                 int b1 = 0, int b2 = 0, int b3 = 0,
+                 const char *name = 0);
+
+    int message (QWidget *parent, Type type, const QString &msg,
+                 const char *autoConfirmId,
+                 int b1 = 0, int b2 = 0, int b3 = 0,
+                 const char *name = 0)
+    {
         return message (parent, type, msg, QString::null, autoConfirmId,
                         b1, b2, b3, name);
     }
 
-    bool messageYesNo (
-        QWidget *parent, Type type, const QString &msg,
-        const QString &details = QString::null,
-        const char *autoConfirmId = 0,
-        const char *name = 0
-    );
-
-    bool messageYesNo (
-        QWidget *parent, Type type, const QString &msg,
-        const char *autoConfirmId,
-        const char *name = 0
-    ) {
+    bool messageYesNo (QWidget *parent, Type type, const QString &msg,
+                       const QString &details = QString::null,
+                       const char *autoConfirmId = 0,
+                       const char *name = 0);
+
+    bool messageYesNo (QWidget *parent, Type type, const QString &msg,
+                       const char *autoConfirmId,
+                       const char *name = 0)
+    {
         return messageYesNo (parent, type, msg, QString::null, autoConfirmId, name);
     }
 
-    bool showModalProgressDialog (
-        CProgress &aProgress, const QString &aTitle, QWidget *aParent,
-        int aMinDuration = 2000
-    );
+    bool showModalProgressDialog (CProgress &aProgress, const QString &aTitle,
+                                  QWidget *aParent, int aMinDuration = 2000);
 
     QWidget *mainWindowShown();
@@ -219 +211 @@
                                    const QString &hostKey);
 
+    void remindAboutWrongColorDepth (ulong aRealBPP, ulong aWantedBPP);
+
     void cannotRunInSelectorMode();
 

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

@@ -518 +518 @@
     , hostkey_pressed (false)
     , hostkey_alone (false)
-    , ignore_mainwnd_resize (true)
+    , mIgnoreMainwndResize (true)
     , mAutoresizeGuest (false)
     , mIsAdditionsActive (false)
@@ -576 +576 @@
     tid = 0;
 #endif
-    fb = 0;
+    mFrameBuf = 0;
 
     LogFlowFunc (("Rendering mode: %d\n", mode));
@@ -590 +590 @@
 #if defined (VBOX_GUI_USE_QIMAGE)
         case VBoxDefs::QImageMode:
-            fb = new VBoxQImageFrameBuffer (this);
+            mFrameBuf = new VBoxQImageFrameBuffer (this);
             break;
 #endif
 #if defined (VBOX_GUI_USE_SDL)
         case VBoxDefs::SDLMode:
-            fb = new VBoxSDLFrameBuffer (this);
+            mFrameBuf = new VBoxSDLFrameBuffer (this);
             /*
              *  disable scrollbars because we cannot correctly draw in a
@@ -606 +606 @@
 #if defined (VBOX_GUI_USE_DDRAW)
         case VBoxDefs::DDRAWMode:
-            fb = new VBoxDDRAWFrameBuffer (this);
+            mFrameBuf = new VBoxDDRAWFrameBuffer (this);
             break;
 #endif
@@ -617 +617 @@
 
 #if defined (VBOX_GUI_USE_DDRAW)
-    if (!fb || fb->address () == NULL)
-    {
-        if (fb)
-            delete fb;
+    if (!mFrameBuf || mFrameBuf->address () == NULL)
+    {
+        if (mFrameBuf)
+            delete mFrameBuf;
         mode = VBoxDefs::QImageMode;
-        fb = new VBoxQImageFrameBuffer (this);
-    }
-#endif
-
-    if (fb)
-    {
-        fb->AddRef();
-        display.RegisterExternalFramebuffer (CFramebuffer (fb));
+        mFrameBuf = new VBoxQImageFrameBuffer (this);
+    }
+#endif
+
+    if (mFrameBuf)
+    {
+        mFrameBuf->AddRef();
+        display.RegisterExternalFramebuffer (CFramebuffer (mFrameBuf));
     }
 
     /* setup the callback */
-    callback = CConsoleCallback (new VBoxConsoleCallback (this));
-    cconsole.RegisterCallback (callback);
+    mCallback = CConsoleCallback (new VBoxConsoleCallback (this));
+    cconsole.RegisterCallback (mCallback);
     AssertWrapperOk (cconsole);
 
@@ -671 +671 @@
         killTimer (tid);
 #endif
-    if (fb)
+    if (mFrameBuf)
     {
         /* detach our framebuffer from Display */
@@ -678 +678 @@
         display.SetupInternalFramebuffer (0);
         /* release the reference */
-        fb->Release();
-    }
-
-    cconsole.UnregisterCallback (callback);
+        mFrameBuf->Release();
+    }
+
+    cconsole.UnregisterCallback (mCallback);
 }
 
@@ -700 +700 @@
 #endif
     {
-        return QSize (fb->width() + frameWidth() * 2,
-                      fb->height() + frameWidth() * 2);
+        return QSize (mFrameBuf->width() + frameWidth() * 2,
+                      mFrameBuf->height() + frameWidth() * 2);
     }
 }
@@ -874 +874 @@
 void VBoxConsoleView::onViewOpened()
 {
-    /* Variable <ignore_mainwnd_resize> is initially "true" to ignore QT
+    /* Variable mIgnoreMainwndResize was initially "true" to ignore QT
      * initial resize event in case of auto-resize feature is on.
-     * Currently initial resize event is already processed, so switching
-     * the ignore_mainwnd_resize to "false" to process all further resize
-     * events as user resize events. */
-    ignore_mainwnd_resize = false;
+     * Currently, initial resize event is already processed, so we set
+     * mIgnoreMainwndResize to "false" to process all further resize
+     * events as user-initiated window resize events. */
+    mIgnoreMainwndResize = false;
 }
 
@@ -906 +906 @@
             case VBoxDefs::ResizeEventType:
             {
-                bool old_ignore_mainwnd_resize = ignore_mainwnd_resize;
-                ignore_mainwnd_resize = true;
+                bool oldIgnoreMainwndResize = mIgnoreMainwndResize;
+                mIgnoreMainwndResize = true;
 
                 VBoxResizeEvent *re = (VBoxResizeEvent *) e;
-                LogFlow (("VBoxDefs::ResizeEventType: %d,%d\n",
-                          re->width(), re->height()));
+                LogFlow (("VBoxDefs::ResizeEventType: %d x %d x %d bpp\n",
+                          re->width(), re->height(), re->bitsPerPixel()));
 
                 /* do frame buffer dependent resize */
-                fb->resizeEvent (re);
+                mFrameBuf->resizeEvent (re);
                 viewport()->unsetCursor();
 
@@ -947 +947 @@
                 cconsole.GetDisplay().ResizeCompleted(0);
 
-                ignore_mainwnd_resize = old_ignore_mainwnd_resize;
+                mIgnoreMainwndResize = oldIgnoreMainwndResize;
 
                 return true;
@@ -1235 +1235 @@
                  *  in order to possibly adjust the direct screen blitting.
                  */
-                if (fb)
-                    fb->moveEvent( (QMoveEvent *) e );
+                if (mFrameBuf)
+                    mFrameBuf->moveEvent ((QMoveEvent *) e);
                 break;
             }
@@ -1276 +1276 @@
             case QEvent::Resize:
             {
-                if (!ignore_mainwnd_resize)
+                if (!mIgnoreMainwndResize)
                 {
                     if (mIsAdditionsActive && mAutoresizeGuest)
                         resize_hint_timer->start (300, TRUE);
+                    /// @todo disabled for the time being since seems to be not
+                    //  necessary anymore
+#if 0
                     /* During window maximization WindowStateChange event is
-                     * processed before Resize event, so the ignore_mainwnd_resize
+                     * processed before Resize event, so the mIgnoreMainwndResize
                      * variable should be set to true here in case of mainwnd is
                      * maximized or in fullscreen state. */
                     /* Not sure if it is really required */
-                    //if (mainwnd->isMaximized() || mainwnd->isTrueFullscreen()
-                    //                           || mainwnd->isTrueSeamless())
-                    //    ignore_mainwnd_resize = true;
+                    if (mainwnd->isMaximized() || mainwnd->isTrueFullscreen()
+                                               || mainwnd->isTrueSeamless())
+                        mIgnoreMainwndResize = true;
+#endif
                 }
                 break;
@@ -1868 +1872 @@
     }
 
-    ignore_mainwnd_resize = false;
+    mIgnoreMainwndResize = false;
 }
 
@@ -2348 +2352 @@
         case CEnums::Paused:
         {
-            if (mode != VBoxDefs::TimerMode && fb)
+            if (mode != VBoxDefs::TimerMode && mFrameBuf)
             {
                 /*
@@ -2354 +2358 @@
                  *  needs a 32bpp image
                  */
-                QImage shot = QImage (fb->width(), fb->height(), 32, 0);
+                QImage shot = QImage (mFrameBuf->width(), mFrameBuf->height(), 32, 0);
                 CDisplay dsp = cconsole.GetDisplay();
                 dsp.TakeScreenShot (shot.bits(), shot.width(), shot.height());
@@ -2379 +2383 @@
             if (last_state == CEnums::Paused)
             {
-                if (mode != VBoxDefs::TimerMode && fb)
+                if (mode != VBoxDefs::TimerMode && mFrameBuf)
                 {
                     /* reset the pixmap to free memory */
@@ -2459 +2463 @@
         {
             /* delegate the paint function to the VBoxFrameBuffer interface */
-            fb->paintEvent (pe);
+            mFrameBuf->paintEvent (pe);
             return;
         }
@@ -3052 +3056 @@
         QSize sz (mainwnd->centralWidget()->size());
         sz -= QSize (frameWidth() * 2, frameWidth() * 2);
-        LogFlowFunc (("Will suggest %d,%d\n", sz.width(), sz.height()));
+        LogFlowFunc (("Will suggest %d x %d\n", sz.width(), sz.height()));
 
         cconsole.GetDisplay().SetVideoModeHint (sz.width(), sz.height(), 0, 0);

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

@@ -24 +24 @@
 
 #include "VBoxConsoleView.h"
+#include "VBoxProblemReporter.h"
+#include "VBoxGlobal.h"
 
 #include <qapplication.h>
@@ -375 +377 @@
     mHgt = re->height();
 
+    bool remind = false;
     bool fallback = false;
 
@@ -382 +385 @@
         switch (re->bitsPerPixel())
         {
+            /* 32-, 8- and 1-bpp are the only depths suported by QImage */
             case 32:
-            case 24:
-            case 16:
+                break;
+            case 8:
+            case 1:
+                remind = true;
                 break;
             default:
+                remind = true;
                 fallback = true;
                 break;
@@ -397 +404 @@
                 ((mWdt * re->bitsPerPixel() + 31) / 32) * 4;
             Assert (!fallback);
-
             if (!fallback)
             {
                 mImg = QImage ((uchar *) re->VRAM(), mWdt, mHgt,
                                re->bitsPerPixel(), NULL, 0, QImage::LittleEndian);
-                mPixelFormat = re->pixelFormat();
+                mPixelFormat = FramebufferPixelFormat_FOURCC_RGB;
                 mUsesGuestVRAM = true;
             }
@@ -419 +425 @@
         mPixelFormat = FramebufferPixelFormat_FOURCC_RGB;
         mUsesGuestVRAM = false;
+    }
+
+    if (remind)
+    {
+        class RemindEvent : public VBoxAsyncEvent
+        {
+            ulong mRealBPP;
+        public:
+            RemindEvent (ulong aRealBPP)
+                : mRealBPP (aRealBPP) {}
+            void handle()
+            {
+                vboxProblem().remindAboutWrongColorDepth (mRealBPP, 32);
+            }
+        };
+        (new RemindEvent (re->bitsPerPixel()))->post();
     }
 }

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

@@ -267 +267 @@
  *      third button code or 0, see QIMessageBox
  *  @param  name
- *      name of the underlying QIMessageBox object. If null, a value of
+ *      name of the underlying QIMessageBox object. If NULL, a value of
  *      autoConfirmId is used.
  *
@@ -273 +273 @@
  *      code of the button pressed by the user
  */
-int VBoxProblemReporter::message (
-    QWidget *parent, Type type, const QString &msg,
-    const QString &details,
-    const char *autoConfirmId,
-    int b1, int b2, int b3,
-    const char *name
-) {
+int VBoxProblemReporter::message (QWidget *parent, Type type, const QString &msg,
+                                  const QString &details,
+                                  const char *autoConfirmId,
+                                  int b1, int b2, int b3,
+                                  const char *name)
+{
     if (b1 == 0 && b2 == 0 && b3 == 0)
         b1 = QIMessageBox::Ok | QIMessageBox::Default;
@@ -1353 +1352 @@
 bool VBoxProblemReporter::remindAboutMouseIntegration (bool supportsAbsolute)
 {
-    static const char *names [2] =
+    static const char *kNames [2] =
     {
         "remindAboutMouseIntegrationOff",
@@ -1359 +1358 @@
     };
 
-    /* close the previous reminder if it is still active -- already outdated
-     * (the name of the modal window will correspond to autoConfirmId if
-     * it is our reminder) */
-    QWidget *modal = QApplication::activeModalWidget();
-    if (modal && !strcmp (modal->name(), names [int (!supportsAbsolute)]))
-        modal->close();
+    /* Close the previous (outdated) window if any. We use kName as
+     * autoConfirmId which is also used as the widget name by default. */
+    {
+        QWidget *outdated =
+            VBoxGlobal::findWidget (NULL, kNames [int (!supportsAbsolute)],
+                                    "QIMessageBox");
+        if (outdated)
+            outdated->close();
+    }
 
     if (supportsAbsolute)
@@ -1388 +1390 @@
                 "corresponding action from the menu bar."
                 "</p>"),
-            names [1] /* autoConfirmId */);
+            kNames [1] /* autoConfirmId */);
 
         return !(rc & AutoConfirmed);
@@ -1400 +1402 @@
                 "display or pressing the host key) in order to use the "
                 "mouse inside the guest OS.</p>"),
-            names [0] /* autoConfirmId */);
+            kNames [0] /* autoConfirmId */);
 
         return !(rc & AutoConfirmed);
@@ -1483 +1485 @@
             .arg (hotKey).arg (hostKey),
         "remindAboutGoingSeamless");
+    NOREF(rc);
+}
+
+void VBoxProblemReporter::remindAboutWrongColorDepth (ulong aRealBPP,
+                                                      ulong aWantedBPP)
+{
+    const char *kName = "remindAboutWrongColorDepth";
+
+    /* Close the previous (outdated) window if any. We use kName as
+     * autoConfirmId which is also used as the widget name by default. */
+    {
+        QWidget *outdated = VBoxGlobal::findWidget (NULL, kName, "QIMessageBox");
+        if (outdated)
+            outdated->close();
+    }
+
+    int rc = message (&vboxGlobal().consoleWnd(), Info,
+        tr ("<p>The virtual machine window is optimized to work in "
+            "<b>%1&nbsp;bit</b> color mode but the color quality of the "
+            "virtual display is currently set to <b>%2&nbsp;bit</b>.</p>"
+            "<p>Please open the display properties dialog of the guest OS and "
+            "select a <b>%3&nbsp;bit</b> color mode to gain maximum "
+            "performance of the virtual video subsystem.</p>")
+            .arg (aWantedBPP).arg (aRealBPP).arg (aWantedBPP),
+        kName);
     NOREF(rc);
 }