summaryrefslogtreecommitdiffstats
path: root/input
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-10-09 18:28:37 +0200
committerwm4 <wm4@nowhere>2014-10-09 18:28:37 +0200
commite294656cb11082a77f2e785fb55ddafa926bbc47 (patch)
treece2c6c09aa15567b78ae9c311de81a90f15c3346 /input
parentfef9ea5f6282b294cc1863dcc9e630e5ad9684ba (diff)
downloadmpv-e294656cb11082a77f2e785fb55ddafa926bbc47.tar.bz2
mpv-e294656cb11082a77f2e785fb55ddafa926bbc47.tar.xz
client API: rename --input-x11-keyboard to --input-vo-keyboard
Apparently we need this for Cocoa too. (The option was X11 specific in the hope that only X11 would need this hack.)
Diffstat (limited to 'input')
-rw-r--r--input/input.c11
-rw-r--r--input/input.h2
2 files changed, 7 insertions, 6 deletions
diff --git a/input/input.c b/input/input.c
index dd3e0b33c4..35377251d1 100644
--- a/input/input.c
+++ b/input/input.c
@@ -175,7 +175,7 @@ struct input_opts {
int use_media_keys;
int default_bindings;
int enable_mouse_movements;
- int x11_key_input;
+ int vo_key_input;
int test;
};
@@ -196,7 +196,8 @@ const struct m_sub_options input_config = {
OPT_FLAG("right-alt-gr", use_alt_gr, CONF_GLOBAL),
OPT_INTRANGE("key-fifo-size", key_fifo_size, CONF_GLOBAL, 2, 65000),
OPT_FLAG("cursor", enable_mouse_movements, CONF_GLOBAL),
- OPT_FLAG("x11-keyboard", x11_key_input, CONF_GLOBAL),
+ OPT_FLAG("vo-keyboard", vo_key_input, CONF_GLOBAL),
+ OPT_FLAG("x11-keyboard", vo_key_input, CONF_GLOBAL), // old alias
#if HAVE_LIRC
OPT_STRING("lirc-conf", lirc_configfile, CONF_GLOBAL),
#endif
@@ -220,7 +221,7 @@ const struct m_sub_options input_config = {
.use_media_keys = 1,
#endif
.default_bindings = 1,
- .x11_key_input = 1,
+ .vo_key_input = 1,
},
};
@@ -709,10 +710,10 @@ bool mp_input_mouse_enabled(struct input_ctx *ictx)
return r;
}
-bool mp_input_x11_keyboard_enabled(struct input_ctx *ictx)
+bool mp_input_vo_keyboard_enabled(struct input_ctx *ictx)
{
input_lock(ictx);
- bool r = ictx->opts->x11_key_input;
+ bool r = ictx->opts->vo_key_input;
input_unlock(ictx);
return r;
}
diff --git a/input/input.h b/input/input.h
index 39489fff75..02257d9c85 100644
--- a/input/input.h
+++ b/input/input.h
@@ -156,7 +156,7 @@ void mp_input_get_mouse_pos(struct input_ctx *ictx, int *x, int *y);
// Return whether we want/accept mouse input.
bool mp_input_mouse_enabled(struct input_ctx *ictx);
-bool mp_input_x11_keyboard_enabled(struct input_ctx *ictx);
+bool mp_input_vo_keyboard_enabled(struct input_ctx *ictx);
/* Make mp_input_set_mouse_pos() mangle the mouse coordinates. Hack for certain
* VOs. dst=NULL, src=NULL reset it. src can be NULL.