Changeset 34872 in vbox for trunk/src/VBox

Timestamp:

Dec 9, 2010 11:00:13 AM (14 years ago)

Author:

vboxsync

Message:

Additions/x11/vboxvideo: handle moving and disabling monitors in X.Org better

File:

• trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.c (modified) (7 diffs)

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

@@ -694 +694 @@
 vboxLineLength(ScrnInfoPtr pScrn, int32_t cDisplayWidth)
 {
-    uint64_t cbLine = ((uint64_t)cDisplayWidth * vboxBPP(pScrn) / 8 + 7) & ~7;
+    uint64_t cbLine = ((uint64_t)cDisplayWidth * vboxBPP(pScrn) / 8 + 3) & ~3;
     return cbLine < INT32_MAX ? cbLine : INT32_MAX;
 }
@@ -1188 +1188 @@
 }
 
-static void
-vboxCalcDisplayDimensions(VBOXPtr pVBox, int32_t *pcWidth, int32_t *pcHeight)
-{
-    int32_t cWidth = 0, cHeight = 0;
-    unsigned i;
-    for (i = 0; i < pVBox->cScreens; ++i)
-    {
-        int32_t cWidthScreen =    pVBox->aScreenLocation[i].x
-                                + pVBox->aScreenLocation[i].cx;
-        int32_t cHeightScreen =   pVBox->aScreenLocation[i].y
-                                + pVBox->aScreenLocation[i].cy;
-        if (cWidthScreen > cWidth)
-            cWidth = cWidthScreen;
-        if (cHeightScreen > cWidth)
-            cWidth = cWidthScreen;
-    }
-    *pcWidth = cWidth;
-    *pcHeight = cHeight;
-}
-
 static Bool
 VBOXSwitchMode(int scrnIndex, DisplayModePtr pMode, int flags)
@@ -1225 +1205 @@
     rc = xf86SetSingleMode(pScrn, pMode, 0);
 #else
+    VBOXAdjustScreenPixmap(pScrn, pMode->HDisplay, pMode->VDisplay);
     rc = VBOXSetMode(pScrn, 0, pMode->HDisplay, pMode->VDisplay,
                      pScrn->frameX0, pScrn->frameY0);
-    {
-        int32_t cWidth, cHeight;
-        vboxCalcDisplayDimensions(pVBox, &cWidth, &cHeight);
-        VBOXAdjustScreenPixmap(pScrn, cWidth, cHeight);
-    }
     if (rc)
     {
@@ -1247 +1223 @@
 }
 
-/* Set a graphics mode.  Poke the required values into registers, enable
-   guest-host acceleration functions and tell the host we support advanced
-   graphics functions. */
+/** Get the index of the screen we will use as the primary one.  This is in
+ * fact the first screen located fully inside the virtual desktop, or zero
+ * if none are.  Screens which are not fully inside will be set up to be
+ * identical to the primary one, so from the host's point of view the first
+ * screen can always be treated as the primary. */
+static uint32_t
+vboxGetPrimaryIndex(ScrnInfoPtr pScrn)
+{
+    VBOXPtr pVBox = VBOXGetRec(pScrn);
+    unsigned i;
+    for (i = 0; i < pVBox->cScreens; ++i)
+        if (     pVBox->aScreenLocation[i].x + pVBox->aScreenLocation[i].cx
+               < pScrn->virtualX
+            &&   pVBox->aScreenLocation[i].y + pVBox->aScreenLocation[i].cy
+               < pScrn->virtualY)
+            return i;
+    return 0;  /* This will probably look bad if it can happen. */
+}
+
+/**
+ * This is a rather un-transparent workaround for the fact that HGSMI doesn't
+ * let us disable screens.  If a guest screen is not enabled we set it to
+ * match the display on the primary screen.
+ */
+static uint32_t
+vboxGetRealLocationIndex(ScrnInfoPtr pScrn, unsigned i)
+{
+    VBOXPtr pVBox = VBOXGetRec(pScrn);
+    if (      pVBox->aScreenLocation[i].x + pVBox->aScreenLocation[i].cx
+           <= pScrn->virtualX
+        &&    pVBox->aScreenLocation[i].y + pVBox->aScreenLocation[i].cy
+           <= pScrn->virtualY)
+        return i;
+    return vboxGetPrimaryIndex(pScrn);
+    
+}
+
+/** Set a graphics mode.  Poke any required values into registers, do an HGSMI
+ * mode set and tell the host we support advanced graphics functions.  This
+ * procedure is complicated by three things.
+ *  - The first is that X.Org can implicitly disable a screen by resizing the
+ *    virtual framebuffer so that the screen is no longer inside it.  We have
+ *    to spot and handle this.
+ *  - The second is that HGSMI doesn't actually let us disable a monitor.  We
+ *    should add this at some point, but for now I want to implement the
+ *    protocol and not extend it, so I "disable" monitors by setting them to
+ *    show the same thing as the first enabled monitor (see @a
+ *    vboxGetPrimaryIndex).
+ *  - The third is that the code has to work around HGSMI's special handling of
+ *    the primary screen.  X.Org doesn't have the same concept, and can move
+ *    the primary about the virtual desktop (not such an issue) and can also
+ *    disable the first screen.
+ */
 static Bool
 VBOXSetMode(ScrnInfoPtr pScrn, unsigned cDisplay, unsigned cWidth,
@@ -1256 +1282 @@
     VBOXPtr pVBox = VBOXGetRec(pScrn);
     Bool rc = TRUE;
-    uint32_t xRel = cDisplay ? x - pVBox->aScreenLocation[0].x : 0;
-    uint32_t yRel = cDisplay ? y - pVBox->aScreenLocation[0].y : 0;
+    Bool fPrimaryMoved = FALSE;
+    uint32_t cPrimary, cIndex;
+    uint32_t cwReal, chReal;
+    int32_t cxRel, cyRel, cxReal, cyReal;
 
     TRACE_LOG("cDisplay=%u, cWidth=%u, cHeight=%u, x=%d, y=%d, displayWidth=%d\n",
               cDisplay, cWidth, cHeight, x, y, pScrn->displayWidth);
+    cPrimary = vboxGetPrimaryIndex(pScrn);
+    cIndex = vboxGetRealLocationIndex(pScrn, cDisplay);
+    if (   cDisplay == cPrimary
+        && (   x != pVBox->aScreenLocation[cDisplay].x
+            || y != pVBox->aScreenLocation[cDisplay].y))
+        fPrimaryMoved = TRUE;
+    pVBox->aScreenLocation[cDisplay].cx = cWidth;
+    pVBox->aScreenLocation[cDisplay].cy = cHeight;
+    pVBox->aScreenLocation[cDisplay].x = x;
+    pVBox->aScreenLocation[cDisplay].y = y;
+    cwReal = pVBox->aScreenLocation[cIndex].cx;
+    chReal = pVBox->aScreenLocation[cIndex].cy;
+    cxReal = pVBox->aScreenLocation[cIndex].x;
+    cyReal = pVBox->aScreenLocation[cIndex].y;
+    cxRel = cxReal - pVBox->aScreenLocation[cPrimary].x;
+    cyRel = cyReal - pVBox->aScreenLocation[cPrimary].y;
     /* Don't fiddle with the hardware if we are switched
      * to a virtual terminal. */
     if (!pVBox->vtSwitch)
     {
+        TRACE_LOG("setting mode.  cWidth=%u, cHeight=%u, cwReal=%u, chReal=%u, pScrn->virtualX=%d, pScrn->virtualY=%d, vboxBPP(pScrn)=%d, x=%d, y=%d, cDisplay=%u, cPrimary=%u, cIndex=%u, cxRel=%d, cyRel=%d, cxReal=%d, cyReal=%d, pVBox->cbLine=%d\n",
+                  cWidth, cHeight, cwReal, chReal, pScrn->virtualX,
+                  pScrn->virtualY, vboxBPP(pScrn), x, y, cDisplay, cPrimary,
+                  cIndex, cxRel, cyRel, cxReal, cyReal, pVBox->cbLine);
         if (cDisplay == 0)
-            VBoxVideoSetModeRegisters(cWidth, cHeight, pScrn->displayWidth,
-                                      vboxBPP(pScrn), x, y);
+            VBoxVideoSetModeRegisters(cwReal, chReal, pScrn->displayWidth,
+                                      vboxBPP(pScrn), cxReal, cyReal);
         /* Tell the host we support graphics */
         if (vbox_device_available(pVBox))
@@ -1275 +1323 @@
         && (pVBox->fHaveHGSMI)
         && !pVBox->vtSwitch)
-        VBoxHGSMIProcessDisplayInfo(&pVBox->guestCtx, cDisplay, xRel, yRel,
-                                    pVBox->cbLine + x * vboxBPP(pScrn) / 8,
+        VBoxHGSMIProcessDisplayInfo(&pVBox->guestCtx, cDisplay, cxRel, cyRel,
+                                      cyReal * pVBox->cbLine
+                                    + cxReal * vboxBPP(pScrn) / 8,
                                     pVBox->cbLine,
-                                    cWidth, cHeight, vboxBPP(pScrn));
-    pVBox->aScreenLocation[cDisplay].cx = cWidth;
-    pVBox->aScreenLocation[cDisplay].cy = cHeight;
-    pVBox->aScreenLocation[cDisplay].x = x;
-    pVBox->aScreenLocation[cDisplay].y = y;
+                                    cwReal, chReal, vboxBPP(pScrn));
+    /* The guest-host protocol says that first screen is always at offset
+     * (0,0).  Ergo, if the guest changes that offset we need to move all
+     * other screens in the host to keep the relative positions right. */
+    if (fPrimaryMoved)
+    {
+        unsigned i;
+        for (i = 1; i < pVBox->cScreens; ++i)
+            if (i != cPrimary)
+                VBOXSetMode(pScrn, i, pVBox->aScreenLocation[i].cx,
+                            pVBox->aScreenLocation[i].cy,
+                            pVBox->aScreenLocation[i].x,
+                            pVBox->aScreenLocation[i].y);
+    }
     TRACE_LOG("returning %s\n", rc ? "TRUE" : "FALSE");
     return rc;
 }
 
+/** Resize the virtual framebuffer.  After resizing we reset all modes
+ * (X.Org 1.3+) to adjust them to the new framebuffer.
+ */
 static Bool VBOXAdjustScreenPixmap(ScrnInfoPtr pScrn, int width, int height)
 {
@@ -1320 +1381 @@
 #ifdef VBOXVIDEO_13
     /* Write the new values to the hardware */
-    xf86SetDesiredModes(pScrn);
+    {
+        unsigned i;
+        for (i = 0; i < pVBox->cScreens; ++i)
+            VBOXSetMode(pScrn, i, pVBox->aScreenLocation[i].cx,
+                            pVBox->aScreenLocation[i].cy,
+                            pVBox->aScreenLocation[i].x,
+                            pVBox->aScreenLocation[i].y);
+    }
 #endif
     return TRUE;