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

Timestamp:

Jan 26, 2015 8:37:10 PM (10 years ago)

Author:

vboxsync

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

97864

Message:

Devices/Graphics, Main: optionally send cursor integration toggle and guest cursor position information through the graphics device.

Location:

trunk/src/VBox/Main/include

Files:

• DisplayImpl.h (modified) (6 diffs)
• DisplayUtils.h (modified) (1 diff)
• MouseImpl.h (modified) (1 diff)

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

@@ -124 +124 @@
     virtual void i_getFramebufferDimensions(int32_t *px1, int32_t *py1,
                                             int32_t *px2, int32_t *py2) = 0;
+    virtual HRESULT i_reportHostCursorCapabilities(uint32_t fCapabilitiesAdded, uint32_t fCapabilitiesRemoved) = 0;
+    virtual HRESULT i_reportHostCursorPosition(int32_t x, int32_t y) = 0;
 };
 
@@ -150 +152 @@
     void i_handleUpdateVMMDevSupportsGraphics(bool fSupportsGraphics);
     void i_handleUpdateGuestVBVACapabilities(uint32_t fNewCapabilities);
+    void i_handleUpdateVBVAInputMapping(int32_t xOrigin, int32_t yOrigin, uint32_t cx, uint32_t cy);
 #ifdef VBOX_WITH_VIDEOHWACCEL
     int  i_handleVHWACommandProcess(PVBOXVHWACMD pCommand);
@@ -200 +203 @@
     virtual void i_getFramebufferDimensions(int32_t *px1, int32_t *py1,
                                             int32_t *px2, int32_t *py2);
+    virtual HRESULT i_reportHostCursorCapabilities(uint32_t fCapabilitiesAdded, uint32_t fCapabilitiesRemoved);
+    virtual HRESULT i_reportHostCursorPosition(int32_t x, int32_t y);
 
     static const PDMDRVREG  DrvReg;
@@ -333 +338 @@
                                                               const void *pvShape);
     static DECLCALLBACK(void)  i_displayVBVAGuestCapabilityUpdate(PPDMIDISPLAYCONNECTOR pInterface, uint32_t fCapabilities);
+
+    static DECLCALLBACK(void)  i_displayVBVAInputMappingUpdate(PPDMIDISPLAYCONNECTOR pInterface, int32_t xOrigin, int32_t yOrigin,
+                                                               uint32_t cx, uint32_t cy);
 #endif
 
@@ -362 +370 @@
 
     unsigned mcMonitors;
+    /** Input mapping rectangle top left X relative to the first screen. */
+    int32_t     xInputMappingOrigin;
+    /** Input mapping rectangle top left Y relative to the first screen. */
+    int32_t     yInputMappingOrigin;
+    uint32_t    cxInputMapping;  /**< Input mapping rectangle width. */
+    uint32_t    cyInputMapping;  /**< Input mapping rectangle height. */
     DISPLAYFBINFO maFramebuffers[SchemaDefs::MaxGuestMonitors];
     /** Does the VMM device have the "supports graphics" capability set?
@@ -369 +383 @@
      *  Does not go into the saved state as it is refreshed on restore. */
     uint32_t    mfGuestVBVACapabilities;
+    /** Mirror of the current host cursor integration support capability.
+     *  Does not go into the saved state as it is refreshed on restore. */
+    uint32_t    mfHostSupportsCursorIntegration;
 
     bool mfSourceBitmapEnabled;

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

@@ -23 +23 @@
 #define sSSMDisplayVer2 0x00010002
 #define sSSMDisplayVer3 0x00010003
+#define sSSMDisplayVer4 0x00010004
 
 int readSavedGuestScreenInfo(const Utf8Str &strStateFilePath, uint32_t u32ScreenId,

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

@@ -104 +104 @@
     HRESULT i_reportMultiTouchEventToDevice(uint8_t cContacts, const uint64_t *pau64Contacts, uint32_t u32ScanTime);
     HRESULT i_reportAbsEventToVMMDev(int32_t x, int32_t y);
-    HRESULT i_reportAbsEvent(int32_t x, int32_t y, int32_t dz, int32_t dw,
-                             uint32_t fButtons, bool fUsesVMMDevEvent);
+    HRESULT i_reportAbsEventToInputDevices(int32_t x, int32_t y, int32_t dz, int32_t dw, uint32_t fButtons,
+                                           bool fUsesVMMDevEvent);
+    HRESULT i_reportAbsEventToDisplayDevice(int32_t x, int32_t y);
     HRESULT i_convertDisplayRes(LONG x, LONG y, int32_t *pxAdj, int32_t *pyAdj,
                                  bool *pfValid);