xserver: Branch 'master'
Aaron Plattner
aplattner at kemper.freedesktop.org
Thu Mar 1 02:13:18 EET 2007
randr/rrcrtc.c | 9 +++++++++
1 files changed, 9 insertions(+)
New commits:
diff-tree 06c3021aec720837bef432656e88ae9b4e35101d (from 68c64ad7b1eea79c786b5a7f3459076780163a47)
Author: Aaron Plattner <aplattner at nvidia.com>
Date: Wed Feb 28 16:09:11 2007 -0800
Don't crash setting a NULL mode with a randr classic DDX. Also remember to update the screen size during modesets.
diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c
index 474c946..1f7462f 100644
--- a/randr/rrcrtc.c
+++ b/randr/rrcrtc.c
@@ -290,6 +290,12 @@ RRCrtcSet (RRCrtcPtr crtc,
RRScreenRate rate;
Bool ret;
+ if (!mode)
+ {
+ RRCrtcNotify (crtc, NULL, x, y, rotation, 0, NULL);
+ return TRUE;
+ }
+
size.width = mode->mode.width;
size.height = mode->mode.height;
if (outputs[0]->mmWidth && outputs[0]->mmHeight)
@@ -310,7 +316,10 @@ RRCrtcSet (RRCrtcPtr crtc,
* Old 1.0 interface tied screen size to mode size
*/
if (ret)
+ {
RRCrtcNotify (crtc, mode, x, y, rotation, 1, outputs);
+ RRScreenSizeNotify (pScreen);
+ }
return ret;
}
#endif
More information about the xorg-commit
mailing list