Changeset 35616 in vbox for trunk/src/VBox/Additions/x11/vboxvideo

Timestamp:

Jan 18, 2011 2:52:52 PM (14 years ago)

Author:

vboxsync

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

69513

Message:

Additions/x11/vboxvideo: support DPMS by disabling monitors

Location:

trunk/src/VBox/Additions/x11/vboxvideo

Files:

• vboxvideo.c (modified) (6 diffs)
• vboxvideo.h (modified) (1 diff)

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

@@ -279 +279 @@
 static void
 vbox_crtc_dpms(xf86CrtcPtr crtc, int mode)
-{ (void) crtc; (void) mode; }
+{
+    VBOXPtr pVBox = VBOXGetRec(crtc->scrn);
+    unsigned cDisplay = (uintptr_t)crtc->driver_private;
+    TRACE_LOG("cDisplay=%u, mode=%i\n", cDisplay, mode);
+    pVBox->afDisabled[cDisplay] = (mode != DPMSModeOn);
+    if (   pVBox->aScreenLocation[cDisplay].cx
+        && pVBox->aScreenLocation[cDisplay].cy)
+        VBOXSetMode(crtc->scrn, cDisplay,
+                    pVBox->aScreenLocation[cDisplay].cx,
+                    pVBox->aScreenLocation[cDisplay].cy,
+                    pVBox->aScreenLocation[cDisplay].x,
+                    pVBox->aScreenLocation[cDisplay].y);
+}
 
 static Bool
@@ -300 +312 @@
     (void) mode;
     VBOXPtr pVBox = VBOXGetRec(crtc->scrn);
+    unsigned cDisplay = (uintptr_t)crtc->driver_private;
 
     TRACE_LOG("name=%s, HDisplay=%d, VDisplay=%d, x=%d, y=%d\n", adjusted_mode->name,
            adjusted_mode->HDisplay, adjusted_mode->VDisplay, x, y);
-    VBOXSetMode(crtc->scrn, (uintptr_t)crtc->driver_private,
-                adjusted_mode->HDisplay, adjusted_mode->VDisplay, x, y);
+    pVBox->afDisabled[cDisplay] = false;
+    VBOXSetMode(crtc->scrn, cDisplay, adjusted_mode->HDisplay,
+                adjusted_mode->VDisplay, x, y);
     /* Don't remember any modes set while we are seamless, as they are
      * just temporary. */
@@ -1132 +1146 @@
     pVBox->CloseScreen = pScreen->CloseScreen;
     pScreen->CloseScreen = VBOXCloseScreen;
+#ifdef VBOXVIDEO_13
+    pScreen->SaveScreen = xf86SaveScreen;
+#else
     pScreen->SaveScreen = VBOXSaveScreen;
-
+#endif
+
+#ifdef VBOXVIDEO_13
+    xf86DPMSInit(pScreen, xf86DPMSSet, 0);
+#else
     /* We probably do want to support power management - even if we just use
        a dummy function. */
     xf86DPMSInit(pScreen, VBOXDisplayPowerManagementSet, 0);
+#endif
 
     /* Report any unused options (only for the first generation) */
@@ -1164 +1186 @@
     cbOldFB = pVBox->cbLine * pScrn->virtualX;
     cbNewFB = vboxLineLength(pScrn, cNewX) * cNewY;
-    if (cbOldFB > pVBox->cbFBMax)
+    if (cbOldFB > (uint64_t)pVBox->cbFBMax)
         cbOldFB = 0;
-    if (cbNewFB > pVBox->cbFBMax)
+    if (cbNewFB > (uint64_t)pVBox->cbFBMax)
         cbNewFB = 0;
     memset(pVBox->base, 0, max(cbOldFB, cbNewFB));
@@ -1298 +1320 @@
 {
     VBOXPtr pVBox = VBOXGetRec(pScrn);
-    Bool rc = TRUE, fActive = TRUE;
+    Bool rc = TRUE, fActive = !pVBox->afDisabled[cDisplay];
     uint32_t offStart, cwReal = cWidth;
 
@@ -1320 +1342 @@
     else
         cwReal = RT_MIN((int) cWidth, pScrn->displayWidth - x);
+    TRACE_LOG("pVBox->afDisabled[cDisplay]=%d, fActive=%d\n",
+              (int)pVBox->afDisabled[cDisplay], (int)fActive);
     /* Don't fiddle with the hardware if we are switched
      * to a virtual terminal. */

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

@@ -212 +212 @@
      * sending dirty rectangle information to the right one. */
     RTRECT2 aScreenLocation[VBOX_VIDEO_MAX_SCREENS];
+    /** Has this screen been disabled by the guest? */
+    Bool afDisabled[VBOX_VIDEO_MAX_SCREENS];
 #ifdef VBOXVIDEO_13
     /** The virtual crtcs */