summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-05-17 00:51:02 +0200
committerwm4 <wm4@nowhere>2014-05-17 00:53:53 +0200
commitc14721c8b930481cbfcfbb8cbbfdf32c68a170fc (patch)
tree3c95050b47aba75d8469093691ba524331e7f3b5 /video
parent9546274710deb36a3ea02e90f65673811b52db18 (diff)
downloadmpv-c14721c8b930481cbfcfbb8cbbfdf32c68a170fc.tar.bz2
mpv-c14721c8b930481cbfcfbb8cbbfdf32c68a170fc.tar.xz
x11: remove gravity restore code
It was added with 3813c685 in 2004. I'm not really sure why this gravity stuff would be needed; apparently it has to do with misplacements with broken WMs and had to be changed on fullscreen. Just get rid of it; it works perfectly fine without on modern WMs. The thread discussing this is here: http://mplayerhq.hu/pipermail/mplayer-dev-eng/2004-July/027674.html
Diffstat (limited to 'video')
-rw-r--r--video/out/x11_common.c9
-rw-r--r--video/out/x11_common.h1
2 files changed, 0 insertions, 10 deletions
diff --git a/video/out/x11_common.c b/video/out/x11_common.c
index 5d7390cc81..713b5071df 100644
--- a/video/out/x11_common.c
+++ b/video/out/x11_common.c
@@ -346,7 +346,6 @@ int vo_x11_init(struct vo *vo)
.olddecor = MWM_DECOR_ALL,
.oldfuncs = MWM_FUNC_MOVE | MWM_FUNC_CLOSE | MWM_FUNC_MINIMIZE |
MWM_FUNC_MAXIMIZE | MWM_FUNC_RESIZE,
- .old_gravity = NorthWestGravity,
};
vo->x11 = x11;
@@ -840,8 +839,6 @@ int vo_x11_check_events(struct vo *vo)
x11->window_hidden = false;
vo_x11_clearwindow(vo, x11->window);
vo_x11_update_geometry(vo);
- x11->vo_hint.win_gravity = x11->old_gravity;
- XSetWMNormalHints(display, x11->window, &x11->vo_hint);
break;
case DestroyNotify:
MP_WARN(x11, "Our window was destroyed, exiting\n");
@@ -1468,12 +1465,6 @@ static void vo_x11_fullscreen(struct vo *vo)
vo_x11_ewmh_fullscreen(x11, _NET_WM_STATE_ADD);
}
- XGetWMNormalHints(x11->display, x11->window, &x11->vo_hint, &(long){0});
- if (!(x11->vo_hint.flags & PWinGravity))
- x11->old_gravity = NorthWestGravity;
- else
- x11->old_gravity = x11->vo_hint.win_gravity;
-
if (!(x11->wm_type & vo_wm_FULLSCREEN)) { // not needed with EWMH fs
vo_x11_decoration(vo, opts->border && !x11->fs);
vo_x11_sizehint(vo, x, y, w, h, true);
diff --git a/video/out/x11_common.h b/video/out/x11_common.h
index 1b1f2d7f92..d410809c09 100644
--- a/video/out/x11_common.h
+++ b/video/out/x11_common.h
@@ -62,7 +62,6 @@ struct vo_x11_state {
XSizeHints vo_hint;
bool mouse_cursor_hidden;
int orig_layer;
- int old_gravity;
// Current actual window position (updated on window move/resize events).
int win_x;