Changeset 57356 in vbox

Timestamp:

Aug 14, 2015 3:03:30 PM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

102119

Message:

Additions/x11: better handling of VT switching and mode hints.

Location:

trunk/src/VBox/Additions/x11

Files:

• VBoxClient/display.cpp (modified) (10 diffs)
• undefined_xfree86 (modified) (1 diff)
• vboxvideo/vboxvideo.c (modified) (16 diffs)

trunk/src/VBox/Additions/x11/VBoxClient/display.cpp

@@ -26 +26 @@
 #include <X11/Xatom.h>
 
+#include <iprt/asm.h>
 #include <iprt/assert.h>
 #include <iprt/err.h>
@@ -54 +55 @@
     bool fEnabled;
     bool fUpdateSize;
-    bool fUpdatePosition;
+    volatile bool fUpdatePosition;
 };
 
@@ -84 +85 @@
 };
 
-/** Tell the VBoxGuest driver we no longer want any events and tell the host
- * we no longer support any capabilities. */
-static int disableEventsAndCaps(bool fDisableEvents)
-{
-    int rc = VbglR3SetGuestCaps(0, VMMDEV_GUEST_SUPPORTS_GRAPHICS);
-    if (RT_FAILURE(rc))
-        VBClFatalError(("Failed to unset graphics capability, rc=%Rrc.\n", rc));
-    rc = VbglR3SetMouseStatus(VMMDEV_MOUSE_GUEST_NEEDS_HOST_CURSOR);
-    if (RT_FAILURE(rc))
-        VBClFatalError(("Failed to unset mouse status, rc=%Rrc.\n", rc));
-    if (fDisableEvents)
-        rc = VbglR3CtlFilterMask(0, VMMDEV_EVENT_MOUSE_CAPABILITIES_CHANGED | VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST);
-    if (RT_FAILURE(rc))
-        VBClFatalError(("Failed to unset filter mask, rc=%Rrc.\n", rc));
-    return VINF_SUCCESS;
-}
-
-/** Tell the VBoxGuest driver which events we want and tell the host which
- * capabilities we support. */
-static int enableEventsAndCaps()
-{
-    int rc = VbglR3CtlFilterMask(  VMMDEV_EVENT_MOUSE_CAPABILITIES_CHANGED
-                                 | VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST, 0);
-    if (RT_FAILURE(rc))
-        VBClFatalError(("Failed to set filter mask, rc=%Rrc.\n", rc));
-    rc = VbglR3SetGuestCaps(VMMDEV_GUEST_SUPPORTS_GRAPHICS, 0);
-    if (RT_FAILURE(rc))
-        VBClFatalError(("Failed to set graphics capability, rc=%Rrc.\n", rc));
-    rc = VbglR3SetMouseStatus(0);
-    if (RT_FAILURE(rc))
-        VBClFatalError(("Failed to set mouse status, rc=%Rrc.\n", rc));
+/** Thread to monitor and react to X server VT switches and exits. */
+static int pfnMonitorThread(RTTHREAD self, void *pvUser)
+{
+    struct DISPLAYSTATE *pState = (struct DISPLAYSTATE *)pvUser;
+    Display *pDisplay;
+    bool fHasVT = true;
+
+    pDisplay = XOpenDisplay(NULL);
+    if (!pDisplay)
+        VBClFatalError(("Failed to open the X11 display\n"));
+    XSelectInput(pDisplay, DefaultRootWindow(pDisplay), PropertyChangeMask);
+    while (true)
+    {
+        XEvent event;
+
+        XNextEvent(pDisplay, &event);
+        /* This property is deleted when the server regains the virtual
+         * terminal.  Force the main thread to call xrandr again, as old X
+         * servers could not handle it while switched out. */
+        if (pState->fHaveRandR12)
+            continue;
+        if (   event.type != PropertyNotify
+            || event.xproperty.state != PropertyDelete
+            || event.xproperty.window != DefaultRootWindow(pDisplay)
+            || event.xproperty.atom != XInternAtom(pDisplay, "VBOXVIDEO_NO_VT", False))
+            continue;
+        LogRel(("VBoxClient/Display: entered virtual terminal.\n"));
+        ASMAtomicWriteBool(&pState->paScreenInformation[0].fUpdateSize, true);
+        VbglR3InterruptEventWaits();
+    }
+    return VINF_SUCCESS;  /* Should never be reached. */
+}
+
+static int startMonitorThread(struct DISPLAYSTATE *pState)
+{
+    int rc;
+
+    rc = RTThreadCreate(NULL, pfnMonitorThread, (void *)pState, 0, RTTHREADTYPE_INFREQUENT_POLLER, 0, "VT_MONITOR");
+    if (rc != VINF_SUCCESS)
+        VBClFatalError(("Failed to start the VT monitor thread, rc=%Rrc\n", rc));
     return VINF_SUCCESS;
 }
@@ -209 +219 @@
         && pState->paScreenInformation[0].cx > 0 && pState->paScreenInformation[0].cy > 0)
     {
+        int ret;
+
         RTStrPrintf(szCommand, sizeof(szCommand), "%s -s %ux%u",
                     pState->pcszXrandr, pState->paScreenInformation[0].cx, pState->paScreenInformation[0].cy);
-        system(szCommand);
+        ret = system(szCommand);
+        LogRel(("VBoxClient/Display: executed \"%s\", returned %d.\n", szCommand, ret));
         pState->paScreenInformation[0].fUpdateSize = false;
     }
@@ -238 +251 @@
     int rc;
     unsigned i, cScreensTracked;
+    uint32_t fModeSet = false;
 
     LogRelFlowFunc(("\n"));
@@ -262 +276 @@
         }
     }
+    /* Semantics: when VBOX_HAS_GRAPHICS is set, the X server driver assumes
+     * that a client capable of forwarding mode hints will be present for the
+     * rest of the X session.  If we crash things will not work as they should.
+     * I thought that preferable to implementing complex crash-handling logic.
+     */
+    XChangeProperty(pState->pDisplay, DefaultRootWindow(pState->pDisplay), XInternAtom(pState->pDisplay, "VBOX_HAS_GRAPHICS", 0),
+                    XA_INTEGER, 32, PropModeReplace, (unsigned char *)&fModeSet, 1);
     while (true)
     {
@@ -333 +354 @@
     if (RT_FAILURE(rc))
         return rc;
-    rc = enableEventsAndCaps();
+    rc = VbglR3CtlFilterMask(VMMDEV_EVENT_MOUSE_CAPABILITIES_CHANGED | VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST, 0);
+    if (RT_FAILURE(rc))
+        VBClFatalError(("Failed to set filter mask, rc=%Rrc.\n", rc));
     if (RT_SUCCESS(rc))
         pSelf->mfInit = true;
@@ -346 +369 @@
     if (!pSelf->mfInit)
         return VERR_WRONG_ORDER;
-    rc = VBClStartVTMonitor();
+    rc = startMonitorThread(pSelf);
     if (RT_FAILURE(rc))
         VBClFatalError(("Failed to start the VT monitor thread: %Rrc\n", rc));
@@ -353 +376 @@
 }
 
-static int pause(struct VBCLSERVICE **ppInterface)
-{
-    struct DISPLAYSTATE *pSelf = getStateFromInterface(ppInterface);
-
-    if (!pSelf->mfInit)
-        return VERR_WRONG_ORDER;
-    return disableEventsAndCaps(false);
-}
-
-static int resume(struct VBCLSERVICE **ppInterface)
-{
-    struct DISPLAYSTATE *pSelf = getStateFromInterface(ppInterface);
-    int rc;
-
-    if (!pSelf->mfInit)
-        return VERR_WRONG_ORDER;
-    rc = enableEventsAndCaps();
-    /* RandR 1.1-based drivers only let us change mode when we are not switched
-     * out, so interrupt the wait when we switch in and re-set it. */
-    VbglR3InterruptEventWaits();
-    return rc;
-}
-
 static void cleanup(struct VBCLSERVICE **ppInterface)
 {
     NOREF(ppInterface);
-    disableEventsAndCaps(true);
+    VbglR3CtlFilterMask(0, VMMDEV_EVENT_MOUSE_CAPABILITIES_CHANGED | VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST);
     VbglR3Term();
 }
@@ -388 +388 @@
     init,
     run,
-    pause,
-    resume,
+    VBClServiceDefaultHandler, /* pause */
+    VBClServiceDefaultHandler, /* resume */
     cleanup
 };

trunk/src/VBox/Additions/x11/undefined_xfree86

@@ -83 +83 @@
 defaultDPMSEnabled
 DeleteCallback
+DeleteProperty
 DeliverEvents
 deltaSaveUndersViewable

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

@@ -57 +57 @@
 #include "vboxvideo.h"
 #include <VBox/VBoxGuest.h>
+#include <VBox/VBoxGuestLib.h>
 #include <VBox/Hardware/VBoxVideoVBE.h>
 #include "version-generated.h"
@@ -98 +99 @@
 # include <stdlib.h>
 # include <string.h>
-#endif
-
-/* This was accepted upstream in X.Org Server 1.16 which bumped the video
- * driver ABI to 17. */
-#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 17
-# define SET_HAVE_VT_PROPERTY
 #endif
 
@@ -300 +295 @@
 
 /** Set a video mode to the hardware, RandR 1.1 version.  Since we no longer do
- * virtual frame buffers, adjust the screen pixmap dimensions to match. */
-static void setModeRandR11(ScrnInfoPtr pScrn, DisplayModePtr pMode, bool fScreenInitTime, bool fEnterVTTime)
+ * virtual frame buffers, adjust the screen pixmap dimensions to match.  The
+ * "override" parameters are for when we received a mode hint while switched to
+ * a virtual terminal.  In this case VBoxClient will have told us about the
+ * mode, but not yet been able to do a mode switch using RandR.  We solve this
+ * by setting the requested mode to the host but keeping the virtual frame-
+ * buffer matching what the X server expects. */
+static void setModeRandR11(ScrnInfoPtr pScrn, DisplayModePtr pMode, bool fScreenInitTime, bool fEnterVTTime,
+                           int cXOverRide, int cYOverRide)
 {
     VBOXPtr pVBox = VBOXGetRec(pScrn);
     struct vbvxFrameBuffer frameBuffer = { 0, 0, pMode->HDisplay, pMode->VDisplay, pScrn->bitsPerPixel};
+    int cXPhysical = cXOverRide > 0 ? min(cXOverRide, pMode->HDisplay) : pMode->HDisplay;
+    int cYPhysical = cYOverRide > 0 ? min(cYOverRide, pMode->VDisplay) : pMode->VDisplay;
 
     pVBox->pScreens[0].aScreenLocation.cx = pMode->HDisplay;
@@ -330 +333 @@
     }
     if (pMode->HDisplay != 0 && pMode->VDisplay != 0 && pScrn->vtSema)
-        vbvxSetMode(pScrn, 0, pMode->HDisplay, pMode->VDisplay, 0, 0, true, true, &frameBuffer);
+        vbvxSetMode(pScrn, 0, cXPhysical, cYPhysical, 0, 0, true, true, &frameBuffer);
     pScrn->currentMode = pMode;
 }
@@ -996 +999 @@
 }
 
-#define HAS_VT_ATOM_NAME "XFree86_has_VT"
-#define VBOXVIDEO_DRIVER_ATOM_NAME "VBOXVIDEO_DRIVER_IN_USE"
-/* The memory storing the initial value of the XFree86_has_VT root window
- * property.  This has to remain available until server start-up, so we just
- * use a global. */
-static CARD32 InitialPropertyValue = 1;
-
-/** Initialise a flag property on the root window to say whether the server VT
- *  is currently the active one as some clients need to know this. */
-static void initialiseProperties(ScrnInfoPtr pScrn)
-{
-    Atom atom = -1;
-    CARD32 *PropertyValue = &InitialPropertyValue;
-#ifdef SET_HAVE_VT_PROPERTY
-    atom = MakeAtom(HAS_VT_ATOM_NAME, sizeof(HAS_VT_ATOM_NAME) - 1, TRUE);
-    if (xf86RegisterRootWindowProperty(pScrn->scrnIndex, atom, XA_INTEGER,
-                                       32, 1, PropertyValue) != Success)
-        FatalError("vboxvideo: failed to register VT property\n");
-#endif /* SET_HAVE_VT_PROPERTY */
-    atom = MakeAtom(VBOXVIDEO_DRIVER_ATOM_NAME,
-                    sizeof(VBOXVIDEO_DRIVER_ATOM_NAME) - 1, TRUE);
-    if (xf86RegisterRootWindowProperty(pScrn->scrnIndex, atom, XA_INTEGER,
-                                       32, 1, PropertyValue) != Success)
-        FatalError("vboxvideo: failed to register driver in use property\n");
-}
-
-#ifdef SET_HAVE_VT_PROPERTY
-/** Update a flag property on the root window to say whether the server VT
- *  is currently the active one as some clients need to know this. */
-static void updateHasVTProperty(ScrnInfoPtr pScrn, Bool hasVT)
-{
-    Atom property_name;
-    int32_t value = hasVT ? 1 : 0;
-    int i;
-
-    property_name = MakeAtom(HAS_VT_ATOM_NAME, sizeof(HAS_VT_ATOM_NAME) - 1,
-                             FALSE);
-    if (property_name == BAD_RESOURCE)
-        FatalError("Failed to retrieve \"HAS_VT\" atom\n");
-    if (ROOT_WINDOW(pScrn) == NULL)
+/** Set the graphics and guest cursor support capabilities to the host if
+ *  the user-space helper is running. */
+static void updateGraphicsCapability(ScrnInfoPtr pScrn, Bool hasVT)
+{
+    VBOXPtr pVBox = VBOXGetRec(pScrn);
+    size_t cData;
+    int32_t *paData;
+    int rc;
+
+    if (pVBox->fHaveHGSMIModeHints)
         return;
-    ChangeWindowProperty(ROOT_WINDOW(pScrn), property_name, XA_INTEGER, 32,
-                         PropModeReplace, 1, &value, TRUE);
-}
-#endif /* SET_HAVE_VT_PROPERTY */
+    rc = vbvxGetIntegerPropery(pScrn, "VBOX_HAS_GRAPHICS", &cData, &paData);
+    if (rc != VINF_SUCCESS || cData != 1)
+        return;
+    if (RT_BOOL(*paData) != hasVT)
+    {
+        uint32_t fFeatures;
+        VbglR3SetGuestCaps(hasVT ? VMMDEV_GUEST_SUPPORTS_GRAPHICS : 0, hasVT ? 0 : VMMDEV_GUEST_SUPPORTS_GRAPHICS);
+        rc = VbglR3GetMouseStatus(&fFeatures, NULL, NULL);
+        fFeatures &= VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE | VMMDEV_MOUSE_NEW_PROTOCOL;
+        if (RT_SUCCESS(rc))
+            VbglR3SetMouseStatus(hasVT ? fFeatures : fFeatures | VMMDEV_MOUSE_GUEST_NEEDS_HOST_CURSOR);
+    }
+    *paData = hasVT;
+}
 
 #ifdef VBOXVIDEO_13
@@ -1169 +1152 @@
  * Although this is far more often than necessary it should not have real-life
  * performance consequences and allows us to simplify the code quite a bit. */
-static void updateSizeHintsBlockHandler(pointer pData, OSTimePtr pTimeout, pointer pReadmask)
+static void vboxBlockHandler(pointer pData, OSTimePtr pTimeout, pointer pReadmask)
 {
     ScrnInfoPtr pScrn = (ScrnInfoPtr)pData;
@@ -1177 +1160 @@
     (void)pTimeout;
     (void)pReadmask;
-    if (!pScrn->vtSema)
-        return;
-    vbvxReadSizesAndCursorIntegrationFromHGSMI(pScrn, &fNeedUpdate);
+    updateGraphicsCapability(pScrn, pScrn->vtSema);
+    if (pScrn->vtSema)
+        vbvxReadSizesAndCursorIntegrationFromHGSMI(pScrn, &fNeedUpdate);
+    /* This has to be done even when we are switched out so that VBoxClient can
+     * set a mode using RandR without having to know the virtual terminal state.
+     */
     if (ROOT_WINDOW(pScrn) != NULL)
         vbvxReadSizesAndCursorIntegrationFromProperties(pScrn, &fNeedUpdate);
@@ -1208 +1194 @@
     TRACE_ENTRY();
 
+    /* Initialise our guest library if possible: ignore failure. */
+    VbglR3Init();
     if (!VBOXMapVidMem(pScrn))
         return (FALSE);
@@ -1340 +1328 @@
 #else
     /* set first video mode */
-    setModeRandR11(pScrn, pScrn->currentMode, true, false);
+    setModeRandR11(pScrn, pScrn->currentMode, true, false, 0, 0);
 #endif
 
     /* Register block and wake-up handlers for getting new screen size hints. */
-    RegisterBlockAndWakeupHandlers(updateSizeHintsBlockHandler, (WakeupHandlerProcPtr)NoopDDA, (pointer)pScrn);
+    RegisterBlockAndWakeupHandlers(vboxBlockHandler, (WakeupHandlerProcPtr)NoopDDA, (pointer)pScrn);
 
     /* software cursor */
@@ -1385 +1373 @@
 #endif
 
-    initialiseProperties(pScrn);
-
     return (TRUE);
 }
 
+#define NO_VT_ATOM_NAME "VBOXVIDEO_NO_VT"
+
 static Bool VBOXEnterVT(ScrnInfoPtr pScrn)
 {
     VBOXPtr pVBox = VBOXGetRec(pScrn);
+#ifndef VBOXVIDEO_13
+    /* If we got a mode request while we were switched out, temporarily override
+     * the physical mode set to the device while keeping things consistent from
+     * the server's point of view. */
+    int cXOverRide = RT_CLAMP(pVBox->pScreens[0].aPreferredSize.cx, VBOX_VIDEO_MIN_SIZE, VBOX_VIDEO_MAX_VIRTUAL);
+    int cYOverRide = RT_CLAMP(pVBox->pScreens[0].aPreferredSize.cy, VBOX_VIDEO_MIN_SIZE, VBOX_VIDEO_MAX_VIRTUAL);
+#endif
 
     TRACE_ENTRY();
+    updateGraphicsCapability(pScrn, TRUE);
 #ifdef VBOX_DRI_OLD
     if (pVBox->useDRI)
@@ -1410 +1406 @@
 #ifdef VBOXVIDEO_13
     vbvxReadSizesAndCursorIntegrationFromHGSMI(pScrn, NULL);
-    vbvxReadSizesAndCursorIntegrationFromProperties(pScrn, NULL);
     setSizesAndCursorIntegration(pScrn, false);
 #else
-    setModeRandR11(pScrn, pScrn->currentMode, false, true);
-#endif
-#ifdef SET_HAVE_VT_PROPERTY
-    updateHasVTProperty(pScrn, TRUE);
+    setModeRandR11(pScrn, pScrn->currentMode, false, true, cXOverRide, cYOverRide);
+    DeleteProperty(ROOT_WINDOW(pScrn), MakeAtom(NO_VT_ATOM_NAME, sizeof(NO_VT_ATOM_NAME) - 1, TRUE));
 #endif
     return TRUE;
@@ -1426 +1419 @@
 #ifdef VBOXVIDEO_13
     unsigned i;
+#else
+    int32_t propertyValue = 0;
 #endif
 
     TRACE_ENTRY();
+    updateGraphicsCapability(pScrn, FALSE);
 #ifdef VBOXVIDEO_13
     for (i = 0; i < pVBox->cScreens; ++i)
         vbox_crtc_dpms(pVBox->pScreens[i].paCrtcs, DPMSModeOff);
+#else
+    ChangeWindowProperty(ROOT_WINDOW(pScrn), MakeAtom(NO_VT_ATOM_NAME, sizeof(NO_VT_ATOM_NAME) - 1, FALSE), XA_INTEGER, 32,
+                         PropModeReplace, 1, &propertyValue, TRUE);
 #endif
     vboxDisableVbva(pScrn);
@@ -1443 +1442 @@
 #endif
     VBOXRestoreMode(pScrn);
-#ifdef SET_HAVE_VT_PROPERTY
-    updateHasVTProperty(pScrn, FALSE);
-#endif
     TRACE_EXIT();
 }
@@ -1456 +1452 @@
     BOOL fRestore = TRUE;
 #endif
+    BOOL ret;
+
     if (pScrn->vtSema)
     {
@@ -1494 +1492 @@
 #endif
 #ifndef XF86_SCRN_INTERFACE
-    return pScreen->CloseScreen(pScreen->myNum, pScreen);
-#else
-    return pScreen->CloseScreen(pScreen);
-#endif
+    ret = pScreen->CloseScreen(pScreen->myNum, pScreen);
+#else
+    ret = pScreen->CloseScreen(pScreen);
+#endif
+    VbglR3Term();
+    return ret;
 }
 
@@ -1508 +1508 @@
     rc = xf86SetSingleMode(pScrn, pMode, RR_Rotate_0);
 #else
-    setModeRandR11(pScrn, pMode, false, false);
+    setModeRandR11(pScrn, pMode, false, false, 0, 0);
 #endif
     TRACE_LOG("returning %s\n", rc ? "TRUE" : "FALSE");