Changeset 30348 in vbox

Timestamp:

Jun 21, 2010 6:23:20 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt: New running VM core: Moving fIsAutoCaptureDisabled flag from UIMachineView to UISession as thats flag common for whole ui session.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachineView.cpp (modified) (5 diffs)
• UIMachineView.h (modified) (1 diff)
• UISession.cpp (modified) (1 diff)
• UISession.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp

@@ -206 +206 @@
     , m_desktopGeometryType(DesktopGeo_Invalid)
     , m_iLastMouseWheelDelta(0)
-    , m_bIsAutoCaptureDisabled(false)
     , m_bIsKeyboardCaptured(false)
     , m_bIsHostkeyPressed(false)
@@ -1264 +1263 @@
     {
 #ifdef Q_WS_WIN32
-        if (!m_bIsAutoCaptureDisabled && m_globalSettings.autoCapture() && GetAncestor(winId(), GA_ROOT) == GetForegroundWindow())
+        if (!uisession()->isAutoCaptureDisabled() && m_globalSettings.autoCapture() && GetAncestor(winId(), GA_ROOT) == GetForegroundWindow())
 #else
-        if (!m_bIsAutoCaptureDisabled && m_globalSettings.autoCapture())
+        if (!uisession()->isAutoCaptureDisabled() && m_globalSettings.autoCapture())
 #endif
         {
@@ -1273 +1272 @@
 
         /* Reset the single-time disable capture flag: */
-        if (m_bIsAutoCaptureDisabled)
-            m_bIsAutoCaptureDisabled = false;
+        if (uisession()->isAutoCaptureDisabled())
+            uisession()->setAutoCaptureDisabled(false);
     }
     else
@@ -1446 +1445 @@
                              * the capture state is to be defined by the
                              * dialog result itself */
-                            m_bIsAutoCaptureDisabled = true;
+                            uisession()->setAutoCaptureDisabled(true);
                             bool autoConfirmed = false;
                             ok = vboxProblem().confirmInputCapture (&autoConfirmed);
                             if (autoConfirmed)
-                                m_bIsAutoCaptureDisabled = false;
+                                uisession()->setAutoCaptureDisabled(false);
                             /* otherwise, the disable flag will be reset in
                              * the next console view's foucs in event (since
@@ -1775 +1774 @@
                     /* Temporarily disable auto capture that will take place after this dialog is dismissed because
                      * the capture state is to be defined by the dialog result itself: */
-                    m_bIsAutoCaptureDisabled = true;
+                    uisession()->setAutoCaptureDisabled(true);
                     bool autoConfirmed = false;
                     bool ok = vboxProblem().confirmInputCapture(&autoConfirmed);
                     if (autoConfirmed)
-                        m_bIsAutoCaptureDisabled = false;
+                        uisession()->setAutoCaptureDisabled(false);
                     /* Otherwise, the disable flag will be reset in the next console view's foucs in event (since
                      * may happen asynchronously on some platforms, after we return from this code): */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.h

@@ -229 +229 @@
     uint8_t m_pressedKeysCopy[128];
 
-    bool m_bIsAutoCaptureDisabled : 1;
     bool m_bIsKeyboardCaptured : 1;
     bool m_bIsHostkeyPressed : 1;

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -559 +559 @@
     , m_fIsGuestResizeIgnored(false)
     , m_fIsSeamlessModeRequested(false)
+    , m_fIsAutoCaptureDisabled(false)
     /* Guest additions flags: */
     , m_fIsGuestAdditionsActive(false)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.h

@@ -102 +102 @@
     bool isGuestResizeIgnored() const { return m_fIsGuestResizeIgnored; }
     bool isSeamlessModeRequested() const { return m_fIsSeamlessModeRequested; }
+    bool isAutoCaptureDisabled() const { return m_fIsAutoCaptureDisabled; }
 
     /* Guest additions state getters: */
@@ -130 +131 @@
     void setGuestResizeIgnored(bool fIsGuestResizeIgnored) { m_fIsGuestResizeIgnored = fIsGuestResizeIgnored; }
     void setSeamlessModeRequested(bool fIsSeamlessModeRequested) { m_fIsSeamlessModeRequested = fIsSeamlessModeRequested; }
+    void setAutoCaptureDisabled(bool fIsAutoCaptureDisabled) { m_fIsAutoCaptureDisabled = fIsAutoCaptureDisabled; }
 
     /* Keyboard setters: */
@@ -234 +236 @@
     bool m_fIsGuestResizeIgnored : 1;
     bool m_fIsSeamlessModeRequested : 1;
+    bool m_fIsAutoCaptureDisabled : 1;
 
     /* Guest additions flags: */