summaryrefslogtreecommitdiffstats
path: root/video
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 /video
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 'video')
-rw-r--r--video/out/x11_common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/video/out/x11_common.c b/video/out/x11_common.c
index 53b18ec5bb..79220d743f 100644
--- a/video/out/x11_common.c
+++ b/video/out/x11_common.c
@@ -1265,7 +1265,7 @@ static void vo_x11_map_window(struct vo *vo, struct mp_rect rc)
LeaveWindowMask;
if (mp_input_mouse_enabled(vo->input_ctx))
events |= PointerMotionMask | ButtonPressMask | ButtonReleaseMask;
- if (mp_input_x11_keyboard_enabled(vo->input_ctx))
+ if (mp_input_vo_keyboard_enabled(vo->input_ctx))
events |= KeyPressMask | KeyReleaseMask;
vo_x11_selectinput_witherr(vo, x11->display, x11->window, events);
XMapWindow(x11->display, x11->window);