Changeset 48510 in vbox for trunk

Timestamp:

Sep 17, 2013 6:32:07 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: 5105: Runtime UI: Some changes to r89019.

Location:

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

Files:

• UIMachineLogic.cpp (modified) (2 diffs)
• UISession.cpp (modified) (2 diffs)
• UISession.h (modified) (4 diffs)

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

@@ -2182 +2182 @@
 //           session().GetMachine().GetName().toAscii().constData());
 
-    /* Here we have to save current host LED lock states in UISession registry.
-     * [void] uisession() -> setHostNumLock(), setHostCapsLock(), setHostScrollLock() can be used for that. */
+    /* Here we have to store host LED lock states to UISession registry.
+     * This can be done for each keyboard separately, just keep in mind keyboard IDs.
+     * [void] uisession() -> setHostLockStates() can be used for that. */
 
     /* Here we have to update host LED lock states using values provided by UISession registry.
@@ -2198 +2199 @@
 
     /* Here we have to restore host LED lock states from UISession registry.
-     * [bool] uisession() -> isHostNumLock(), isHostCapsLock(), isHostScrollLock() can be used for that. */
+     * This can be done for each keyboard separately, just use the same keyboard IDs.
+     * [bool] uisession() -> getHostLockStates() can be used for that. */
 }
 

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

@@ -99 +99 @@
     , m_fCapsLock(false)
     , m_fScrollLock(false)
-    , m_fHostNumLock(false)
-    , m_fHostCapsLock(false)
-    , m_fHostScrollLock(false)
     , m_uNumLockAdaptionCnt(2)
     , m_uCapsLockAdaptionCnt(2)
@@ -467 +464 @@
 }
 
+void UISession::setHostLockStates(const QString &strKeyboardID, bool fNum, bool fCaps, bool fScroll)
+{
+    /* Acquire modifiable reference, create default value if doesn't exists: */
+    UIKeyboardLocks &hostLock = m_hostLocks[strKeyboardID];
+    /* Save passed values: */
+    hostLock.m_num = fNum;
+    hostLock.m_caps = fCaps;
+    hostLock.m_scroll = fScroll;
+}
+
+void UISession::getHostLockStates(const QString &strKeyboardID, bool &fNum, bool &fCaps, bool &fScroll)
+{
+    /* Acquire modifiable reference, create default value if doesn't exists: */
+    UIKeyboardLocks &hostLock = m_hostLocks[strKeyboardID];
+    /* Load cached values: */
+    fNum = hostLock.m_num;
+    fCaps = hostLock.m_caps;
+    fScroll = hostLock.m_scroll;
+}
+
 bool UISession::setPause(bool fOn)
 {

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

@@ -24 +24 @@
 #include <QCursor>
 #include <QEvent>
+#include <QMap>
 
 /* GUI includes: */
@@ -77 +78 @@
 };
 
+/* Keyboard Lock container: */
+struct UIKeyboardLocks
+{
+    /* Constructor: */
+    UIKeyboardLocks()
+        : m_num(false)
+        , m_caps(false)
+        , m_scroll(false)
+    {}
+    /* Variables: */
+    bool m_num;
+    bool m_caps;
+    bool m_scroll;
+};
+typedef QMap<QString, UIKeyboardLocks> UIKeyboardLocksMap;
+
 class UISession : public QObject
 {
@@ -134 +151 @@
     bool isCapsLock() const { return m_fCapsLock; }
     bool isScrollLock() const { return m_fScrollLock; }
-    bool isHostNumLock() const { return m_fHostNumLock; }
-    bool isHostCapsLock() const { return m_fHostCapsLock; }
-    bool isHostScrollLock() const { return m_fHostScrollLock; }
-    void setHostNumLock(bool fHostNumLock) { m_fHostNumLock = fHostNumLock; }
-    void setHostCapsLock(bool fHostCapsLock) { m_fHostCapsLock = fHostCapsLock; }
-    void setHostScrollLock(bool fHostScrollLock) { m_fHostScrollLock = fHostScrollLock; }
     uint numLockAdaptionCnt() const { return m_uNumLockAdaptionCnt; }
     uint capsLockAdaptionCnt() const { return m_uCapsLockAdaptionCnt; }
+    void setHostLockStates(const QString &strKeyboardID, bool fNum, bool fCaps, bool fScroll);
+    void getHostLockStates(const QString &strKeyboardID, bool &fNum, bool &fCaps, bool &fScroll);
 
     /* Mouse getters: */
@@ -306 +319 @@
     bool m_fCapsLock : 1;
     bool m_fScrollLock : 1;
-    bool m_fHostNumLock : 1;
-    bool m_fHostCapsLock : 1;
-    bool m_fHostScrollLock : 1;
     uint m_uNumLockAdaptionCnt;
     uint m_uCapsLockAdaptionCnt;
+    UIKeyboardLocksMap m_hostLocks;
 
     /* Mouse flags: */