Changeset 26795 in vbox

Timestamp:

Feb 25, 2010 1:37:14 PM (15 years ago)

Author:

vboxsync

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

58062

Message:

FE/Qt4: New running VM core: Take into account Main API changes from r58047.

Location:

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

Files:

• UIMachineLogic.cpp (modified) (6 diffs)
• UIMachineLogic.h (modified) (2 diffs)
• UIMachineView.cpp (modified) (13 diffs)
• UIMachineView.h (modified) (4 diffs)
• UISession.cpp (modified) (4 diffs)
• UISession.h (modified) (1 diff)

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

@@ -383 +383 @@
     , m_fIsGuestSupportsSeamless(false)
     , m_fIsMouseSupportsAbsolute(false)
+    , m_fIsMouseSupportsRelative(false)
     , m_fIsHostCursorNeeded(false)
     , m_fIsPreventAutoClose(false)
@@ -410 +411 @@
 
     /* Mouse capability state-change updater: */
-    connect(uisession(), SIGNAL(sigMouseCapabilityChange(bool, bool)), this, SLOT(sltMouseCapabilityChanged(bool, bool)));
+    connect(uisession(), SIGNAL(sigMouseCapabilityChange(bool, bool, bool)), this, SLOT(sltMouseCapabilityChanged(bool, bool, bool)));
 
     /* USB devices state-change updater: */
@@ -637 +638 @@
         m_fIsGuestSupportsSeamless = uisession()->property("MachineLogic/IsGuestSupportsSeamless").toBool();
         m_fIsMouseSupportsAbsolute = uisession()->property("MachineLogic/IsMouseSupportsAbsolute").toBool();
+        m_fIsMouseSupportsRelative = uisession()->property("MachineLogic/IsMouseSupportsRelative").toBool();
         m_fIsHostCursorNeeded = uisession()->property("MachineLogic/IsHostCursorNeeded").toBool();
 
@@ -672 +674 @@
         uisession()->setProperty("MachineLogic/IsGuestSupportsSeamless", m_fIsGuestSupportsSeamless);
         uisession()->setProperty("MachineLogic/IsMouseSupportsAbsolute", m_fIsMouseSupportsAbsolute);
+        uisession()->setProperty("MachineLogic/IsMouseSupportsRelative", m_fIsMouseSupportsRelative);
         uisession()->setProperty("MachineLogic/IsHostCursorNeeded", m_fIsHostCursorNeeded);
     }
@@ -827 +830 @@
     /* Update related things: */
     QAction *pAction = actionsPool()->action(UIActionIndex_Toggle_MouseIntegration);
-    pAction->setEnabled(m_fIsMouseSupportsAbsolute && !m_fIsHostCursorNeeded);
+    pAction->setEnabled(m_fIsMouseSupportsAbsolute && m_fIsMouseSupportsRelative && !m_fIsHostCursorNeeded);
     pAction->setChecked(m_fIsHostCursorNeeded || pAction->isChecked());
 }
@@ -869 +872 @@
 }
 
-void UIMachineLogic::sltMouseCapabilityChanged(bool fIsSupportsAbsolute, bool fIsHostCursorNeeded)
+void UIMachineLogic::sltMouseCapabilityChanged(bool fIsSupportsAbsolute, bool fIsSupportsRelative, bool fIsHostCursorNeeded)
 {
     /* Check if something is changed: */
-    if (m_fIsMouseSupportsAbsolute != fIsSupportsAbsolute || m_fIsHostCursorNeeded != fIsHostCursorNeeded)
+    if (m_fIsMouseSupportsAbsolute != fIsSupportsAbsolute ||
+        m_fIsMouseSupportsRelative != fIsSupportsRelative ||
+        m_fIsHostCursorNeeded != fIsHostCursorNeeded)
     {
         /* Store new data: */
         m_fIsMouseSupportsAbsolute = fIsSupportsAbsolute;
+        m_fIsMouseSupportsRelative = fIsSupportsRelative;
         m_fIsHostCursorNeeded = fIsHostCursorNeeded;
 

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

@@ -108 +108 @@
     virtual void sltMachineStateChanged(KMachineState machineState);
     virtual void sltAdditionsStateChanged();
-    virtual void sltMouseCapabilityChanged(bool fIsSupportsAbsolute, bool fNeedsHostCursor);
+    virtual void sltMouseCapabilityChanged(bool fIsSupportsAbsolute, bool fIsSupportsRelative, bool fNeedsHostCursor);
     virtual void sltUSBDeviceStateChange(const CUSBDevice &device, bool bIsAttached, const CVirtualBoxErrorInfo &error);
     virtual void sltRuntimeError(bool bIsFatal, const QString &strErrorId, const QString &strMessage);
@@ -171 +171 @@
     bool m_fIsGuestSupportsSeamless : 1;
     bool m_fIsMouseSupportsAbsolute : 1;
+    bool m_fIsMouseSupportsRelative : 1;
     bool m_fIsHostCursorNeeded : 1;
     bool m_fIsPreventAutoClose : 1;

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

@@ -157 +157 @@
 {
     return (m_bIsMouseCaptured ? UIMouseStateType_MouseCaptured : 0) |
-           (m_bIsMouseAbsolute ? UIMouseStateType_MouseAbsolute : 0) |
+           (m_fIsMouseSupportsAbsolute ? UIMouseStateType_MouseAbsolute : 0) |
            (m_bIsMouseIntegrated ? 0 : UIMouseStateType_MouseAbsoluteDisabled);
 }
@@ -166 +166 @@
         return;
 
-    if (m_bIsMouseAbsolute)
+    if (m_fIsMouseSupportsAbsolute)
         captureMouse(!bEnabled, false);
 
@@ -214 +214 @@
     , m_bIsKeyboardCaptured(false)
     , m_bIsMouseCaptured(false)
-    , m_bIsMouseAbsolute(false)
+    , m_fIsMouseSupportsAbsolute(false)
+    , m_fIsMouseSupportsRelative(false)
     , m_bIsMouseIntegrated(true)
     , m_fIsHideHostPointer(true)
@@ -586 +587 @@
 
     /* Mouse capability state-change updater: */
-    connect(sender, SIGNAL(sigMouseCapabilityChange(bool, bool)), this, SLOT(sltMouseCapabilityChanged(bool, bool)));
+    connect(sender, SIGNAL(sigMouseCapabilityChange(bool, bool, bool)), this, SLOT(sltMouseCapabilityChanged(bool, bool, bool)));
 }
 
@@ -635 +636 @@
         m_bIsKeyboardCaptured = loader->property("MachineView/IsKeyboardCaptured").toBool();
         m_bIsMouseCaptured = loader->property("MachineView/IsMouseCaptured").toBool();
-        m_bIsMouseAbsolute = loader->property("MachineView/IsMouseAbsolute").toBool();
+        m_fIsMouseSupportsAbsolute = loader->property("MachineView/IsMouseSupportsAbsolute").toBool();
+        m_fIsMouseSupportsRelative = loader->property("MachineView/IsMouseSupportsRelative").toBool();
         m_bIsMouseIntegrated = loader->property("MachineView/IsMouseIntegrated").toBool();
         m_fIsHideHostPointer = loader->property("MachineView/IsHideHostPointer").toBool();
@@ -668 +670 @@
         saver->setProperty("MachineView/IsKeyboardCaptured", m_bIsKeyboardCaptured);
         saver->setProperty("MachineView/IsMouseCaptured", m_bIsMouseCaptured);
-        saver->setProperty("MachineView/IsMouseAbsolute", m_bIsMouseAbsolute);
+        saver->setProperty("MachineView/IsMouseSupportsAbsolute", m_fIsMouseSupportsAbsolute);
+        saver->setProperty("MachineView/IsMouseSupportsRelative", m_fIsMouseSupportsRelative);
         saver->setProperty("MachineView/IsMouseIntegrated", m_bIsMouseIntegrated);
         saver->setProperty("MachineView/IsHideHostPointer", m_fIsHideHostPointer);
@@ -795 +798 @@
 void UIMachineView::updateMousePointerShape()
 {
-    if (m_bIsMouseAbsolute)
+    if (m_fIsMouseSupportsAbsolute)
     {
         /* Should we hide/show pointer? */
@@ -808 +811 @@
 {
     /* Correct the mouse capture state and reset the cursor to the default shape if necessary: */
-    if (m_bIsMouseAbsolute)
+    if (m_fIsMouseSupportsAbsolute)
     {
         CMouse mouse = m_console.GetMouse();
@@ -818 +821 @@
 
     /* Notify user about mouse integration state: */
-    vboxProblem().remindAboutMouseIntegration(m_bIsMouseAbsolute);
+    vboxProblem().remindAboutMouseIntegration(m_fIsMouseSupportsAbsolute);
 
     /* Notify all watchers: */
@@ -890 +893 @@
 }
 
-void UIMachineView::sltMouseCapabilityChanged(bool bIsSupportsAbsolute, bool /* bNeedsHostCursor */)
+void UIMachineView::sltMouseCapabilityChanged(bool fIsMouseSupportsAbsolute, bool fIsMouseSupportsRelative, bool /* fIsMouseNeedsHostCursor */)
 {
     /* Check if something had changed: */
-    if (m_bIsMouseAbsolute != bIsSupportsAbsolute)
+    if (m_fIsMouseSupportsAbsolute != fIsMouseSupportsAbsolute || m_fIsMouseSupportsRelative != fIsMouseSupportsRelative)
     {
         /* Get new data: */
-        m_bIsMouseAbsolute = bIsSupportsAbsolute;
+        m_fIsMouseSupportsAbsolute = fIsMouseSupportsAbsolute;
+        m_fIsMouseSupportsRelative = fIsMouseSupportsRelative;
 
         /* Update depending things: */
@@ -1533 +1537 @@
                 {
                     captureKbd (false);
-                    if (!(m_bIsMouseAbsolute && m_bIsMouseIntegrated))
+                    if (!(m_fIsMouseSupportsAbsolute && m_bIsMouseIntegrated))
                         captureMouse (false);
                 }
@@ -1641 +1645 @@
                         {
                             captureKbd (!captured, false);
-                            if (!(m_bIsMouseAbsolute && m_bIsMouseIntegrated))
+                            if (!(m_fIsMouseSupportsAbsolute && m_bIsMouseIntegrated))
                             {
 #ifdef Q_WS_X11
@@ -1925 +1929 @@
 #endif
 
-        if (m_bIsMouseAbsolute && m_bIsMouseIntegrated)
+        if (m_fIsMouseSupportsAbsolute && m_bIsMouseIntegrated)
         {
             int cw = contentsWidth(), ch = contentsHeight();

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

@@ -121 +121 @@
     bool isGuestSupportsGraphics() const { return m_bIsGuestSupportsGraphics; }
     const QPixmap& pauseShot() const { return m_pauseShot; }
-    //bool isMouseAbsolute() const { return m_bIsMouseAbsolute; }
+    //bool isMouseAbsolute() const { return m_fIsMouseSupportsAbsolute; }
 
     /* Protected members: */
@@ -159 +159 @@
                                              uint uXHot, uint uYHot, uint uWidth, uint uHeight,
                                              const uchar *pShapeData);
-    virtual void sltMouseCapabilityChanged(bool bIsSupportsAbsolute, bool bNeedsHostCursor);
+    virtual void sltMouseCapabilityChanged(bool bIsSupportsAbsolute, bool bIsSupportsRelative, bool bNeedsHostCursor);
 
     /* Initiate resize request to guest: */
@@ -232 +232 @@
     /* Private getters: */
     bool isRunning() { return m_machineState == KMachineState_Running || m_machineState == KMachineState_Teleporting || m_machineState == KMachineState_LiveSnapshotting; }
-    bool shouldHideHostPointer() const { return m_bIsMouseCaptured || (m_bIsMouseAbsolute && m_fIsHideHostPointer); }
+    bool shouldHideHostPointer() const { return m_bIsMouseCaptured || (m_fIsMouseSupportsAbsolute && m_fIsHideHostPointer); }
 
     static void dimImage(QImage &img);
@@ -261 +261 @@
     bool m_bIsKeyboardCaptured : 1;
     bool m_bIsMouseCaptured : 1;
-    bool m_bIsMouseAbsolute : 1;
+    bool m_fIsMouseSupportsAbsolute : 1;
+    bool m_fIsMouseSupportsRelative : 1;
     bool m_bIsMouseIntegrated : 1;
     bool m_fIsHideHostPointer;

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

@@ -77 +77 @@
 public:
 
-    UIMouseCapabilityChangeEvent(bool bSupportsAbsolute, bool bNeedsHostCursor)
+    UIMouseCapabilityChangeEvent(bool bSupportsAbsolute, bool bSupportsRelative, bool bNeedsHostCursor)
         : QEvent((QEvent::Type)UIConsoleEventType_MouseCapabilityChange)
-        , m_bSupportsAbsolute(bSupportsAbsolute), m_bNeedsHostCursor(bNeedsHostCursor) {}
+        , m_bSupportsAbsolute(bSupportsAbsolute), m_bSupportsRelative(bSupportsRelative), m_bNeedsHostCursor(bNeedsHostCursor) {}
 
     bool supportsAbsolute() const { return m_bSupportsAbsolute; }
+    bool supportsRelative() const { return m_bSupportsRelative; }
     bool needsHostCursor() const { return m_bNeedsHostCursor; }
 
@@ -87 +88 @@
 
     bool m_bSupportsAbsolute;
+    bool m_bSupportsRelative;
     bool m_bNeedsHostCursor;
 };
@@ -359 +361 @@
     }
 
-    STDMETHOD(OnMouseCapabilityChange)(BOOL bSupportsAbsolute, BOOL bNeedHostCursor)
-    {
-        QApplication::postEvent(m_pEventHandler, new UIMouseCapabilityChangeEvent(bSupportsAbsolute, bNeedHostCursor));
+    STDMETHOD(OnMouseCapabilityChange)(BOOL bSupportsAbsolute, BOOL bSupportsRelative, BOOL bNeedHostCursor)
+    {
+        QApplication::postEvent(m_pEventHandler, new UIMouseCapabilityChangeEvent(bSupportsAbsolute, bSupportsRelative, bNeedHostCursor));
         return S_OK;
     }
@@ -548 +550 @@
         {
             UIMouseCapabilityChangeEvent *pConsoleEvent = static_cast<UIMouseCapabilityChangeEvent*>(pEvent);
-            emit sigMouseCapabilityChange(pConsoleEvent->supportsAbsolute(), pConsoleEvent->needsHostCursor());
+            emit sigMouseCapabilityChange(pConsoleEvent->supportsAbsolute(), pConsoleEvent->supportsRelative(), pConsoleEvent->needsHostCursor());
             return true;
         }

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

@@ -76 +76 @@
     /* Console signals: */
     void sigMousePointerShapeChange(bool bIsVisible, bool bHasAlpha, uint uXHot, uint uYHot, uint uWidth, uint uHeight, const uchar *pShapeData);
-    void sigMouseCapabilityChange(bool bIsSupportsAbsolute, bool bNeedsHostCursor);
+    void sigMouseCapabilityChange(bool bIsSupportsAbsolute, bool bIsSupportsRelative, bool bNeedsHostCursor);
     void sigKeyboardLedsChange(bool bNumLock, bool bCapsLock, bool bScrollLock);
     void sigStateChange(KMachineState machineState);