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

Timestamp:

Jul 16, 2013 1:44:46 PM (12 years ago)

Author:

vboxsync

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

87296

Message:

Main/MouseImpl: restored Mouse test case, not yet building though.

Location:

trunk/src/VBox/Main/include

Files:

• ConsoleImpl.h (modified) (3 diffs)
• DisplayImpl.h (modified) (2 diffs)
• MouseImpl.h (modified) (3 diffs)
• VMMDev.h (modified) (3 diffs)

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

@@ -49 +49 @@
 class ExtPackManager;
 #endif
+class VMMDevMouseInterface;
+class DisplayMouseInterface;
 
 #include <VBox/RemoteDesktop/VRDE.h>
@@ -89 +91 @@
 ///////////////////////////////////////////////////////////////////////////////
 
+class ConsoleMouseInterface
+{
+public:
+    virtual VMMDevMouseInterface  *getVMMDevMouseInterface()  = 0;
+    virtual DisplayMouseInterface *getDisplayMouseInterface() = 0;
+    virtual void onMouseCapabilityChange(BOOL supportsAbsolute,
+                                         BOOL supportsRelative,
+                                         BOOL supportsMT,
+                                         BOOL needsHostCursor) = 0;
+};
+
 /** IConsole implementation class */
 class ATL_NO_VTABLE Console :
     public VirtualBoxBase,
-    VBOX_SCRIPTABLE_IMPL(IConsole)
+    VBOX_SCRIPTABLE_IMPL(IConsole), public ConsoleMouseInterface
 {
     Q_OBJECT
@@ -291 +304 @@
     HRESULT onNATRedirectRuleChange(ULONG ulInstance, BOOL aNatRuleRemove,
                                  NATProtocol_T aProto, IN_BSTR aHostIp, LONG aHostPort, IN_BSTR aGuestIp, LONG aGuestPort);
+
+    // Mouse interface
+    VMMDevMouseInterface *getVMMDevMouseInterface();
+    DisplayMouseInterface *getDisplayMouseInterface();
 
 private:

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

@@ -104 +104 @@
 } DISPLAYFBINFO;
 
+class DisplayMouseInterface
+{
+public:
+    virtual int getScreenResolution(uint32_t cScreen, uint32_t *pcx,
+                                    uint32_t *pcy, uint32_t *pcBPP) = 0;
+    virtual void getFramebufferDimensions(int32_t *px1, int32_t *py1,
+                                          int32_t *px2, int32_t *py2) = 0;
+};
+
 class ATL_NO_VTABLE Display :
     public VirtualBoxBase,
     VBOX_SCRIPTABLE_IMPL(IEventListener),
-    VBOX_SCRIPTABLE_IMPL(IDisplay)
+    VBOX_SCRIPTABLE_IMPL(IDisplay),
+    public DisplayMouseInterface
 {
 public:
@@ -151 +161 @@
     }
     void getFramebufferDimensions(int32_t *px1, int32_t *py1, int32_t *px2, int32_t *py2);
+    int getScreenResolution(uint32_t cScreen, uint32_t *pcx, uint32_t *pcy,
+                            uint32_t *pcBPP)
+    {
+        return GetScreenResolution(cScreen, pcx, pcy, pcBPP);
+    }
 
     int  handleSetVisibleRegion(uint32_t cRect, PRTRECT pRect);

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

@@ -52 +52 @@
 
     // public initializer/uninitializer for internal purposes only
-    HRESULT init(Console *parent);
+    HRESULT init(ConsoleMouseInterface *parent);
     void uninit();
 
@@ -70 +70 @@
     static const PDMDRVREG  DrvReg;
 
-    Console *getParent() const
+    ConsoleMouseInterface *getParent() const
     {
         return mParent;
@@ -112 +112 @@
     bool supportsMT(void);
 
-    Console * const         mParent;
+    ConsoleMouseInterface * const         mParent;
     /** Pointer to the associated mouse driver. */
     struct DRVMAINMOUSE    *mpDrv[MOUSE_MAX_DEVICES];

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

@@ -24 +24 @@
 class Console;
 
-class VMMDev
+class VMMDevMouseInterface
+{
+public:
+    virtual PPDMIVMMDEVPORT getVMMDevPort() = 0;
+};
+
+class VMMDev : public VMMDevMouseInterface
 {
 public:
@@ -49 +55 @@
     PPDMIVMMDEVPORT getVMMDevPort();
 
+#ifdef VBOX_WITH_HGCM
     int hgcmLoadService (const char *pszServiceLibrary, const char *pszServiceName);
     int hgcmHostCall (const char *pszServiceName, uint32_t u32Function, uint32_t cParms, PVBOXHGCMSVCPARM paParms);
@@ -59 +66 @@
 
     bool hgcmIsActive (void) { return ASMAtomicReadBool(&m_fHGCMActive); }
+#endif /* VBOX_WITH_HGCM */
 
 private: