Changeset 53965 in vbox for trunk/src/VBox/Devices/Graphics

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA.cpp (modified) (1 diff)
• DevVGA.h (modified) (2 diffs)
• DevVGA_VBVA.cpp (modified) (5 diffs)

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

@@ -6064 +6064 @@
 #endif
     pThis->IPort.pfnSendModeHint        = vbvaPortSendModeHint;
+    pThis->IPort.pfnReportHostCursorCapabilities
+                                        = vbvaPortReportHostCursorCapabilities;
+    pThis->IPort.pfnReportHostCursorPosition
+                                        = vbvaPortReportHostCursorPosition;
 
 #if defined(VBOX_WITH_HGSMI)

trunk/src/VBox/Devices/Graphics/DevVGA.h

@@ -557 +557 @@
     uint32_t                    fGuestCaps;
     uint32_t                    fScanLineCfg;
-    uint8_t                     Padding10[4];
+    uint32_t                    fHostCursorCapabilities;
 #  else
     uint8_t                     Padding10[14];
@@ -692 +692 @@
                                        uint32_t dy, uint32_t fEnabled,
                                        uint32_t fNotifyGuest);
+DECLCALLBACK(void) vbvaPortReportHostCursorCapabilities(PPDMIDISPLAYPORT pInterface, uint32_t fCapabilitiesAdded,
+                                                        uint32_t fCapabilitiesRemoved);
+DECLCALLBACK(void) vbvaPortReportHostCursorPosition(PPDMIDISPLAYPORT pInterface, uint32_t x, uint32_t y);
 
 # ifdef VBOX_WITH_VDMA

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

@@ -83 +83 @@
     VBVAMOUSESHAPEINFO mouseShapeInfo;
     bool fPaused;
+    uint32_t xCursor;
+    uint32_t yCursor;
     VBVAMODEHINT aModeHints[VBOX_VIDEO_MAX_SCREENS];
 } VBVACONTEXT;
@@ -2179 +2181 @@
                 pConf32->u32Value = 64*_1K;
             }
-            else if (pConf32->u32Index == VBOX_VBVA_CONF32_MODE_HINT_REPORTING)
+            else if (   pConf32->u32Index == VBOX_VBVA_CONF32_MODE_HINT_REPORTING
+                     || pConf32->u32Index == VBOX_VBVA_CONF32_GUEST_CURSOR_REPORTING)
             {
                 pConf32->u32Value = VINF_SUCCESS;
+            }
+            else if (pConf32->u32Index == VBOX_VBVA_CONF32_CURSOR_CAPABILITIES)
+            {
+                pConf32->u32Value = pVGAState->fHostCursorCapabilities;
             }
             else
@@ -2483 +2490 @@
                 Assert(pbHint - (uint8_t *)pvBuffer <= cbBuffer);
             }
+        } break;
+
+        case VBVA_REPORT_INPUT_MAPPING:
+        {
+            if (cbBuffer != sizeof(VBVAREPORTINPUTMAPPING))
+            {
+                rc = VERR_INVALID_PARAMETER;
+                break;
+            }
+            VBVAREPORTINPUTMAPPING *pReport = (VBVAREPORTINPUTMAPPING *)pvBuffer;
+            LogRelFlowFunc(("VBVA_REPORT_INPUT_MAPPING: x=%u, y=%u, cx=%u, cy=%u\n", (unsigned)pReport->x, (unsigned)pReport->y,
+                            (unsigned)pReport->cx, (unsigned)pReport->cy));
+            pVGAState->pDrv->pfnVBVAInputMappingUpdate(pVGAState->pDrv, pReport->x, pReport->y, pReport->cx, pReport->cy);
+        } break;
+
+        case VBVA_CURSOR_POSITION:
+        {
+            if (cbBuffer != sizeof(VBVACURSORPOSITION))
+            {
+                rc = VERR_INVALID_PARAMETER;
+                break;
+            }
+            VBVACURSORPOSITION *pReport
+                = (VBVACURSORPOSITION *)pvBuffer;
+            LogRelFlowFunc(("VBVA_CURSOR_POSITION: fReportPosition=%RTbool",
+                            RT_BOOL(pReport->fReportPosition)));
+            if (RT_BOOL(pReport->fReportPosition))
+                LogRelFlowFunc(("VBVA_CURSOR_POSITION: fReportPosition=true, x=%u, y=%u\n",
+                               (unsigned)pReport->x, (unsigned)pReport->y));
+            else
+                LogRelFlowFunc(("VBVA_CURSOR_POSITION: fReportPosition=false\n"));
+            pReport->x = pCtx->xCursor;
+            pReport->y = pCtx->yCursor;
         } break;
 
@@ -2622 +2662 @@
 }
 
+DECLCALLBACK(void) vbvaPortReportHostCursorCapabilities(PPDMIDISPLAYPORT pInterface, uint32_t fCapabilitiesAdded,
+                                                        uint32_t fCapabilitiesRemoved)
+{
+    PVGASTATE pThis = IDISPLAYPORT_2_VGASTATE(pInterface);
+    int rc = PDMCritSectEnter(&pThis->CritSect, VERR_SEM_BUSY);
+    AssertRC(rc);
+    pThis->fHostCursorCapabilities |= fCapabilitiesAdded;
+    pThis->fHostCursorCapabilities &= ~fCapabilitiesRemoved;
+    if (pThis->fGuestCaps & VBVACAPS_IRQ)
+        VBVARaiseIrqNoWait(pThis, HGSMIHOSTFLAGS_CURSOR_CAPABILITIES);
+    PDMCritSectLeave(&pThis->CritSect);
+}
+
+DECLCALLBACK(void) vbvaPortReportHostCursorPosition
+                       (PPDMIDISPLAYPORT pInterface, uint32_t x, uint32_t y)
+{
+    PVGASTATE pThis = IDISPLAYPORT_2_VGASTATE(pInterface);
+    VBVACONTEXT *pCtx = (VBVACONTEXT *)HGSMIContext(pThis->pHGSMI);
+    int rc = PDMCritSectEnter(&pThis->CritSect, VERR_SEM_BUSY);
+    AssertRC(rc);
+    pCtx->xCursor = x;
+    pCtx->yCursor = y;
+    PDMCritSectLeave(&pThis->CritSect);
+}
+
 static HGSMICHANNELHANDLER sOldChannelHandler;
 
@@ -2653 +2718 @@
              pCtx->fPaused = true;
              memset(pCtx->aModeHints, ~0, sizeof(*pCtx->aModeHints));
+             pVGAState->fHostCursorCapabilities = 0;
          }
      }