Changeset 60180 in vbox for trunk/src/VBox/Additions/x11

Timestamp:

Mar 24, 2016 11:43:48 AM (9 years ago)

Author:

vboxsync

Message:

bugref:8087:8087: Additions/x11: support non-root X server: revert r99502 which removed our fake EDID handling in the user space X.Org video driver. We provided/again provide a fake, unique EDID for our virtual monitors in order to confuse gnome-settings-daemon. g-s-d tries to remember monitors which have been plugged in to a system in the past in order to force a particular video mode on them, which interferes with our dynamic resizing. By ensuring that g-s-d sees a different monitor every time we resize we prevent this.

Location:

trunk/src/VBox/Additions/x11/vboxvideo

Files:

• Makefile.kmk (modified) (1 diff)
• edid.c (copied) (copied from trunk/src/VBox/Additions/x11/vboxvideo/edid.c )
• vboxvideo.c (modified) (3 diffs)
• vboxvideo.h (modified) (1 diff)

trunk/src/VBox/Additions/x11/vboxvideo/Makefile.kmk

@@ -163 +163 @@
         $(VBOX_PATH_X11_ROOT)/xorg-server-1.3.0.0
 vboxvideo_drv_13_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
-vboxvideo_drv_13_SOURCES = $(vboxvideo_drv_SOURCES)
+vboxvideo_drv_13_SOURCES = $(vboxvideo_drv_SOURCES) edid.c
 
 

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

@@ -551 +551 @@
     unsigned cIndex = 0;
     DisplayModePtr pModes = NULL;
+    DisplayModePtr pPreferred = NULL;
     ScrnInfoPtr pScrn = output->scrn;
     VBOXPtr pVBox = VBOXGetRec(pScrn);
@@ -556 +557 @@
     TRACE_ENTRY();
     uint32_t iScreen = (uintptr_t)output->driver_private;
-    vbox_output_add_mode(pVBox, &pModes, NULL,
+    pPreferred = vbox_output_add_mode(pVBox, &pModes, NULL,
                          RT_CLAMP(pVBox->pScreens[iScreen].aPreferredSize.cx, VBOX_VIDEO_MIN_SIZE, VBOX_VIDEO_MAX_VIRTUAL),
                          RT_CLAMP(pVBox->pScreens[iScreen].aPreferredSize.cy, VBOX_VIDEO_MIN_SIZE, VBOX_VIDEO_MAX_VIRTUAL),
@@ -572 +573 @@
     vbox_output_add_mode(pVBox, &pModes, NULL, 800,  600,  FALSE, FALSE);
     vbox_output_add_mode(pVBox, &pModes, NULL, 640,  480,  FALSE, FALSE);
+    VBOXEDIDSet(output, pPreferred);
     TRACE_EXIT();
     return pModes;

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

@@ -252 +252 @@
 extern void vbvxReadSizesAndCursorIntegrationFromHGSMI(ScrnInfoPtr pScrn, bool *pfNeedUpdate);
 
+/* EDID generation */
+#ifdef VBOXVIDEO_13
+extern Bool VBOXEDIDSet(struct _xf86Output *output, DisplayModePtr pmode);
+#endif
+
 #endif /* _VBOXVIDEO_H_ */