From c406f83d375718c7b2798a08a7225df4a915292e Mon Sep 17 00:00:00 2001 From: Nils Schneider Date: Wed, 20 Jan 2016 20:06:46 +0100 Subject: x11: get *current* XRandR screen configuration Only request the current screen configuration instead of polling for new screens, too. We're not interested in detecting any new screens as we're merely enumerating what is currently connected and configured. On some hardware (like mine) calling XRRGetScreenResources will stall X11 for about 10 to 20 seconds. This has annoyed me for a few months now and almost made me switch to VLC ;) Signed-off-by: wm4 --- video/out/x11_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'video/out/x11_common.c') diff --git a/video/out/x11_common.c b/video/out/x11_common.c index 4c7237dd82..5c53ed4c34 100644 --- a/video/out/x11_common.c +++ b/video/out/x11_common.c @@ -364,7 +364,7 @@ static void xrandr_read(struct vo_x11_state *x11) RRCrtcChangeNotifyMask | RROutputChangeNotifyMask); } - XRRScreenResources *r = XRRGetScreenResources(x11->display, x11->rootwin); + XRRScreenResources *r = XRRGetScreenResourcesCurrent(x11->display, x11->rootwin); if (!r) { MP_VERBOSE(x11, "Xrandr doesn't work.\n"); return; -- cgit v1.2.3