Changeset 52924 in vbox for trunk/src/VBox

Timestamp:

Oct 2, 2014 7:47:58 AM (10 years ago)

Author:

vboxsync

Message:

IKeyboard::KeyboardLEDs getter

Location:

trunk/src/VBox/Main

Files:

• idl/VirtualBox.xidl (modified) (2 diffs)
• include/KeyboardImpl.h (modified) (3 diffs)
• src-client/KeyboardImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -14923 +14923 @@
   -->
 
+  <enum
+    name="KeyboardLED"
+    uuid="ef29ea38-409b-49c7-a817-c858d426dfba"
+    >
+    <desc>
+      Keyboard LED indicators.
+    </desc>
+
+    <const name="NumLock" value="0x01"/>
+    <const name="CapsLock" value="0x02"/>
+    <const name="ScrollLock" value="0x04"/>
+  </enum>
+
   <interface
     name="IKeyboard" extends="$unknown"
-    uuid="71aa2898-28bd-43fe-8c98-e53321451db7"
+    uuid="585cc5e8-349c-41c6-899d-d9a38e3f4126"
     wsmap="managed"
     >
@@ -14935 +14948 @@
       to the virtual machine.
     </desc>
+
+    <attribute name="keyboardLEDs" type="KeyboardLED" safearray="yes" readonly="yes">
+      <desc>
+        Current status of the guest keyboard LEDs.
+      </desc>
+    </attribute>
 
     <method name="putScancode">

trunk/src/VBox/Main/include/KeyboardImpl.h

@@ -66 +66 @@
     // Wrapped Keyboard properties
     HRESULT getEventSource(ComPtr<IEventSource> &aEventSource);
+    HRESULT getKeyboardLEDs(std::vector<KeyboardLED_T> &aKeyboardLEDs);
+
+    // Wrapped Keyboard members
     HRESULT putScancode(LONG aScancode);
     HRESULT putScancodes(const std::vector<LONG> &aScancodes,
                          ULONG *aCodesStored);
-
-    // Wrapped Keyboard members
     HRESULT putCAD();
     HRESULT releaseKeys();
@@ -80 +81 @@
     static DECLCALLBACK(void)   i_drvDestruct(PPDMDRVINS pDrvIns);
 
+    void onKeyboardLedsChange(PDMKEYBLEDS enmLeds);
+
     Console * const         mParent;
     /** Pointer to the associated keyboard driver(s). */
@@ -88 +91 @@
     bool                    mfVMMDevInited;
 
+    /* The current guest keyboard LED status. */
+    PDMKEYBLEDS menmLeds;
+
     const ComObjPtr<EventSource> mEventSource;
 };

trunk/src/VBox/Main/src-client/KeyboardImpl.cpp

@@ -79 +79 @@
     mpVMMDev = NULL;
     mfVMMDevInited = false;
+    menmLeds = PDMKEYBLEDS_NONE;
     return BaseFinalConstruct();
 }
@@ -141 +142 @@
     mpVMMDev = NULL;
     mfVMMDevInited = true;
+
+    menmLeds = PDMKEYBLEDS_NONE;
 
     unconst(mParent) = NULL;
@@ -261 +264 @@
 }
 
+HRESULT Keyboard::getKeyboardLEDs(std::vector<KeyboardLED_T> &aKeyboardLEDs)
+{
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    aKeyboardLEDs.resize(0);
+
+    if (menmLeds & PDMKEYBLEDS_NUMLOCK)    aKeyboardLEDs.push_back(KeyboardLED_NumLock);
+    if (menmLeds & PDMKEYBLEDS_CAPSLOCK)   aKeyboardLEDs.push_back(KeyboardLED_CapsLock);
+    if (menmLeds & PDMKEYBLEDS_SCROLLLOCK) aKeyboardLEDs.push_back(KeyboardLED_ScrollLock);
+
+    return S_OK;
+}
 
 HRESULT Keyboard::getEventSource(ComPtr<IEventSource> &aEventSource)
@@ -273 +288 @@
 // private methods
 //
+void Keyboard::onKeyboardLedsChange(PDMKEYBLEDS enmLeds)
+{
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    /* Save the current status. */
+    menmLeds = enmLeds;
+
+    alock.release();
+
+    i_getParent()->i_onKeyboardLedsChange(RT_BOOL(enmLeds & PDMKEYBLEDS_NUMLOCK),
+                                          RT_BOOL(enmLeds & PDMKEYBLEDS_CAPSLOCK),
+                                          RT_BOOL(enmLeds & PDMKEYBLEDS_SCROLLLOCK));
+}
+
 DECLCALLBACK(void) Keyboard::i_keyboardLedStatusChange(PPDMIKEYBOARDCONNECTOR pInterface, PDMKEYBLEDS enmLeds)
 {
     PDRVMAINKEYBOARD pDrv = RT_FROM_MEMBER(pInterface, DRVMAINKEYBOARD, IConnector);
-    pDrv->pKeyboard->i_getParent()->i_onKeyboardLedsChange(RT_BOOL(enmLeds & PDMKEYBLEDS_NUMLOCK),
-                                                           RT_BOOL(enmLeds & PDMKEYBLEDS_CAPSLOCK),
-                                                           RT_BOOL(enmLeds & PDMKEYBLEDS_SCROLLLOCK));
+    pDrv->pKeyboard->onKeyboardLedsChange(enmLeds);
 }