Changeset 77130 in vbox

Timestamp:

Feb 1, 2019 4:55:20 PM (6 years ago)

Author:

vboxsync

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

128588

Message:

pdmifs/DevVGA/DisplayImpl: add screen id to pfnVBVAReportCursorPosition.
bugref:9376: Complete hardware cursor implementation in VMSVGA.
vboxvideo in Linux passes cursor position information relative to a particular
screen, but we loose this information when we pass it on to the front-end.
Since no front-end has used the information yet this was not noticed. This
change fixes that and converts the co-ordinates to frame-buffer global ones
as early as possible.

Location:

trunk

Files:

• include/VBox/vmm/pdmifs.h (modified) (2 diffs)
• src/VBox/Devices/Graphics/DevVGA_VBVA.cpp (modified) (1 diff)
• src/VBox/Main/include/DisplayImpl.h (modified) (1 diff)
• src/VBox/Main/src-client/DisplayImpl.cpp (modified) (2 diffs)

trunk/include/VBox/vmm/pdmifs.h

@@ -715 +715 @@
 #endif
 
+/** @name Flags for PDMIDISPLAYCONNECTOR::pfnVBVAReportCursorPosition.
+ * @{ */
+/** Is the data in the report valid? */
+#define VBVA_CURSOR_VALID_DATA                              RT_BIT(0)
+/** Is the cursor position reported relative to a particular guest screen? */
+#define VBVA_CURSOR_SCREEN_RELATIVE                         RT_BIT(1)
+/** @} */
 
 /** Pointer to a 2D graphics acceleration command. */
@@ -1049 +1056 @@
      *
      * @param   pInterface  Pointer to this interface.
-     * @param   fData       Does this report contain valid X and Y data or is
-     *                      it only reporting interface support?
+     * @param   fFlags      VBVA_CURSOR_*
+     * @param   uScreenId   The screen to which X and Y are relative if VBVA_CURSOR_SCREEN_RELATIVE is set.
      * @param   x           Cursor X offset.
      * @param   y           Cursor Y offset.
      * @thread  The emulation thread.
      */
-    DECLR3CALLBACKMEMBER(void, pfnVBVAReportCursorPosition,(PPDMIDISPLAYCONNECTOR pInterface, bool fData, uint32_t x, uint32_t y));
+    DECLR3CALLBACKMEMBER(void, pfnVBVAReportCursorPosition,(PPDMIDISPLAYCONNECTOR pInterface, uint32_t fFlags, uint32_t uScreen, uint32_t x, uint32_t y));
 } PDMIDISPLAYCONNECTOR;
 /** PDMIDISPLAYCONNECTOR interface ID. */
-#define PDMIDISPLAYCONNECTOR_IID                "e648dac6-c918-11e7-8be6-a317e6b79645"
+#define PDMIDISPLAYCONNECTOR_IID                "f2a4c9fc-2613-11e9-bc48-bf934e641fc0"
 
 

trunk/src/VBox/Devices/Graphics/DevVGA_VBVA.cpp

@@ -2660 +2660 @@
                 RT_UNTRUSTED_NONVOLATILE_COPY_FENCE();
 
-                LogRelFlowFunc(("VBVA: ChannelHandler: VBVA_CURSOR_POSITION: fReportPosition=%RTbool, x=%RU32, y=%RU32\n",
-                                RT_BOOL(Report.fReportPosition), Report.x, Report.y));
-
-                pVGAState->pDrv->pfnVBVAReportCursorPosition(pVGAState->pDrv, RT_BOOL(Report.fReportPosition), Report.x, Report.y);
+                LogRelFlowFunc(("VBVA: ChannelHandler: VBVA_CURSOR_POSITION: fReportPosition=%RTbool, Id=%RU32, x=%RU32, y=%RU32\n",
+                                RT_BOOL(Report.fReportPosition), vbvaViewFromBufferPtr(pIns, pCtx, pvBuffer), Report.x, Report.y));
+
+                pVGAState->pDrv->pfnVBVAReportCursorPosition(pVGAState->pDrv, RT_BOOL(Report.fReportPosition), vbvaViewFromBufferPtr(pIns, pCtx, pvBuffer), Report.x, Report.y);
                 pReport->x = pCtx->xCursor;
                 pReport->y = pCtx->yCursor;

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

@@ -380 +380 @@
     static DECLCALLBACK(void)  i_displayVBVAInputMappingUpdate(PPDMIDISPLAYCONNECTOR pInterface, int32_t xOrigin, int32_t yOrigin,
                                                                uint32_t cx, uint32_t cy);
-    static DECLCALLBACK(void)  i_displayVBVAReportCursorPosition(PPDMIDISPLAYCONNECTOR pInterface, bool fData, uint32_t x, uint32_t y);
+    static DECLCALLBACK(void)  i_displayVBVAReportCursorPosition(PPDMIDISPLAYCONNECTOR pInterface, uint32_t fFlags, uint32_t uScreen, uint32_t x, uint32_t y);
 #endif
 

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

@@ -4454 +4454 @@
 }
 
-DECLCALLBACK(void) Display::i_displayVBVAReportCursorPosition(PPDMIDISPLAYCONNECTOR pInterface, bool fData, uint32_t x, uint32_t y)
+DECLCALLBACK(void) Display::i_displayVBVAReportCursorPosition(PPDMIDISPLAYCONNECTOR pInterface, uint32_t fFlags, ULONG aScreenId, uint32_t x, uint32_t y)
 {
     LogFlowFunc(("\n"));
@@ -4461 +4461 @@
     Display *pThis = pDrv->pDisplay;
 
-    fireCursorPositionChangedEvent(pThis->mParent->i_getEventSource(), fData, x, y);
+    if (fFlags & VBVA_CURSOR_SCREEN_RELATIVE)
+    {
+        x += pThis->maFramebuffers[aScreenId].xOrigin;
+        y += pThis->maFramebuffers[aScreenId].yOrigin;
+    }
+    fireCursorPositionChangedEvent(pThis->mParent->i_getEventSource(), RT_BOOL(fFlags & VBVA_CURSOR_VALID_DATA), x, y);
 }