summaryrefslogtreecommitdiffstats
path: root/options
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-05-16 00:47:13 +0200
committerwm4 <wm4@nowhere>2014-05-16 00:47:13 +0200
commitebd5bbd241f2b88b99a84fb899d3802e7c9b989d (patch)
treed91103a26d891d89c934b4d436863e7d4c5f10e5 /options
parentb6e675a9bcf05a2c52ce75e057ef522092610611 (diff)
downloadmpv-ebd5bbd241f2b88b99a84fb899d3802e7c9b989d.tar.bz2
mpv-ebd5bbd241f2b88b99a84fb899d3802e7c9b989d.tar.xz
x11: replace--[x11-]fstype option with --x11-netwm
Simplifies the code a lot. You can still use --x11-netwm=no to disable NetWM for whatever reasons.
Diffstat (limited to 'options')
-rw-r--r--options/options.c3
-rw-r--r--options/options.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/options/options.c b/options/options.c
index d3a10457a8..1e17854dba 100644
--- a/options/options.c
+++ b/options/options.c
@@ -509,7 +509,7 @@ const m_option_t mp_opts[] = {
OPT_INT64("wid", vo.WinID, CONF_GLOBAL),
#if HAVE_X11
- OPT_STRINGLIST("x11-fstype", vo.fstype_list, 0),
+ OPT_FLAG("x11-netwm", vo.x11_netwm, 0),
#endif
OPT_STRING("heartbeat-cmd", heartbeat_cmd, 0),
OPT_FLOAT("heartbeat-interval", heartbeat_interval, CONF_MIN, 0),
@@ -663,6 +663,7 @@ const struct MPOpts mp_default_opts = {
.keepaspect = 1,
.border = 1,
.WinID = -1,
+ .x11_netwm = 1,
},
.wintitle = "mpv - ${media-title}",
.heartbeat_interval = 30.0,
diff --git a/options/options.h b/options/options.h
index c9d0d82cf7..e7008846de 100644
--- a/options/options.h
+++ b/options/options.h
@@ -13,7 +13,7 @@ typedef struct mp_vo_opts {
int screen_id;
int fsscreen_id;
char *winname;
- char** fstype_list;
+ int x11_netwm;
int native_keyrepeat;
float panscan;