Changeset 53527 in vbox for trunk/src/VBox

Timestamp:

Dec 12, 2014 5:26:17 PM (10 years ago)

Author:

vboxsync

Message:

Additions/x11/vboxvideo: report monitor connected status to X11, based on the enabled state in the last mode hint.

Location:

trunk/src/VBox/Additions/x11/vboxvideo

Files:

• getmode.c (modified) (2 diffs)
• vboxvideo.c (modified) (1 diff)
• vboxvideo.h (modified) (1 diff)

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

@@ -217 +217 @@
         pVBox->pScreens[i].aPreferredSize.cx = 1024;
         pVBox->pScreens[i].aPreferredSize.cy = 768;
+        pVBox->pScreens[i].afConnected       = true;
     }
     /* Set up the first mode correctly to match the requested initial mode. */
@@ -253 +254 @@
         for (i = 0; i < prop->size && i < pVBox->cScreens; ++i)
         {
-            if (((int32_t *)prop->data)[i] == 0)
-            {
-                pVBox->pScreens[i].aPreferredSize.cx = 1024;
-                pVBox->pScreens[i].aPreferredSize.cy = 768;
-            }
-            else
+            if (((int32_t *)prop->data)[i] != 0)
             {
                 pVBox->pScreens[i].aPreferredSize.cx =

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

@@ -418 +418 @@
 vbox_output_detect (xf86OutputPtr output)
 {
-    (void) output;
-    return XF86OutputStatusConnected;
+    ScrnInfoPtr pScrn = output->scrn;
+    VBOXPtr pVBox = VBOXGetRec(pScrn);
+    uint32_t iScreen = (uintptr_t)output->driver_private;
+    return   pVBox->pScreens[iScreen].afConnected
+           ? XF86OutputStatusConnected : XF86OutputStatusDisconnected;
 }
 

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

@@ -162 +162 @@
     /** The current preferred resolution for the screen */
     RTRECTSIZE aPreferredSize;
+    /** Has this screen been enabled by the host? */
+    Bool afConnected;
 };