Changeset 24971 in vbox for trunk/src

Timestamp:

Nov 25, 2009 5:03:25 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt: do not send resize hints for guest-initiated resizes

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxConsoleView.h (modified) (2 diffs)
• src/VBoxConsoleView.cpp (modified) (7 diffs)

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

@@ -259 +259 @@
 
     void setDesktopGeometry (DesktopGeo aGeo, int aWidth, int aHeight);
-    void setDesktopGeoHint (int aWidth, int aHeight);
+    void storeConsoleSize (int aWidth, int aHeight);
     void calculateDesktopGeometry();
     void maybeRestrictMinimumSize();
@@ -365 +365 @@
     DesktopGeo mDesktopGeo;
     QRect mDesktopGeometry;
-    QRect mLastSizeHint;
+    QRect mStoredConsoleSize;
     bool mPassCAD;
     bool mHideHostPointer;

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

@@ -1272 +1272 @@
                 LogFlow (("VBoxDefs::ResizeEventType: %d x %d x %d bpp\n",
                           re->width(), re->height(), re->bitsPerPixel()));
-
+#ifdef DEBUG_michael
+                LogRel (("Resize event from guest: %d x %d x %d bpp\n",
+                         re->width(), re->height(), re->bitsPerPixel()));
+#endif
+
+                /* Store the new size to prevent unwanted resize hints being
+                 * sent back. */
+                storeConsoleSize(re->width(), re->height());
                 /* do frame buffer dependent resize */
 
@@ -1354 +1361 @@
                 {
                     mIgnoreFrameBufferResize = false;
-                    doResizeHint (mNormalSize);
                 }
 
@@ -2693 +2699 @@
         case DesktopGeo_Automatic:
             rc = QRect (0, 0,
-                        RT_MAX (mDesktopGeometry.width(), mLastSizeHint.width()),
-                        RT_MAX (mDesktopGeometry.height(), mLastSizeHint.height()));
+                        RT_MAX (mDesktopGeometry.width(), mStoredConsoleSize.width()),
+                        RT_MAX (mDesktopGeometry.height(), mStoredConsoleSize.height()));
             break;
         case DesktopGeo_Any:
@@ -4017 +4023 @@
         if (!aToSize.isValid())
             sz -= QSize (frameWidth() * 2, frameWidth() * 2);
+        /* Do not send out useless hints. */
+        if ((sz.width() == mStoredConsoleSize.width()) &&
+            (sz.height() == mStoredConsoleSize.height()))
+            return;
         /* We only actually send the hint if
          * 1) the autoresize property is set to true and
@@ -4029 +4039 @@
             LogFlowFunc (("Will suggest %d x %d\n", sz.width(), sz.height()));
 
-            /* Increase the maximum allowed size to the new size if needed. */
-            setDesktopGeoHint (sz.width(), sz.height());
+            /* Remember the new size. */
+            storeConsoleSize (sz.width(), sz.height());
 
             mConsole.GetDisplay().SetVideoModeHint (sz.width(), sz.height(), 0, 0);
@@ -4047 +4057 @@
 
 /**
- * Remember a geometry hint sent by the console window.  This is used to
- * determine the maximum supported guest resolution in the @a desktopGeometry
- * method.  A hint will always override other restrictions.
+ * Store the current size of the console (i.e. the viewport to the guest).
+ * This has two purposes.  One is to suppress unwanted resize events for
+ * which the new size is the same as the stored size.  The other is to expand
+ * the maximum size to which we will let the guest resize itself.  It makes
+ * no sense to forbid guest resizes which are less than the current resolution
+ * anyway.
  *
  * @param aWidth  width of the resolution hint
  * @param aHeight height of the resolution hint
  */
-void VBoxConsoleView::setDesktopGeoHint (int aWidth, int aHeight)
+void VBoxConsoleView::storeConsoleSize (int aWidth, int aHeight)
 {
     LogFlowThisFunc (("aWidth=%d, aHeight=%d\n", aWidth, aHeight));
-    mLastSizeHint = QRect (0, 0, aWidth, aHeight);
+    mStoredConsoleSize = QRect (0, 0, aWidth, aHeight);
 }
 
@@ -4092 +4105 @@
             else
                 mDesktopGeometry = QRect (0, 0, 0, 0);
-            setDesktopGeoHint (0, 0);
+            storeConsoleSize (0, 0);
             break;
         case DesktopGeo_Automatic:
             mDesktopGeo = DesktopGeo_Automatic;
             mDesktopGeometry = QRect (0, 0, 0, 0);
-            setDesktopGeoHint (0, 0);
+            storeConsoleSize (0, 0);
             break;
         case DesktopGeo_Any: