Changeset 52400 in vbox for trunk/src/VBox/Main/include

Timestamp:

Aug 18, 2014 6:04:00 PM (10 years ago)

Author:

vboxsync

Message:

6813 KeyboardImpl.cpp changes

File:

• trunk/src/VBox/Main/include/KeyboardImpl.h (modified) (6 diffs)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -19 +19 @@
 #define ____H_KEYBOARDIMPL
 
-#include "VirtualBoxBase.h"
+#include "KeyboardWrap.h"
 #include "ConsoleEvents.h"
 #include "EventImpl.h"
@@ -34 +34 @@
     KeyboardEvent() : scan(-1) {}
     KeyboardEvent(int _scan) : scan(_scan) {}
-    bool isValid()
+    bool i_isValid()
     {
         return (scan & ~0x80) && !(scan & ~0xFF);
@@ -46 +46 @@
 
 class ATL_NO_VTABLE Keyboard :
-    public VirtualBoxBase,
-    VBOX_SCRIPTABLE_IMPL(IKeyboard)
+    public KeyboardWrap
 {
 public:
-
-    VIRTUALBOXBASE_ADD_ERRORINFO_SUPPORT(Keyboard, IKeyboard)
-
-    DECLARE_NOT_AGGREGATABLE(Keyboard)
-
-    DECLARE_PROTECT_FINAL_CONSTRUCT()
-
-    BEGIN_COM_MAP(Keyboard)
-        VBOX_DEFAULT_INTERFACE_ENTRIES(IKeyboard)
-    END_COM_MAP()
 
     DECLARE_EMPTY_CTOR_DTOR(Keyboard)
@@ -70 +59 @@
     void uninit();
 
-    STDMETHOD(PutScancode)(LONG scancode);
-    STDMETHOD(PutScancodes)(ComSafeArrayIn(LONG, scancodes),
-                            ULONG *codesStored);
-    STDMETHOD(PutCAD)();
-    STDMETHOD(ReleaseKeys)();
-
-    STDMETHOD(COMGETTER(EventSource))(IEventSource ** aEventSource);
-
     static const PDMDRVREG  DrvReg;
 
-    Console *getParent() const
+    Console *i_getParent() const
     {
         return mParent;
@@ -87 +68 @@
 private:
 
-    static DECLCALLBACK(void)   keyboardLedStatusChange(PPDMIKEYBOARDCONNECTOR pInterface, PDMKEYBLEDS enmLeds);
-    static DECLCALLBACK(void)   keyboardSetActive(PPDMIKEYBOARDCONNECTOR pInterface, bool fActive);
-    static DECLCALLBACK(void *) drvQueryInterface(PPDMIBASE pInterface, const char *pszIID);
-    static DECLCALLBACK(int)    drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags);
-    static DECLCALLBACK(void)   drvDestruct(PPDMDRVINS pDrvIns);
+    // Wrapped Keyboard properties
+    HRESULT getEventSource(ComPtr<IEventSource> &aEventSource);
+    HRESULT putScancode(LONG aScancode);
+    HRESULT putScancodes(const std::vector<LONG> &aScancodes,
+                         ULONG *aCodesStored);
+
+    // Wrapped Keyboard members
+    HRESULT putCAD();
+    HRESULT releaseKeys();
+
+    static DECLCALLBACK(void)   i_keyboardLedStatusChange(PPDMIKEYBOARDCONNECTOR pInterface, PDMKEYBLEDS enmLeds);
+    static DECLCALLBACK(void)   i_keyboardSetActive(PPDMIKEYBOARDCONNECTOR pInterface, bool fActive);
+    static DECLCALLBACK(void *) i_drvQueryInterface(PPDMIBASE pInterface, const char *pszIID);
+    static DECLCALLBACK(int)    i_drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags);
+    static DECLCALLBACK(void)   i_drvDestruct(PPDMDRVINS pDrvIns);
 
     Console * const         mParent;