summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFederico Mena Quintero <federico@novell.com>2009-07-20 16:44:52 -0500
committerSøren Sandmann Pedersen <ssp@l3000.localdomain>2009-07-20 19:36:17 -0400
commitb9166441bdb08ef76b9c6712da5902b0dcbf03f3 (patch)
tree6c1fb60db0c42b83717ae168a14aed856073e7f8
parent68d5134142e3c616f3996c7ea8d08c887ce56118 (diff)
bfo#22864 - grab the server around all modifications to CRTCs
We were not grabbed while disabling the CRTCs that should be off, so other clients could think that there was an intermediate stage with no enabled outputs. Signed-off-by: Federico Mena Quintero <federico@novell.com>
-rw-r--r--xrandr.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/xrandr.c b/xrandr.c
index f9d9e06..413ea7b 100644
--- a/xrandr.c
+++ b/xrandr.c
@@ -1438,6 +1438,15 @@ apply (void)
int c;
/*
+ * Hold the server grabbed while messing with
+ * the screen so that apps which notice the resize
+ * event and ask for xinerama information from the server
+ * receive up-to-date information
+ */
+ if (grab_server)
+ XGrabServer (dpy);
+
+ /*
* Turn off any crtcs which are to be disabled or which are
* larger than the target size
*/
@@ -1484,15 +1493,6 @@ apply (void)
}
/*
- * Hold the server grabbed while messing with
- * the screen so that apps which notice the resize
- * event and ask for xinerama information from the server
- * receive up-to-date information
- */
- if (grab_server)
- XGrabServer (dpy);
-
- /*
* Set the screen size
*/
screen_apply ();