Changeset 26815 in vbox for trunk

Timestamp:

Feb 26, 2010 2:43:37 AM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: New running VM core: cumulative patch to let uimachine to restore mouse/keyboard states when switching modes.

Location:

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

Files:

• UIMachine.cpp (modified) (1 diff)
• UIMachine.h (modified) (1 diff)
• UIMachineLogic.cpp (modified) (52 diffs)
• UIMachineLogic.h (modified) (10 diffs)
• UIMachineView.cpp (modified) (54 diffs)
• UIMachineView.h (modified) (10 diffs)
• UIMachineWindow.cpp (modified) (13 diffs)
• UIMachineWindow.h (modified) (5 diffs)
• UISession.cpp (modified) (9 diffs)
• UISession.h (modified) (4 diffs)
• normal/UIMachineLogicNormal.cpp (modified) (10 diffs)
• normal/UIMachineViewNormal.cpp (modified) (5 diffs)
• normal/UIMachineWindowNormal.cpp (modified) (8 diffs)
• normal/UIMachineWindowNormal.h (modified) (2 diffs)

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

@@ -162 +162 @@
 UIMachine::UIMachine(UIMachine **ppSelf, const CSession &session)
     : QObject(0)
+    , m_pActionsPool(new UIActionsPool(this))
     , m_pSession(new UISession(this, session))
-    , m_pActionsPool(new UIActionsPool(this))
     , m_pVisualState(0)
 {

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

@@ -58 +58 @@
     /* Private getters: */
     UIMachineLogic* machineLogic() const;
+    UIActionsPool* actionsPool() const { return m_pActionsPool; }
 
     /* Private variables: */
+    UIActionsPool *m_pActionsPool;
     UISession *m_pSession;
-    UIActionsPool *m_pActionsPool;
     UIVisualState *m_pVisualState;
 

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

@@ -25 +25 @@
 #include <QDir>
 #include <QFileInfo>
-#include <QProgressBar>
 #include <QDesktopWidget>
 
 /* Local includes */
-#include "VBoxGlobal.h"
+#include "COMDefs.h"
 #include "VBoxProblemReporter.h"
 
@@ -40 +39 @@
 
 #include "QIFileDialog.h"
-#include "QIHttp.h"
+//#include "QIHttp.h"
 
 #include "UISession.h"
@@ -51 +50 @@
 #include "UIMachineView.h"
 
-#include <iprt/param.h>
 #include <iprt/path.h>
 #include <VBox/VMMDev.h>
@@ -87 +85 @@
 {
     USBTarget() : attach(false), id(QString()) {}
-    USBTarget(bool bAttach, const QString &strId)
-        : attach(bAttach), id(strId) {}
+    USBTarget(bool fAttach, const QString &strId)
+        : attach(fAttach), id(strId) {}
     bool attach;
     QString id;
@@ -372 +370 @@
     , m_pSession(pSession)
     , m_pActionsPool(pActionsPool)
-    , m_machineState(KMachineState_Null)
     , m_visualStateType(visualStateType)
     , m_pMachineWindowWrapper(0)
     , m_pRunningActions(0)
     , m_pRunningOrPausedActions(0)
-    , m_fIsFirstTimeStarted(false)
-    , m_fIsIgnoringRutimeMediums(false)
-    , m_fIsAdditionsActive(false)
-    , m_fIsGuestSupportsGraphics(false)
-    , m_fIsGuestSupportsSeamless(false)
-    , m_fIsMouseSupportsAbsolute(false)
-    , m_fIsMouseSupportsRelative(false)
-    , m_fIsHostCursorNeeded(false)
     , m_fIsPreventAutoClose(false)
 {
@@ -399 +388 @@
 CSession& UIMachineLogic::session()
 {
-    return m_pSession->session();
+    return uisession()->session();
 }
 
@@ -405 +394 @@
 {
     /* Machine state-change updater: */
-    connect(uisession(), SIGNAL(sigStateChange(KMachineState)), this, SLOT(sltMachineStateChanged(KMachineState)));
+    connect(uisession(), SIGNAL(sigMachineStateChange()), this, SLOT(sltMachineStateChanged()));
 
     /* Guest additions state-change updater: */
@@ -411 +400 @@
 
     /* Mouse capability state-change updater: */
-    connect(uisession(), SIGNAL(sigMouseCapabilityChange(bool, bool, bool)), this, SLOT(sltMouseCapabilityChanged(bool, bool, bool)));
+    connect(uisession(), SIGNAL(sigMouseCapabilityChange()), this, SLOT(sltMouseCapabilityChanged()));
 
     /* USB devices state-change updater: */
@@ -534 +523 @@
 
     /* Check if the virtualization feature is required. */
-    bool bIs64BitsGuest = vboxGlobal().virtualBox().GetGuestOSType(console.GetGuest().GetOSTypeId()).GetIs64Bit();
+    bool fIs64BitsGuest = vboxGlobal().virtualBox().GetGuestOSType(console.GetGuest().GetOSTypeId()).GetIs64Bit();
     bool fRecommendVirtEx = vboxGlobal().virtualBox().GetGuestOSType(console.GetGuest().GetOSTypeId()).GetRecommendedVirtEx();
-    AssertMsg(!bIs64BitsGuest || fRecommendVirtEx, ("Virtualization support missed for 64bit guest!\n"));
-    bool bIsVirtEnabled = console.GetDebugger().GetHWVirtExEnabled();
-    if (fRecommendVirtEx && !bIsVirtEnabled)
-    {
-        bool result;
-
-        pause();
+    AssertMsg(!fIs64BitsGuest || fRecommendVirtEx, ("Virtualization support missed for 64bit guest!\n"));
+    bool fIsVirtEnabled = console.GetDebugger().GetHWVirtExEnabled();
+    if (fRecommendVirtEx && !fIsVirtEnabled)
+    {
+        bool fResult;
+
+        uisession()->pause();
 
         bool fVTxAMDVSupported = vboxGlobal().virtualBox().GetHost().GetProcessorFeature(KProcessorFeature_HWVirtEx);
 
-        if (bIs64BitsGuest)
-            result = vboxProblem().warnAboutVirtNotEnabled64BitsGuest(fVTxAMDVSupported);
+        if (fIs64BitsGuest)
+            fResult = vboxProblem().warnAboutVirtNotEnabled64BitsGuest(fVTxAMDVSupported);
         else
-            result = vboxProblem().warnAboutVirtNotEnabledGuestRequired(fVTxAMDVSupported);
-
-        if (result == true)
+            fResult = vboxProblem().warnAboutVirtNotEnabledGuestRequired(fVTxAMDVSupported);
+
+        if (fResult == true)
             sltClose();
         else
-            unpause();
+            uisession()->unpause();
     }
 
@@ -564 +553 @@
 }
 
-void UIMachineLogic::loadLogicSettings()
-{
-    /* Get current machine: */
-    CMachine machine = session().GetMachine();
-
-    /* Extra-data settings: */
-    {
-        QString strSettings;
-
-        strSettings = machine.GetExtraData(VBoxDefs::GUI_AutoresizeGuest);
-        if (strSettings != "off")
-            actionsPool()->action(UIActionIndex_Toggle_GuestAutoresize)->setChecked(true);
-
-        strSettings = machine.GetExtraData(VBoxDefs::GUI_FirstRun);
-        if (strSettings == "yes")
-            m_fIsFirstTimeStarted = true;
-
-        strSettings = machine.GetExtraData(VBoxDefs::GUI_SaveMountedAtRuntime);
-        if (strSettings == "no")
-            m_fIsIgnoringRutimeMediums = true;
-    }
-
-    /* Initial settings: */
-    {
-        /* Initialize storage stuff: */
-        int iDevicesCountCD = 0;
-        int iDevicesCountFD = 0;
-        const CMediumAttachmentVector &attachments = machine.GetMediumAttachments();
-        foreach (const CMediumAttachment &attachment, attachments)
-        {
-            if (attachment.GetType() == KDeviceType_DVD)
-                ++ iDevicesCountCD;
-            if (attachment.GetType() == KDeviceType_Floppy)
-                ++ iDevicesCountFD;
-        }
-        actionsPool()->action(UIActionIndex_Menu_OpticalDevices)->setData(iDevicesCountCD);
-        actionsPool()->action(UIActionIndex_Menu_FloppyDevices)->setData(iDevicesCountFD);
-        actionsPool()->action(UIActionIndex_Menu_OpticalDevices)->setVisible(iDevicesCountCD);
-        actionsPool()->action(UIActionIndex_Menu_FloppyDevices)->setVisible(iDevicesCountFD);
-    }
-
-    /* Availability settings: */
-    {
-        /* USB Stuff: */
-        CUSBController usbController = machine.GetUSBController();
-        if (usbController.isNull())
-        {
-            /* Hide USB menu if controller is NULL: */
-            actionsPool()->action(UIActionIndex_Menu_USBDevices)->setVisible(false);
-        }
-        else
-        {
-            /* Enable/Disable USB menu depending on USB controller: */
-            actionsPool()->action(UIActionIndex_Menu_USBDevices)->setEnabled(usbController.GetEnabled());
-        }
-
-        /* VRDP Stuff: */
-        CVRDPServer vrdpServer = machine.GetVRDPServer();
-        if (vrdpServer.isNull())
-        {
-            /* Hide VRDP Action: */
-            actionsPool()->action(UIActionIndex_Toggle_VRDP)->setVisible(false);
-        }
-    }
-
-#if 0
-    /* Dynamical property settings: */
-    {
-        /* Load dynamical properties: */
-        m_machineState = uisession()->property("MachineLogic/MachineState").value<KMachineState>();
-        m_fIsAdditionsActive = uisession()->property("MachineLogic/IsAdditionsActive").toBool();
-        m_fIsGuestSupportsGraphics = uisession()->property("MachineLogic/IsGuestSupportsGraphics").toBool();
-        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();
-
-        /* Update relative things: */
-        updateMachineState();
-        updateAdditionsState();
-        updateMouseCapability();
-    }
-#endif
-}
-
-void UIMachineLogic::saveLogicSettings()
-{
-    /* Get current machine: */
-    CMachine machine = session().GetMachine();
-
-    /* Extra-data settings: */
-    {
-        machine.SetExtraData(VBoxDefs::GUI_AutoresizeGuest,
-                             actionsPool()->action(UIActionIndex_Toggle_GuestAutoresize)->isChecked() ? "on" : "off");
-
-        machine.SetExtraData(VBoxDefs::GUI_FirstRun, QString());
-
-        // TODO: Move to fullscreen/seamless logic:
-        //machine.SetExtraData(VBoxDefs::GUI_MiniToolBarAutoHide, mMiniToolBar->isAutoHide() ? "on" : "off");
-    }
-
-#if 0
-    /* Dynamical property settings: */
-    {
-        /* Save dynamical properties: */
-        uisession()->setProperty("MachineLogic/MachineState", QVariant::fromValue(machineState()));
-        uisession()->setProperty("MachineLogic/IsAdditionsActive", m_fIsAdditionsActive);
-        uisession()->setProperty("MachineLogic/IsGuestSupportsGraphics", m_fIsGuestSupportsGraphics);
-        uisession()->setProperty("MachineLogic/IsGuestSupportsSeamless", m_fIsGuestSupportsSeamless);
-        uisession()->setProperty("MachineLogic/IsMouseSupportsAbsolute", m_fIsMouseSupportsAbsolute);
-        uisession()->setProperty("MachineLogic/IsMouseSupportsRelative", m_fIsMouseSupportsRelative);
-        uisession()->setProperty("MachineLogic/IsHostCursorNeeded", m_fIsHostCursorNeeded);
-    }
-#endif
-}
-
-void UIMachineLogic::updateMachineState()
-{
-    /* State flags: */
-    bool fIsRunning = machineState() == KMachineState_Running ||
-                      machineState() == KMachineState_Teleporting ||
-                      machineState() == KMachineState_LiveSnapshotting;
-    bool fIsRunningOrPaused = fIsRunning ||
-                              machineState() == KMachineState_Paused;
+void UIMachineLogic::sltMachineStateChanged()
+{
+    /* Get machine state: */
+    KMachineState state = uisession()->machineState();
 
     /* Update action groups: */
-    m_pRunningActions->setEnabled(fIsRunning);
-    m_pRunningOrPausedActions->setEnabled(fIsRunningOrPaused);
+    m_pRunningActions->setEnabled(uisession()->isRunning());
+    m_pRunningOrPausedActions->setEnabled(uisession()->isRunning() || uisession()->isPaused());
 
     /* Do we have GURU? */
     bool fIsGuruMeditation = false;
 
-    switch (machineState())
+    switch (state)
     {
         case KMachineState_Stuck:
         {
-            /* We will handle GURU later: */
+            /* We will process GURU later: */
             fIsGuruMeditation = true;
             break;
         }
         case KMachineState_Paused:
+        case KMachineState_TeleportingPausedVM:
         {
             QAction *pPauseAction = actionsPool()->action(UIActionIndex_Toggle_Pause);
@@ -746 +616 @@
 
     /* Close VM if was closed someway: */
-    if (machineState() == KMachineState_PoweredOff || machineState() == KMachineState_Saved ||
-        machineState() == KMachineState_Teleported || machineState() == KMachineState_Aborted)
+    if (uisession()->isTurnedOff())
     {
         /* VM has been powered off or saved or aborted, no matter internally or externally.
@@ -755 +624 @@
     }
 
-    /* Process GURU: */
+    /* Postprocess GURU: */
     if (fIsGuruMeditation)
     {
-        if (machineWindowWrapper()->machineView())
-            machineWindowWrapper()->machineView()->setIgnoreGuestResize(true);
+        uisession()->setGuestResizeIgnored(true);
 
         CConsole console = session().GetConsole();
@@ -780 +648 @@
         }
     }
-
-#ifdef Q_WS_MAC
-    /* Update Dock Overlay: */
-    if (machineWindowWrapper() && machineWindowWrapper()->machineView())
-        machineWindowWrapper()->machineView()->updateDockOverlay();
-#endif /* Q_WS_MAC */
-}
-
-void UIMachineLogic::updateAdditionsState()
-{
-    /* Update action groups: */
-    actionsPool()->action(UIActionIndex_Toggle_GuestAutoresize)->setEnabled(m_fIsAdditionsActive && m_fIsGuestSupportsGraphics);
-    actionsPool()->action(UIActionIndex_Toggle_Seamless)->setEnabled(m_fIsAdditionsActive && m_fIsGuestSupportsGraphics && m_fIsGuestSupportsSeamless);
-
-#if 0 // TODO: Enter seamless if necessary!
-    /* If seamless mode should be enabled then check if it is enabled currently and re-enable it if open-view procedure is finished */
-    if (actionsPool()->action(UIActionIndex_Toggle_Seamless)->isChecked() &&
-        m_fIsAdditionsActive && m_fIsGuestSupportsGraphics && m_fIsGuestSupportsSeamless)
-        toggleFullscreenMode(true, true);
-#endif
+}
+
+void UIMachineLogic::sltAdditionsStateChanged()
+{
+    /* Variable falgs: */
+    bool fIsAdditionsActive = uisession()->isGuestAdditionsActive();
+    bool fIsSupportsGraphics = fIsAdditionsActive && uisession()->isGuestSupportsGraphics();
+    bool fIsSupportsSeamless = fIsSupportsGraphics && uisession()->isGuestSupportsSeamless();
+
+    /* Update action states: */
+    actionsPool()->action(UIActionIndex_Toggle_GuestAutoresize)->setEnabled(fIsSupportsGraphics);
+    actionsPool()->action(UIActionIndex_Toggle_Seamless)->setEnabled(fIsSupportsSeamless);
 
     /* Check the GA version only in case of additions are active: */
-    if (!m_fIsAdditionsActive)
+    if (!fIsAdditionsActive)
         return;
-
     /* Check the Guest Additions version and warn the user about possible compatibility issues in case if the installed version is outdated. */
     CGuest guest = session().GetConsole().GetGuest();
@@ -826 +685 @@
 }
 
-void UIMachineLogic::updateMouseCapability()
-{
-    /* Update related things: */
+void UIMachineLogic::sltMouseCapabilityChanged()
+{
+    /* Variable falgs: */
+    bool fIsMouseSupportsAbsolute = uisession()->isMouseSupportsAbsolute();
+    /* bool fIsMouseSupportsRelative = uisession()->isMouseSupportsRelative(); */
+    bool fIsMouseHostCursorNeeded = uisession()->isMouseHostCursorNeeded();
+
+    /* Update action state: */
     QAction *pAction = actionsPool()->action(UIActionIndex_Toggle_MouseIntegration);
-    pAction->setEnabled(m_fIsMouseSupportsAbsolute && m_fIsMouseSupportsRelative && !m_fIsHostCursorNeeded);
-    pAction->setChecked(m_fIsHostCursorNeeded || pAction->isChecked());
-}
-
-void UIMachineLogic::sltMachineStateChanged(KMachineState state)
-{
-    /* Check if something had changed: */
-    if (m_machineState != state)
-    {
-        /* Store new data: */
-        m_machineState = state;
-
-        /* Update machine state: */
-        updateMachineState();
-    }
-}
-
-void UIMachineLogic::sltAdditionsStateChanged()
-{
-    /* Get our guest: */
-    CGuest guest = session().GetConsole().GetGuest();
-
-    /* Variable flags: */
-    bool fIsAdditionsActive = guest.GetAdditionsActive();
-    bool fIsGuestSupportsGraphics = guest.GetSupportsGraphics();
-    bool fIsGuestSupportsSeamless = guest.GetSupportsSeamless();
-
-    /* Check if something had changed: */
-    if (m_fIsAdditionsActive != fIsAdditionsActive ||
-        m_fIsGuestSupportsGraphics != fIsGuestSupportsGraphics ||
-        m_fIsGuestSupportsSeamless != fIsGuestSupportsSeamless)
-    {
-        /* Store new data: */
-        m_fIsAdditionsActive = fIsAdditionsActive;
-        m_fIsGuestSupportsGraphics = fIsGuestSupportsGraphics;
-        m_fIsGuestSupportsSeamless = fIsGuestSupportsSeamless;
-
-        /* Update additions state: */
-        updateAdditionsState();
-    }
-}
-
-void UIMachineLogic::sltMouseCapabilityChanged(bool fIsSupportsAbsolute, bool fIsSupportsRelative, bool fIsHostCursorNeeded)
-{
-    /* Check if something is changed: */
-    if (m_fIsMouseSupportsAbsolute != fIsSupportsAbsolute ||
-        m_fIsMouseSupportsRelative != fIsSupportsRelative ||
-        m_fIsHostCursorNeeded != fIsHostCursorNeeded)
-    {
-        /* Store new data: */
-        m_fIsMouseSupportsAbsolute = fIsSupportsAbsolute;
-        m_fIsMouseSupportsRelative = fIsSupportsRelative;
-        m_fIsHostCursorNeeded = fIsHostCursorNeeded;
-
-        /* Update mouse capability: */
-        updateMouseCapability();
-    }
-}
-
-void UIMachineLogic::sltUSBDeviceStateChange(const CUSBDevice &device, bool bIsAttached, const CVirtualBoxErrorInfo &error)
-{
-    bool success = error.isNull();
-
-    if (!success)
-    {
-        if (bIsAttached)
+    pAction->setEnabled(fIsMouseSupportsAbsolute /* && fIsMouseSupportsRelative */ && !fIsMouseHostCursorNeeded);
+    pAction->setChecked(fIsMouseHostCursorNeeded || pAction->isChecked());
+}
+
+void UIMachineLogic::sltUSBDeviceStateChange(const CUSBDevice &device, bool fIsAttached, const CVirtualBoxErrorInfo &error)
+{
+    bool fSuccess = error.isNull();
+
+    if (!fSuccess)
+    {
+        if (fIsAttached)
             vboxProblem().cannotAttachUSBDevice(session().GetConsole(), vboxGlobal().details(device), error);
         else
@@ -902 +711 @@
 }
 
-void UIMachineLogic::sltRuntimeError(bool bIsFatal, const QString &strErrorId, const QString &strMessage)
-{
-    vboxProblem().showRuntimeError(session().GetConsole(), bIsFatal, strErrorId, strMessage);
-}
-
-void UIMachineLogic::sltToggleGuestAutoresize(bool bEnabled)
+void UIMachineLogic::sltRuntimeError(bool fIsFatal, const QString &strErrorId, const QString &strMessage)
+{
+    vboxProblem().showRuntimeError(session().GetConsole(), fIsFatal, strErrorId, strMessage);
+}
+
+void UIMachineLogic::sltToggleGuestAutoresize(bool fEnabled)
 {
     /* Do not process if window or view is missing! */
@@ -913 +722 @@
         return;
 
-    machineWindowWrapper()->machineView()->setGuestAutoresizeEnabled(bEnabled);
+    machineWindowWrapper()->machineView()->setGuestAutoresizeEnabled(fEnabled);
 }
 
@@ -930 +739 @@
 }
 
-void UIMachineLogic::sltToggleMouseIntegration(bool aOff)
+void UIMachineLogic::sltToggleMouseIntegration(bool fOff)
 {
     /* Do not process if window or view is missing! */
@@ -937 +746 @@
 
     /* Disable/Enable mouse-integration for view: */
-    machineWindowWrapper()->machineView()->setMouseIntegrationEnabled(!aOff);
+    machineWindowWrapper()->machineView()->setMouseIntegrationEnabled(!fOff);
 }
 
@@ -972 +781 @@
 
     /* Remember the paused state. */
-    bool bWasPaused = machineState() == KMachineState_Paused;
-    if (!bWasPaused)
+    bool fWasPaused = uisession()->isPaused();
+    if (!fWasPaused)
     {
         /* Suspend the VM and ignore the close event if failed to do so.
          * pause() will show the error message to the user. */
-        if (!pause())
+        if (!uisession()->pause())
             return;
     }
@@ -1012 +821 @@
 
     /* Restore the running state if needed. */
-    if (!bWasPaused)
-        unpause();
+    if (!fWasPaused)
+        uisession()->unpause();
 }
 
@@ -1023 +832 @@
 
     // TODO: Call for singleton information dialog for this machine!
-//    VBoxVMInformationDlg::createInformationDlg(session(), machineWindowWrapper()->machineWindow());
+    //VBoxVMInformationDlg::createInformationDlg(session(), machineWindowWrapper()->machineWindow());
 }
 
@@ -1037 +846 @@
 }
 
-void UIMachineLogic::sltPause(bool aOn)
-{
-    pause(aOn);
+void UIMachineLogic::sltPause(bool fOn)
+{
+    uisession()->setPause(fOn);
 }
 
 void UIMachineLogic::sltACPIShutdown()
 {
+    /* Get console: */
     CConsole console = session().GetConsole();
 
@@ -1144 +954 @@
             CMedium currentMedium = attachment.GetMedium();
             QString currentId = currentMedium.isNull() ? QString::null : currentMedium.GetId();
-            bool currentUsed = false;
+            bool fCurrentUsed = false;
             foreach (CMedium medium, mediums)
             {
@@ -1162 +972 @@
                 if (!isMediumUsed)
                 {
-                    if (!currentUsed && !currentMedium.isNull() && mediumsToBeShown == maxMediumsToBeShown - 1)
+                    if (!fCurrentUsed && !currentMedium.isNull() && mediumsToBeShown == maxMediumsToBeShown - 1)
                         medium = currentMedium;
 
                     if (medium.GetId() == currentId)
-                        currentUsed = true;
+                        fCurrentUsed = true;
 
                     QAction *mountMediumAction = new QAction(VBoxMedium(medium, mediumType).name(), pAttachmentMenu);
@@ -1269 +1079 @@
     /* New mount-target attributes: */
     QString newId = QString("");
-    bool selectWithMediaManager = target.type != VBoxDefs::MediumType_Invalid;
+    bool fSelectWithMediaManager = target.type != VBoxDefs::MediumType_Invalid;
 
     /* Open Virtual Media Manager to select image id: */
-    if (selectWithMediaManager)
+    if (fSelectWithMediaManager)
     {
         /* Search for already used images: */
@@ -1293 +1103 @@
         newId = target.id;
 
-    bool mount = !newId.isEmpty();
+    bool fMount = !newId.isEmpty();
 
     /* Remount medium to the predefined port/device: */
-    bool wasMounted = false;
+    bool fWasMounted = false;
     machine.MountMedium(target.name, target.port, target.device, newId, false /* force */);
     if (machine.isOk())
-        wasMounted = true;
+        fWasMounted = true;
     else
     {
         /* Ask for force remounting: */
-        if (vboxProblem().cannotRemountMedium(machineWindowWrapper()->machineWindow(), machine, vboxGlobal().findMedium (mount ? newId : currentId), mount, true /* retry? */) == QIMessageBox::Ok)
+        if (vboxProblem().cannotRemountMedium(machineWindowWrapper()->machineWindow(), machine, vboxGlobal().findMedium (fMount ? newId : currentId), fMount, true /* retry? */) == QIMessageBox::Ok)
         {
             /* Force remount medium to the predefined port/device: */
             machine.MountMedium(target.name, target.port, target.device, newId, true /* force */);
             if (machine.isOk())
-                wasMounted = true;
+                fWasMounted = true;
             else
-                vboxProblem().cannotRemountMedium(machineWindowWrapper()->machineWindow(), machine, vboxGlobal().findMedium (mount ? newId : currentId), mount, false /* retry? */);
+                vboxProblem().cannotRemountMedium(machineWindowWrapper()->machineWindow(), machine, vboxGlobal().findMedium (fMount ? newId : currentId), fMount, false /* retry? */);
         }
     }
 
     /* Save medium mounted at runtime */
-    if (wasMounted && !m_fIsIgnoringRutimeMediums)
+    if (fWasMounted && !uisession()->isIgnoreRuntimeMediumsChanging())
     {
         machine.SaveSettings();
@@ -1338 +1148 @@
 
     /* Fill USB devices menu: */
-    bool bIsUSBListEmpty = devices.size() == 0;
-    if (bIsUSBListEmpty)
+    bool fIsUSBListEmpty = devices.size() == 0;
+    if (fIsUSBListEmpty)
     {
         /* Fill USB devices menu: */
@@ -1423 +1233 @@
 }
 
-void UIMachineLogic::sltSwitchVrdp(bool aOn)
+void UIMachineLogic::sltSwitchVrdp(bool fOn)
 {
     /* Enable VRDP server if possible: */
     CVRDPServer server = session().GetMachine().GetVRDPServer();
     AssertMsg(!server.isNull(), ("VRDP server should not be null!\n"));
-    server.SetEnabled(aOn);
+    server.SetEnabled(fOn);
 }
 
@@ -1513 +1323 @@
 }
 
-void UIMachineLogic::sltLoggingToggled(bool bState)
-{
-    NOREF(bState);
+void UIMachineLogic::sltLoggingToggled(bool fState)
+{
+    NOREF(fState);
     CConsole console = session().GetConsole();
     if (console.isOk())
@@ -1521 +1331 @@
         CMachineDebugger cdebugger = console.GetDebugger();
         if (console.isOk())
-            cdebugger.SetLogEnabled(bState);
-    }
-}
-#endif
-
-bool UIMachineLogic::pause(bool bOn)
-{
-    if (isPaused() == bOn)
-        return true;
-
-    CConsole console = session().GetConsole();
-
-    if (bOn)
-        console.Pause();
-    else
-        console.Resume();
-
-    bool ok = console.isOk();
-    if (!ok)
-    {
-        if (bOn)
-            vboxProblem().cannotPauseMachine(console);
-        else
-            vboxProblem().cannotResumeMachine(console);
-    }
-
-    return ok;
-}
+            cdebugger.SetLogEnabled(fState);
+    }
+}
+#endif
 
 void UIMachineLogic::installGuestAdditionsFrom(const QString &strSource)
@@ -1602 +1388 @@
     if (!strCntName.isNull())
     {
-        bool isMounted = false;
+        bool fIsMounted = false;
 
         /* Mount medium to the predefined port/device */
         machine.MountMedium(strCntName, iCntPort, iCntDevice, strUuid, false /* force */);
         if (machine.isOk())
-            isMounted = true;
+            fIsMounted = true;
         else
         {
@@ -1617 +1403 @@
                 machine.MountMedium(strCntName, iCntPort, iCntDevice, strUuid, true /* force */);
                 if (machine.isOk())
-                    isMounted = true;
+                    fIsMounted = true;
                 else
                     vboxProblem().cannotRemountMedium(machineWindowWrapper()->machineWindow(), machine, VBoxMedium(image, VBoxDefs::MediumType_DVD),
                                                       true /* mount? */, false /* retry? */);
             }
-        }
-
-        /* Save medium mounted at runtime */
-        if (isMounted && !m_fIsIgnoringRutimeMediums)
-        {
-            machine.SaveSettings();
-            if (!machine.isOk())
-                vboxProblem().cannotSaveMachineSettings(machine);
         }
     }
@@ -1736 +1514 @@
 }
 # endif
-bool UIMachineLogic::toggleFullscreenMode (bool aOn, bool aSeamless)
+bool UIMachineLogic::toggleFullscreenMode (bool fOn, bool fSeamless)
 {
     /* Please note: For some platforms like the Mac, the calling order of the
@@ -1743 +1521 @@
 
     QSize initialSize = size();
-    if (aSeamless || mConsole->isAutoresizeGuestActive())
-    {
-        QRect screen = aSeamless ?
+    if (fSeamless || mConsole->isAutoresizeGuestActive())
+    {
+        QRect screen = fSeamless ?
             QApplication::desktop()->availableGeometry (this) :
             QApplication::desktop()->screenGeometry (this);
@@ -1758 +1536 @@
                          * mSession.GetMachine().GetMonitorCount() /**< @todo fix assumption that all screens have same resolution */
                          + 4096 * 8; /* adapter info */
-        if (aOn && (availBits < usedBits))
-        {
-            if (aSeamless)
+        if (fOn && (availBits < usedBits))
+        {
+            if (fSeamless)
             {
                 vboxProblem().cannotEnterSeamlessMode (
@@ -1779 +1557 @@
 
     AssertReturn (mConsole, false);
-    AssertReturn ((mHiddenChildren.empty() == aOn), false);
-    AssertReturn ((aSeamless && mIsSeamless != aOn) ||
-                  (!aSeamless && mIsFullscreen != aOn), false);
-    if (aOn)
-        AssertReturn ((aSeamless && !mIsFullscreen) ||
-                      (!aSeamless && !mIsSeamless), false);
-
-    if (aOn)
+    AssertReturn ((mHiddenChildren.empty() == fOn), false);
+    AssertReturn ((fSeamless && mIsSeamless != fOn) ||
+                  (!fSeamless && mIsFullscreen != fOn), false);
+    if (fOn)
+        AssertReturn ((fSeamless && !mIsFullscreen) ||
+                      (!fSeamless && !mIsSeamless), false);
+
+    if (fOn)
     {
         /* Take the toggle hot key from the menu item. Since
@@ -1792 +1570 @@
          * linked key without the 'Host+' part we are adding it here. */
         QString hotKey = QString ("Host+%1")
-            .arg (VBoxGlobal::extractKeyFromActionText (aSeamless ?
+            .arg (VBoxGlobal::extractKeyFromActionText (fSeamless ?
                   mVmSeamlessAction->text() : mVmFullscreenAction->text()));
 
@@ -1798 +1576 @@
 
         /* Show the info message. */
-        bool ok = aSeamless ?
+        bool ok = fSeamless ?
             vboxProblem().confirmGoingSeamless (hotKey) :
             vboxProblem().confirmGoingFullscreen (hotKey);
@@ -1806 +1584 @@
 
 #ifdef Q_WS_MAC
-    if (!aSeamless)
-    {
-    }
-#endif
-
-    if (aSeamless)
+    if (!fSeamless)
+    {
+    }
+#endif
+
+    if (fSeamless)
     {
         /* Activate the auto-resize feature required for the seamless mode. */
@@ -1821 +1599 @@
             mVmDisableMouseIntegrAction->setChecked (false);
 
-        mVmAdjustWindowAction->setEnabled (!aOn);
-        mVmFullscreenAction->setEnabled (!aOn);
-        mVmAutoresizeGuestAction->setEnabled (!aOn);
-        mVmDisableMouseIntegrAction->setEnabled (!aOn);
-
-        mConsole->console().GetDisplay().SetSeamlessMode (aOn);
-        mIsSeamless = aOn;
+        mVmAdjustWindowAction->setEnabled (!fOn);
+        mVmFullscreenAction->setEnabled (!fOn);
+        mVmAutoresizeGuestAction->setEnabled (!fOn);
+        mVmDisableMouseIntegrAction->setEnabled (!fOn);
+
+        mConsole->console().GetDisplay().SetSeamlessMode (fOn);
+        mIsSeamless = fOn;
     }
     else
     {
-        mIsFullscreen = aOn;
-        mVmAdjustWindowAction->setEnabled (!aOn);
-        mVmSeamlessAction->setEnabled (!aOn && m_fIsGuestSupportsSeamless && m_fIsGuestSupportsGraphics);
+        mIsFullscreen = fOn;
+        mVmAdjustWindowAction->setEnabled (!fOn);
+        mVmSeamlessAction->setEnabled (!fOn && m_fIsGuestSupportsSeamless && m_fIsGuestSupportsGraphics);
     }
 
@@ -1840 +1618 @@
     /* Temporarily disable the mode-related action to make sure
      * user can not leave the mode before he enter it and inside out. */
-    aSeamless ? mVmSeamlessAction->setEnabled (false) :
+    fSeamless ? mVmSeamlessAction->setEnabled (false) :
                 mVmFullscreenAction->setEnabled (false);
 
@@ -1846 +1624 @@
     QSize consoleSize;
 
-    if (aOn)
+    if (fOn)
     {
         consoleSize = mConsole->frameSize();
@@ -1868 +1646 @@
 
         /* let the widget take the whole available desktop space */
-        QRect scrGeo = aSeamless ?
+        QRect scrGeo = fSeamless ?
             dtw->availableGeometry (this) : dtw->screenGeometry (this);
 
@@ -1874 +1652 @@
          * we requested. So after all the resizing stuff set the clipping
          * mask and the spacing shifter to the corresponding values. */
-        if (aSeamless)
+        if (fSeamless)
             setViewInSeamlessMode (scrGeo);
 
@@ -1902 +1680 @@
         palette.setColor (centralWidget()->backgroundRole(), Qt::black);
         centralWidget()->setPalette (palette);
-        centralWidget()->setAutoFillBackground (!aSeamless);
+        centralWidget()->setAutoFillBackground (!fSeamless);
         mConsoleStyle = mConsole->frameStyle();
         mConsole->setFrameStyle (QFrame::NoFrame);
@@ -1923 +1701 @@
 
 #ifdef Q_WS_MAC
-        if (aSeamless)
+        if (fSeamless)
         {
             /* Please note: All the stuff below has to be done before the
@@ -1954 +1732 @@
         mIsWaitingModeResize = true;
 
-    if (!aOn)
+    if (!fOn)
     {
         /* Animation takes a bit long, the mini toolbar is still disappearing
@@ -1963 +1741 @@
 
     /* Toggle qt full-screen mode */
-    switchToFullscreen (aOn, aSeamless);
-
-    if (aOn)
-    {
-        mMiniToolBar->setSeamlessMode (aSeamless);
+    switchToFullscreen (fOn, fSeamless);
+
+    if (fOn)
+    {
+        mMiniToolBar->setSeamlessMode (fSeamless);
         mMiniToolBar->updateDisplay (true, true);
     }
 
 #ifdef Q_WS_MAC
-    if (aOn && aSeamless)
+    if (fOn && fSeamless)
     {
         /* Please note: All the stuff below has to be done after the window has
@@ -2004 +1782 @@
     return true;
 }
-void UIMachineLogic::switchToFullscreen (bool aOn, bool aSeamless)
+void UIMachineLogic::switchToFullscreen (bool fOn, bool fSeamless)
 {
 #ifdef Q_WS_MAC
@@ -2012 +1790 @@
     WindowGroupRef g = GetWindowGroup (::darwinToNativeWindow (this));
 # endif  /* !QT_MAC_USE_COCOA */
-    if (aSeamless)
-        if (aOn)
+    if (fSeamless)
+        if (fOn)
         {
             /* Save for later restoring */
@@ -2035 +1813 @@
         /* Here we are going really fullscreen */
         setWindowState (windowState() ^ Qt::WindowFullScreen);
-        sltChangePresentationMode (VBoxChangePresentationModeEvent(aOn));
+        sltChangePresentationMode (VBoxChangePresentationModeEvent(fOn));
     }
 
@@ -2043 +1821 @@
 # endif /* !QT_MAC_USE_COCOA */
 #else
-    NOREF (aOn);
-    NOREF (aSeamless);
+    NOREF (fOn);
+    NOREF (fSeamless);
     setWindowState (windowState() ^ Qt::WindowFullScreen);
 #endif

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

@@ -24 +24 @@
 #define __UIMachineLogic_h__
 
+/* Global includes */
+#include <QObject>
+
 /* Local includes */
-#include "COMDefs.h"
 #include "UIMachineDefs.h"
 #ifdef VBOX_WITH_DEBUGGER_GUI
@@ -35 +37 @@
 
 /* Local forwards */
+class CSession;
+class CMachine;
+class CSnapshot;
+class CUSBDevice;
+class CVirtualBoxErrorInfo;
 class UISession;
 class UIActionsPool;
@@ -51 +58 @@
                                   UIVisualStateType visualStateType);
 
-    /* Public getters: */
+    /* Main getters/setters: */
     UISession* uisession() { return m_pSession; }
     UIActionsPool* actionsPool() { return m_pActionsPool; }
     UIVisualStateType visualStateType() const { return m_visualStateType; }
     UIMachineWindow* machineWindowWrapper() { return m_pMachineWindowWrapper; }
-    KMachineState machineState() const { return m_machineState; }
-    bool isPaused() const { return machineState() == KMachineState_Paused ||
-                                   machineState() == KMachineState_TeleportingPausedVM; }
+
+    /* Maintenance getters/setters: */
     bool isPreventAutoClose() const { return m_fIsPreventAutoClose; }
-
-    /* Public setters: */
     void setPreventAutoClose(bool fIsPreventAutoClose) { m_fIsPreventAutoClose = fIsPreventAutoClose; }
 
@@ -73 +77 @@
     virtual ~UIMachineLogic();
 
-    /* Protected getters: */
+    /* Protected wrappers: */
     CSession& session();
-    bool isFirstTimeStarted() const { return m_fIsFirstTimeStarted; }
 
     /* Protected setters: */
     void setMachineWindowWrapper(UIMachineWindow *pMachineWindowWrapper) { m_pMachineWindowWrapper = pMachineWindowWrapper; }
-
-    /* Console related routines: */
-    bool pause() { return pause(true); }
-    bool unpause() { return pause(false); }
 
     /* Prepare helpers: */
@@ -89 +88 @@
     virtual void prepareActionConnections();
     virtual void prepareRequiredFeatures();
-    virtual void loadLogicSettings();
 
     /* Cleanup helpers: */
-    virtual void saveLogicSettings();
-    virtual void cleanupRequiredFeatures() {}
-    virtual void cleanupActionConnections() {}
-    virtual void cleanupActionGroups() {}
-    virtual void cleanupConsoleConnections() {}
-
-    /* Update helpers: */
-    virtual void updateMachineState();
-    virtual void updateAdditionsState();
-    virtual void updateMouseCapability();
+    //virtual void cleanupRequiredFeatures() {}
+    //virtual void cleanupActionConnections() {}
+    //virtual void cleanupActionGroups() {}
+    //virtual void cleanupConsoleConnections() {}
 
 protected slots:
 
     /* Console callback handlers: */
-    virtual void sltMachineStateChanged(KMachineState machineState);
+    virtual void sltMachineStateChanged();
     virtual void sltAdditionsStateChanged();
-    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);
+    virtual void sltMouseCapabilityChanged();
+    virtual void sltUSBDeviceStateChange(const CUSBDevice &device, bool fIsAttached, const CVirtualBoxErrorInfo &error);
+    virtual void sltRuntimeError(bool fIsFatal, const QString &strErrorId, const QString &strMessage);
 
 private slots:
 
     /* "Machine" menu funtionality */
-    void sltToggleGuestAutoresize(bool bEnabled);
+    void sltToggleGuestAutoresize(bool fEnabled);
     void sltAdjustWindow();
-    void sltToggleMouseIntegration(bool bDisabled);
+    void sltToggleMouseIntegration(bool fDisabled);
     void sltTypeCAD();
 #ifdef Q_WS_X11
@@ -125 +117 @@
     void sltShowInformationDialog();
     void sltReset();
-    void sltPause(bool aOn);
+    void sltPause(bool fOn);
     void sltACPIShutdown();
     void sltClose();
@@ -136 +128 @@
     void sltOpenNetworkAdaptersDialog();
     void sltOpenSharedFoldersDialog();
-    void sltSwitchVrdp(bool bOn);
+    void sltSwitchVrdp(bool fOn);
     void sltInstallGuestAdditions();
 
@@ -149 +141 @@
 
     /* Utility functions: */
-    bool pause(bool bPaused);
     void installGuestAdditionsFrom(const QString &strSource);
     static int searchMaxSnapshotIndex(const CMachine &machine,
@@ -158 +149 @@
     UISession *m_pSession;
     UIActionsPool *m_pActionsPool;
-    KMachineState m_machineState;
     UIVisualStateType m_visualStateType;
     UIMachineWindow *m_pMachineWindowWrapper;
@@ -165 +155 @@
     QActionGroup *m_pRunningOrPausedActions;
 
-    bool m_fIsFirstTimeStarted : 1;
-    bool m_fIsIgnoringRutimeMediums : 1;
-    bool m_fIsAdditionsActive : 1;
-    bool m_fIsGuestSupportsGraphics : 1;
-    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

@@ -30 +30 @@
 
 /* Local includes */
+#include "COMDefs.h"
 #include "VBoxGlobal.h"
 #include "VBoxProblemReporter.h"
@@ -71 +72 @@
 # endif
 # include "XKeyboard.h"
-# ifndef VBOX_WITHOUT_XCURSOR
-#  include <X11/Xcursor/Xcursor.h>
-# endif
 #endif
 
@@ -157 +155 @@
 int UIMachineView::mouseState() const
 {
-    return (m_bIsMouseCaptured ? UIMouseStateType_MouseCaptured : 0) |
-           (m_fIsMouseSupportsAbsolute ? UIMouseStateType_MouseAbsolute : 0) |
-           (m_bIsMouseIntegrated ? 0 : UIMouseStateType_MouseAbsoluteDisabled);
+    return (uisession()->isMouseCaptured() ? UIMouseStateType_MouseCaptured : 0) |
+           (uisession()->isMouseSupportsAbsolute() ? UIMouseStateType_MouseAbsolute : 0) |
+           (uisession()->isMouseIntegrated() ? 0 : UIMouseStateType_MouseAbsoluteDisabled);
 }
 
 void UIMachineView::setMouseIntegrationEnabled(bool bEnabled)
 {
-    if (m_bIsMouseIntegrated == bEnabled)
+    if (uisession()->isMouseIntegrated() == bEnabled)
         return;
 
-    if (m_fIsMouseSupportsAbsolute)
+    if (uisession()->isMouseSupportsAbsolute())
         captureMouse(!bEnabled, false);
 
     /* Hiding host cursor in case we are entering mouse integration
-     * mode until it's shape is set to the guest cursor shape in
-     * OnMousePointerShapeChange event handler.
-     *
-     * This is necessary to avoid double-cursor issues where both the
-     * guest and the host cursors are displayed in one place, one above the
-     * other.
-     *
-     * This is a workaround because the correct decision would be to notify
-     * the Guest Additions about we are entering the mouse integration
-     * mode. The GuestOS should hide it's cursor to allow using of
-     * host cursor for the guest's manipulation.
-     *
-     * This notification is not always possible though, as not all guests
-     * support switching to a hardware pointer on demand. */
+     * mode until it's shape is set to the guest cursor shape. */
     if (bEnabled)
         viewport()->setCursor(QCursor(Qt::BlankCursor));
 
-    m_bIsMouseIntegrated = bEnabled;
+    uisession()->setMouseIntegrated(bEnabled);
 
     emitMouseStateChanged();
@@ -201 +186 @@
     : QAbstractScrollArea(pMachineWindow->machineWindow())
     , m_pMachineWindow(pMachineWindow)
-    , m_console(pMachineWindow->machineLogic()->uisession()->session().GetConsole())
     , m_mode(renderMode)
     , m_globalSettings(vboxGlobal().settings())
-    , m_machineState(KMachineState_Null)
     , m_pFrameBuffer(0)
 #if defined(Q_WS_WIN)
@@ -210 +193 @@
 #endif
     , m_iLastMouseWheelDelta(0)
-    , m_uNumLockAdaptionCnt(2)
-    , m_uCapsLockAdaptionCnt(2)
     , m_bIsAutoCaptureDisabled(false)
     , m_bIsKeyboardCaptured(false)
-    , m_bIsMouseCaptured(false)
-    , m_fIsMouseSupportsAbsolute(false)
-    , m_fIsMouseSupportsRelative(false)
-    , m_bIsMouseIntegrated(true)
-    , m_fIsHideHostPointer(true)
     , m_bIsHostkeyPressed(false)
     , m_bIsHostkeyAlone (false)
     , m_bIsHostkeyInCapture(false)
-    , m_bIsGuestSupportsGraphics(false)
     , m_bIsMachineWindowResizeIgnored(true)
     , m_bIsFrameBufferResizeIgnored(false)
-    , m_bIsGuestResizeIgnored(false)
-    , m_fNumLock(false)
-    , m_fCapsLock(false)
-    , m_fScrollLock(false)
     , m_fPassCAD(false)
 #ifdef VBOX_WITH_VIDEOHWACCEL
@@ -251 +222 @@
 UIMachineView::~UIMachineView()
 {
+}
+
+UISession* UIMachineView::uisession() const
+{
+    return machineWindowWrapper()->machineLogic()->uisession();
+}
+
+CSession& UIMachineView::session()
+{
+    return uisession()->session();
 }
 
@@ -385 +366 @@
 void UIMachineView::prepareFrameBuffer()
 {
-    CDisplay display = m_console.GetDisplay();
+    CDisplay display = session().GetConsole().GetDisplay();
     Assert(!display.isNull());
     m_pFrameBuffer = NULL;
@@ -527 +508 @@
     /* Overlay logo for the dock icon */
     //mVirtualBoxLogo = ::darwinToCGImageRef("VirtualBox_cube_42px.png");
-    QString osTypeId = m_console.GetGuest().GetOSTypeId();
+    QString osTypeId = session().GetConsole().GetGuest().GetOSTypeId();
 
     // TODO_NEW_CORE
@@ -573 +554 @@
 
     /* Machine state-change updater: */
-    connect(sender, SIGNAL(sigStateChange(KMachineState)), this, SLOT(sltMachineStateChanged(KMachineState)));
+    connect(sender, SIGNAL(sigMachineStateChange()), this, SLOT(sltMachineStateChanged()));
 
     /* Guest additions state-change updater: */
     connect(sender, SIGNAL(sigAdditionsStateChange()), this, SLOT(sltAdditionsStateChanged()));
 
-    /* Keyboard LEDs state-change updater: */
-    connect(sender, SIGNAL(sigKeyboardLedsChange(bool, bool, bool)), this, SLOT(sltKeyboardLedsChanged(bool, bool, bool)));
-
     /* Mouse pointer shape state-change updater: */
-    connect(sender, SIGNAL(sigMousePointerShapeChange(bool, bool, uint, uint, uint, uint, const uchar *)),
-            this, SLOT(sltMousePointerShapeChanged(bool, bool, uint, uint, uint, uint, const uchar *)));
+    connect(sender, SIGNAL(sigMousePointerShapeChange()), this, SLOT(sltMousePointerShapeChanged()));
 
     /* Mouse capability state-change updater: */
-    connect(sender, SIGNAL(sigMouseCapabilityChange(bool, bool, bool)), this, SLOT(sltMouseCapabilityChanged(bool, bool, bool)));
+    connect(sender, SIGNAL(sigMouseCapabilityChange()), this, SLOT(sltMouseCapabilityChanged()));
 }
 
@@ -617 +594 @@
     {
         /* CAD settings: */
-        QString passCAD = m_console.GetMachine().GetExtraData(VBoxDefs::GUI_PassCAD);
+        QString passCAD = session().GetConsole().GetMachine().GetExtraData(VBoxDefs::GUI_PassCAD);
         if (!passCAD.isEmpty() && ((passCAD != "false") || (passCAD != "no")))
             m_fPassCAD = true;
     }
 
-#if 0
-    /* Dynamical property settings: */
-    {
-        /* Get loader: */
-        UISession *loader = machineWindowWrapper()->machineLogic()->uisession();
-
-        /* Load dynamical properties: */
-        m_machineState = loader->property("MachineView/MachineState").value<KMachineState>();
-        m_uNumLockAdaptionCnt = loader->property("MachineView/NumLockAdaptionCnt").toUInt();
-        m_uCapsLockAdaptionCnt = loader->property("MachineView/CapsLockAdaptionCnt").toUInt();
-        m_bIsAutoCaptureDisabled = loader->property("MachineView/IsAutoCaptureDisabled").toBool();
-        m_bIsKeyboardCaptured = loader->property("MachineView/IsKeyboardCaptured").toBool();
-        m_bIsMouseCaptured = loader->property("MachineView/IsMouseCaptured").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();
-        m_bIsHostkeyInCapture = loader->property("MachineView/IsHostkeyInCapture").toBool();
-        m_bIsGuestSupportsGraphics = loader->property("MachineView/IsGuestSupportsGraphics").toBool();
-        m_fNumLock = loader->property("MachineView/IsNumLock").toBool();
-        m_fCapsLock = loader->property("MachineView/IsCapsLock").toBool();
-        m_fScrollLock = loader->property("MachineView/IsScrollLock").toBool();
-
-        /* Update related things: */
-        updateMachineState();
-        updateAdditionsState();
-        updateMousePointerShape();
-        updateMouseCapability();
-    }
-#endif
-}
-
-void UIMachineView::saveMachineViewSettings()
-{
-#if 0
-    /* Dynamical property settings: */
-    {
-        /* Get saver: */
-        UISession *saver = machineWindowWrapper()->machineLogic()->uisession();
-
-        /* Save dynamical properties: */
-        saver->setProperty("MachineView/MachineState", QVariant::fromValue(machineState()));
-        saver->setProperty("MachineView/NumLockAdaptionCnt", m_uNumLockAdaptionCnt);
-        saver->setProperty("MachineView/CapsLockAdaptionCnt", m_uCapsLockAdaptionCnt);
-        saver->setProperty("MachineView/IsAutoCaptureDisabled", m_bIsAutoCaptureDisabled);
-        saver->setProperty("MachineView/IsKeyboardCaptured", m_bIsKeyboardCaptured);
-        saver->setProperty("MachineView/IsMouseCaptured", m_bIsMouseCaptured);
-        saver->setProperty("MachineView/IsMouseSupportsAbsolute", m_fIsMouseSupportsAbsolute);
-        saver->setProperty("MachineView/IsMouseSupportsRelative", m_fIsMouseSupportsRelative);
-        saver->setProperty("MachineView/IsMouseIntegrated", m_bIsMouseIntegrated);
-        saver->setProperty("MachineView/IsHideHostPointer", m_fIsHideHostPointer);
-        saver->setProperty("MachineView/IsHostkeyInCapture", m_bIsHostkeyInCapture);
-        saver->setProperty("MachineView/IsGuestSupportsGraphics", m_bIsGuestSupportsGraphics);
-        saver->setProperty("MachineView/IsNumLock", m_fNumLock);
-        saver->setProperty("MachineView/IsCapsLock", m_fCapsLock);
-        saver->setProperty("MachineView/IsScrollLock", m_fScrollLock);
-    }
+#ifdef Q_WS_MAC
+    QString strSettings = vboxGlobal().virtualBox().GetExtraData(VBoxDefs::GUI_RealtimeDockIconUpdateEnabled).toLower();
+    /* Default to true if it is an empty value: */
+    bool fIsDockIconEnabled = strSettings.isEmpty() || strSettings == "true";
+    setDockIconEnabled(fIsDockIconEnabled);
+    updateDockOverlay();
 #endif
 }
@@ -717 +643 @@
     {
         /* Detach framebuffer from Display: */
-        CDisplay display = console().GetDisplay();
+        CDisplay display = session().GetConsole().GetDisplay();
         display.SetFramebuffer(VBOX_VIDEO_PRIMARY_SCREEN, CFramebuffer(NULL));
         /* Release the reference: */
@@ -725 +651 @@
 }
 
-void UIMachineView::updateMachineState()
-{
-    switch (machineState())
+void UIMachineView::sltMachineStateChanged()
+{
+    /* Get machine state: */
+    KMachineState state = uisession()->machineState();
+    switch (state)
     {
         case KMachineState_Paused:
@@ -733 +661 @@
         {
             if (mode() != VBoxDefs::TimerMode &&  m_pFrameBuffer &&
-                (machineState() != KMachineState_TeleportingPausedVM || machineState() != KMachineState_Teleporting))
+                (state != KMachineState_TeleportingPausedVM || state != KMachineState_Teleporting))
             {
                 /* Take a screen snapshot. Note that TakeScreenShot() always needs a 32bpp image: */
                 QImage shot = QImage(m_pFrameBuffer->width(), m_pFrameBuffer->height(), QImage::Format_RGB32);
-                CDisplay dsp = m_console.GetDisplay();
+                CDisplay dsp = session().GetConsole().GetDisplay();
                 dsp.TakeScreenShot(shot.bits(), shot.width(), shot.height());
                 /* TakeScreenShot() may fail if, e.g. the Paused notification was delivered
@@ -759 +687 @@
         case KMachineState_Running:
         {
-            if (machineState() == KMachineState_Paused || machineState() == KMachineState_TeleportingPausedVM)
+            if (state == KMachineState_Paused || state == KMachineState_TeleportingPausedVM)
             {
                 if (mode() != VBoxDefs::TimerMode && m_pFrameBuffer)
@@ -767 +695 @@
                     /* Ask for full guest display update (it will also update
                      * the viewport through IFramebuffer::NotifyUpdate): */
-                    CDisplay dsp = m_console.GetDisplay();
+                    CDisplay dsp = session().GetConsole().GetDisplay();
                     dsp.InvalidateAndUpdate();
                 }
@@ -779 +707 @@
             break;
     }
-}
-
-void UIMachineView::updateAdditionsState()
+
+#ifdef Q_WS_MAC
+    /* Update Dock Overlay: */
+    updateDockOverlay();
+#endif /* Q_WS_MAC */
+}
+
+void UIMachineView::sltAdditionsStateChanged()
 {
     /* Check if we should restrict minimum size: */
@@ -795 +728 @@
 }
 
-void UIMachineView::updateMousePointerShape()
-{
-    if (m_fIsMouseSupportsAbsolute)
+void UIMachineView::sltMousePointerShapeChanged()
+{
+    if (uisession()->isMouseSupportsAbsolute())
     {
         /* Should we hide/show pointer? */
-        if (m_fIsHideHostPointer)
+        if (uisession()->isHidingHostPointer())
             viewport()->setCursor(Qt::BlankCursor);
         else
-            viewport()->setCursor(m_lastCursor);
-    }
-}
-
-void UIMachineView::updateMouseCapability()
+            viewport()->setCursor(uisession()->cursor());
+    }
+}
+
+void UIMachineView::sltMouseCapabilityChanged()
 {
     /* Correct the mouse capture state and reset the cursor to the default shape if necessary: */
-    if (m_fIsMouseSupportsAbsolute)
-    {
-        CMouse mouse = m_console.GetMouse();
-        mouse.PutMouseEventAbsolute(-1, -1, 0, 0 /* Horizontal wheel */, 0);
+    if (uisession()->isMouseSupportsAbsolute())
+    {
+        CMouse mouse = session().GetConsole().GetMouse();
+        mouse.PutMouseEventAbsolute(-1, -1, 0, 0, 0);
         captureMouse(false, false);
     }
@@ -820 +753 @@
 
     /* Notify user about mouse integration state: */
-    vboxProblem().remindAboutMouseIntegration(m_fIsMouseSupportsAbsolute);
-
-    /* Notify all watchers: */
+    vboxProblem().remindAboutMouseIntegration(uisession()->isMouseSupportsAbsolute());
+
+    /* Notify all listeners: */
     emitMouseStateChanged();
-}
-
-void UIMachineView::sltMachineStateChanged(KMachineState state)
-{
-    /* Check if something had changed: */
-    if (m_machineState != state)
-    {
-        /* Set new data: */
-        m_machineState = state;
-
-        /* Update depending things: */
-        updateMachineState();
-    }
-}
-
-void UIMachineView::sltAdditionsStateChanged()
-{
-    /* Get new values: */
-    CGuest guest = console().GetGuest();
-    bool bIsGuestSupportsGraphics = guest.GetSupportsGraphics();
-
-    /* Check if something had changed: */
-    if (m_bIsGuestSupportsGraphics != bIsGuestSupportsGraphics)
-    {
-        /* Get new data: */
-        m_bIsGuestSupportsGraphics = bIsGuestSupportsGraphics;
-
-        /* Update depending things: */
-        updateAdditionsState();
-    }
-}
-
-void UIMachineView::sltKeyboardLedsChanged(bool bNumLock, bool bCapsLock, bool bScrollLock)
-{
-    /* Update num lock status: */
-    if (m_fNumLock != bNumLock)
-    {
-        m_fNumLock = bNumLock;
-        m_uNumLockAdaptionCnt = 2;
-    }
-
-    /* Update caps lock status: */
-    if (m_fCapsLock != bCapsLock)
-    {
-        m_fCapsLock = bCapsLock;
-        m_uCapsLockAdaptionCnt = 2;
-    }
-
-    /* Update scroll lock status: */
-    if (m_fScrollLock != bScrollLock)
-        m_fScrollLock = bScrollLock;
-}
-
-void UIMachineView::sltMousePointerShapeChanged(bool fIsVisible, bool fHasAlpha,
-                                                uint uXHot, uint uYHot, uint uWidth, uint uHeight,
-                                                const uchar *pShapeData)
-{
-    /* Should we show cursor anyway? */
-    m_fIsHideHostPointer = !fIsVisible;
-
-    /* Should we cache shape data? */
-    if (pShapeData)
-        setPointerShape(pShapeData, fHasAlpha, uXHot, uYHot, uWidth, uHeight);
-
-    /* Perform cursor update: */
-    updateMousePointerShape();
-}
-
-void UIMachineView::sltMouseCapabilityChanged(bool fIsMouseSupportsAbsolute, bool fIsMouseSupportsRelative, bool /* fIsMouseNeedsHostCursor */)
-{
-    /* Check if something had changed: */
-    if (m_fIsMouseSupportsAbsolute != fIsMouseSupportsAbsolute || m_fIsMouseSupportsRelative != fIsMouseSupportsRelative)
-    {
-        /* Get new data: */
-        m_fIsMouseSupportsAbsolute = fIsMouseSupportsAbsolute;
-        m_fIsMouseSupportsRelative = fIsMouseSupportsRelative;
-
-        /* Update depending things: */
-        updateMouseCapability();
-    }
 }
 
@@ -952 +805 @@
         case QEvent::FocusIn:
         {
-            if (isRunning())
+            if (uisession()->isRunning())
                 focusEvent(true);
             break;
@@ -958 +811 @@
         case QEvent::FocusOut:
         {
-            if (isRunning())
+            if (uisession()->isRunning())
                 focusEvent(false);
             else
@@ -975 +828 @@
              * to be ignored at all, leaving previous framebuffer,
              * machine view and machine window sizes preserved: */
-            if (m_bIsGuestResizeIgnored)
+            if (uisession()->isGuestResizeIgnored())
                 return true;
 
@@ -991 +844 @@
              * Moreover the current cursor, which could be set by the guest, should be restored after resize: */
             QCursor cursor;
-            if (shouldHideHostPointer())
+            if (uisession()->isHidingHostPointer())
                 cursor = QCursor(Qt::BlankCursor);
             else
@@ -1007 +860 @@
              * which was unset to default here will not be hidden in capture state. So it is necessary to perform
              * updateMouseClipping() for the guest resize event if the mouse cursor was captured: */
-            if (m_bIsMouseCaptured)
+            if (uisession()->isMouseCaptured())
                 updateMouseClipping();
 
@@ -1035 +888 @@
 
             /* Report to the VM thread that we finished resizing */
-            m_console.GetDisplay().ResizeCompleted(0);
+            session().GetConsole().GetDisplay().ResizeCompleted(0);
 
             m_bIsMachineWindowResizeIgnored = oldIgnoreMainwndResize;
@@ -1063 +916 @@
             viewport()->repaint(pPaintEvent->x() - contentsX(), pPaintEvent->y() - contentsY(),
                                 pPaintEvent->width(), pPaintEvent->height());
-            /* m_console.GetDisplay().UpdateCompleted(); - the event was acked already */
+            /* session().GetConsole().GetDisplay().UpdateCompleted(); - the event was acked already */
             return true;
         }
@@ -1103 +956 @@
             {
                 bool pressed = pEvent->type() == QEvent::KeyPress;
-                CKeyboard keyboard = m_console.GetKeyboard();
+                CKeyboard keyboard = session().GetConsole().GetKeyboard();
 
                 /* Whether the host key is Shift so that it will modify the hot key values?
@@ -1194 +1047 @@
                         Assert(0);
 
-                    CKeyboard keyboard = m_console.GetKeyboard();
+                    CKeyboard keyboard = session().GetConsole().GetKeyboard();
                     keyboard.PutScancodes(combo);
                 }
@@ -1203 +1056 @@
                     /* Activate the main menu */
                     if (machineWindowWrapper()->isTrueSeamless() || machineWindowWrapper()->isTrueFullscreen())
-                        machineWindowWrapper()->popupMainMenu (m_bIsMouseCaptured);
+                        machineWindowWrapper()->popupMainMenu (uisession()->isMouseCaptured());
                     else
                     {
@@ -1224 +1077 @@
             {
                 /* Show a possible warning on key release which seems to be more expected by the end user: */
-                if (machineWindowWrapper()->machineLogic()->isPaused())
+                if (uisession()->isPaused())
                 {
                     /* Iif the reminder is disabled we pass the event to Qt to enable normal
@@ -1324 +1177 @@
             case QEvent::Resize:
             {
-                if (m_bIsMouseCaptured)
+                if (uisession()->isMouseCaptured())
                     updateMouseClipping();
 #ifdef VBOX_WITH_VIDEOHWACCEL
@@ -1533 +1386 @@
                  * that's not possible because we cannot predict what other
                  * keys will be pressed next when one of C, A, D is held. */
-                if (isRunning() && m_bIsKeyboardCaptured)
+                if (uisession()->isRunning() && m_bIsKeyboardCaptured)
                 {
                     captureKbd (false);
-                    if (!(m_fIsMouseSupportsAbsolute && m_bIsMouseIntegrated))
+                    if (!(uisession()->isMouseSupportsAbsolute() && uisession()->isMouseIntegrated()))
                         captureMouse (false);
                 }
@@ -1589 +1442 @@
             {
                 m_bIsHostkeyPressed = m_bIsHostkeyAlone = true;
-                if (isRunning())
+                if (uisession()->isRunning())
                     saveKeyStates();
                 emitSignal = true;
@@ -1616 +1469 @@
                 if (m_bIsHostkeyAlone)
                 {
-                    if (machineWindowWrapper()->machineLogic()->isPaused())
+                    if (uisession()->isPaused())
                     {
                         vboxProblem().remindAboutPausedVMInput();
                     }
-                    else if (isRunning())
+                    else if (uisession()->isRunning())
                     {
                         bool captured = m_bIsKeyboardCaptured;
@@ -1644 +1497 @@
                         {
                             captureKbd (!captured, false);
-                            if (!(m_fIsMouseSupportsAbsolute && m_bIsMouseIntegrated))
+                            if (!(uisession()->isMouseSupportsAbsolute() && uisession()->isMouseIntegrated()))
                             {
 #ifdef Q_WS_X11
@@ -1658 +1511 @@
                 }
 
-                if (isRunning())
+                if (uisession()->isRunning())
                     sendChangedKeyStates();
 
@@ -1728 +1581 @@
 
     /* No more to do, if the host key is in action or the VM is paused: */
-    if (m_bIsHostkeyPressed || isHostKey || machineWindowWrapper()->machineLogic()->isPaused())
+    if (m_bIsHostkeyPressed || isHostKey || uisession()->isPaused())
     {
         /* Grab the key from Qt and from VM if it's a host key,
@@ -1735 +1588 @@
     }
 
-    CKeyboard keyboard = m_console.GetKeyboard();
+    CKeyboard keyboard = session().GetConsole().GetKeyboard();
     Assert(!keyboard.isNull());
 
@@ -1803 +1656 @@
         wheelHorizontal = aWheelDelta / 120;
 
-    if (m_bIsMouseCaptured)
+    if (uisession()->isMouseCaptured())
     {
 #ifdef Q_WS_WIN32
@@ -1810 +1663 @@
 #endif
 
-        CMouse mouse = m_console.GetMouse();
+        CMouse mouse = session().GetConsole().GetMouse();
         mouse.PutMouseEvent(aGlobalPos.x() - m_lastMousePos.x(),
                             aGlobalPos.y() - m_lastMousePos.y(),
@@ -1903 +1756 @@
         return true; /* stop further event handling */
     }
-    else /* !m_bIsMouseCaptured */
+    else /* !uisession()->isMouseCaptured() */
     {
 #if 0 // TODO: Move that to fullscreen event-hjadler:
@@ -1928 +1781 @@
 #endif
 
-        if (m_fIsMouseSupportsAbsolute && m_bIsMouseIntegrated)
+        if (uisession()->isMouseSupportsAbsolute() && uisession()->isMouseIntegrated())
         {
             int cw = contentsWidth(), ch = contentsHeight();
@@ -1953 +1806 @@
             else if (cpnt.y() > ch) cpnt.setY (ch);
 
-            CMouse mouse = m_console.GetMouse();
+            CMouse mouse = session().GetConsole().GetMouse();
             mouse.PutMouseEventAbsolute (cpnt.x(), cpnt.y(), wheelVertical,
                                          wheelHorizontal, state);
@@ -1962 +1815 @@
             if (hasFocus() && (aType == QEvent::MouseButtonRelease && aButtons == Qt::NoButton))
             {
-                if (machineWindowWrapper()->machineLogic()->isPaused())
+                if (uisession()->isPaused())
                 {
                     vboxProblem().remindAboutPausedVMInput();
                 }
-                else if (isRunning())
+                else if (uisession()->isRunning())
                 {
                     /* Temporarily disable auto capture that will take place after this dialog is dismissed because
@@ -2024 +1877 @@
         /* Update the dock icon if we are in the running state */
             // TODO_NEW_CORE
-//        if (isRunning())
+//        if (uisession()->isRunning())
 //            updateDockIcon();
 #endif
@@ -2316 +2169 @@
         case XFocusOut:
         case XFocusIn:
-            if (isRunning())
+            if (uisession()->isRunning())
                 focusEvent(pEvent->type == XFocusIn);
             return false;
@@ -2569 +2422 @@
 #endif
 
-void UIMachineView::fixModifierState(LONG *piCodes, uint *puCount)
+void UIMachineView::fixModifierState(int *piCodes, uint *puCount)
 {
     /* Synchronize the views of the host and the guest to the modifier keys.
@@ -2597 +2450 @@
     XFreeModifiermap(map);
 
-    if (m_uNumLockAdaptionCnt && (m_fNumLock ^ !!(uMask & uKeyMaskNum)))
-    {
-        -- m_uNumLockAdaptionCnt;
+    if (uisession()->numLockAdaptionCnt() && (uisession()->isNumLock() ^ !!(uMask & uKeyMaskNum)))
+    {
+        uisession()->setNumLockAdaptionCnt(uisession()->numLockAdaptionCnt() - 1);
         piCodes[(*puCount)++] = 0x45;
         piCodes[(*puCount)++] = 0x45 | 0x80;
     }
-    if (m_uCapsLockAdaptionCnt && (m_fCapsLock ^ !!(uMask & uKeyMaskCaps)))
-    {
-        m_uCapsLockAdaptionCnt--;
+    if (uisession()->capsLockAdaptionCnt() && (uisession()->isCapsLock() ^ !!(uMask & uKeyMaskCaps)))
+    {
+        uisession()->setCapsLockAdaptionCnt(uisession()->capsLockAdaptionCnt() - 1);
+        piCodes[(*puCount)++] = 0x3a;
+        piCodes[(*puCount)++] = 0x3a | 0x80;
+        /* Some keyboard layouts require shift to be pressed to break
+         * capslock.  For simplicity, only do this if shift is not
+         * already held down. */
+        if (uisession()->isCapsLock() && !(m_pressedKeys[0x2a] & IsKeyPressed))
+        {
+            piCodes[(*puCount)++] = 0x2a;
+            piCodes[(*puCount)++] = 0x2a | 0x80;
+        }
+    }
+
+#elif defined(Q_WS_WIN32)
+
+    if (uisession()->numLockAdaptionCnt() && (m_fNumLock ^ !!(GetKeyState(VK_NUMLOCK))))
+    {
+        uisession()->setNumLockAdaptionCnt(uisession()->numLockAdaptionCnt() - 1);
+        piCodes[(*puCount)++] = 0x45;
+        piCodes[(*puCount)++] = 0x45 | 0x80;
+    }
+    if (uisession()->capsLockAdaptionCnt() && (m_fCapsLock ^ !!(GetKeyState(VK_CAPITAL))))
+    {
+        uisession()->setCapsLockAdaptionCnt(uisession()->capsLockAdaptionCnt() - 1);
         piCodes[(*puCount)++] = 0x3a;
         piCodes[(*puCount)++] = 0x3a | 0x80;
@@ -2618 +2494 @@
     }
 
-#elif defined(Q_WS_WIN32)
-
-    if (m_uNumLockAdaptionCnt && (m_fNumLock ^ !!(GetKeyState(VK_NUMLOCK))))
-    {
-        m_uNumLockAdaptionCnt--;
-        piCodes[(*puCount)++] = 0x45;
-        piCodes[(*puCount)++] = 0x45 | 0x80;
-    }
-    if (m_uCapsLockAdaptionCnt && (m_fCapsLock ^ !!(GetKeyState(VK_CAPITAL))))
-    {
-        m_uCapsLockAdaptionCnt--;
-        piCodes[(*puCount)++] = 0x3a;
-        piCodes[(*puCount)++] = 0x3a | 0x80;
-        /* Some keyboard layouts require shift to be pressed to break
-         * capslock.  For simplicity, only do this if shift is not
-         * already held down. */
-        if (m_fCapsLock && !(m_pressedKeys[0x2a] & IsKeyPressed))
-        {
-            piCodes[(*puCount)++] = 0x2a;
-            piCodes[(*puCount)++] = 0x2a | 0x80;
-        }
-    }
-
 #elif defined(Q_WS_MAC)
 
-    /* if (m_uNumLockAdaptionCnt) ... - NumLock isn't implemented by Mac OS X so ignore it. */
-    if (m_uCapsLockAdaptionCnt && (m_fCapsLock ^ !!(::GetCurrentEventKeyModifiers() & alphaLock)))
-    {
-        m_uCapsLockAdaptionCnt--;
+    /* if (uisession()->numLockAdaptionCnt()) ... - NumLock isn't implemented by Mac OS X so ignore it. */
+    if (uisession()->capsLockAdaptionCnt() && (m_fCapsLock ^ !!(::GetCurrentEventKeyModifiers() & alphaLock)))
+    {
+        uisession()->setCapsLockAdaptionCnt(uisession()->capsLockAdaptionCnt() - 1);
         piCodes[(*puCount)++] = 0x3a;
         piCodes[(*puCount)++] = 0x3a | 0x80;
@@ -2758 +2611 @@
 void UIMachineView::captureMouse(bool fCapture, bool fEmitSignal /* = true */)
 {
-    if (m_bIsMouseCaptured == fCapture)
+    if (uisession()->isMouseCaptured() == fCapture)
         return;
 
@@ -2787 +2640 @@
 #endif
         /* Release mouse buttons: */
-        CMouse mouse = m_console.GetMouse();
+        CMouse mouse = session().GetConsole().GetMouse();
         mouse.PutMouseEvent (0, 0, 0, 0 /* Horizontal wheel */, 0);
     }
 
-    m_bIsMouseCaptured = fCapture;
+    uisession()->setMouseCaptured(fCapture);
 
     updateMouseClipping();
@@ -2806 +2659 @@
 void UIMachineView::releaseAllPressedKeys(bool aReleaseHostKey /* = true */)
 {
-    CKeyboard keyboard = m_console.GetKeyboard();
+    CKeyboard keyboard = session().GetConsole().GetKeyboard();
     bool fSentRESEND = false;
 
@@ -2856 +2709 @@
 {
     QVector <LONG> codes(2);
-    CKeyboard keyboard = m_console.GetKeyboard();
+    CKeyboard keyboard = session().GetConsole().GetKeyboard();
     for (uint i = 0; i < SIZEOF_ARRAY(m_pressedKeys); ++ i)
     {
@@ -2881 +2734 @@
 void UIMachineView::updateMouseClipping()
 {
-    if (m_bIsMouseCaptured)
+    if (uisession()->isMouseCaptured())
     {
         viewport()->setCursor(QCursor(Qt::BlankCursor));
@@ -2900 +2753 @@
         viewport()->unsetCursor();
     }
-}
-
-void UIMachineView::setPointerShape(const uchar *pShapeData, bool fHasAlpha,
-                                    uint uXHot, uint uYHot, uint uWidth, uint uHeight)
-{
-    AssertMsg(pShapeData, ("Shape data must not be NULL!\n"));
-
-    bool ok = false;
-
-    const uchar *srcAndMaskPtr = pShapeData;
-    uint andMaskSize = (uWidth + 7) / 8 * uHeight;
-    const uchar *srcShapePtr = pShapeData + ((andMaskSize + 3) & ~3);
-    uint srcShapePtrScan = uWidth * 4;
-
-#if defined (Q_WS_WIN)
-
-    BITMAPV5HEADER bi;
-    HBITMAP hBitmap;
-    void *lpBits;
-
-    ::ZeroMemory(&bi, sizeof (BITMAPV5HEADER));
-    bi.bV5Size = sizeof(BITMAPV5HEADER);
-    bi.bV5Width = uWidth;
-    bi.bV5Height = - (LONG)uHeight;
-    bi.bV5Planes = 1;
-    bi.bV5BitCount = 32;
-    bi.bV5Compression = BI_BITFIELDS;
-    bi.bV5RedMask   = 0x00FF0000;
-    bi.bV5GreenMask = 0x0000FF00;
-    bi.bV5BlueMask  = 0x000000FF;
-    if (fHasAlpha)
-        bi.bV5AlphaMask = 0xFF000000;
-    else
-        bi.bV5AlphaMask = 0;
-
-    HDC hdc = GetDC(NULL);
-
-    /* Create the DIB section with an alpha channel: */
-    hBitmap = CreateDIBSection(hdc, (BITMAPINFO *)&bi, DIB_RGB_COLORS, (void **)&lpBits, NULL, (DWORD) 0);
-
-    ReleaseDC(NULL, hdc);
-
-    HBITMAP hMonoBitmap = NULL;
-    if (fHasAlpha)
-    {
-        /* Create an empty mask bitmap: */
-        hMonoBitmap = CreateBitmap(uWidth, uHeight, 1, 1, NULL);
-    }
-    else
-    {
-        /* Word aligned AND mask. Will be allocated and created if necessary. */
-        uint8_t *pu8AndMaskWordAligned = NULL;
-
-        /* Width in bytes of the original AND mask scan line. */
-        uint32_t cbAndMaskScan = (uWidth + 7) / 8;
-
-        if (cbAndMaskScan & 1)
-        {
-            /* Original AND mask is not word aligned. */
-
-            /* Allocate memory for aligned AND mask. */
-            pu8AndMaskWordAligned = (uint8_t *)RTMemTmpAllocZ((cbAndMaskScan + 1) * uHeight);
-
-            Assert(pu8AndMaskWordAligned);
-
-            if (pu8AndMaskWordAligned)
-            {
-                /* According to MSDN the padding bits must be 0.
-                 * Compute the bit mask to set padding bits to 0 in the last byte of original AND mask. */
-                uint32_t u32PaddingBits = cbAndMaskScan * 8  - uWidth;
-                Assert(u32PaddingBits < 8);
-                uint8_t u8LastBytesPaddingMask = (uint8_t)(0xFF << u32PaddingBits);
-
-                Log(("u8LastBytesPaddingMask = %02X, aligned w = %d, width = %d, cbAndMaskScan = %d\n",
-                      u8LastBytesPaddingMask, (cbAndMaskScan + 1) * 8, uWidth, cbAndMaskScan));
-
-                uint8_t *src = (uint8_t *)srcAndMaskPtr;
-                uint8_t *dst = pu8AndMaskWordAligned;
-
-                unsigned i;
-                for (i = 0; i < uHeight; i++)
-                {
-                    memcpy(dst, src, cbAndMaskScan);
-
-                    dst[cbAndMaskScan - 1] &= u8LastBytesPaddingMask;
-
-                    src += cbAndMaskScan;
-                    dst += cbAndMaskScan + 1;
-                }
-            }
-        }
-
-        /* Create the AND mask bitmap: */
-        hMonoBitmap = ::CreateBitmap(uWidth, uHeight, 1, 1,
-                                     pu8AndMaskWordAligned? pu8AndMaskWordAligned: srcAndMaskPtr);
-
-        if (pu8AndMaskWordAligned)
-        {
-            RTMemTmpFree(pu8AndMaskWordAligned);
-        }
-    }
-
-    Assert(hBitmap);
-    Assert(hMonoBitmap);
-    if (hBitmap && hMonoBitmap)
-    {
-        DWORD *dstShapePtr = (DWORD *) lpBits;
-
-        for (uint y = 0; y < uHeight; y ++)
-        {
-            memcpy(dstShapePtr, srcShapePtr, srcShapePtrScan);
-            srcShapePtr += srcShapePtrScan;
-            dstShapePtr += uWidth;
-        }
-
-        ICONINFO ii;
-        ii.fIcon = FALSE;
-        ii.xHotspot = uXHot;
-        ii.yHotspot = uYHot;
-        ii.hbmMask = hMonoBitmap;
-        ii.hbmColor = hBitmap;
-
-        HCURSOR hAlphaCursor = CreateIconIndirect(&ii);
-        Assert(hAlphaCursor);
-        if (hAlphaCursor)
-        {
-            viewport()->setCursor(QCursor(hAlphaCursor));
-            ok = true;
-            if (m_alphaCursor)
-                DestroyIcon(m_alphaCursor);
-            m_alphaCursor = hAlphaCursor;
-        }
-    }
-
-    if (hMonoBitmap)
-        DeleteObject(hMonoBitmap);
-    if (hBitmap)
-        DeleteObject(hBitmap);
-
-#elif defined (Q_WS_X11) && !defined (VBOX_WITHOUT_XCURSOR)
-
-    XcursorImage *img = XcursorImageCreate(uWidth, uHeight);
-    Assert(img);
-    if (img)
-    {
-        img->xhot = uXHot;
-        img->yhot = uYHot;
-
-        XcursorPixel *dstShapePtr = img->pixels;
-
-        for (uint y = 0; y < uHeight; y ++)
-        {
-            memcpy (dstShapePtr, srcShapePtr, srcShapePtrScan);
-
-            if (!fHasAlpha)
-            {
-                /* Convert AND mask to the alpha channel: */
-                uchar byte = 0;
-                for (uint x = 0; x < uWidth; x ++)
-                {
-                    if (!(x % 8))
-                        byte = *(srcAndMaskPtr ++);
-                    else
-                        byte <<= 1;
-
-                    if (byte & 0x80)
-                    {
-                        /* Linux doesn't support inverted pixels (XOR ops,
-                         * to be exact) in cursor shapes, so we detect such
-                         * pixels and always replace them with black ones to
-                         * make them visible at least over light colors */
-                        if (dstShapePtr [x] & 0x00FFFFFF)
-                            dstShapePtr [x] = 0xFF000000;
-                        else
-                            dstShapePtr [x] = 0x00000000;
-                    }
-                    else
-                        dstShapePtr [x] |= 0xFF000000;
-                }
-            }
-
-            srcShapePtr += srcShapePtrScan;
-            dstShapePtr += uWidth;
-        }
-
-        Cursor cur = XcursorImageLoadCursor(QX11Info::display(), img);
-        Assert (cur);
-        if (cur)
-        {
-            viewport()->setCursor(QCursor(cur));
-            ok = true;
-        }
-
-        XcursorImageDestroy(img);
-    }
-
-#elif defined(Q_WS_MAC)
-
-    /* Create a ARGB image out of the shape data. */
-    QImage image  (uWidth, uHeight, QImage::Format_ARGB32);
-    const uint8_t* pbSrcMask = static_cast<const uint8_t*> (srcAndMaskPtr);
-    unsigned cbSrcMaskLine = RT_ALIGN (uWidth, 8) / 8;
-    for (unsigned int y = 0; y < uHeight; ++y)
-    {
-        for (unsigned int x = 0; x < uWidth; ++x)
-        {
-           unsigned int color = ((unsigned int*)srcShapePtr)[y*uWidth+x];
-           /* If the alpha channel isn't in the shape data, we have to
-            * create them from the and-mask. This is a bit field where 1
-            * represent transparency & 0 opaque respectively. */
-           if (!fHasAlpha)
-           {
-               if (!(pbSrcMask[x / 8] & (1 << (7 - (x % 8)))))
-                   color  |= 0xff000000;
-               else
-               {
-                   /* This isn't quite right, but it's the best we can do I think... */
-                   if (color & 0x00ffffff)
-                       color = 0xff000000;
-                   else
-                       color = 0x00000000;
-               }
-           }
-           image.setPixel (x, y, color);
-        }
-        /* Move one scanline forward. */
-        pbSrcMask += cbSrcMaskLine;
-    }
-    /* Set the new cursor: */
-    QCursor cursor(QPixmap::fromImage(image), uXHot, uYHot);
-    viewport()->setCursor(cursor);
-    ok = true;
-    NOREF(srcShapePtrScan);
-
-#else
-
-# warning "port me"
-
-#endif
-
-    if (ok)
-        m_lastCursor = viewport()->cursor();
-    else
-        viewport()->unsetCursor();
 }
 

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

@@ -24 +24 @@
 #define ___UIMachineView_h___
 
+/* Global includes */
+#include <QAbstractScrollArea>
+
+/* Local includes */
+#include "VBoxDefs.h"
+#include "UIMachineDefs.h"
+
+#ifdef Q_WS_MAC
+# include <CoreFoundation/CFBase.h>
+#endif /* Q_WS_MAC */
+
 /* Local forwards */
+class CSession;
+class UISession;
 class UIFrameBuffer;
 class UIMachineWindow;
 class VBoxGlobalSettings;
-
-/* Global includes */
-#include <QAbstractScrollArea>
-
-/* Local includes */
-#include "COMDefs.h"
-#include "UIMachineDefs.h"
-
-#ifdef Q_WS_MAC
-# include <CoreFoundation/CFBase.h>
-#endif /* Q_WS_MAC */
-
-/* Local forwards */
 #ifdef Q_WS_MAC
 class VBoxChangeDockIconUpdateEvent;
@@ -61 +61 @@
                                  , UIVisualStateType visualStateType);
 
-    /* Public virtual members: */
-    virtual void normalizeGeometry(bool bAdjustPosition = false) = 0;
-
     /* Public getters: */
     int keyboardState() const;
@@ -69 +66 @@
 
     /* Public setters: */
-    void setIgnoreGuestResize(bool bIgnore) { m_bIsGuestResizeIgnored = bIgnore; }
     virtual void setGuestAutoresizeEnabled(bool bEnabled) = 0;
     virtual void setMouseIntegrationEnabled(bool bEnabled);
     //void setMachineViewFinalized(bool fTrue = true) { m_bIsMachineWindowResizeIgnored = !fTrue; }
+
+    /* Public members: */
+    virtual void normalizeGeometry(bool bAdjustPosition = false) = 0;
 
 #if defined(Q_WS_MAC)
@@ -105 +104 @@
 
     /* Protected getters: */
-    UIMachineWindow* machineWindowWrapper() { return m_pMachineWindow; }
-    CConsole &console() { return m_console; }
-
-    /* Protected getters: */
-    KMachineState machineState() const { return m_machineState; }
+    UISession* uisession() const;
+    CSession& session();
+    UIMachineWindow* machineWindowWrapper() const { return m_pMachineWindow; }
     VBoxDefs::RenderMode mode() const { return m_mode; }
     QSize sizeHint() const;
@@ -119 +116 @@
     int visibleHeight() const;
     QRect desktopGeometry() const;
-    bool isGuestSupportsGraphics() const { return m_bIsGuestSupportsGraphics; }
     const QPixmap& pauseShot() const { return m_pauseShot; }
-    //bool isMouseAbsolute() const { return m_fIsMouseSupportsAbsolute; }
 
     /* Protected members: */
@@ -138 +133 @@
 
     /* Cleanup routines: */
-    virtual void saveMachineViewSettings();
-    virtual void cleanupConsoleConnections() {}
-    virtual void cleanupFilters() {}
+    //virtual void saveMachineViewSettings() {}
+    //virtual void cleanupConsoleConnections() {}
+    //virtual void cleanupFilters() {}
     virtual void cleanupCommon();
     virtual void cleanupFrameBuffer();
 
-    /* Update routines: */
-    virtual void updateMachineState();
-    virtual void updateAdditionsState();
-    virtual void updateMousePointerShape();
-    virtual void updateMouseCapability();
-
 protected slots:
 
     /* Console callback handlers: */
-    virtual void sltMachineStateChanged(KMachineState state);
+    virtual void sltMachineStateChanged();
     virtual void sltAdditionsStateChanged();
-    virtual void sltKeyboardLedsChanged(bool bNumLock, bool bCapsLock, bool bScrollLock);
-    virtual void sltMousePointerShapeChanged(bool fIsVisible, bool fHasAlpha,
-                                             uint uXHot, uint uYHot, uint uWidth, uint uHeight,
-                                             const uchar *pShapeData);
-    virtual void sltMouseCapabilityChanged(bool bIsSupportsAbsolute, bool bIsSupportsRelative, bool bNeedsHostCursor);
+    virtual void sltMousePointerShapeChanged();
+    virtual void sltMouseCapabilityChanged();
 
     /* Initiate resize request to guest: */
@@ -212 +198 @@
 
     /* Private helpers: */
-    void fixModifierState(LONG *piCodes, uint *puCount);
+    void fixModifierState(int *piCodes, uint *puCount);
     QPoint viewportToContents(const QPoint &vp) const;
     void updateSliders();
@@ -227 +213 @@
     void sendChangedKeyStates();
     void updateMouseClipping();
-    void setPointerShape(const uchar *pShapeData, bool fHasAlpha,
-                         uint uXHot, uint uYHot, uint uWidth, uint uHeight);
-
-    /* Private getters: */
-    bool isRunning() { return m_machineState == KMachineState_Running || m_machineState == KMachineState_Teleporting || m_machineState == KMachineState_LiveSnapshotting; }
-    bool shouldHideHostPointer() const { return m_bIsMouseCaptured || (m_fIsMouseSupportsAbsolute && m_fIsHideHostPointer); }
 
     static void dimImage(QImage &img);
@@ -238 +218 @@
     /* Private members: */
     UIMachineWindow *m_pMachineWindow;
-    CConsole m_console;
     VBoxDefs::RenderMode m_mode;
     const VBoxGlobalSettings &m_globalSettings;
-    KMachineState m_machineState;
     UIFrameBuffer *m_pFrameBuffer;
 
-    QCursor m_lastCursor;
-#if defined(Q_WS_WIN)
-    HCURSOR m_alphaCursor;
-#endif
     QPoint m_lastMousePos;
     QPoint m_capturedMousePos;
@@ -255 +229 @@
     uint8_t m_pressedKeysCopy[128];
 
-    uint m_uNumLockAdaptionCnt;
-    uint m_uCapsLockAdaptionCnt;
-
     bool m_bIsAutoCaptureDisabled : 1;
     bool m_bIsKeyboardCaptured : 1;
-    bool m_bIsMouseCaptured : 1;
-    bool m_fIsMouseSupportsAbsolute : 1;
-    bool m_fIsMouseSupportsRelative : 1;
-    bool m_bIsMouseIntegrated : 1;
-    bool m_fIsHideHostPointer;
     bool m_bIsHostkeyPressed : 1;
     bool m_bIsHostkeyAlone : 1;
     bool m_bIsHostkeyInCapture : 1;
-    bool m_bIsGuestSupportsGraphics : 1;
     bool m_bIsMachineWindowResizeIgnored : 1;
     bool m_bIsFrameBufferResizeIgnored : 1;
-    bool m_bIsGuestResizeIgnored : 1;
-    bool m_fNumLock : 1;
-    bool m_fCapsLock : 1;
-    bool m_fScrollLock : 1;
     bool m_fPassCAD;
 #ifdef VBOX_WITH_VIDEOHWACCEL

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

@@ -27 +27 @@
 
 /* Local includes */
+#include "COMDefs.h"
 #include "VBoxGlobal.h"
 #include "VBoxProblemReporter.h"
@@ -98 +99 @@
 }
 
-CSession UIMachineWindow::session()
-{
-    return m_pMachineLogic->uisession()->session();
+UISession* UIMachineWindow::uisession()
+{
+    return machineLogic()->uisession();
+}
+
+CSession& UIMachineWindow::session()
+{
+    return uisession()->session();
 }
 
@@ -131 +137 @@
     }
 
-    switch (machineLogic()->machineState())
+    /* Get machine state: */
+    KMachineState state = uisession()->machineState();
+
+    switch (state)
     {
         case KMachineState_PoweredOff:
@@ -161 +170 @@
             bool success = true;
 
-            bool wasPaused = machineLogic()->machineState() == KMachineState_Paused ||
-                             machineLogic()->machineState() == KMachineState_Stuck ||
-                             machineLogic()->machineState() == KMachineState_TeleportingPausedVM;
+            bool wasPaused = uisession()->isPaused() || state == KMachineState_Stuck;
             if (!wasPaused)
             {
                 /* Suspend the VM and ignore the close event if failed to do so.
                  * pause() will show the error message to the user. */
-                success = machineLogic()->pause();
+                success = uisession()->pause();
             }
 
@@ -185 +192 @@
                     dlg.mCbDiscardCurState->setText(dlg.mCbDiscardCurState->text().arg(machine.GetCurrentSnapshot().GetName()));
 
-                if (machineLogic()->machineState() != KMachineState_Stuck)
+                if (state != KMachineState_Stuck)
                 {
                     /* Read the last user's choice for the given VM */
@@ -246 +253 @@
                     {
                         /* Unpause the VM to let it grab the ACPI shutdown event */
-                        machineLogic()->unpause();
+                        uisession()->unpause();
                         /* Prevent the subsequent unpause request */
                         wasPaused = true;
@@ -330 +337 @@
             machineLogic()->setPreventAutoClose(false);
 
-            if (machineLogic()->machineState() == KMachineState_PoweredOff ||
-                machineLogic()->machineState() == KMachineState_Saved ||
-                machineLogic()->machineState() == KMachineState_Teleported ||
-                machineLogic()->machineState() == KMachineState_Aborted)
+            if (state == KMachineState_PoweredOff ||
+                state == KMachineState_Saved ||
+                state == KMachineState_Teleported ||
+                state == KMachineState_Aborted)
             {
                 /* The machine has been stopped while showing the Close or the Pause
@@ -344 +351 @@
                 {
                     /* Restore the running state if needed */
-                    if (!wasPaused && machineLogic()->machineState() == KMachineState_Paused)
-                        machineLogic()->unpause();
+                    if (!wasPaused && state == KMachineState_Paused)
+                        uisession()->unpause();
                 }
             }
@@ -393 +400 @@
 {
     /* Machine state-change updater: */
-    QObject::connect(machineLogic()->uisession(), SIGNAL(sigStateChange(KMachineState)),
-                     machineWindow(), SLOT(sltMachineStateChanged(KMachineState)));
+    QObject::connect(uisession(), SIGNAL(sigMachineStateChange()), machineWindow(), SLOT(sltMachineStateChanged()));
 }
 
@@ -460 +466 @@
 #endif /* VBOX_WITH_DEBUGGER_GUI */
 
-void UIMachineWindow::loadWindowSettings()
-{
-#ifdef Q_WS_MAC
-    QString testStr = vboxGlobal().virtualBox().GetExtraData(VBoxDefs::GUI_RealtimeDockIconUpdateEnabled).toLower();
-    /* Default to true if it is an empty value */
-    bool bIsDockIconEnabled = testStr.isEmpty() || testStr == "true";
-    if (machineView())
-    {
-        machineView()->setDockIconEnabled(bIsDockIconEnabled);
-        machineView()->updateDockOverlay();
-    }
-#endif
-}
-
 void UIMachineWindow::updateAppearanceOf(int iElement)
 {
@@ -480 +472 @@
     if (iElement & UIVisualElement_WindowCaption)
     {
+        /* Get machine state: */
+        KMachineState state = uisession()->machineState();
+        /* Prepare full name: */
         QString strSnapshotName;
         if (machine.GetSnapshotCount() > 0)
@@ -487 +482 @@
         }
         QString strMachineName = machine.GetName() + strSnapshotName;
-        if (machineLogic()->machineState() != KMachineState_Null)
-            strMachineName += " [" + vboxGlobal().toString(machineLogic()->machineState()) + "] - ";
+        if (state != KMachineState_Null)
+            strMachineName += " [" + vboxGlobal().toString(state) + "] - ";
         strMachineName += m_strWindowTitlePrefix;
         machineWindow()->setWindowTitle(strMachineName);
@@ -497 +492 @@
 }
 
-void UIMachineWindow::sltMachineStateChanged(KMachineState /* machineState */)
+void UIMachineWindow::sltMachineStateChanged()
 {
     updateAppearanceOf(UIVisualElement_WindowCaption);

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

@@ -25 +25 @@
 
 /* Local includes */
-#include "COMDefs.h"
 #include "UIMachineDefs.h"
 
@@ -33 +32 @@
 
 /* Local forwards */
+class CSession;
+class UISession;
 class UIMachineLogic;
 class UIMachineView;
@@ -58 +59 @@
     virtual ~UIMachineWindow();
 
+    /* Protected wrappers: */
+    UISession* uisession();
+    CSession& session();
+
     /* Protected getters: */
-    CSession session();
     const QString& defaultWindowTitle() const { return m_strWindowTitlePrefix; }
 
@@ -76 +80 @@
     virtual void prepareMenuDebug();
 #endif
-    virtual void loadWindowSettings();
+    //virtual void loadWindowSettings() {}
 
     /* Cleanup helpers: */
@@ -92 +96 @@
 
     /* Protected slots: */
-    void sltMachineStateChanged(KMachineState machineState);
+    virtual void sltMachineStateChanged();
 
     /* Protected variables: */

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

@@ -28 +28 @@
 /* Local includes */
 #include "UISession.h"
-
 #include "UIMachine.h"
+#include "UIActionsPool.h"
 #include "UIMachineLogic.h"
 #include "UIMachineWindow.h"
-
-#include "VBoxUtils.h"
+#include "VBoxProblemReporter.h"
+
+#ifdef Q_WS_X11
+# include <QX11Info>
+# ifndef VBOX_WITHOUT_XCURSOR
+#  include <X11/Xcursor/Xcursor.h>
+# endif
+#endif
+
+#if defined (Q_WS_MAC)
+# include "VBoxUtils.h"
+#endif
 
 /* Guest mouse pointer shape change event: */
@@ -513 +523 @@
 UISession::UISession(UIMachine *pMachine, const CSession &session)
     : QObject(pMachine)
+    /* Base variables: */
     , m_pMachine(pMachine)
     , m_session(session)
     , m_pCallback(new UIConsoleCallback(this))
     , m_callback(CConsoleCallback(m_pCallback))
+    /* Common varibles: */
+    , m_machineState(KMachineState_Null)
+    /* Common flags: */
+    , m_fIsFirstTimeStarted(false)
+    , m_fIsIgnoreRutimeMediumsChanging(false)
+    /* Guest additions flags: */
+    , m_fIsGuestAdditionsActive(false)
+    , m_fIsGuestSupportsGraphics(false)
+    , m_fIsGuestSupportsSeamless(false)
+    /* Mouse flags: */
+    , m_fNumLock(false)
+    , m_fCapsLock(false)
+    , m_fScrollLock(false)
+    , m_uNumLockAdaptionCnt(2)
+    , m_uCapsLockAdaptionCnt(2)
+    /* Mouse flags: */
+    , m_fIsMouseSupportsAbsolute(false)
+    , m_fIsMouseSupportsRelative(false)
+    , m_fIsMouseHostCursorNeeded(false)
+    , m_fIsMouseCaptured(false)
+    , m_fIsMouseIntegrated(true)
+    , m_fIsHideHostPointer(true)
 {
     /* Check CSession object */
-    AssertMsg(!m_session.isNull(), ("CSession is not set!\n"));
+    AssertMsg(!m_session.isNull(), ("CSession should not be NULL!\n"));
 
     /* Register console callback: */
     m_session.GetConsole().RegisterCallback(m_callback);
+
+    /* Load session settings: */
+    loadSessionSettings();
 }
 
 UISession::~UISession()
 {
+    /* Save session settings: */
+    saveSessionSettings();
+
     /* Unregister console callback: */
     m_session.GetConsole().UnregisterCallback(m_callback);
@@ -533 +572 @@
 }
 
+bool UISession::setPause(bool fOn)
+{
+    if (isPaused() == fOn)
+        return true;
+
+    CConsole console = session().GetConsole();
+
+    if (fOn)
+        console.Pause();
+    else
+        console.Resume();
+
+    bool ok = console.isOk();
+    if (!ok)
+    {
+        if (fOn)
+            vboxProblem().cannotPauseMachine(console);
+        else
+            vboxProblem().cannotResumeMachine(console);
+    }
+
+    return ok;
+}
+
 bool UISession::event(QEvent *pEvent)
 {
@@ -539 +602 @@
         case UIConsoleEventType_MousePointerShapeChange:
         {
+            /* Convert to mouse shape change event: */
             UIMousePointerShapeChangeEvent *pConsoleEvent = static_cast<UIMousePointerShapeChangeEvent*>(pEvent);
-            emit sigMousePointerShapeChange(pConsoleEvent->isVisible(), pConsoleEvent->hasAlpha(),
-                                            pConsoleEvent->xHot(), pConsoleEvent->yHot(),
-                                            pConsoleEvent->width(), pConsoleEvent->height(),
-                                            pConsoleEvent->shapeData());
+
+            /* Remember if we should show cursor: */
+            m_fIsHideHostPointer = !pConsoleEvent->isVisible();
+
+            /* Cache shape dataif present: */
+            if (pConsoleEvent->shapeData())
+                setPointerShape(pConsoleEvent->shapeData(), pConsoleEvent->hasAlpha(),
+                                pConsoleEvent->xHot(), pConsoleEvent->yHot(),
+                                pConsoleEvent->width(), pConsoleEvent->height());
+
+            /* Notify listeners about mouse capability changed: */
+            emit sigMousePointerShapeChange();
+
+            /* Accept event: */
+            pEvent->accept();
             return true;
         }
@@ -549 +624 @@
         case UIConsoleEventType_MouseCapabilityChange:
         {
+            /* Convert to mouse capability event: */
             UIMouseCapabilityChangeEvent *pConsoleEvent = static_cast<UIMouseCapabilityChangeEvent*>(pEvent);
-            emit sigMouseCapabilityChange(pConsoleEvent->supportsAbsolute(), pConsoleEvent->supportsRelative(), pConsoleEvent->needsHostCursor());
+
+            /* Check if something had changed: */
+            if (m_fIsMouseSupportsAbsolute != pConsoleEvent->supportsAbsolute() ||
+                m_fIsMouseSupportsRelative != pConsoleEvent->supportsRelative() ||
+                m_fIsMouseHostCursorNeeded != pConsoleEvent->needsHostCursor())
+            {
+                /* Store new data: */
+                m_fIsMouseSupportsAbsolute = pConsoleEvent->supportsAbsolute();
+                m_fIsMouseSupportsRelative = pConsoleEvent->supportsRelative();
+                m_fIsMouseHostCursorNeeded = pConsoleEvent->needsHostCursor();
+
+                /* Notify listeners about mouse capability changed: */
+                emit sigMouseCapabilityChange();
+            }
+
+            /* Accept event: */
+            pEvent->accept();
             return true;
         }
@@ -556 +648 @@
         case UIConsoleEventType_KeyboardLedsChange:
         {
+            /* Convert to keyboard LEDs change event: */
             UIKeyboardLedsChangeEvent *pConsoleEvent = static_cast<UIKeyboardLedsChangeEvent*>(pEvent);
-            emit sigKeyboardLedsChange(pConsoleEvent->numLock(), pConsoleEvent->capsLock(), pConsoleEvent->scrollLock());
+
+            /* Check if something had changed: */
+            if (m_fNumLock != pConsoleEvent->numLock() ||
+                m_fCapsLock != pConsoleEvent->capsLock() ||
+                m_fScrollLock != pConsoleEvent->scrollLock())
+            {
+                /* Store new num lock data: */
+                if (m_fNumLock != pConsoleEvent->numLock())
+                {
+                    m_fNumLock = pConsoleEvent->numLock();
+                    m_uNumLockAdaptionCnt = 2;
+                }
+
+                /* Store new caps lock data: */
+                if (m_fCapsLock != pConsoleEvent->capsLock())
+                {
+                    m_fCapsLock = pConsoleEvent->capsLock();
+                    m_uCapsLockAdaptionCnt = 2;
+                }
+
+                /* Store new scroll lock data: */
+                if (m_fScrollLock != pConsoleEvent->scrollLock())
+                {
+                    m_fScrollLock = pConsoleEvent->scrollLock();
+                }
+
+                /* Notify listeners about mouse capability changed: */
+                emit sigKeyboardLedsChange();
+            }
+
+            /* Accept event: */
+            pEvent->accept();
             return true;
         }
@@ -563 +687 @@
         case UIConsoleEventType_StateChange:
         {
+            /* Convert to machine state event: */
             UIStateChangeEvent *pConsoleEvent = static_cast<UIStateChangeEvent*>(pEvent);
-            emit sigStateChange(pConsoleEvent->machineState());
+
+            /* Check if something had changed: */
+            if (m_machineState != pConsoleEvent->machineState())
+            {
+                /* Store new data: */
+                m_machineState = pConsoleEvent->machineState();
+
+                /* Notify listeners about machine state changed: */
+                emit sigMachineStateChange();
+            }
+
+            /* Accept event: */
+            pEvent->accept();
             return true;
         }
@@ -570 +707 @@
         case UIConsoleEventType_AdditionsStateChange:
         {
-            emit sigAdditionsStateChange();
+            /* Get our guest: */
+            CGuest guest = session().GetConsole().GetGuest();
+
+            /* Variable flags: */
+            bool fIsGuestAdditionsActive = guest.GetAdditionsActive();
+            bool fIsGuestSupportsGraphics = guest.GetSupportsGraphics();
+            bool fIsGuestSupportsSeamless = guest.GetSupportsSeamless();
+
+            /* Check if something had changed: */
+            if (m_fIsGuestAdditionsActive != fIsGuestAdditionsActive ||
+                m_fIsGuestSupportsGraphics != fIsGuestSupportsGraphics ||
+                m_fIsGuestSupportsSeamless != fIsGuestSupportsSeamless)
+            {
+                /* Store new data: */
+                m_fIsGuestAdditionsActive = fIsGuestAdditionsActive;
+                m_fIsGuestSupportsGraphics = fIsGuestSupportsGraphics;
+                m_fIsGuestSupportsSeamless = fIsGuestSupportsSeamless;
+
+                /* Notify listeners about guest additions state changed: */
+                emit sigAdditionsStateChange();
+            }
+
+            /* Accept event: */
+            pEvent->accept();
             return true;
         }
@@ -679 +839 @@
 }
 
+void UISession::loadSessionSettings()
+{
+    /* Get machine: */
+    CMachine machine = session().GetConsole().GetMachine();
+
+    /* Availability settings: */
+    {
+        /* USB Stuff: */
+        CUSBController usbController = machine.GetUSBController();
+        if (usbController.isNull())
+        {
+            /* Hide USB menu if controller is NULL: */
+            uimachine()->actionsPool()->action(UIActionIndex_Menu_USBDevices)->setVisible(false);
+        }
+        else
+        {
+            /* Enable/Disable USB menu depending on USB controller: */
+            uimachine()->actionsPool()->action(UIActionIndex_Menu_USBDevices)->setEnabled(usbController.GetEnabled());
+        }
+
+        /* VRDP Stuff: */
+        CVRDPServer vrdpServer = machine.GetVRDPServer();
+        if (vrdpServer.isNull())
+        {
+            /* Hide VRDP Action: */
+            uimachine()->actionsPool()->action(UIActionIndex_Toggle_VRDP)->setVisible(false);
+        }
+    }
+
+    /* Prepare some initial settings: */
+    {
+        /* Initialize CD/FD menus: */
+        int iDevicesCountCD = 0;
+        int iDevicesCountFD = 0;
+        const CMediumAttachmentVector &attachments = machine.GetMediumAttachments();
+        foreach (const CMediumAttachment &attachment, attachments)
+        {
+            if (attachment.GetType() == KDeviceType_DVD)
+                ++ iDevicesCountCD;
+            if (attachment.GetType() == KDeviceType_Floppy)
+                ++ iDevicesCountFD;
+        }
+        QAction *pOpticalDevicesMenu = uimachine()->actionsPool()->action(UIActionIndex_Menu_OpticalDevices);
+        QAction *pFloppyDevicesMenu = uimachine()->actionsPool()->action(UIActionIndex_Menu_FloppyDevices);
+        pOpticalDevicesMenu->setData(iDevicesCountCD);
+        pOpticalDevicesMenu->setVisible(iDevicesCountCD);
+        pFloppyDevicesMenu->setData(iDevicesCountFD);
+        pFloppyDevicesMenu->setVisible(iDevicesCountFD);
+    }
+
+    /* Load extra-data settings: */
+    {
+        /* Temporary: */
+        QString strSettings;
+
+        /* Is there shoul be First RUN Wizard? */
+        strSettings = machine.GetExtraData(VBoxDefs::GUI_FirstRun);
+        if (strSettings == "yes")
+            m_fIsFirstTimeStarted = true;
+
+        /* Ignore mediums mounted at runtime? */
+        strSettings = machine.GetExtraData(VBoxDefs::GUI_SaveMountedAtRuntime);
+        if (strSettings == "no")
+            m_fIsIgnoreRutimeMediumsChanging = true;
+
+        /* Should guest autoresize? */
+        strSettings = machine.GetExtraData(VBoxDefs::GUI_AutoresizeGuest);
+        QAction *pGuestAutoresizeSwitch = uimachine()->actionsPool()->action(UIActionIndex_Toggle_GuestAutoresize);
+        pGuestAutoresizeSwitch->blockSignals(true);
+        pGuestAutoresizeSwitch->setChecked(strSettings != "off");
+        pGuestAutoresizeSwitch->blockSignals(false);
+    }
+}
+
+void UISession::saveSessionSettings()
+{
+    /* Get session machine: */
+    CMachine machine = session().GetConsole().GetMachine();
+
+    /* Save extra-data settings: */
+    {
+        /* Disable First RUN Wizard for the since now: */
+        machine.SetExtraData(VBoxDefs::GUI_FirstRun, QString());
+
+        /* Remember if guest should autoresize: */
+        machine.SetExtraData(VBoxDefs::GUI_AutoresizeGuest,
+                             uimachine()->actionsPool()->action(UIActionIndex_Toggle_GuestAutoresize)->isChecked() ?
+                             QString() : "off");
+
+        // TODO: Move to fullscreen/seamless logic:
+        //machine.SetExtraData(VBoxDefs::GUI_MiniToolBarAutoHide, mMiniToolBar->isAutoHide() ? "on" : "off");
+    }
+}
+
 qulonglong UISession::winId() const
 {
-    return machine()->machineLogic()->machineWindowWrapper()->machineWindow()->winId();
+    return uimachine()->machineLogic()->machineWindowWrapper()->machineWindow()->winId();
 }
 
+void UISession::setPointerShape(const uchar *pShapeData, bool fHasAlpha,
+                                uint uXHot, uint uYHot, uint uWidth, uint uHeight)
+{
+    AssertMsg(pShapeData, ("Shape data must not be NULL!\n"));
+
+    const uchar *srcAndMaskPtr = pShapeData;
+    uint andMaskSize = (uWidth + 7) / 8 * uHeight;
+    const uchar *srcShapePtr = pShapeData + ((andMaskSize + 3) & ~3);
+    uint srcShapePtrScan = uWidth * 4;
+
+#if defined (Q_WS_WIN)
+
+    BITMAPV5HEADER bi;
+    HBITMAP hBitmap;
+    void *lpBits;
+
+    ::ZeroMemory(&bi, sizeof (BITMAPV5HEADER));
+    bi.bV5Size = sizeof(BITMAPV5HEADER);
+    bi.bV5Width = uWidth;
+    bi.bV5Height = - (LONG)uHeight;
+    bi.bV5Planes = 1;
+    bi.bV5BitCount = 32;
+    bi.bV5Compression = BI_BITFIELDS;
+    bi.bV5RedMask   = 0x00FF0000;
+    bi.bV5GreenMask = 0x0000FF00;
+    bi.bV5BlueMask  = 0x000000FF;
+    if (fHasAlpha)
+        bi.bV5AlphaMask = 0xFF000000;
+    else
+        bi.bV5AlphaMask = 0;
+
+    HDC hdc = GetDC(NULL);
+
+    /* Create the DIB section with an alpha channel: */
+    hBitmap = CreateDIBSection(hdc, (BITMAPINFO *)&bi, DIB_RGB_COLORS, (void **)&lpBits, NULL, (DWORD) 0);
+
+    ReleaseDC(NULL, hdc);
+
+    HBITMAP hMonoBitmap = NULL;
+    if (fHasAlpha)
+    {
+        /* Create an empty mask bitmap: */
+        hMonoBitmap = CreateBitmap(uWidth, uHeight, 1, 1, NULL);
+    }
+    else
+    {
+        /* Word aligned AND mask. Will be allocated and created if necessary. */
+        uint8_t *pu8AndMaskWordAligned = NULL;
+
+        /* Width in bytes of the original AND mask scan line. */
+        uint32_t cbAndMaskScan = (uWidth + 7) / 8;
+
+        if (cbAndMaskScan & 1)
+        {
+            /* Original AND mask is not word aligned. */
+
+            /* Allocate memory for aligned AND mask. */
+            pu8AndMaskWordAligned = (uint8_t *)RTMemTmpAllocZ((cbAndMaskScan + 1) * uHeight);
+
+            Assert(pu8AndMaskWordAligned);
+
+            if (pu8AndMaskWordAligned)
+            {
+                /* According to MSDN the padding bits must be 0.
+                 * Compute the bit mask to set padding bits to 0 in the last byte of original AND mask. */
+                uint32_t u32PaddingBits = cbAndMaskScan * 8  - uWidth;
+                Assert(u32PaddingBits < 8);
+                uint8_t u8LastBytesPaddingMask = (uint8_t)(0xFF << u32PaddingBits);
+
+                Log(("u8LastBytesPaddingMask = %02X, aligned w = %d, width = %d, cbAndMaskScan = %d\n",
+                      u8LastBytesPaddingMask, (cbAndMaskScan + 1) * 8, uWidth, cbAndMaskScan));
+
+                uint8_t *src = (uint8_t *)srcAndMaskPtr;
+                uint8_t *dst = pu8AndMaskWordAligned;
+
+                unsigned i;
+                for (i = 0; i < uHeight; i++)
+                {
+                    memcpy(dst, src, cbAndMaskScan);
+
+                    dst[cbAndMaskScan - 1] &= u8LastBytesPaddingMask;
+
+                    src += cbAndMaskScan;
+                    dst += cbAndMaskScan + 1;
+                }
+            }
+        }
+
+        /* Create the AND mask bitmap: */
+        hMonoBitmap = ::CreateBitmap(uWidth, uHeight, 1, 1,
+                                     pu8AndMaskWordAligned? pu8AndMaskWordAligned: srcAndMaskPtr);
+
+        if (pu8AndMaskWordAligned)
+        {
+            RTMemTmpFree(pu8AndMaskWordAligned);
+        }
+    }
+
+    Assert(hBitmap);
+    Assert(hMonoBitmap);
+    if (hBitmap && hMonoBitmap)
+    {
+        DWORD *dstShapePtr = (DWORD *) lpBits;
+
+        for (uint y = 0; y < uHeight; y ++)
+        {
+            memcpy(dstShapePtr, srcShapePtr, srcShapePtrScan);
+            srcShapePtr += srcShapePtrScan;
+            dstShapePtr += uWidth;
+        }
+
+        ICONINFO ii;
+        ii.fIcon = FALSE;
+        ii.xHotspot = uXHot;
+        ii.yHotspot = uYHot;
+        ii.hbmMask = hMonoBitmap;
+        ii.hbmColor = hBitmap;
+
+        HCURSOR hAlphaCursor = CreateIconIndirect(&ii);
+        Assert(hAlphaCursor);
+        if (hAlphaCursor)
+        {
+            /* Set the new cursor: */
+            m_cursor = QCursor(hAlphaCursor);
+            if (m_alphaCursor)
+                DestroyIcon(m_alphaCursor);
+            m_alphaCursor = hAlphaCursor;
+        }
+    }
+
+    if (hMonoBitmap)
+        DeleteObject(hMonoBitmap);
+    if (hBitmap)
+        DeleteObject(hBitmap);
+
+#elif defined (Q_WS_X11) && !defined (VBOX_WITHOUT_XCURSOR)
+
+    XcursorImage *img = XcursorImageCreate(uWidth, uHeight);
+    Assert(img);
+    if (img)
+    {
+        img->xhot = uXHot;
+        img->yhot = uYHot;
+
+        XcursorPixel *dstShapePtr = img->pixels;
+
+        for (uint y = 0; y < uHeight; y ++)
+        {
+            memcpy (dstShapePtr, srcShapePtr, srcShapePtrScan);
+
+            if (!fHasAlpha)
+            {
+                /* Convert AND mask to the alpha channel: */
+                uchar byte = 0;
+                for (uint x = 0; x < uWidth; x ++)
+                {
+                    if (!(x % 8))
+                        byte = *(srcAndMaskPtr ++);
+                    else
+                        byte <<= 1;
+
+                    if (byte & 0x80)
+                    {
+                        /* Linux doesn't support inverted pixels (XOR ops,
+                         * to be exact) in cursor shapes, so we detect such
+                         * pixels and always replace them with black ones to
+                         * make them visible at least over light colors */
+                        if (dstShapePtr [x] & 0x00FFFFFF)
+                            dstShapePtr [x] = 0xFF000000;
+                        else
+                            dstShapePtr [x] = 0x00000000;
+                    }
+                    else
+                        dstShapePtr [x] |= 0xFF000000;
+                }
+            }
+
+            srcShapePtr += srcShapePtrScan;
+            dstShapePtr += uWidth;
+        }
+
+        /* Set the new cursor: */
+        m_cursor = QCursor(XcursorImageLoadCursor(QX11Info::display(), img));
+
+        XcursorImageDestroy(img);
+    }
+
+#elif defined(Q_WS_MAC)
+
+    /* Create a ARGB image out of the shape data. */
+    QImage image  (uWidth, uHeight, QImage::Format_ARGB32);
+    const uint8_t* pbSrcMask = static_cast<const uint8_t*> (srcAndMaskPtr);
+    unsigned cbSrcMaskLine = RT_ALIGN (uWidth, 8) / 8;
+    for (unsigned int y = 0; y < uHeight; ++y)
+    {
+        for (unsigned int x = 0; x < uWidth; ++x)
+        {
+           unsigned int color = ((unsigned int*)srcShapePtr)[y*uWidth+x];
+           /* If the alpha channel isn't in the shape data, we have to
+            * create them from the and-mask. This is a bit field where 1
+            * represent transparency & 0 opaque respectively. */
+           if (!fHasAlpha)
+           {
+               if (!(pbSrcMask[x / 8] & (1 << (7 - (x % 8)))))
+                   color  |= 0xff000000;
+               else
+               {
+                   /* This isn't quite right, but it's the best we can do I think... */
+                   if (color & 0x00ffffff)
+                       color = 0xff000000;
+                   else
+                       color = 0x00000000;
+               }
+           }
+           image.setPixel (x, y, color);
+        }
+        /* Move one scanline forward. */
+        pbSrcMask += cbSrcMaskLine;
+    }
+
+    /* Set the new cursor: */
+    m_cursor = cursor(QPixmap::fromImage(image), uXHot, uYHot);
+    NOREF(srcShapePtrScan);
+
+#else
+
+# warning "port me"
+
+#endif
+}
+

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

@@ -26 +26 @@
 /* Global includes */
 #include <QObject>
+#include <QCursor>
 
 /* Local includes */
@@ -69 +70 @@
     virtual ~UISession();
 
-    /* Public getters: */
+    /* Common getters: */
     CSession& session() { return m_session; }
+    KMachineState machineState() const { return m_machineState; }
+    bool isSaved() const { return machineState() == KMachineState_Saved; }
+    bool isTurnedOff() const { return machineState() == KMachineState_PoweredOff ||
+                                      machineState() == KMachineState_Saved ||
+                                      machineState() == KMachineState_Teleported ||
+                                      machineState() == KMachineState_Aborted; }
+    bool isPaused() const { return machineState() == KMachineState_Paused ||
+                                   machineState() == KMachineState_TeleportingPausedVM; }
+    bool isRunning() const { return machineState() == KMachineState_Running ||
+                                    machineState() == KMachineState_Teleporting ||
+                                    machineState() == KMachineState_LiveSnapshotting; }
+    bool isFirstTimeStarted() const { return m_fIsFirstTimeStarted; }
+    bool isIgnoreRuntimeMediumsChanging() const { return m_fIsIgnoreRutimeMediumsChanging; }
+    bool isGuestResizeIgnored() const { return m_fIsGuestResizeIgnored; }
+    QCursor cursor() const { return m_cursor; }
+
+    /* Guest additions state getters: */
+    bool isGuestAdditionsActive() const { return m_fIsGuestAdditionsActive; }
+    bool isGuestSupportsGraphics() const { return m_fIsGuestSupportsGraphics; }
+    bool isGuestSupportsSeamless() const { return m_fIsGuestSupportsSeamless; }
+
+    /* Keyboard getters: */
+    bool isNumLock() const { return m_fNumLock; }
+    bool isCapsLock() const { return m_fCapsLock; }
+    bool isScrollLock() const { return m_fScrollLock; }
+    uint numLockAdaptionCnt() const { return m_uNumLockAdaptionCnt; }
+    uint capsLockAdaptionCnt() const { return m_uCapsLockAdaptionCnt; }
+
+    /* Mouse getters: */
+    bool isMouseSupportsAbsolute() const { return m_fIsMouseSupportsAbsolute; }
+    bool isMouseSupportsRelative() const { return m_fIsMouseSupportsRelative; }
+    bool isMouseHostCursorNeeded() const { return m_fIsMouseHostCursorNeeded; }
+    bool isMouseCaptured() const { return m_fIsMouseCaptured; }
+    bool isMouseIntegrated() const { return m_fIsMouseIntegrated; }
+    bool isHidingHostPointer() const { return m_fIsMouseCaptured || (m_fIsMouseSupportsAbsolute && m_fIsHideHostPointer); }
+
+    /* Common setters: */
+    bool pause() { return setPause(true); }
+    bool unpause() { return setPause(false); }
+    bool setPause(bool fOn);
+    void setGuestResizeIgnored(bool fIsGuestResizeIgnored) { m_fIsGuestResizeIgnored = fIsGuestResizeIgnored; }
+
+    /* Keyboard setters: */
+    void setNumLockAdaptionCnt(uint uNumLockAdaptionCnt) { m_uNumLockAdaptionCnt = uNumLockAdaptionCnt; }
+    void setCapsLockAdaptionCnt(uint uCapsLockAdaptionCnt) { m_uCapsLockAdaptionCnt = uCapsLockAdaptionCnt; }
+
+    /* Mouse setters: */
+    void setMouseCaptured(bool fIsMouseCaptured) { m_fIsMouseCaptured = fIsMouseCaptured; }
+    void setMouseIntegrated(bool fIsMouseIntegrated) { m_fIsMouseIntegrated = fIsMouseIntegrated; }
 
 signals:
 
-    /* Console signals: */
-    void sigMousePointerShapeChange(bool bIsVisible, bool bHasAlpha, uint uXHot, uint uYHot, uint uWidth, uint uHeight, const uchar *pShapeData);
-    void sigMouseCapabilityChange(bool bIsSupportsAbsolute, bool bIsSupportsRelative, bool bNeedsHostCursor);
-    void sigKeyboardLedsChange(bool bNumLock, bool bCapsLock, bool bScrollLock);
-    void sigStateChange(KMachineState machineState);
+    /* Console callback signals: */
+    void sigMousePointerShapeChange();
+    void sigMouseCapabilityChange();
+    void sigKeyboardLedsChange();
+    void sigMachineStateChange();
     void sigAdditionsStateChange();
     void sigNetworkAdapterChange(const CNetworkAdapter &networkAdapter);
@@ -96 +146 @@
 
     /* Private getters: */
-    UIMachine* machine() const { return m_pMachine; }
+    UIMachine* uimachine() const { return m_pMachine; }
 
     /* Event handlers: */
     bool event(QEvent *pEvent);
 
-    /* Helper routines: */
+    /* Prepare helpers: */
+    void loadSessionSettings();
+
+    /* Cleanup helpers: */
+    void saveSessionSettings();
+
+    /* Common helpers: */
     qulonglong winId() const;
+    void setPointerShape(const uchar *pShapeData, bool fHasAlpha, uint uXHot, uint uYHot, uint uWidth, uint uHeight);
 
     /* Private variables: */
@@ -110 +167 @@
     const CConsoleCallback &m_callback;
 
+    /* Common variables: */
+    KMachineState m_machineState;
+    QCursor m_cursor;
+#if defined(Q_WS_WIN)
+    HCURSOR m_alphaCursor;
+#endif
+
+    /* Common flags: */
+    bool m_fIsFirstTimeStarted : 1;
+    bool m_fIsIgnoreRutimeMediumsChanging : 1;
+    bool m_fIsGuestResizeIgnored : 1;
+
+    /* Guest additions flags: */
+    bool m_fIsGuestAdditionsActive : 1;
+    bool m_fIsGuestSupportsGraphics : 1;
+    bool m_fIsGuestSupportsSeamless : 1;
+
+    /* Keyboard flags: */
+    bool m_fNumLock : 1;
+    bool m_fCapsLock : 1;
+    bool m_fScrollLock : 1;
+    uint m_uNumLockAdaptionCnt;
+    uint m_uCapsLockAdaptionCnt;
+
+    /* Mouse flags: */
+    bool m_fIsMouseSupportsAbsolute : 1;
+    bool m_fIsMouseSupportsRelative : 1;
+    bool m_fIsMouseHostCursorNeeded : 1;
+    bool m_fIsMouseCaptured : 1;
+    bool m_fIsMouseIntegrated : 1;
+    bool m_fIsHideHostPointer : 1;
+
     /* Friend classes: */
     friend class UIConsoleCallback;

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineLogicNormal.cpp

@@ -27 +27 @@
 
 /* Local includes */
+#include "COMDefs.h"
 #include "VBoxGlobal.h"
 #include "VBoxProblemReporter.h"
@@ -55 +56 @@
     prepareRequiredFeatures();
 
-    /* Load common logic settings: */
-    loadLogicSettings();
-
     /* Prepare normal machine window: */
     prepareMachineWindow();
+
+    /* Initialization: */
+    sltMachineStateChanged();
+    sltAdditionsStateChanged();
+    sltMouseCapabilityChanged();
 }
 
@@ -66 +69 @@
     /* Cleanup normal machine window: */
     cleanupMachineWindow();
-
-    /* Save common logic settings: */
-    saveLogicSettings();
 }
 
@@ -97 +97 @@
 void UIMachineLogicNormal::prepareActionConnections()
 {
-    /* Base-class connections: */
+    /* Base class connections: */
     UIMachineLogic::prepareActionConnections();
 
@@ -124 +124 @@
     setMachineWindowWrapper(UIMachineWindow::create(this, visualStateType()));
 
-    bool bIsSaved = machineState() == KMachineState_Saved;
-    bool bIsRunning = machineState() == KMachineState_Running ||
-                      machineState() == KMachineState_Teleporting ||
-                      machineState() == KMachineState_LiveSnapshotting;
-    bool bIsRunningOrPaused = bIsRunning ||
-                              machineState() == KMachineState_Paused;
-
     /* If we are not started yet: */
-    if (!bIsRunningOrPaused)
+    if (!uisession()->isRunning() && !uisession()->isPaused())
     {
         /* Get current machine/console: */
@@ -143 +136 @@
 
         /* Shows first run wizard if necessary: */
-        if (isFirstTimeStarted())
+        if (uisession()->isFirstTimeStarted())
         {
             UIFirstRunWzd wzd(machineWindowWrapper()->machineWindow(), machine);
@@ -160 +153 @@
         }
 
-        /* Disable auto closure because we want to have a chance to show the error dialog on startup failure: */
+        /* Disable auto-closure because we want to have a chance to show the error dialog on startup failure: */
         setPreventAutoClose(true);
 
         /* Show "Starting/Restoring" progress dialog: */
-        if (bIsSaved)
+        if (uisession()->isSaved())
             vboxProblem().showModalProgressDialog(progress, machine.GetName(), machineWindowWrapper()->machineWindow(), 0);
         else
@@ -180 +173 @@
         qApp->processEvents();
 
-        /* Enable auto closure again: */
+        /* Enable auto-closure again: */
         setPreventAutoClose(false);
 
         /* Check if we missed a really quick termination after successful startup, and process it if we did: */
-        if (machineState() == KMachineState_PoweredOff || machineState() == KMachineState_Saved ||
-            machineState() == KMachineState_Teleported || machineState() == KMachineState_Aborted)
+        if (uisession()->isTurnedOff())
         {
             machineWindowWrapper()->machineWindow()->close();
@@ -216 +208 @@
 #ifdef VBOX_WITH_UPDATE_REQUEST
         /* Check for updates if necessary: */
-        vboxGlobal().showUpdateDialog(false /* aForce */);
+        vboxGlobal().showUpdateDialog(false /* force request? */);
 #endif
     }
@@ -227 +219 @@
         return;
 
-    /* Cleanup machine window: */
+    /* Cleanup normal machine window: */
     UIMachineWindow::destroy(machineWindowWrapper());
     setMachineWindowWrapper(0);

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.cpp

@@ -30 +30 @@
 /* Local includes */
 #include "VBoxGlobal.h"
+#include "UISession.h"
 #include "UIActionsPool.h"
 #include "UIMachineLogic.h"
@@ -62 +63 @@
     /* Load machine view settings: */
     loadMachineViewSettings();
+
+    /* Initialization: */
+    sltMachineStateChanged();
+    sltAdditionsStateChanged();
+    sltMousePointerShapeChanged();
+    sltMouseCapabilityChanged();
 }
 
@@ -114 +121 @@
 
     /* Enable/Disable guest auto-resizing depending on advanced graphics availablability: */
-    setGuestAutoresizeEnabled(isGuestSupportsGraphics() && m_bIsGuestAutoresizeEnabled);
+    setGuestAutoresizeEnabled(m_bIsGuestAutoresizeEnabled && uisession()->isGuestSupportsGraphics());
 }
 
@@ -134 +141 @@
         maybeRestrictMinimumSize();
 
-        if (isGuestSupportsGraphics() && m_bIsGuestAutoresizeEnabled)
+        if (uisession()->isGuestSupportsGraphics() && m_bIsGuestAutoresizeEnabled)
             sltPerformGuestResize();
     }
@@ -195 +202 @@
     if (mode() == VBoxDefs::SDLMode)
     {
-        if (!isGuestSupportsGraphics() || !m_bIsGuestAutoresizeEnabled)
+        if (!uisession()->isGuestSupportsGraphics() || !m_bIsGuestAutoresizeEnabled)
             setMinimumSize(sizeHint());
         else

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp

@@ -31 +31 @@
 #include "VBoxGlobal.h"
 
-#include "VBoxVMInformationDlg.h"
-
 #include "UISession.h"
 #include "UIActionsPool.h"
@@ -68 +66 @@
     prepareConnections();
 
+    /* Retranslate normal window finally: */
+    retranslateUi();
+
+    /* Prepare normal machine view: */
+    prepareMachineView();
+
     /* Load normal window settings: */
     loadWindowSettings();
 
-    /* Retranslate normal window finally: */
-    retranslateUi();
-
-    /* Prepare normal machine view: */
-    prepareMachineView();
-
     /* Update all the elements: */
     updateAppearanceOf(UIVisualElement_AllStuff);
@@ -93 +91 @@
 }
 
-void UIMachineWindowNormal::sltMachineStateChanged(KMachineState machineState)
-{
-    UIMachineWindow::sltMachineStateChanged(machineState);
+void UIMachineWindowNormal::sltMachineStateChanged()
+{
+    UIMachineWindow::sltMachineStateChanged();
 }
 
@@ -477 +475 @@
 void UIMachineWindowNormal::loadWindowSettings()
 {
-    /* Load parent class settings: */
-    UIMachineWindow::loadWindowSettings();
-
-    /* Load this class settings: */
+    /* Load normal window settings: */
     CMachine machine = session().GetMachine();
 
-    /* Extra-data settings */
+    /* Load extra-data settings: */
     {
         QString strPositionSettings = machine.GetExtraData(VBoxDefs::GUI_LastWindowPosition);
@@ -511 +506 @@
                 machineView()->normalizeGeometry(true /* adjust position? */);
 
-            /* Maximize if needed */
+            /* Maximize if needed: */
             if (max)
                 setWindowState(windowState() | Qt::WindowMaximized);
@@ -528 +523 @@
     }
 
-    /* Availability settings */
+    /* Load availability settings: */
     {
         /* USB Stuff: */
@@ -545 +540 @@
     }
 
-    /* Global settings */
+    /* Load global settings: */
     {
         VBoxGlobalSettings settings = vboxGlobal().settings();
@@ -557 +552 @@
     CMachine machine = session().GetMachine();
 
-    /* Extra-data settings */
+    /* Save extra-data settings: */
     {
         QString strWindowPosition = QString("%1,%2,%3,%4")

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.h

@@ -37 +37 @@
 
 /* Local forwards */
+class CMediumAttachment;
 class UIIndicatorsPool;
 class QIStateIndicator;
@@ -53 +54 @@
 
     /* Console callback handlers: */
-    void sltMachineStateChanged(KMachineState machineState);
+    void sltMachineStateChanged();
     void sltMediumChange(const CMediumAttachment &attachment);
     void sltUSBControllerChange();