summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-01-16 23:09:06 +0100
committerwm4 <wm4@nowhere>2015-01-16 23:09:06 +0100
commit5649658c4e12eb98af9da3a21b644c40cd1b2313 (patch)
tree90af9232f0da604d637bcb248e56c79b9aa15bef
parentfc524e8a0704670d2e7daad36e54b66daf93e3d8 (diff)
downloadmpv-5649658c4e12eb98af9da3a21b644c40cd1b2313.tar.bz2
mpv-5649658c4e12eb98af9da3a21b644c40cd1b2313.tar.xz
x11: minor cleanup
No reason for these functions to exist separately...
-rw-r--r--video/out/x11_common.c22
1 files changed, 4 insertions, 18 deletions
diff --git a/video/out/x11_common.c b/video/out/x11_common.c
index cb5f9c524c..e280349d24 100644
--- a/video/out/x11_common.c
+++ b/video/out/x11_common.c
@@ -1599,20 +1599,6 @@ static void vo_x11_fullscreen(struct vo *vo)
x11->pos_changed_during_fs = false;
}
-static void vo_x11_ontop(struct vo *vo)
-{
- struct mp_vo_opts *opts = vo->opts;
- opts->ontop = !opts->ontop;
-
- vo_x11_setlayer(vo, opts->ontop);
-}
-
-static void vo_x11_border(struct vo *vo)
-{
- vo->opts->border = !vo->opts->border;
- vo_x11_decoration(vo, vo->opts->border);
-}
-
int vo_x11_control(struct vo *vo, int *events, int request, void *arg)
{
struct mp_vo_opts *opts = vo->opts;
@@ -1624,14 +1610,14 @@ int vo_x11_control(struct vo *vo, int *events, int request, void *arg)
case VOCTRL_FULLSCREEN:
opts->fullscreen = !opts->fullscreen;
vo_x11_fullscreen(vo);
- *events |= VO_EVENT_RESIZE;
return VO_TRUE;
case VOCTRL_ONTOP:
- vo_x11_ontop(vo);
+ opts->ontop = !opts->ontop;
+ vo_x11_setlayer(vo, opts->ontop);
return VO_TRUE;
case VOCTRL_BORDER:
- vo_x11_border(vo);
- *events |= VO_EVENT_RESIZE;
+ opts->border = !opts->border;
+ vo_x11_decoration(vo, vo->opts->border);
return VO_TRUE;
case VOCTRL_GET_UNFS_WINDOW_SIZE: {
int *s = arg;