Changeset 60905 in vbox for trunk

Timestamp:

May 9, 2016 6:56:00 PM (9 years ago)

Author:

vboxsync

Message:

bugref:8087: Additions/x11: support non-root X server: do not reset the absolute input device to screen position co-ordinate mapping when we reset the screen mode after restoring a saved state. Among other potential problems this fixes problems with the cursor hot-spot position.

Location:

trunk

Files:

• include/VBox/vmm/pdmifs.h (modified) (1 diff)
• src/VBox/Devices/Graphics/DevVGA_VBVA.cpp (modified) (4 diffs)
• 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

@@ -949 +949 @@
      * @param   pScreen             The data of screen being resized.
      * @param   pvVRAM              Address of the guest VRAM.
+     * @param   fResetInputMapping  Whether to reset the absolute pointing device to screen position co-ordinate
+     *                              mapping.  Needed for real resizes, as the caller on the guest may not know how
+     *                              to set the mapping.  Not wanted when we restore a saved state and are resetting
+     *                              the mode.
      * @thread  if render thread mode is on (fRenderThreadMode that was passed to pfnVBVAEnable is TRUE) - the render thread pfnVBVAEnable was called in,
      *          otherwise - the emulation thread.
      */
-    DECLR3CALLBACKMEMBER(int, pfnVBVAResize,(PPDMIDISPLAYCONNECTOR pInterface, const PVBVAINFOVIEW pView, const PVBVAINFOSCREEN pScreen, void *pvVRAM));
+    DECLR3CALLBACKMEMBER(int, pfnVBVAResize,(PPDMIDISPLAYCONNECTOR pInterface, const PVBVAINFOVIEW pView, const PVBVAINFOSCREEN pScreen, void *pvVRAM, bool fResetInputMapping));
 
     /**

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

@@ -547 +547 @@
 }
 
-static int vbvaResize(PVGASTATE pVGAState, VBVAVIEW *pView, const VBVAINFOSCREEN *pNewScreen)
+static int vbvaResize(PVGASTATE pVGAState, VBVAVIEW *pView, const VBVAINFOSCREEN *pNewScreen, bool fResetInputMapping)
 {
     /* Callers ensure that pNewScreen contains valid data. */
@@ -555 +555 @@
 
     uint8_t *pu8VRAM = pVGAState->vram_ptrR3 + pView->view.u32ViewOffset;
-    return pVGAState->pDrv->pfnVBVAResize (pVGAState->pDrv, &pView->view, &pView->screen, pu8VRAM);
+    return pVGAState->pDrv->pfnVBVAResize (pVGAState->pDrv, &pView->view, &pView->screen, pu8VRAM, fResetInputMapping);
 }
 
@@ -2060 +2060 @@
                 if (RT_SUCCESS(rc))
                 {
-                    vbvaResize(pVGAState, pView, &pView->screen);
+                    vbvaResize(pVGAState, pView, &pView->screen, false);
                 }
                 else
@@ -2266 +2266 @@
                 && screen.u32StartOffset <= pView->u32ViewSize - (uint32_t)u64ScreenSize)
             {
-                vbvaResize(pVGAState, &pCtx->aViews[screen.u32ViewIndex], &screen);
+                vbvaResize(pVGAState, &pCtx->aViews[screen.u32ViewIndex], &screen, true);
                 return VINF_SUCCESS;
             }

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

@@ -343 +343 @@
                                                       uint32_t cx, uint32_t cy);
     static DECLCALLBACK(int)   i_displayVBVAResize(PPDMIDISPLAYCONNECTOR pInterface, const PVBVAINFOVIEW pView,
-                                                   const PVBVAINFOSCREEN pScreen, void *pvVRAM);
+                                                   const PVBVAINFOSCREEN pScreen, void *pvVRAM,
+                                                   bool fResetInputMapping);
     static DECLCALLBACK(int)   i_displayVBVAMousePointerShape(PPDMIDISPLAYCONNECTOR pInterface, bool fVisible, bool fAlpha,
                                                               uint32_t xHot, uint32_t yHot, uint32_t cx, uint32_t cy,

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

@@ -3921 +3921 @@
 
 DECLCALLBACK(int) Display::i_displayVBVAResize(PPDMIDISPLAYCONNECTOR pInterface, const PVBVAINFOVIEW pView,
-                                               const PVBVAINFOSCREEN pScreen, void *pvVRAM)
+                                               const PVBVAINFOSCREEN pScreen, void *pvVRAM, bool fResetInputMapping)
 {
     LogRelFlowFunc(("pScreen %p, pvVRAM %p\n", pScreen, pvVRAM));
@@ -4012 +4012 @@
     pFBInfo->flags = pScreen->u16Flags;
 
-    pThis->xInputMappingOrigin = 0;
-    pThis->yInputMappingOrigin = 0;
-    pThis->cxInputMapping = 0;
-    pThis->cyInputMapping = 0;
+    if (fResetInputMapping)
+    {
+        pThis->xInputMappingOrigin = 0;
+        pThis->yInputMappingOrigin = 0;
+        pThis->cxInputMapping = 0;
+        pThis->cyInputMapping = 0;
+    }
 
     if (fNewOrigin)