summaryrefslogtreecommitdiffstats
path: root/player
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-01-16 23:38:47 +0100
committerwm4 <wm4@nowhere>2015-01-16 23:38:47 +0100
commiteb5a83e1c110234b3e835b7a76d83e1ddaa7bfb5 (patch)
tree16189fc460f5f2fb5cc9920a8d1e72a0e18f7fcc /player
parent5649658c4e12eb98af9da3a21b644c40cd1b2313 (diff)
downloadmpv-eb5a83e1c110234b3e835b7a76d83e1ddaa7bfb5.tar.bz2
mpv-eb5a83e1c110234b3e835b7a76d83e1ddaa7bfb5.tar.xz
x11: add --on-all-workspaces option and property
Fixes #1469.
Diffstat (limited to 'player')
-rw-r--r--player/command.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/player/command.c b/player/command.c
index 14b3cac7c2..bfdc823018 100644
--- a/player/command.c
+++ b/player/command.c
@@ -2272,6 +2272,14 @@ static int mp_property_border(void *ctx, struct m_property *prop,
&mpctx->opts->vo.border, mpctx);
}
+static int mp_property_all_workspaces(void *ctx, struct m_property *prop,
+ int action, void *arg)
+{
+ MPContext *mpctx = ctx;
+ return mp_property_vo_flag(prop, action, arg, VOCTRL_ALL_WORKSPACES,
+ &mpctx->opts->vo.all_workspaces, mpctx);
+}
+
static int get_frame_count(struct MPContext *mpctx)
{
struct demuxer *demuxer = mpctx->demuxer;
@@ -3309,6 +3317,7 @@ static const struct m_property mp_properties[] = {
{"colormatrix-primaries", mp_property_primaries},
{"ontop", mp_property_ontop},
{"border", mp_property_border},
+ {"on-all-workspaces", mp_property_all_workspaces},
{"framedrop", mp_property_framedrop},
{"gamma", mp_property_video_color},
{"brightness", mp_property_video_color},