Revision: 4936
http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4936&view=rev
Author: ossman_
Date: 2012-07-17 11:57:42 +0000 (Tue, 17 Jul 2012)
Log Message:
-----------
The internal API for RRCrtcNotify() changed in Xorg 1.6+, so make sure things
work on those versions as well.
Modified Paths:
--------------
trunk/unix/xserver/hw/vnc/xvnc.cc
Modified: trunk/unix/xserver/hw/vnc/xvnc.cc
===================================================================
--- trunk/unix/xserver/hw/vnc/xvnc.cc 2012-07-13 11:22:55 UTC (rev 4935)
+++ trunk/unix/xserver/hw/vnc/xvnc.cc 2012-07-17 11:57:42 UTC (rev 4936)
@@ -1116,6 +1116,9 @@
if ((crtc->x >= width) || (crtc->y >= height)) {
/* Disable it */
ret = RRCrtcNotify(crtc, NULL, crtc->x, crtc->y, crtc->rotation,
+#if XORG >= 16
+ NULL,
+#endif
crtc->numOutputs, crtc->outputs);
if (!ret)
ErrorF("Warning: Unable to disable CRTC that is outside of new
screen dimensions");
@@ -1131,6 +1134,9 @@
}
ret = RRCrtcNotify(crtc, mode, crtc->x, crtc->y, crtc->rotation,
+#if XORG >= 16
+ NULL,
+#endif
crtc->numOutputs, crtc->outputs);
RRModeDestroy(mode);
if (!ret)
@@ -1147,7 +1153,11 @@
Bool ret;
/* Let RandR know we approve, and let it update its internal state */
- ret = RRCrtcNotify(crtc, mode, x, y, rotation, num_outputs, outputs);
+ ret = RRCrtcNotify(crtc, mode, x, y, rotation,
+#if XORG >= 16
+ NULL,
+#endif
+ num_outputs, outputs);
if (!ret)
return FALSE;
@@ -1217,7 +1227,11 @@
RROutputSetConnection(output, RR_Connected);
/* Make sure the CRTC has this output set */
- RRCrtcNotify(crtc, NULL, 0, 0, RR_Rotate_0, 1, &output);
+ RRCrtcNotify(crtc, NULL, 0, 0, RR_Rotate_0,
+#if XORG >= 16
+ NULL,
+#endif
+ 1, &output);
/* Populate a list of default modes */
RRModePtr modes[sizeof(vncRandRWidths)/sizeof(*vncRandRWidths)];
@@ -1272,6 +1286,9 @@
return FALSE;
RRCrtcNotify(crtc, mode, 0, 0, RR_Rotate_0,
+#if XORG >= 16
+ NULL,
+#endif
crtc->numOutputs, crtc->outputs);
return TRUE;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Tigervnc-commits mailing list
Tigervnc-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tigervnc-commits
