From af54ff826b124c7ed8642a8d163f210541da51c3 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 24 Feb 2013 17:00:52 +0100 Subject: Remove --rootwin option and rootwin property You can just use --wid=0 if you really want this. This only worked/works for X11, and even then it might interact badly with most desktop environments. All the option did was setting --wid to 0, and the property did nothing. --- video/out/vo.c | 1 - video/out/vo.h | 2 -- video/out/x11_common.c | 3 --- 3 files changed, 6 deletions(-) (limited to 'video') diff --git a/video/out/vo.c b/video/out/vo.c index a2eda768e7..aa34f7704a 100644 --- a/video/out/vo.c +++ b/video/out/vo.c @@ -57,7 +57,6 @@ int vo_fsmode = 0; float vo_panscan = 0.0f; int vo_refresh_rate=0; int vo_keepaspect=1; -int vo_rootwin=0; int vo_border=1; int64_t WinID = -1; diff --git a/video/out/vo.h b/video/out/vo.h index a6b760d52f..f26ec1baff 100644 --- a/video/out/vo.h +++ b/video/out/vo.h @@ -60,7 +60,6 @@ enum mp_voctrl { VOCTRL_REDRAW_FRAME, VOCTRL_ONTOP, - VOCTRL_ROOTWIN, VOCTRL_BORDER, VOCTRL_SET_DEINTERLACE, @@ -316,7 +315,6 @@ extern int vo_fsmode; extern float vo_panscan; extern int vo_refresh_rate; extern int vo_keepaspect; -extern int vo_rootwin; extern int vo_border; extern int vo_nomouse_input; diff --git a/video/out/x11_common.c b/video/out/x11_common.c index a78ca11402..6b34e1cc65 100644 --- a/video/out/x11_common.c +++ b/video/out/x11_common.c @@ -433,9 +433,6 @@ int vo_x11_init(struct vo *vo) }; vo->x11 = x11; - if (vo_rootwin) - WinID = 0; // use root window - XSetErrorHandler(x11_errorhandler); dispName = XDisplayName(NULL); -- cgit v1.2.3