Apparently it is more kosher to completely disassociate an

output from its CRTC than just removing the mode when
disabling an output. This is what "xrandr --off" does.

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@5099 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/unix/xserver/hw/vnc/XserverDesktop.cc b/unix/xserver/hw/vnc/XserverDesktop.cc
index 3ef6f251506221db75a654bef5aafec94b47dc5c..b087279379592e891672f7068d01d1232bf2740b 100644 (file)
--- a/unix/xserver/hw/vnc/XserverDesktop.cc
+++ b/unix/xserver/hw/vnc/XserverDesktop.cc
@@ -934,8 +934,7 @@ unsigned int XserverDesktop::setScreenLayout(int fb_width, int fb_height,
     /* Missing? */
     if (iter == layout.end()) {
       /* Disable and move on... */
-      ret = RRCrtcSet(crtc, NULL, crtc->x, crtc->y, crtc->rotation,
-                      crtc->numOutputs, crtc->outputs);
+      ret = RRCrtcSet(crtc, NULL, crtc->x, crtc->y, crtc->rotation, 0, NULL);
       if (!ret) {
         vlog.error("Failed to disable unused CRTC for output '%s'",
                    output->name);

diff --git a/unix/xserver/hw/vnc/xvnc.cc b/unix/xserver/hw/vnc/xvnc.cc
index 8dc20bcd23ec4ee01cd21168ddb2a55f4a579e1b..abb7121897d6c1ec8eb7df9973575caea2539a8d 100644 (file)
--- a/unix/xserver/hw/vnc/xvnc.cc
+++ b/unix/xserver/hw/vnc/xvnc.cc
@@ -1196,8 +1196,7 @@ static Bool vncRandRScreenSetSize(ScreenPtr pScreen,
         if ((crtc->x >= width) || (crtc->y >= height)) {
             /* Disable it */
             ret = vncRandRCrtcSet(pScreen, crtc, NULL,
-                                  crtc->x, crtc->y, crtc->rotation,
-                                  crtc->numOutputs, crtc->outputs);
+                                  crtc->x, crtc->y, crtc->rotation, 0, NULL);
             if (!ret)
                 ErrorF("Warning: Unable to disable CRTC that is outside of new screen dimensions");
             continue;