Changeset 27309 in vbox

Timestamp:

Mar 11, 2010 11:19:50 PM (15 years ago)

Author:

vboxsync

Message:

Additions/x11/vboxvideo: do not save the video mode for size hints sent while in seamless

Location:

trunk/src/VBox/Additions

Files:

• common/VBoxGuestLib/VBoxGuestR3LibSeamless.cpp (modified) (2 diffs)
• x11/vboxvideo/vboxutils.c (modified) (2 diffs)
• x11/vboxvideo/vboxvideo.h (modified) (1 diff)
• x11/vboxvideo/vboxvideo_13.c (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSeamless.cpp

@@ -67 +67 @@
     int rc;
 
+#if !defined(VBOX_VBGLR3_XFREE86)
     AssertPtrReturn(pMode, VERR_INVALID_PARAMETER);
+#endif
     waitEvent.u32TimeoutIn = RT_INDEFINITE_WAIT;
     waitEvent.u32EventMaskIn = VMMDEV_EVENT_SEAMLESS_MODE_CHANGE_REQUEST;
@@ -92 +94 @@
         else
             rc = VERR_TRY_AGAIN;
+    }
+    return rc;
+}
+
+/**
+ * Request the last seamless mode switch from the host again.
+ *
+ * @returns IPRT status value
+ * @retval  pMode on success, the seamless mode that was switched into (i.e.
+ *          disabled, visible region or host window)
+ */
+VBGLR3DECL(int) VbglR3SeamlessGetLastEvent(VMMDevSeamlessMode *pMode)
+{
+    int rc;
+
+#if !defined(VBOX_VBGLR3_XFREE86)
+    AssertPtrReturn(pMode, VERR_INVALID_PARAMETER);
+#endif
+    VMMDevSeamlessChangeRequest seamlessChangeRequest;
+
+    /* get the seamless change request */
+    vmmdevInitRequest(&seamlessChangeRequest.header, VMMDevReq_GetSeamlessChangeRequest);
+    seamlessChangeRequest.eventAck = VMMDEV_EVENT_SEAMLESS_MODE_CHANGE_REQUEST;
+    rc = vbglR3GRPerform(&seamlessChangeRequest.header);
+    if (RT_SUCCESS(rc))
+    {
+        *pMode = seamlessChangeRequest.mode;
+        return VINF_SUCCESS;
     }
     return rc;

trunk/src/VBox/Additions/x11/vboxvideo/vboxutils.c

@@ -209 +209 @@
 
     pVBox = pScrn->driverPrivate;
-    TRACE_ENTRY();
     if (pVBox->useVbva == FALSE)
         return;
@@ -1019 +1018 @@
 }
 
+Bool
+vboxGuestIsSeamless(ScrnInfoPtr pScrn)
+{
+    VMMDevSeamlessMode mode;
+    VBOXPtr pVBox = pScrn->driverPrivate;
+    TRACE_ENTRY();
+    if (!pVBox->useDevice)
+        return FALSE;
+    if (RT_FAILURE(VbglR3SeamlessGetLastEvent(&mode)))
+        return FALSE;
+    return (mode != VMMDev_Seamless_Disabled);
+}
+
 /**
  * Save video mode parameters to the registry.

trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.h

@@ -253 +253 @@
 
 extern Bool vboxHostLikesVideoMode(ScrnInfoPtr pScrn, uint32_t cx, uint32_t cy, uint32_t cBits);
+extern Bool vboxGuestIsSeamless(ScrnInfoPtr pScrn);
 extern Bool vboxSaveVideoMode(ScrnInfoPtr pScrn, uint32_t cx, uint32_t cy, uint32_t cBits);
 extern Bool vboxRetrieveVideoMode(ScrnInfoPtr pScrn, uint32_t *pcx, uint32_t *pcy, uint32_t *pcBits);

trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo_13.c

@@ -295 +295 @@
     VBOXSetMode(crtc->scrn, adjusted_mode);
     VBOXAdjustFrame(crtc->scrn->scrnIndex, x, y, 0);
-    vboxSaveVideoMode(crtc->scrn, adjusted_mode->HDisplay,
-                      adjusted_mode->VDisplay, crtc->scrn->bitsPerPixel);
+    /* Don't remember any modes set while we are seamless, as they are
+     * just temporary. */
+    if (!vboxGuestIsSeamless(crtc->scrn))
+        vboxSaveVideoMode(crtc->scrn, adjusted_mode->HDisplay,
+                          adjusted_mode->VDisplay, crtc->scrn->bitsPerPixel);
 }