summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-10-30 22:02:51 +0100
committerwm4 <wm4@nowhere>2013-10-30 22:19:31 +0100
commit7743ed2dc61a256afff53411b6629b25b0dd44ea (patch)
treefb311bf8283e45799f27f23218d03d3e2e55b8ae /video
parent4b2d93f103eac0ea33494b5597ea3fbf44de7dd0 (diff)
downloadmpv-7743ed2dc61a256afff53411b6629b25b0dd44ea.tar.bz2
mpv-7743ed2dc61a256afff53411b6629b25b0dd44ea.tar.xz
x11: remove ancient metacity hack
Tested with recent metacity; this code is not triggered anymore. The code was added in 2003 and probably has been unused for years.
Diffstat (limited to 'video')
-rw-r--r--video/out/x11_common.c15
1 files changed, 1 insertions, 14 deletions
diff --git a/video/out/x11_common.c b/video/out/x11_common.c
index 98a91bc3aa..0025ef90c3 100644
--- a/video/out/x11_common.c
+++ b/video/out/x11_common.c
@@ -371,24 +371,11 @@ static int vo_wm_detect(struct vo *vo)
// -- supports layers
if (x11_get_property(x11, x11->XA_WIN_PROTOCOLS, &args, &nitems)) {
MP_VERBOSE(x11, "Detected wm supports layers.\n");
- int metacity_hack = 0;
for (i = 0; i < nitems; i++) {
- if (args[i] == x11->XA_WIN_LAYER) {
+ if (args[i] == x11->XA_WIN_LAYER)
wm |= vo_wm_LAYER;
- metacity_hack |= 1;
- } else {
- /* metacity is the only window manager I know which reports
- * supporting only the _WIN_LAYER hint in _WIN_PROTOCOLS.
- * (what's more support for it is broken) */
- metacity_hack |= 2;
- }
}
XFree(args);
- if (wm && (metacity_hack == 1)) {
- // metacity claims to support layers, but it is not the truth :-)
- wm ^= vo_wm_LAYER;
- MP_VERBOSE(x11, "Using workaround for Metacity bugs.\n");
- }
}
// --- netwm
if (x11_get_property(x11, x11->XA_NET_SUPPORTED, &args, &nitems)) {