Changeset 7463 in vbox

Timestamp:

Mar 14, 2008 5:03:06 PM (17 years ago)

Author:

vboxsync

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

28902

Message:

Frontends/VirtualBox: support VideoModeSupported guest request, this time using the right threads

Location:

trunk/src/VBox/Frontends

Files:

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

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

@@ -98 +98 @@
     void setIgnoreMainwndResize (bool aYes) { mIgnoreMainwndResize = aYes; }
 
+    QRect getDesktopGeometry();
+
 signals:
 
@@ -190 +192 @@
 
     void doResizeHint (const QSize &aSize = QSize());
+    void doResizeDesktop (int);
 
 private:
@@ -286 +289 @@
 #endif
     QSize mLastSizeHint;
+    QRect mDesktopGeometry;
 };
 

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

@@ -753 +753 @@
     setFocusPolicy (WheelFocus);
 
+    /* Remember the desktop geometry and register for geometry change
+       events for telling the guest about video modes we like. */
+    mDesktopGeometry = QApplication::desktop()->screenGeometry (this);
+    connect (QApplication::desktop(), SIGNAL(workAreaResized(int)),
+             this, SLOT(doResizeDesktop(int)));
+
 #if defined (VBOX_GUI_DEBUG) && defined (VBOX_GUI_FRAMEBUF_STAT)
     VMCPUTimer::calibrate (200);
@@ -2252 +2258 @@
     }
     mToggleFSModeTimer->start (2000, true);
+}
+
+/**
+ * Get the current desktop geometry for the console view widget
+ *
+ * @returns the geometry
+ */
+QRect VBoxConsoleView::getDesktopGeometry()
+{
+    return mDesktopGeometry;
 }
 
@@ -3586 +3602 @@
 }
 
+void VBoxConsoleView::doResizeDesktop (int)
+{
+    mDesktopGeometry = QApplication::desktop()->screenGeometry (this);
+}
 
 /**

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

@@ -197 +197 @@
         return E_POINTER;
     *aSupported = TRUE;
-    QRect screen = QApplication::desktop()->screenGeometry (mView);
+    QRect screen = mView->getDesktopGeometry();
     /* Leave 200 pixels leeway. */
     if (aWidth > (ULONG) screen.width() - 200)

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

@@ -94 +94 @@
     void setIgnoreMainwndResize (bool aYes) { mIgnoreMainwndResize = aYes; }
 
+    QRect getDesktopGeometry();
+
 signals:
 
@@ -186 +188 @@
 
     void doResizeHint (const QSize &aSize = QSize());
+    void doResizeDesktop (int);
 
 private:
@@ -282 +285 @@
 #endif
     QSize mLastSizeHint;
+    QRect mDesktopGeometry;
 };
 

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

@@ -749 +749 @@
     setFocusPolicy (Qt::WheelFocus);
 
+    /* Remember the desktop geometry and register for geometry change
+       events for telling the guest about video modes we like. */
+    mDesktopGeometry = QApplication::desktop()->screenGeometry (this);
+    connect (QApplication::desktop(), SIGNAL(workAreaResized(int)),
+             this, SLOT(doResizeDesktop(int)));
+
 #if defined (VBOX_GUI_DEBUG) && defined (VBOX_GUI_FRAMEBUF_STAT)
     VMCPUTimer::calibrate (200);
@@ -2242 +2248 @@
     }
     mToggleFSModeTimer->start (2000);
+}
+
+/**
+ * Get the current desktop geometry for the console view widget
+ *
+ * @returns the geometry
+ */
+QRect VBoxConsoleView::getDesktopGeometry()
+{
+    return mDesktopGeometry;
 }
 
@@ -3580 +3596 @@
 }
 
+void VBoxConsoleView::doResizeDesktop (int)
+{
+    mDesktopGeometry = QApplication::desktop()->screenGeometry (this);
+}
  
 /**

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

@@ -25 +25 @@
 /* Qt includes */
 #include <QPainter>
-#include <qdesktopwidget.h>
 
 //
@@ -199 +198 @@
         return E_POINTER;
     *aSupported = TRUE;
-    QRect screen = QApplication::desktop()->screenGeometry (mView);
+    QRect screen = mView->getDesktopGeometry();
     if (aWidth > (ULONG) screen.width())
         *aSupported = FALSE;