Changeset 7512 in vbox

Timestamp:

Mar 20, 2008 7:01:47 PM (17 years ago)

Author:

vboxsync

Message:

Frontends/VirtualBox: better handle VideoModeSupported requests - accept sizes less that 100 pixels below the screen size or sizes less than the last hint we sent, whichever is greater

Location:

trunk/src/VBox/Frontends

Files:

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

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

@@ -196 +196 @@
 private:
 
+    void setDesktopGeometry(int minWidth, int minHeight);
     void sendInitialSizeHint(void);
     void maybeRestrictMinimumSize();

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

@@ -755 +755 @@
     /* Remember the desktop geometry and register for geometry change
        events for telling the guest about video modes we like. */
-    mDesktopGeometry = QApplication::desktop()->screenGeometry (this);
+
+    doResizeDesktop(0);
     connect (QApplication::desktop(), SIGNAL(workAreaResized(int)),
              this, SLOT(doResizeDesktop(int)));
@@ -3598 +3599 @@
         LogFlowFunc (("Will suggest %d x %d\n", sz.width(), sz.height()));
 
+        /* Increase the desktop geometry if needed */
+        setDesktopGeometry(sz.width(), sz.height());
+
         mConsole.GetDisplay().SetVideoModeHint (sz.width(), sz.height(), 0, 0);
     }
@@ -3604 +3608 @@
 void VBoxConsoleView::doResizeDesktop (int)
 {
-    mDesktopGeometry = QApplication::desktop()->screenGeometry (this);
-}
+    setDesktopGeometry(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.
+ *
+ * @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
+ */
+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);
+}
+
 
 /**

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

@@ -194 +194 @@
                                                   ULONG aBPP, BOOL *aSupported)
 {
+    LogFlowThisFunc(("aWidth=%lu, aHeight=%lu, aBPP=%lu\n",
+                     (unsigned long) aWidth,  (unsigned long) aHeight,
+                      (unsigned long) aBPP));
     if (!aSupported)
         return E_POINTER;
     *aSupported = TRUE;
     QRect screen = mView->getDesktopGeometry();
-    /* Leave 200 pixels leeway. */
     if (aWidth > (ULONG) screen.width())
         *aSupported = FALSE;
@@ -205 +207 @@
     if (aBPP != 32)
         *aSupported = FALSE;
+    LogFlowThisFunc(("returning aSupported=%d\n", *aSupported));
     return S_OK;
 }

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

@@ -192 +192 @@
 private:
 
+    void setDesktopGeometry(int minWidth, int minHeight);
     void sendInitialSizeHint(void);
     void maybeRestrictMinimumSize();

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

@@ -751 +751 @@
     /* Remember the desktop geometry and register for geometry change
        events for telling the guest about video modes we like. */
-    mDesktopGeometry = QApplication::desktop()->screenGeometry (this);
+
+    doResizeDesktop(0);
     connect (QApplication::desktop(), SIGNAL(workAreaResized(int)),
              this, SLOT(doResizeDesktop(int)));
@@ -3592 +3593 @@
         LogFlowFunc (("Will suggest %d x %d\n", sz.width(), sz.height()));
 
+        /* Increase the desktop geometry if needed */
+        setDesktopGeometry(sz.width(), sz.height());
+
         mConsole.GetDisplay().SetVideoModeHint (sz.width(), sz.height(), 0, 0);
     }
@@ -3598 +3602 @@
 void VBoxConsoleView::doResizeDesktop (int)
 {
-    mDesktopGeometry = QApplication::desktop()->screenGeometry (this);
+    setDesktopGeometry(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.
+ *
+ * @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
+ */
+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);
+}
+
+
 /**
  * We send an initial size hint to the VM on startup, based on the last

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

@@ -195 +195 @@
                                                   ULONG aBPP, BOOL *aSupported)
 {
+    LogFlowThisFunc(("aWidth=%lu, aHeight=%lu, aBPP=%lu\n",
+                     (unsigned long) aWidth,  (unsigned long) aHeight,
+                      (unsigned long) aBPP));
     if (!aSupported)
         return E_POINTER;
@@ -205 +208 @@
     if (aBPP != 32)
         *aSupported = FALSE;
+    LogFlowThisFunc(("returning aSupported=%d\n", *aSupported));
     return S_OK;
 }