Changeset 77370 in vbox for trunk/src

Timestamp:

Feb 20, 2019 8:04:38 AM (6 years ago)

Author:

vboxsync

Message:

Device/Graphics, pdm, Main, Front-ends: infrastructure for host software cursor.
bugref:9376: Complete hardware cursor implementation in VMSVGA.
This change provides the infrastructure for letting front-ends report to the
graphics device that they are able to render a pointer cursor at any location,
not just where the host cursor is, and for the device to ask them to do this.
It also provides mediation in Main/Display between multiple front-ends and the
device, and tells the guest that we can always render the cursor. In a
follow-up change the device is expected to add support for rendering the
cursor itself into the frame-buffer image it provides to the front-end if not
all attached front-ends are capable of rendering it.

Location:

trunk/src/VBox

Files:

• Devices/Graphics/DevVGA.h (modified) (1 diff)
• Devices/Graphics/DevVGA_VBVA.cpp (modified) (2 diffs)
• Frontends/VBoxSDL/Framebuffer.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp (modified) (1 diff)
• Main/idl/VirtualBox.xidl (modified) (2 diffs)
• Main/include/DisplayImpl.h (modified) (3 diffs)
• Main/src-client/ConsoleImpl.cpp (modified) (2 diffs)
• Main/src-client/DisplayImpl.cpp (modified) (5 diffs)

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

@@ -585 +585 @@
                                        uint32_t dy, uint32_t fEnabled,
                                        uint32_t fNotifyGuest);
-DECLCALLBACK(void) vbvaPortReportHostCursorCapabilities(PPDMIDISPLAYPORT pInterface, uint32_t fCapabilitiesAdded,
-                                                        uint32_t fCapabilitiesRemoved);
+DECLCALLBACK(void) vbvaPortReportHostCursorCapabilities(PPDMIDISPLAYPORT pInterface, bool fSupportsRenderCursor, bool fSupportsMoveCursor);
 DECLCALLBACK(void) vbvaPortReportHostCursorPosition(PPDMIDISPLAYPORT pInterface, uint32_t x, uint32_t y);
 

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

@@ -2834 +2834 @@
 }
 
-DECLCALLBACK(void) vbvaPortReportHostCursorCapabilities(PPDMIDISPLAYPORT pInterface, uint32_t fCapabilitiesAdded,
-                                                        uint32_t fCapabilitiesRemoved)
-{
+DECLCALLBACK(void) vbvaPortReportHostCursorCapabilities(PPDMIDISPLAYPORT pInterface, bool fSupportsRenderCursor, bool fSupportsMoveCursor)
+{
+    LogRelFlowFunc(("fSupportsRenderCursor=%RTbool, fSupportsMoveCursor=%RTbool\n",
+                    fSupportsRenderCursor, fSupportsMoveCursor));
+#if 0
     PVGASTATE pThis = IDISPLAYPORT_2_VGASTATE(pInterface);
     int rc = PDMCritSectEnter(&pThis->CritSect, VERR_SEM_BUSY);
+    NOREF(fSupportsMoveCursor);
     AssertRC(rc);
-    pThis->fHostCursorCapabilities |= fCapabilitiesAdded;
-    pThis->fHostCursorCapabilities &= ~fCapabilitiesRemoved;
+    pThis->fHostCursorCapabilities = fSupportsRenderCursor ? VBOX_VBVA_CURSOR_CAPABILITY_HARDWARE : 0;
     if (pThis->fGuestCaps & VBVACAPS_IRQ && pThis->fGuestCaps & VBVACAPS_DISABLE_CURSOR_INTEGRATION)
         VBVARaiseIrq(pThis, HGSMIHOSTFLAGS_CURSOR_CAPABILITIES);
     PDMCritSectLeave(&pThis->CritSect);
+#else
+    RT_NOREF(pInterface, fSupportsRenderCursor, fSupportsMoveCursor);
+#endif
 }
 
@@ -2885 +2890 @@
              pCtx->fPaused = true;
              memset(pCtx->aModeHints, ~0, sizeof(pCtx->aModeHints));
-             pVGAState->fHostCursorCapabilities = 0;
+             pVGAState->fHostCursorCapabilities = VBOX_VBVA_CURSOR_CAPABILITY_HARDWARE;
          }
      }

trunk/src/VBox/Frontends/VBoxSDL/Framebuffer.cpp

@@ -412 +412 @@
     if (mfUpdateImage)
     {
+        caps.resize(2);
+        caps[0] = FramebufferCapabilities_UpdateImage;
+        caps[1] = FramebufferCapabilities_RenderCursor;
+    }
+    else
+    {
         caps.resize(1);
-        caps[0] = FramebufferCapabilities_UpdateImage;
-    }
-    else
-    {
-        /* No caps to return. */
+        caps[0] = FramebufferCapabilities_RenderCursor;
     }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp

@@ -711 +711 @@
     if (vboxGlobal().isSeparateProcess())
     {
-       caps.resize(1);
+       caps.resize(2);
        caps[0] = FramebufferCapabilities_UpdateImage;
+       caps[1] = FramebufferCapabilities_RenderCursor;
     }
     else
     {
-       caps.resize(2);
+       caps.resize(3);
        caps[0] = FramebufferCapabilities_VHWA;
        caps[1] = FramebufferCapabilities_VisibleRegion;
+       caps[2] = FramebufferCapabilities_RenderCursor;
     }
 

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -17882 +17882 @@
       </desc>
     </const>
+
+    <const name="RenderCursor" value="0x08">
+      <desc>
+        This framebuffer implementation can render a pointer cursor itself.  Unless the
+        MoveCursor capability is also set the cursor will always be rendered at the
+        location of (and usually using) the host pointer.
+      </desc>
+    </const>
+
+    <const name="MoveCursor" value="0x10">
+      <desc>
+        Supports rendering a pointer cursor anywhere within the guest screen.  Implies
+        RenderCursor.
+      </desc>
+    </const>
   </enum>
 
@@ -25447 +25462 @@
 
     <attribute name="hasData" readonly="yes" type="boolean">
-      <desc>Event contains valid data (alternative: notification of support)</desc>
+      <desc>Event contains valid data.  If not set, switch back to using the host cursor.</desc>
     </attribute>
     <attribute name="x" readonly="yes" type="unsigned long">

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

@@ -193 +193 @@
     int  i_handleQueryVisibleRegion(uint32_t *pcRects, PRTRECT paRects);
 
-    void i_VideoAccelVRDP(bool fEnable);
+    void i_VRDPConnectionEvent(bool fConnect);
+    void i_VideoAccelVRDP(bool fEnable, int c);
 
     /* Legacy video acceleration requests coming from the VGA refresh timer. */
@@ -201 +202 @@
     int  VideoAccelEnableVMMDev(bool fEnable, VBVAMEMORY *pVbvaMemory);
     void VideoAccelFlushVMMDev(void);
+
+    void i_UpdateDeviceCursorCapabilities(void);
 
 #ifdef VBOX_WITH_RECORDING
@@ -433 +436 @@
     bool        mfVideoAccelVRDP;
     uint32_t    mfu32SupportedOrders;
-    int32_t volatile mcVideoAccelVRDPRefs;
+    /** Number of currently connected VRDP clients. */
+    int32_t volatile mcVRDPRefs;
 
     /** Accelerate3DEnabled = true && GraphicsControllerType == VBoxVGA. */

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

@@ -1405 +1405 @@
 
     NOREF(u32ClientId);
-    mDisplay->i_VideoAccelVRDP(true);
+    mDisplay->i_VRDPConnectionEvent(true);
 
 #ifdef VBOX_WITH_GUEST_PROPS
@@ -1439 +1439 @@
     }
 
-    mDisplay->i_VideoAccelVRDP(false);
+    mDisplay->i_VRDPConnectionEvent(false);
 
     if (fu32Intercepted & VRDE_CLIENT_INTERCEPT_USB)

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

@@ -125 +125 @@
     mfVideoAccelVRDP = false;
     mfu32SupportedOrders = 0;
-    mcVideoAccelVRDPRefs = 0;
+    mcVRDPRefs = 0;
 
     mfSeamlessEnabled = false;
@@ -1351 +1351 @@
 }
 
+/** Updates the device's view of the host cursor handling capabilities.
+ *  Calls into mpDrv->pUpPort. */
+void Display::i_UpdateDeviceCursorCapabilities(void)
+{
+    bool fRenderCursor = true;
+    bool fMoveCursor = mcVRDPRefs == 0;
+#ifdef VBOX_WITH_RECORDING
+    RecordingContext *pCtx = mParent->i_recordingGetContext();
+
+    if (   pCtx
+        && pCtx->IsStarted()
+        && pCtx->IsFeatureEnabled(RecordingFeature_Video))
+        fRenderCursor = fMoveCursor = false;
+    else
+#endif /* VBOX_WITH_RECORDING */
+    {
+        for (unsigned uScreenId = 0; uScreenId < mcMonitors; uScreenId++)
+        {
+            DISPLAYFBINFO *pFBInfo = &maFramebuffers[uScreenId];
+            if (!(pFBInfo->u32Caps & FramebufferCapabilities_RenderCursor))
+                fRenderCursor = false;
+            if (!(pFBInfo->u32Caps & FramebufferCapabilities_MoveCursor))
+                fMoveCursor = false;
+        }
+    }
+    mpDrv->pUpPort->pfnReportHostCursorCapabilities(mpDrv->pUpPort, fRenderCursor, fMoveCursor);
+}
+
 HRESULT Display::i_reportHostCursorCapabilities(uint32_t fCapabilitiesAdded, uint32_t fCapabilitiesRemoved)
 {
@@ -1366 +1394 @@
     CHECK_CONSOLE_DRV(mpDrv);
     alock.release();  /* Release before calling up for lock order reasons. */
-    mpDrv->pUpPort->pfnReportHostCursorCapabilities(mpDrv->pUpPort, fCapabilitiesAdded, fCapabilitiesRemoved);
     mfHostCursorCapabilities = fHostCursorCapabilities;
+    i_UpdateDeviceCursorCapabilities();
     return S_OK;
 }
@@ -1625 +1653 @@
 /* Called always by one VRDP server thread. Can be thread-unsafe.
  */
-void Display::i_VideoAccelVRDP(bool fEnable)
-{
-    LogRelFlowFunc(("fEnable = %d\n", fEnable));
-
+void Display::i_VRDPConnectionEvent(bool fConnect)
+{
+    LogRelFlowFunc(("fConnect = %d\n", fConnect));
+
+    int c = fConnect?
+                ASMAtomicIncS32(&mcVRDPRefs):
+                ASMAtomicDecS32(&mcVRDPRefs);
+
+    i_VideoAccelVRDP(fConnect, c);
+    i_UpdateDeviceCursorCapabilities();
+}
+
+
+void Display::i_VideoAccelVRDP(bool fEnable, int c)
+{
     VIDEOACCEL *pVideoAccel = &mVideoAccelLegacy;
-
-    int c = fEnable?
-                ASMAtomicIncS32(&mcVideoAccelVRDPRefs):
-                ASMAtomicDecS32(&mcVideoAccelVRDPRefs);
 
     Assert (c >= 0);
@@ -2441 +2476 @@
     RecordingContext *pCtx = mParent->i_recordingGetContext();
 
+    i_UpdateDeviceCursorCapabilities();
     if (   RT_LIKELY(!maRecordingEnabled[uScreenId])
         || !pCtx || !pCtx->IsStarted())