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

Timestamp:

May 16, 2008 12:15:58 PM (17 years ago)

Author:

vboxsync

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

30923

Message:

Frontends/VirtualBox: created a configuration setting for the maximum guest resolution allowed (see #2787c27-36)

Location:

trunk/src/VBox/Frontends

Files:

• VirtualBox/include/VBoxConsoleView.h (modified) (2 diffs)
• VirtualBox/include/VBoxGlobalSettings.h (modified) (3 diffs)
• VirtualBox/src/VBoxConsoleView.cpp (modified) (5 diffs)
• VirtualBox/src/VBoxFrameBuffer.cpp (modified) (1 diff)
• VirtualBox/src/VBoxGlobalSettings.cpp (modified) (4 diffs)
• VirtualBox4/include/VBoxConsoleView.h (modified) (2 diffs)
• VirtualBox4/include/VBoxGlobalSettings.h (modified) (3 diffs)
• VirtualBox4/src/VBoxConsoleView.cpp (modified) (5 diffs)
• VirtualBox4/src/VBoxFrameBuffer.cpp (modified) (1 diff)
• VirtualBox4/src/VBoxGlobalSettings.cpp (modified) (4 diffs)

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

@@ -197 +197 @@
 private:
 
-    void setDesktopGeometry(int minWidth, int minHeight);
+    enum meDesktopGeo {
+        invalid = 0, fixed, automatic, any, unchanged
+    };
+    void setDesktopGeometry(meDesktopGeo type, int width, int height);
+    void setDesktopGeoHint(int width, int height);
     void maybeRestrictMinimumSize();
 
@@ -284 +288 @@
     CGImageRef mVirtualBoxLogo;
 #endif
+    meDesktopGeo mDesktopGeoType;
     QRect mDesktopGeometry;
+    QRect mLastSizeHint;
 };
 

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

@@ -45 +45 @@
     QString guiFeatures;
     QString languageId;
+    QString maxGuestRes;
 
     friend class VBoxGlobalSettings;
@@ -58 +59 @@
     Q_PROPERTY (QString guiFeatures READ guiFeatures WRITE setGuiFeatures)
     Q_PROPERTY (QString languageId READ languageId WRITE setLanguageId)
+    Q_PROPERTY (QString maxGuestRes READ maxGuestRes WRITE setMaxGuestRes)
 
 public:
@@ -92 +94 @@
     {
         mData()->languageId = aLanguageId;
+    }
+
+    QString maxGuestRes() const { return data()->maxGuestRes; }
+    void setMaxGuestRes (const QString &aMaxGuestRes)
+    {
+        mData()->maxGuestRes = aMaxGuestRes;
     }
 

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

@@ -646 +646 @@
     , mVirtualBoxLogo (NULL)
 #endif
+    , mDesktopGeoType(invalid)
 {
     Assert (!mConsole.isNull() &&
@@ -769 +770 @@
        events for telling the guest about video modes we like. */
 
-    doResizeDesktop(0);
+    QString desktopGeometry = vboxGlobal().settings()
+                                  .publicProperty("GUI/MaxGuestResolution");
+    if (   (QString::null == desktopGeometry)
+        || ("auto" == desktopGeometry)
+       )
+        setDesktopGeometry(automatic, 0, 0);
+    else if ("any" == desktopGeometry)
+        setDesktopGeometry(any, 0, 0);
+    else
+    {
+        int width = desktopGeometry.section(',', 0, 0).toInt();
+        int height = desktopGeometry.section(',', 1, 1).toInt();
+        setDesktopGeometry(fixed, width, height);
+    }
     connect (QApplication::desktop(), SIGNAL(workAreaResized(int)),
              this, SLOT(doResizeDesktop(int)));
@@ -2267 +2281 @@
 
 /**
- * Get the current desktop geometry for the console view widget
+ * Get the current available desktop geometry for the console/framebuffer
  *
- * @returns the geometry
+ * @returns the geometry.  An empty rectangle means unrestricted.
  */
 QRect VBoxConsoleView::getDesktopGeometry()
 {
-    return mDesktopGeometry;
+    QRect rc;
+    switch (mDesktopGeoType)
+    {
+    case fixed:
+    case automatic:
+        rc = QRect (0, 0, RT_MAX(mDesktopGeometry.width(), mLastSizeHint.width()),
+                    RT_MAX(mDesktopGeometry.height(), mLastSizeHint.height()));
+        break;
+    case any:
+        rc = QRect (0, 0, 0, 0);
+        break;
+    default:
+        AssertMsgFailed (("Bad geometry type %d\n", mDesktopGeoType));
+    }
+    return rc;
 }
 
@@ -3531 +3559 @@
 
         /* Increase the desktop geometry if needed */
-        setDesktopGeometry(sz.width(), sz.height());
+        setDesktopGeoHint(sz.width(), sz.height());
 
         if (mAutoresizeGuest)
@@ -3540 +3568 @@
 void VBoxConsoleView::doResizeDesktop (int)
 {
-    setDesktopGeometry(0, 0);
+    /* If the desktop geometry is set automatically, this will update it. */
+    setDesktopGeometry(unchanged, 0, 0);
 }
 
 /**
- * Set the maximum size allowed for the guest desktop to the available area
- * minus 100 pixels each way, or to the specified minimum width and height,
- * whichever is greater.
+ * Set the maximum size allowed for the guest desktop.  This can either be
+ * a fixed maximum size, or a lower bound on the maximum.  In the second case,
+ * the maximum will be set to the available desktop area minus 100 pixels each
+ * way, or to the specified lower bound, whichever is greater.
  *
- * @param minWidth   The width that the guest screen should at least be
- *                   allowed to increase to
- * @param minHeight  The height that the guest screen should at least be
- *                   allowed to increase to
+ * @param fixed   Are the parameters a fixed geometry size or a lower bound?
+ * @param width   The maximum width for the guest screen (fixed geometry)
+ *                or a lower bound for the maximum
+ * @param height  The maximum height for the guest screen (fixed geometry)
+ *                or a lower bound for the maximum
  */
-void VBoxConsoleView::setDesktopGeometry(int minWidth, int minHeight)
-{
-    LogFlowThisFunc(("minWidth=%d, minHeight=%d\n", minWidth, minHeight));
-    QRect desktopGeometry = QApplication::desktop()->screenGeometry (this);
-    int width = desktopGeometry.width();
-    if (width - 100 < minWidth)
-        width = minWidth;
-    else
-        width = width - 100;
-    int height = desktopGeometry.height();
-    if (height - 100 < minHeight)
-        height = minHeight;
-    else
-        height = height - 100;
-    LogFlowThisFunc(("Setting %d, %d\n", width, height));
-    mDesktopGeometry = QRect(0, 0, width, height);
-}
-
+void VBoxConsoleView::setDesktopGeoHint(int width, int height)
+{
+    LogFlowThisFunc(("width=%d, height=%d\n", width, height));
+    mLastSizeHint = QRect (0, 0, width, height);
+}
+
+/**
+ * Set initial desktop geometry restrictions on the guest framebuffer.  These
+ * determine the maximum size the guest framebuffer can take on.  Note that
+ * a hint from the host will always override these restrictions.
+ *
+ * @param type    Values: fixed - the guest has a fixed maximum framebuffer size
+ *                        automatic - we recalculate the maximum size ourselves
+ *                        any - any size is allowed
+ * @param width   The maximum width for the guest screen or zero for no change
+ *                (only used for fixed geometry)
+ * @param height  The maximum height for the guest screen or zero for no change
+ *                (only used for fixed geometry)
+ */
+void VBoxConsoleView::setDesktopGeometry(meDesktopGeo type, int width, int height)
+{
+    LogFlowThisFunc (("type = %s, width=%d, height=%d\n",
+                      (fixed == type ? "fixed"
+                           : (automatic == type ? "automatic"
+                                 : (any == type ? "any"
+                                       : (unchanged == type ? "unchanged" : "invalid")
+                                   )
+                             )
+                      ), width, height
+                    ));
+    Assert((type != unchanged) || (mDesktopGeoType != invalid));
+    if (unchanged == type)
+        type = mDesktopGeoType;
+    switch (type)
+    {
+    case fixed:
+        mDesktopGeoType = fixed;
+        if ((0 != width ) && (0 != height))
+            mDesktopGeometry = QRect (0, 0, width, height);
+        setDesktopGeoHint (0, 0);
+        break;
+    case automatic:
+    {
+        mDesktopGeoType = automatic;
+        QRect desktop = QApplication::desktop()->screenGeometry (this);
+        mDesktopGeometry = QRect(0, 0, desktop.width() - 100, desktop.height() - 100);
+        LogFlowThisFunc(("Setting %d, %d\n", desktop.width() - 100, desktop.height() - 100));
+        setDesktopGeoHint (0, 0);
+        break;
+    }
+    case any:
+        mDesktopGeoType = any;
+        mDesktopGeometry = QRect (0, 0, 0, 0);
+        break;
+    default:
+        AssertMsgFailed(("Invalid desktop geometry type %d\n", type));
+        mDesktopGeoType = invalid;
+    }
+}
 
 /**

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

@@ -206 +206 @@
     *aSupported = TRUE;
     QRect screen = mView->getDesktopGeometry();
-    if (aWidth > (ULONG) screen.width())
+    if (   (screen.width() != 0)
+        && (aWidth > (ULONG) screen.width())
+       )
         *aSupported = FALSE;
-    if (aHeight > (ULONG) screen.height())
+    if (   (screen.height() != 0)
+        && (aHeight > (ULONG) screen.height())
+       )
         *aSupported = FALSE;
     LogFlowThisFunc(("returning aSupported=%d\n", *aSupported));

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

@@ -60 +60 @@
     guiFeatures = QString::null;
     languageId  = QString::null;
+    maxGuestRes = "auto";
 }
 
@@ -68 +69 @@
     guiFeatures = that.guiFeatures;
     languageId  = that.languageId;
+    maxGuestRes = that.maxGuestRes;
 }
 
@@ -80 +82 @@
          autoCapture == that.autoCapture &&
          guiFeatures == that.guiFeatures &&
-         languageId  == that.languageId);
+         languageId  == that.languageId &&
+         maxGuestRes == that.maxGuestRes);
 }
 
@@ -105 +108 @@
     { "GUI/Customizations",     "guiFeatures",  "\\S+", true },
     { "GUI/LanguageID",         "languageId",   gVBoxLangIDRegExp, true },
+    { "GUI/MaxGuestResolution", "maxGuestRes",  "\\d*[1-9]\\d*,\\d*[1-9]\\d*|any|auto", true }
 };
 

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

@@ -215 +215 @@
 private:
 
-    void setDesktopGeometry(int minWidth, int minHeight);
+    enum meDesktopGeo {
+        invalid = 0, fixed, automatic, any, unchanged
+    };
+    void setDesktopGeometry(meDesktopGeo type, int width, int height);
+    void setDesktopGeoHint(int width, int height);
     void maybeRestrictMinimumSize();
 
@@ -301 +305 @@
     CGImageRef mVirtualBoxLogo;
 #endif
+    meDesktopGeo mDesktopGeoType;
     QRect mDesktopGeometry;
+    QRect mLastSizeHint;
 };
 

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxGlobalSettings.h

@@ -46 +46 @@
     QString guiFeatures;
     QString languageId;
+    QString maxGuestRes;
 
     friend class VBoxGlobalSettings;
@@ -59 +60 @@
     Q_PROPERTY (QString guiFeatures READ guiFeatures WRITE setGuiFeatures)
     Q_PROPERTY (QString languageId READ languageId WRITE setLanguageId)
+    Q_PROPERTY (QString maxGuestRes READ maxGuestRes WRITE setMaxGuestRes)
 
 public:
@@ -93 +95 @@
     {
         mData()->languageId = aLanguageId;
+    }
+
+    QString maxGuestRes() const { return data()->maxGuestRes; }
+    void setMaxGuestRes (const QString &aMaxGuestRes)
+    {
+        mData()->maxGuestRes = aMaxGuestRes;
     }
 

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

@@ -667 +667 @@
     , mVirtualBoxLogo (NULL)
 #endif
+    , mDesktopGeoType(invalid)
 {
     Assert (!mConsole.isNull() &&
@@ -798 +799 @@
        events for telling the guest about video modes we like. */
 
-    doResizeDesktop(0);
+    QString desktopGeometry = vboxGlobal().settings()
+                                  .publicProperty("GUI/MaxGuestResolution");
+    if (   (QString::null == desktopGeometry)
+        || ("auto" == desktopGeometry)
+       )
+        setDesktopGeometry(automatic, 0, 0);
+    else if ("any" == desktopGeometry)
+        setDesktopGeometry(any, 0, 0);
+    else
+    {
+        int width = desktopGeometry.section(',', 0, 0).toInt();
+        int height = desktopGeometry.section(',', 1, 1).toInt();
+        setDesktopGeometry(fixed, width, height);
+    }
     connect (QApplication::desktop(), SIGNAL(workAreaResized(int)),
              this, SLOT(doResizeDesktop(int)));
@@ -2289 +2303 @@
 
 /**
- * Get the current desktop geometry for the console view widget
+ * Get the current available desktop geometry for the console/framebuffer
  *
- * @returns the geometry
+ * @returns the geometry.  An empty rectangle means unrestricted.
  */
 QRect VBoxConsoleView::getDesktopGeometry()
 {
-    return mDesktopGeometry;
+    QRect rc;
+    switch (mDesktopGeoType)
+    {
+    case fixed:
+    case automatic:
+        rc = QRect (0, 0, RT_MAX(mDesktopGeometry.width(), mLastSizeHint.width()),
+                    RT_MAX(mDesktopGeometry.height(), mLastSizeHint.height()));
+        break;
+    case any:
+        rc = QRect (0, 0, 0, 0);
+        break;
+    default:
+        AssertMsgFailed (("Bad geometry type %d\n", mDesktopGeoType));
+    }
+    return rc;
 }
 
@@ -3545 +3573 @@
 
         /* Increase the desktop geometry if needed */
-        setDesktopGeometry(sz.width(), sz.height());
+        setDesktopGeoHint(sz.width(), sz.height());
 
         if (mAutoresizeGuest)
@@ -3554 +3582 @@
 void VBoxConsoleView::doResizeDesktop (int)
 {
-    setDesktopGeometry(0, 0);
+    /* If the desktop geometry is set automatically, this will update it. */
+    setDesktopGeometry(unchanged, 0, 0);
 }
 
 /**
- * Set the maximum size allowed for the guest desktop to the available area
- * minus 100 pixels each way, or to the specified minimum width and height,
- * whichever is greater.
+ * Set the maximum size allowed for the guest desktop.  This can either be
+ * a fixed maximum size, or a lower bound on the maximum.  In the second case,
+ * the maximum will be set to the available desktop area minus 100 pixels each
+ * way, or to the specified lower bound, whichever is greater.
  *
- * @param minWidth   The width that the guest screen should at least be
- *                   allowed to increase to
- * @param minHeight  The height that the guest screen should at least be
- *                   allowed to increase to
+ * @param fixed   Are the parameters a fixed geometry size or a lower bound?
+ * @param width   The maximum width for the guest screen (fixed geometry)
+ *                or a lower bound for the maximum
+ * @param height  The maximum height for the guest screen (fixed geometry)
+ *                or a lower bound for the maximum
  */
-void VBoxConsoleView::setDesktopGeometry(int minWidth, int minHeight)
-{
-    LogFlowThisFunc(("minWidth=%d, minHeight=%d\n", minWidth, minHeight));
-    QRect desktopGeometry = QApplication::desktop()->screenGeometry (this);
-    int width = desktopGeometry.width();
-    if (width - 100 < minWidth)
-        width = minWidth;
-    else
-        width = width - 100;
-    int height = desktopGeometry.height();
-    if (height - 100 < minHeight)
-        height = minHeight;
-    else
-        height = height - 100;
-    LogFlowThisFunc(("Setting %d, %d\n", width, height));
-    mDesktopGeometry = QRect(0, 0, width, height);
-}
-
+void VBoxConsoleView::setDesktopGeoHint(int width, int height)
+{
+    LogFlowThisFunc(("width=%d, height=%d\n", width, height));
+    mLastSizeHint = QRect (0, 0, width, height);
+}
+
+/**
+ * Set initial desktop geometry restrictions on the guest framebuffer.  These
+ * determine the maximum size the guest framebuffer can take on.  Note that
+ * a hint from the host will always override these restrictions.
+ *
+ * @param type    Values: fixed - the guest has a fixed maximum framebuffer size
+ *                        automatic - we recalculate the maximum size ourselves
+ *                        any - any size is allowed
+ * @param width   The maximum width for the guest screen or zero for no change
+ *                (only used for fixed geometry)
+ * @param height  The maximum height for the guest screen or zero for no change
+ *                (only used for fixed geometry)
+ */
+void VBoxConsoleView::setDesktopGeometry(meDesktopGeo type, int width, int height)
+{
+    LogFlowThisFunc (("type = %s, width=%d, height=%d\n",
+                      (fixed == type ? "fixed"
+                           : (automatic == type ? "automatic"
+                                 : (any == type ? "any"
+                                       : (unchanged == type ? "unchanged" : "invalid")
+                                   )
+                             )
+                      ), width, height
+                    ));
+    Assert((type != unchanged) || (mDesktopGeoType != invalid));
+    if (unchanged == type)
+        type = mDesktopGeoType;
+    switch (type)
+    {
+    case fixed:
+        mDesktopGeoType = fixed;
+        if ((0 != width ) && (0 != height))
+            mDesktopGeometry = QRect (0, 0, width, height);
+        setDesktopGeoHint (0, 0);
+        break;
+    case automatic:
+    {
+        mDesktopGeoType = automatic;
+        QRect desktop = QApplication::desktop()->screenGeometry (this);
+        mDesktopGeometry = QRect(0, 0, desktop.width() - 100, desktop.height() - 100);
+        LogFlowThisFunc(("Setting %d, %d\n", desktop.width() - 100, desktop.height() - 100));
+        setDesktopGeoHint (0, 0);
+        break;
+    }
+    case any:
+        mDesktopGeoType = any;
+        mDesktopGeometry = QRect (0, 0, 0, 0);
+        break;
+    default:
+        AssertMsgFailed(("Invalid desktop geometry type %d\n", type));
+        mDesktopGeoType = invalid;
+    }
+}
 
 /**

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

@@ -207 +207 @@
     *aSupported = TRUE;
     QRect screen = mView->getDesktopGeometry();
-    if (aWidth > (ULONG) screen.width())
+    if (   (screen.width() != 0)
+        && (aWidth > (ULONG) screen.width())
+       )
         *aSupported = FALSE;
-    if (aHeight > (ULONG) screen.height())
+    if (   (screen.height() != 0)
+        && (aHeight > (ULONG) screen.height())
+       )
         *aSupported = FALSE;
     LogFlowThisFunc(("returning aSupported=%d\n", *aSupported));

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxGlobalSettings.cpp

@@ -59 +59 @@
     guiFeatures = QString::null;
     languageId  = QString::null;
+    maxGuestRes = "auto";
 }
 
@@ -67 +68 @@
     guiFeatures = that.guiFeatures;
     languageId  = that.languageId;
+    maxGuestRes = that.maxGuestRes;
 }
 
@@ -79 +81 @@
          autoCapture == that.autoCapture &&
          guiFeatures == that.guiFeatures &&
-         languageId  == that.languageId);
+         languageId  == that.languageId &&
+         maxGuestRes == that.maxGuestRes);
 }
 
@@ -104 +107 @@
     { "GUI/Customizations",     "guiFeatures",  "\\S+", true },
     { "GUI/LanguageID",         "languageId",   gVBoxLangIDRegExp, true },
+    { "GUI/MaxGuestResolution", "maxGuestRes",  "\\d*[1-9]\\d*,\\d*[1-9]\\d*|any|auto", true }
 };