summaryrefslogtreecommitdiffstats
path: root/options
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 /options
parent5649658c4e12eb98af9da3a21b644c40cd1b2313 (diff)
downloadmpv-eb5a83e1c110234b3e835b7a76d83e1ddaa7bfb5.tar.bz2
mpv-eb5a83e1c110234b3e835b7a76d83e1ddaa7bfb5.tar.xz
x11: add --on-all-workspaces option and property
Fixes #1469.
Diffstat (limited to 'options')
-rw-r--r--options/options.c1
-rw-r--r--options/options.h4
2 files changed, 4 insertions, 1 deletions
diff --git a/options/options.c b/options/options.c
index 9033241605..aeec497b84 100644
--- a/options/options.c
+++ b/options/options.c
@@ -370,6 +370,7 @@ const m_option_t mp_opts[] = {
OPT_FLAG("force-window", force_vo, CONF_GLOBAL),
OPT_FLAG("ontop", vo.ontop, M_OPT_FIXED),
OPT_FLAG("border", vo.border, M_OPT_FIXED),
+ OPT_FLAG("on-all-workspaces", vo.all_workspaces, M_OPT_FIXED),
OPT_FLAG("window-dragging", allow_win_drag, CONF_GLOBAL),
diff --git a/options/options.h b/options/options.h
index 3784cf5546..00b4b588dd 100644
--- a/options/options.h
+++ b/options/options.h
@@ -10,6 +10,9 @@ typedef struct mp_vo_opts {
int ontop;
int fullscreen;
+ int border;
+ int all_workspaces;
+
int screen_id;
int fsscreen_id;
int fs_black_out_screens;
@@ -30,7 +33,6 @@ typedef struct mp_vo_opts {
int keepaspect;
int keepaspect_window;
- int border;
int64_t WinID;