From eb5a83e1c110234b3e835b7a76d83e1ddaa7bfb5 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 16 Jan 2015 23:38:47 +0100
Subject: x11: add --on-all-workspaces option and property

Fixes #1469.
---
 options/options.c | 1 +
 options/options.h | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'options')

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;
 
-- 
cgit v1.2.3