Changeset 52195 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jul 25, 2014 3:32:45 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: 7468: Update to r95247: Re-integrate flag from UISession side (better for 4.3).

Location:

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

Files:

• UIKeyboardHandler.cpp (modified) (1 diff)
• UIMouseHandler.cpp (modified) (2 diffs)
• UISession.cpp (modified) (2 diffs)
• UISession.h (modified) (2 diffs)

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

@@ -1393 +1393 @@
                         if (m_fIsKeyboardCaptured)
                         {
-                            const MouseCapturePolicy policy = gEDataManager->mouseCapturePolicy(vboxGlobal().managedVMUuid());
-                            if (policy == MouseCapturePolicy_Default || policy == MouseCapturePolicy_HostComboOnly)
+                            if (uisession()->mouseCapturePolicy() == MouseCapturePolicy_Default ||
+                                uisession()->mouseCapturePolicy() == MouseCapturePolicy_HostComboOnly)
                                 machineLogic()->mouseHandler()->captureMouse(uScreenId);
                         }

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

@@ -35 +35 @@
 #include "UIMachineView.h"
 #include "UIFrameBuffer.h"
-#include "UIExtraDataManager.h"
 
 #ifdef Q_WS_WIN
@@ -992 +991 @@
 #endif /* Q_WS_X11 */
                         machineLogic()->keyboardHandler()->captureKeyboard(uScreenId);
-                        if (gEDataManager->mouseCapturePolicy(vboxGlobal().managedVMUuid()) == MouseCapturePolicy_Default)
+                        if (uisession()->mouseCapturePolicy() == MouseCapturePolicy_Default)
                             captureMouse(uScreenId);
                     }

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

@@ -134 +134 @@
     , m_pMachineWindowIcon(0)
 #endif /* !Q_WS_MAC */
+    , m_mouseCapturePolicy(MouseCapturePolicy_Default)
     , m_guruMeditationHandlerType(GuruMeditationHandlerType_Default)
     , m_hiDPIOptimizationType(HiDPIOptimizationType_None)
@@ -1147 +1148 @@
 #endif /* !Q_WS_MAC */
 
+        /* Determine mouse-capture policy: */
+        m_mouseCapturePolicy = gEDataManager->mouseCapturePolicy(strMachineID);
+
         /* Determine Guru Meditation handler type: */
         m_guruMeditationHandlerType = gEDataManager->guruMeditationHandlerType(strMachineID);

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

@@ -107 +107 @@
     /** @name Runtime workflow stuff.
      ** @{ */
+    /** Returns the mouse-capture policy. */
+    MouseCapturePolicy mouseCapturePolicy() const { return m_mouseCapturePolicy; }
     /** Returns Guru Meditation handler type. */
     GuruMeditationHandlerType guruMeditationHandlerType() const { return m_guruMeditationHandlerType; }
@@ -343 +345 @@
     /** @name Runtime workflow variables.
      ** @{ */
+    /** Holds the mouse-capture policy. */
+    MouseCapturePolicy m_mouseCapturePolicy;
     /** Holds Guru Meditation handler type. */
     GuruMeditationHandlerType m_guruMeditationHandlerType;