Changeset 53965 in vbox for trunk/src/VBox/Main/src-client

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/src-client

Files:

• DisplayImpl.cpp (modified) (11 diffs)
• MouseImpl.cpp (modified) (5 diffs)

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

@@ -507 +507 @@
         SSMR3PutU32(pSSM, that->maFramebuffers[i].flags);
     }
+    SSMR3PutS32(pSSM, that->xInputMappingOrigin);
+    SSMR3PutS32(pSSM, that->yInputMappingOrigin);
+    SSMR3PutU32(pSSM, that->cxInputMapping);
+    SSMR3PutU32(pSSM, that->cyInputMapping);
 }
 
@@ -516 +520 @@
     if (!(   uVersion == sSSMDisplayVer
           || uVersion == sSSMDisplayVer2
-          || uVersion == sSSMDisplayVer3))
+          || uVersion == sSSMDisplayVer3
+          || uVersion == sSSMDisplayVer4))
         return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION;
     Assert(uPass == SSM_PASS_FINAL); NOREF(uPass);
@@ -531 +536 @@
         SSMR3GetU32(pSSM, &that->maFramebuffers[i].u32InformationSize);
         if (   uVersion == sSSMDisplayVer2
-            || uVersion == sSSMDisplayVer3)
+            || uVersion == sSSMDisplayVer3
+            || uVersion == sSSMDisplayVer4)
         {
             uint32_t w;
@@ -540 +546 @@
             that->maFramebuffers[i].h = h;
         }
-        if (uVersion == sSSMDisplayVer3)
+        if (   uVersion == sSSMDisplayVer3
+            || uVersion == sSSMDisplayVer4)
         {
             int32_t xOrigin;
@@ -554 +561 @@
         }
     }
+    if (uVersion == sSSMDisplayVer4)
+    {
+        SSMR3GetS32(pSSM, &that->xInputMappingOrigin);
+        SSMR3GetS32(pSSM, &that->yInputMappingOrigin);
+        SSMR3GetU32(pSSM, &that->cxInputMapping);
+        SSMR3GetU32(pSSM, &that->cyInputMapping);
+    }
 
     return VINF_SUCCESS;
@@ -694 +708 @@
      * the framebuffer offset in the virtual desktop and the framebuffer flags.
      */
-    int rc = SSMR3RegisterExternal(pUVM, "DisplayData", 0, sSSMDisplayVer3,
+    int rc = SSMR3RegisterExternal(pUVM, "DisplayData", 0, sSSMDisplayVer4,
                                    mcMonitors * sizeof(uint32_t) * 8 + sizeof(uint32_t),
                                    NULL, NULL, NULL,
@@ -1082 +1096 @@
 }
 
+void Display::i_handleUpdateVBVAInputMapping(int32_t xOrigin, int32_t yOrigin, uint32_t cx, uint32_t cy)
+{
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    xInputMappingOrigin = xOrigin;
+    yInputMappingOrigin = yOrigin;
+    cxInputMapping      = cx;
+    cyInputMapping      = cy;
+}
+
 /**
  * Returns the upper left and lower right corners of the virtual framebuffer.
@@ -1110 +1134 @@
         y2 = mpDrv->IConnector.cy + (int32_t)maFramebuffers[0].yOrigin;
     }
-    for (unsigned i = 1; i < mcMonitors; ++i)
-    {
-        if (!maFramebuffers[i].fDisabled)
-        {
-            x1 = RT_MIN(x1, maFramebuffers[i].xOrigin);
-            y1 = RT_MIN(y1, maFramebuffers[i].yOrigin);
-            x2 = RT_MAX(x2,   maFramebuffers[i].xOrigin
-                            + (int32_t)maFramebuffers[i].w);
-            y2 = RT_MAX(y2,   maFramebuffers[i].yOrigin
-                            + (int32_t)maFramebuffers[i].h);
-        }
-    }
+    if (cxInputMapping && cyInputMapping)
+    {
+        x1 = xInputMappingOrigin;
+        y1 = yInputMappingOrigin;
+        x2 = xInputMappingOrigin + cxInputMapping;
+        y2 = xInputMappingOrigin + cyInputMapping;
+    }
+    else
+        for (unsigned i = 1; i < mcMonitors; ++i)
+        {
+            if (!maFramebuffers[i].fDisabled)
+            {
+                x1 = RT_MIN(x1, maFramebuffers[i].xOrigin);
+                y1 = RT_MIN(y1, maFramebuffers[i].yOrigin);
+                x2 = RT_MAX(x2, maFramebuffers[i].xOrigin + (int32_t)maFramebuffers[i].w);
+                y2 = RT_MAX(y2, maFramebuffers[i].yOrigin + (int32_t)maFramebuffers[i].h);
+            }
+        }
     *px1 = x1;
     *py1 = y1;
     *px2 = x2;
     *py2 = y2;
+}
+
+HRESULT Display::i_reportHostCursorCapabilities(uint32_t fCapabilitiesAdded, uint32_t fCapabilitiesRemoved)
+{
+    /* Do we need this to access mParent?  I presume that the safe VM pointer
+     * ensures that mpDrv will remain valid. */
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    Console::SafeVMPtr ptrVM(mParent);
+    if (!ptrVM.isOk())
+        return ptrVM.rc();
+    CHECK_CONSOLE_DRV(mpDrv);
+    alock.release();  /* Release before calling up for lock order reasons. */
+    mpDrv->pUpPort->pfnReportHostCursorCapabilities (mpDrv->pUpPort, fCapabilitiesAdded, fCapabilitiesRemoved);
+    if (   mfGuestVBVACapabilities & VBVACAPS_DISABLE_CURSOR_INTEGRATION
+        && !(mfGuestVBVACapabilities & VBVACAPS_IRQ))
+    {
+        HRESULT hrc = mParent->i_sendACPIMonitorHotPlugEvent();
+        if (FAILED(hrc))
+            return hrc;
+    }
+    return S_OK;
+}
+
+HRESULT Display::i_reportHostCursorPosition(int32_t x, int32_t y)
+{
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+    uint32_t xAdj = (uint32_t)RT_MAX(x - xInputMappingOrigin, 0);
+    uint32_t yAdj = (uint32_t)RT_MAX(y - yInputMappingOrigin, 0);
+    xAdj = RT_MIN(xAdj, cxInputMapping);
+    yAdj = RT_MIN(yAdj, cyInputMapping);
+
+    Console::SafeVMPtr ptrVM(mParent);
+    if (!ptrVM.isOk())
+        return ptrVM.rc();
+    CHECK_CONSOLE_DRV(mpDrv);
+    alock.release();  /* Release before calling up for lock order reasons. */
+    mpDrv->pUpPort->pfnReportHostCursorPosition(mpDrv->pUpPort, xAdj, yAdj);
+    return S_OK;
 }
 
@@ -3836 +3905 @@
     pFBInfo->flags = pScreen->u16Flags;
 
+    pThis->xInputMappingOrigin = 0;
+    pThis->yInputMappingOrigin = 0;
+    pThis->cxInputMapping = 0;
+    pThis->cyInputMapping = 0;
+
     if (fNewOrigin)
     {
@@ -3896 +3970 @@
     pThis->i_handleUpdateGuestVBVACapabilities(fCapabilities);
 }
+
+DECLCALLBACK(void) Display::i_displayVBVAInputMappingUpdate(PPDMIDISPLAYCONNECTOR pInterface, int32_t xOrigin, int32_t yOrigin,
+                                                            uint32_t cx, uint32_t cy)
+{
+    LogFlowFunc(("\n"));
+
+    PDRVMAINDISPLAY pDrv = PDMIDISPLAYCONNECTOR_2_MAINDISPLAY(pInterface);
+    Display *pThis = pDrv->pDisplay;
+
+    pThis->i_handleUpdateVBVAInputMapping(xOrigin, yOrigin, cx, cy);
+}
+
 #endif /* VBOX_WITH_HGSMI */
 
@@ -3997 +4083 @@
     pThis->IConnector.pfnVBVAMousePointerShape = Display::i_displayVBVAMousePointerShape;
     pThis->IConnector.pfnVBVAGuestCapabilityUpdate = Display::i_displayVBVAGuestCapabilityUpdate;
+    pThis->IConnector.pfnVBVAInputMappingUpdate = Display::i_displayVBVAInputMappingUpdate;
 #endif
 

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

@@ -347 +347 @@
         return E_FAIL;  /* No assertion, as the front-ends can send events
                          * at all sorts of inconvenient times. */
+    DisplayMouseInterface *pDisplay = mParent->i_getDisplayMouseInterface();
+    if (pDisplay == NULL)
+        return E_FAIL;
     PPDMIVMMDEVPORT pVMMDevPort = pVMMDev->getVMMDevPort();
     if (!pVMMDevPort)
@@ -353 +356 @@
     int rc = pVMMDevPort->pfnUpdateMouseCapabilities(pVMMDevPort, fCapsAdded,
                                                      fCapsRemoved);
-    return RT_SUCCESS(rc) ? S_OK : E_FAIL;
+    if (RT_FAILURE(rc))
+        return E_FAIL;
+    return pDisplay->i_reportHostCursorCapabilities(fCapsAdded, fCapsRemoved);
 }
 
@@ -619 +624 @@
  * @returns   COM status code
  */
-HRESULT Mouse::i_reportAbsEvent(int32_t x, int32_t y,
-                                int32_t dz, int32_t dw, uint32_t fButtons,
-                                bool fUsesVMMDevEvent)
+HRESULT Mouse::i_reportAbsEventToInputDevices(int32_t x, int32_t y, int32_t dz, int32_t dw, uint32_t fButtons,
+                                              bool fUsesVMMDevEvent)
 {
     HRESULT rc;
@@ -648 +652 @@
     return rc;
 }
+
+
+/**
+ * Send an absolute position event to the display device.
+ * @note all calls out of this object are made with no locks held!
+ * @param  x  Cursor X position in pixels relative to the first screen, where
+ *            (1, 1) is the upper left corner.
+ * @param  y  Cursor Y position in pixels relative to the first screen, where
+ *            (1, 1) is the upper left corner.
+ */
+HRESULT Mouse::i_reportAbsEventToDisplayDevice(int32_t x, int32_t y)
+{
+    DisplayMouseInterface *pDisplay = mParent->i_getDisplayMouseInterface();
+    ComAssertRet(pDisplay, E_FAIL);
+
+    if (x != mcLastX || y != mcLastY)
+    {
+        pDisplay->i_reportHostCursorPosition(x - 1, y - 1);
+    }
+    return S_OK;
+}
+
 
 void Mouse::i_fireMouseEvent(bool fAbsolute, LONG x, LONG y, LONG dz, LONG dw,
@@ -838 +864 @@
     if (fValid)
     {
-        rc = i_reportAbsEvent(xAdj, yAdj, dz, dw, fButtonsAdj,
-                              RT_BOOL(  mfVMMDevGuestCaps
-                                      & VMMDEV_MOUSE_NEW_PROTOCOL));
+        rc = i_reportAbsEventToInputDevices(xAdj, yAdj, dz, dw, fButtonsAdj,
+                                            RT_BOOL(mfVMMDevGuestCaps & VMMDEV_MOUSE_NEW_PROTOCOL));
+        if (FAILED(rc)) return rc;
 
         i_fireMouseEvent(true, x, y, dz, dw, aButtonState);
     }
+    rc = i_reportAbsEventToDisplayDevice(x, y);
 
     return rc;