Changeset 3674 in vbox for trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleView.cpp

Timestamp:

Jul 17, 2007 4:12:36 PM (17 years ago)

Author:

vboxsync

Message:

Seamless Mode beta version committed:

1. Menu item "Seamless Mode" is added into VM menu and linked to "GUI/Seamless" xml-config parameter.
2. This menu item could be toggled on/off (the starting value is loading from config at startup) but disabled at startup until the guest additions notifies the host about this feature is supported.
3. After that this mode is activated automatically (in case it was set "on" in config) and can be toggled on/off by the user with Host+S key-shortcut.

Due to any callback to guest additions are not supported yet (afaik) the Seamless Mode's starting screen could be correct (only one guest status-bar displayed) and incorrect sometimes (whole guest desktop). It becomes correct after any guest region update (for example, in case of any guest window is created, moved or resized).

File:

• trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleView.cpp (modified) (8 diffs)

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

@@ -231 +231 @@
     GuestAdditionsEvent (const QString &aOsTypeId,
                          const QString &aAddVersion,
-                         bool aAddActive) :
+                         bool aAddActive,
+                         bool aSeamlessActive) :
         QEvent ((QEvent::Type) VBoxDefs::AdditionsStateChangeEventType),
-        mOsTypeId (aOsTypeId), mAddVersion (aAddVersion), mAddActive (aAddActive) {}
+        mOsTypeId (aOsTypeId), mAddVersion (aAddVersion),
+        mAddActive (aAddActive), mSeamlessActive (aSeamlessActive) {}
     const QString &osTypeId() const { return mOsTypeId; }
     const QString &additionVersion() const { return mAddVersion; }
     bool additionActive() const { return mAddActive; }
+    bool seamlessActive() const { return mSeamlessActive; }
 private:
     QString mOsTypeId;
     QString mAddVersion;
     bool mAddActive;
+    bool mSeamlessActive;
 };
 
@@ -391 +395 @@
                                      guest.GetOSTypeId(),
                                      guest.GetAdditionsVersion(),
-                                     guest.GetAdditionsActive()));
+                                     guest.GetAdditionsActive(),
+                                     guest.GetSeamlessSupport()));
         return S_OK;
     }
@@ -935 +940 @@
                  * full screen */
                 if (!mainwnd->isTrueFullscreen() &&
+                    !mainwnd->isTrueSeamless() &&
                     !topLevelWidget()->isMaximized())
                     normalizeGeometry (true /* adjustPosition */);
@@ -955 +961 @@
             }
 #endif /* Q_WS_MAC */
+
+            case VBoxDefs::SetRegionEventType:
+            {
+                VBoxSetRegionEvent *sre = (VBoxSetRegionEvent*) e;
+                mainwnd->setMask (sre->region());
+                return true;
+            }
 
             case VBoxDefs::MousePointerChangeEventType:
@@ -1022 +1035 @@
                 maybeRestrictMinimumSize();
 
-                emit additionsStateChanged (ge->additionVersion(), ge->additionActive());
+                emit additionsStateChanged (ge->additionVersion(),
+                                            ge->additionActive(),
+                                            ge->seamlessActive());
                 return true;
             }
@@ -1261 +1276 @@
                      * variable should be set to true here in case of mainwnd is
                      * maximized or in fullscreen state. */
-                    if (mainwnd->isMaximized() || mainwnd->isTrueFullscreen())
+                    if (mainwnd->isMaximized() || mainwnd->isTrueFullscreen()
+                                               || mainwnd->isTrueSeamless())
                         ignore_mainwnd_resize = true;
                 }
@@ -1273 +1289 @@
                 if (!mainwnd->isMinimized() &&
                     !mainwnd->isMaximized() &&
-                    !mainwnd->isTrueFullscreen())
+                    !mainwnd->isTrueFullscreen() &&
+                    !mainwnd->isTrueSeamless())
                     QTimer::singleShot (0, this, SLOT (exitFullScreen()));
             }
@@ -1824 +1841 @@
 }
 
+bool VBoxConsoleView::isInSeamlessMode()
+{
+    return mainwnd->isTrueSeamless();
+}
+
 /**
  *  Called on exit from fullscreen or from maximized mode.