Changeset 5544 in vbox

Timestamp:

Oct 29, 2007 9:50:13 AM (17 years ago)

Author:

vboxsync

Message:

2349: "Fullscreen loses focus" issue:

Just upgraded fullscreen/seamless mode entering mechanism from "reparenting way" to "QT inner fullscreen mode" (with region restriction for seamless).

Need to be checked on every platform for different issues.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

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

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

@@ -91 +91 @@
     void fixModifierState (LONG *codes, uint *count);
 
-    void toggleFSMode (const QSize &aFeatSize);
+    void toggleFSMode();
 
     void setIgnoreMainwndResize (bool aYes) { mIgnoreMainwndResize = aYes; }
@@ -232 +232 @@
 
     QRegion mLastVisibleRegion;
+    QSize mNormalSize;
 
 #if defined(Q_WS_WIN)

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

@@ -42 +42 @@
 class QHBox;
 class QLabel;
+class QSpacerItem;
 
 class VBoxConsoleView;
@@ -69 +70 @@
     bool isTrueSeamless() const { return mIsSeamless; }
 
-    bool isManualResize() const { return mManualResize; }
-
     void setMouseIntegrationLocked (bool aDisabled);
 
@@ -77 +76 @@
     void installGuestAdditionsFrom (const QString &aSource);
 
-#ifdef Q_WS_WIN
     void setMask (const QRegion &aRegion);
-#endif
 
 public slots:
@@ -87 +84 @@
     // events
     bool event (QEvent *e);
-    void resizeEvent (QResizeEvent *e);
     void closeEvent (QCloseEvent *e);
 #if defined(Q_WS_X11)
@@ -252 +248 @@
     bool statusBarChangedInside;
 
+    QSpacerItem *mShiftingSpacer;
+
 #ifdef VBOX_WITH_DEBUGGER_GUI
     // Debugger popup menu
@@ -294 +292 @@
     QSize normal_size;
     QSize prev_min_size;
-    QSize mPrevSize;
-    QSize mAwaitingSize;
 
 #ifdef Q_WS_WIN32
@@ -302 +298 @@
 
     // variables for dealing with true fullscreen
-    bool mDoMaximize : 1;
-    bool mManualResize : 1;
-    bool mAllowOneResize : 1;
+    QRegion mStrictedRegion;
     bool mIsFullscreen : 1;
     bool mIsSeamless : 1;

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

@@ -846 +846 @@
     /* Make no normalizeGeometry in case we are in manual resize
      * mode or main window is maximized */
-    if (mainwnd->isManualResize() || mainwnd->isMaximized())
+    if (mainwnd->isMaximized())
         return;
 
@@ -1651 +1651 @@
     {
         flags |= KeyExtended;
-        scan = ch >> 8; 
+        scan = ch >> 8;
     }
     else if (scan == 0x5C && (ch & 0xFF) == '/')
@@ -2054 +2054 @@
  *  Called on enter/exit seamless/fullscreen mode.
  */
-void VBoxConsoleView::toggleFSMode (const QSize &aResizeTo)
+void VBoxConsoleView::toggleFSMode()
 {
     if (mIsAdditionsActive && mAutoresizeGuest)
-        doResizeHint (aResizeTo);
+    {
+        QSize newSize = QSize();
+        if (mainwnd->isTrueFullscreen() || mainwnd->isTrueSeamless())
+        {
+            mNormalSize = frameSize();
+            newSize = maximumSize();
+        }
+        else
+            newSize = mNormalSize;
+        doResizeHint (newSize);
+    }
     mToggleFSModeTimer->start (400, true);
 }
@@ -3267 +3277 @@
          * and gives it all available space. */
         QSize sz (aToSize.isValid() ? aToSize : mainwnd->centralWidget()->size());
-        sz -= QSize (frameWidth() * 2, frameWidth() * 2);
+        if (!aToSize.isValid())
+            sz -= QSize (frameWidth() * 2, frameWidth() * 2);
         LogFlowFunc (("Will suggest %d x %d\n", sz.width(), sz.height()));
 

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

@@ -108 +108 @@
     , machine_state (CEnums::InvalidMachineState)
     , no_auto_close (false)
-    , mDoMaximize (false)
-    , mManualResize (false)
-    , mAllowOneResize (false)
     , mIsFullscreen (false)
     , mIsSeamless (false)
@@ -634 +631 @@
     {
         setCentralWidget (new QWidget (this, "centralWidget"));
-        new QBoxLayout (centralWidget(), QBoxLayout::LeftToRight);
+        new QBoxLayout (centralWidget(), QBoxLayout::Down);
     }
 
@@ -651 +648 @@
     ((QBoxLayout*) centralWidget()->layout())->addWidget (
         console, 0, AlignVCenter | AlignHCenter);
+
+    mShiftingSpacer = new QSpacerItem (0, 0, QSizePolicy::Expanding,
+                                             QSizePolicy::Fixed);
+    ((QBoxLayout*) centralWidget()->layout())->addItem (mShiftingSpacer);
 
     CMachine cmachine = csession.GetMachine();
@@ -1008 +1009 @@
     vmSeamlessAction->setEnabled (mIsSeamless);
     vmFullscreenAction->setEnabled (mIsFullscreen);
-
-    mAwaitingSize = mPrevSize;
 }
 
@@ -1023 +1022 @@
     vmFullscreenAction->setEnabled (true);
 
-    mManualResize = false;
     console->setIgnoreMainwndResize (false);
     console->normalizeGeometry (true /* adjustPosition */);
@@ -1078 +1076 @@
             QResizeEvent *re = (QResizeEvent *) e;
 
-            /* do not process event if the resize events are blocked
-             * and the proposed size is not the awaited one */
-            if (mManualResize && !mAllowOneResize &&
-                re->size() != mAwaitingSize)
-                return false;
-
-            if (!mManualResize  &&
-                (windowState() & WindowMaximized) == 0)
+            if ((windowState() & WindowMaximized) == 0)
             {
                 normal_size = re->size();
@@ -1092 +1083 @@
 #endif
             }
-            if (mManualResize && mAllowOneResize)
-                mAllowOneResize = false;
-
             break;
         }
         case QEvent::Move:
         {
-            if (!mManualResize  &&
-                (windowState() & (WindowMaximized | WindowMinimized |
+            if ((windowState() & (WindowMaximized | WindowMinimized |
                                   WindowFullScreen)) == 0)
             {
@@ -1116 +1103 @@
             break;
         }
-        case QEvent::WindowStateChange:
-        {
-            if (mDoMaximize)
-            {
-                /* this workaround is necessary due to KDE seems to be
-                 * thinks the seamless mode is maximized state */
-                mDoMaximize = false;
-                setWindowState (windowState() | WindowMaximized);
-            }
-        }
         default:
             break;
@@ -1131 +1108 @@
 
     return QMainWindow::event (e);
-}
-
-void VBoxConsoleWnd::resizeEvent (QResizeEvent *aEvent)
-{
-    if (aEvent->size() == mAwaitingSize)
-    {
-        /* this resize was done to awaited size, so
-         * let the guest to be resized to this size too */
-        mAwaitingSize = QSize();
-        console->toggleFSMode (centralWidget()->size());
-    }
-
-    QMainWindow::resizeEvent (aEvent);
 }
 
@@ -1940 +1904 @@
     if (aSeamless)
     {
-        /* Check if it is necessary to enter/leave seamless mode */
-        if (aOn && !mIsSeamlessSupported || aOn && mIsFullscreen ||
+        /* Check if it is necessary to enter/leave seamless mode. */
+        if (aOn && (!mIsSeamlessSupported || mIsFullscreen) ||
             !aOn && !mIsSeamless)
             return;
 
-        /* Check if the Guest Video RAM enough for the seamless mode */
+        /* Check if the Guest Video RAM enough for the seamless mode. */
         QRect screen = QApplication::desktop()->screenGeometry (this);
         ULONG64 availBits = (csession.GetMachine().GetVRAMSize() /* vram */
@@ -1956 +1920 @@
                          * screen.height() /* display height */
                          * QColor::numBitPlanes(); /* bit per pixel */
-
         if (aOn && (availBits < usedBits))
         {
@@ -1975 +1938 @@
     if (aOn)
     {
-        /* take the toggle hot key from the menu item */
+        /* Take the toggle hot key from the menu item. */
         QString hotKey = aSeamless ? vmSeamlessAction->menuText() :
                                      vmFullscreenAction->menuText();
         hotKey = QStringList::split ('\t', hotKey) [1];
         Assert (!hotKey.isEmpty());
-        /* get the host key name */
+        /* Get the host key name. */
         QString hostKey = QIHotKeyEdit::keyName (vboxGlobal().settings()
                                                              .hostKey());
-        /* show the info message */
+        /* Show the info message. */
         aSeamless ? vboxProblem().remindAboutGoingSeamless (hotKey, hostKey) :
                     vboxProblem().remindAboutGoingFullscreen (hotKey, hostKey);
@@ -1990 +1953 @@
     if (aSeamless)
     {
-        /* activate the auto-resize feature required for the seamless mode */
+        /* Activate the auto-resize feature required for the seamless mode. */
         if (!vmAutoresizeGuestAction->isOn())
             vmAutoresizeGuestAction->setOn (true);
 
-        /* activate the mouse integration feature for the seamless mode */
+        /* Activate the mouse integration feature for the seamless mode. */
         if (vmDisableMouseIntegrAction->isOn())
             vmDisableMouseIntegrAction->setOn (false);
@@ -2017 +1980 @@
     if (aOn)
     {
-        /* Block any disallowed resize events: */
-        mManualResize = true;
-        console->setIgnoreMainwndResize (true);
-
-        /* temporarily disable the mode-related action to make sure
-         * user can not leave the mode before he enter it */
+        /* Temporarily disable the mode-related action to make sure
+         * user can not leave the mode before he enter it. */
         aSeamless ? vmSeamlessAction->setEnabled (false) :
                     vmFullscreenAction->setEnabled (false);
-
-        connect (console, SIGNAL (resizeHintDone()), this, SLOT (onEnterFullscreen()));
+        /* Toggle console to manual resize mode. */
+        console->setIgnoreMainwndResize (true);
+        connect (console, SIGNAL (resizeHintDone()),
+                 this, SLOT (onEnterFullscreen()));
+
+        /* Memorize the maximized state. */
+        was_max = isMaximized();
 
         /* Save the previous scroll-view minimum size before entering
@@ -2035 +1999 @@
         console->setMinimumSize (0, 0);
 
-        /* memorize the maximized state */
-        was_max = isMaximized();
-
-        /* memorize previous size before entering the f/s mode */
-        mPrevSize = size();
-
-        /* set the correct flags to disable unnecessary frame controls */
-        int flags = WType_TopLevel | WStyle_Customize | WStyle_NoBorder;
-        if (!aSeamless)
-            flags |= WStyle_StaysOnTop;
-
         /* let the widget take the whole available desktop space */
         QRect scrGeo = aSeamless ?
@@ -2051 +2004 @@
             QApplication::desktop()->screenGeometry (this);
 
-        /* let the required resize event pass */
-        mAwaitingSize = scrGeo.size();
+        /* Calculate the difference region between current mode
+         * (fullscreen or seamless) and the screen geometry. */
+        mStrictedRegion =
+            QRegion (QApplication::desktop()->screenGeometry (this)) - scrGeo;
+
+        /* Setup the shifting spacer to make the console to be aligned on top
+         * in the seamless mode. */
+        mShiftingSpacer->changeSize (0, mStrictedRegion.boundingRect().height(),
+                                     QSizePolicy::Preferred, QSizePolicy::Fixed);
 
 #ifdef Q_WS_WIN32
@@ -2058 +2018 @@
 #endif
 
-        /* hide early to avoid extra flicker */
-        hide();
-        /* hide all but the central widget containing the console view */
+        /* Hide all but the central widget containing the console view. */
         QObjectList *list = queryList (NULL, NULL, false, false);
         for (QObject *obj = list->first(); obj != NULL; obj = list->next())
@@ -2076 +2034 @@
         delete list;
 
-        /* reparent to apply new flags and place to the top left corner of the
-         * current desktop */
-        reparent (parentWidget(), flags, QPoint (scrGeo.x(), scrGeo.y()), false);
-        /* reattaching application icon after window reparenting */
-        setIcon (QPixmap::fromMimeSource ("ico40x01.png"));
-
-        /* adjust colors and appearance */
+        /* Adjust colors and appearance. */
         erase_color = centralWidget()->eraseColor();
         centralWidget()->setEraseColor (black);
         console_style = console->frameStyle();
         console->setFrameStyle (QFrame::NoFrame);
-        console->setMaximumSize (console->sizeHint());
+        console->setMaximumSize (scrGeo.size());
         console->setVScrollBarMode (QScrollView::AlwaysOff);
         console->setHScrollBarMode (QScrollView::AlwaysOff);
 
-        /* go fullscreen */
-        resize (scrGeo.size());
-        setMinimumSize (scrGeo.size());
-        setMaximumSize (scrGeo.size());
+        /* Going fullscreen:
+         * "normal -> fullscreen" for normal window,
+         * "maximized -> normal -> fullscreen" for maximized window.
+         * Going "maximized -> fullscreen" wrong on KDE in both directions.
+         * Here it does not resize the child window correctly. */
+        if (was_max)
+            showNormal();
+        showFullScreen();
 
 #ifdef Q_WS_MAC
         if (!aSeamless)
         {
-            /* make the apple menu bar go away. */
+            /* Make the apple menu bar go away. */
             OSStatus orc = SetSystemUIMode (kUIModeAllHidden,
                                             kUIOptionDisableAppleMenu);
@@ -2106 +2062 @@
         }
 #endif
+
+        qApp->processEvents();
+        console->toggleFSMode();
     }
     else
     {
-        /* temporarily disable the mode-related action to make sure
-         * user can not enter the mode before he leave it */
+        /* Temporarily disable the mode-related action to make sure
+         * user can not enter the mode before he leave it. */
         aSeamless ? vmSeamlessAction->setEnabled (false) :
                     vmFullscreenAction->setEnabled (false);
-
+        /* Toggle console to manual resize mode. */
         connect (console, SIGNAL (resizeHintDone()), this, SLOT (onExitFullscreen()));
+
+        /* Reset the shifting spacer. */
+        mShiftingSpacer->changeSize (0, 0, QSizePolicy::Preferred,
+                                           QSizePolicy::Fixed);
 
         /* Restore the previous scroll-view minimum size before the exiting
@@ -2128 +2091 @@
 #endif
 
-        /* hide early to avoid extra flicker */
-        hide();
-
-        /* reparent to restore normal flags */
-        reparent (parentWidget(), normal_wflags, normal_pos, false);
-        /* reattaching application icon after window reparenting */
-        setIcon (QPixmap::fromMimeSource ("ico40x01.png"));
-
-        /* adjust colors and appearance */
+        /* Adjust colors and appearance. */
+        clearMask();
         centralWidget()->setEraseColor (erase_color);
         console->setFrameStyle (console_style);
@@ -2143 +2099 @@
         console->setHScrollBarMode (QScrollView::Auto);
 
-        /* show everything hidden when going fullscreen */
+        /* Show everything hidden when going fullscreen. */
         for (QObject *obj = hidden_children.first(); obj != NULL;
              obj = hidden_children.next())
@@ -2149 +2105 @@
         hidden_children.clear();
 
-        /* restore normal values */
-        setMinimumSize (QSize(0, 0));
-        setMaximumSize (QSize (QWIDGETSIZE_MAX, QWIDGETSIZE_MAX));
-
-        /* check if we are maximized: seamless on some wm == maximized */
-        bool is_max = isMaximized();
-
-        /* restore previous position */
-        move (normal_pos);
-
+        /* Going normal || maximized:
+         * "fullscreen -> normal" if was normal window,
+         * "fullscreen -> normal -> maximized" if was maximized window.
+         * Going "fullscreen -> maximized" wrong on KDE in both directions.
+         * Here it looses the window frame totally. */
+        showNormal();
         if (was_max)
-            /* let pass one resize event with previous size */
-            mAllowOneResize = true;
-        else
-            /* ensure we are waiting for the previous size */
-            mAwaitingSize = normal_size;
-
-        /* restore previous size */
-        resize (normal_size);
+            showMaximized();
+
         qApp->processEvents();
-
-        if (was_max)
-        {
-            if (aSeamless && is_max)
-                /* if seamless == maximized do delayed maximization */
-                mDoMaximize = true;
-            else
-                /* restore maximized mode now */
-                setWindowState (windowState() | WindowMaximized);
-            qApp->processEvents();
-        }
-    }
-
-    /* VBoxConsoleView loses focus for some reason after reparenting,
-     * restore it */
-    console->setFocus();
-
-    if (!wasHidden)
-        show();
+        console->toggleFSMode();
+    }
+    if (wasHidden)
+        hide();
 }
 
@@ -2564 +2495 @@
 }
 
+void VBoxConsoleWnd::setMask (const QRegion &aRegion)
+{
+    QRegion region = aRegion - mStrictedRegion;
+
 #ifdef Q_WS_WIN
-void VBoxConsoleWnd::setMask (const QRegion &aRegion)
-{
-    QRegion difference = mPrevRegion.subtract (aRegion);
+    QRegion difference = mPrevRegion.subtract (region);
 
     /* Region offset calculation */
@@ -2579 +2512 @@
     /* Visible region calculation */
     HRGN newReg = CreateRectRgn (0, 0, 0, 0);
-    CombineRgn (newReg, aRegion.handle(), 0, RGN_COPY);
+    CombineRgn (newReg, region.handle(), 0, RGN_COPY);
     OffsetRgn (newReg, fleft, ftop);
 
@@ -2592 +2525 @@
     RedrawWindow (console->viewport()->winId(), NULL, NULL, RDW_INVALIDATE);
 
-    mPrevRegion = aRegion;
-}
-#endif
+    mPrevRegion = region;
+#else
+    QMainWindow::setMask (region);
+#endif
+}
 
 /**