summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authorPierre Ossman <ossman@cendio.se>2013-05-22 11:59:38 +0000
committerPierre Ossman <ossman@cendio.se>2013-05-22 11:59:38 +0000
commit1556e8148de3ab0bfa35b4840fea28a575f9cdfd (patch)
tree86dd5de53602c0b82bfbf72fd3270ec4a1c3f273 /unix
parent2058ecb98993a67ba97aacb4dd4776976a175c3e (diff)
downloadtigervnc-1556e8148de3ab0bfa35b4840fea28a575f9cdfd.tar.gz
tigervnc-1556e8148de3ab0bfa35b4840fea28a575f9cdfd.zip
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
Diffstat (limited to 'unix')
-rw-r--r--unix/xserver/hw/vnc/XserverDesktop.cc3
-rw-r--r--unix/xserver/hw/vnc/xvnc.cc3
2 files changed, 2 insertions, 4 deletions
diff --git a/unix/xserver/hw/vnc/XserverDesktop.cc b/unix/xserver/hw/vnc/XserverDesktop.cc
index 3ef6f251..b0872793 100644
--- 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 8dc20bcd..abb71218 100644
--- 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;