diff options
author | wm4 <wm4@nowhere> | 2013-09-08 02:12:36 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-09-08 03:03:58 +0200 |
commit | 68e331851ad206b7504353e864d5720c9d0d73e1 (patch) | |
tree | 7f34dadb6e557e3c3e3d4ee2d6996dddf3c666ec /video | |
parent | 0509532d702e53ec77e47c38a3c92575a8843dcb (diff) | |
download | mpv-68e331851ad206b7504353e864d5720c9d0d73e1.tar.bz2 mpv-68e331851ad206b7504353e864d5720c9d0d73e1.tar.xz |
options: remove --(no-)mouseinput option
I have no idea why it exists, as it's redundant to --(no-)mouse-movements.
Diffstat (limited to 'video')
-rw-r--r-- | video/out/vo_caca.c | 4 | ||||
-rw-r--r-- | video/out/w32_common.c | 2 | ||||
-rw-r--r-- | video/out/x11_common.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/video/out/vo_caca.c b/video/out/vo_caca.c index 4d457eb57b..c71527d445 100644 --- a/video/out/vo_caca.c +++ b/video/out/vo_caca.c @@ -175,12 +175,12 @@ static void check_events(struct vo *vo) vo_mouse_movement(vo, cev.data.mouse.x, cev.data.mouse.y); break; case CACA_EVENT_MOUSE_PRESS: - if (!vo->opts->nomouse_input) + if (vo->opts->enable_mouse_movements) mp_input_put_key(vo->input_ctx, (MP_MOUSE_BTN0 + cev.data.mouse.button - 1) | MP_KEY_STATE_DOWN); break; case CACA_EVENT_MOUSE_RELEASE: - if (!vo->opts->nomouse_input) + if (vo->opts->enable_mouse_movements) mp_input_put_key(vo->input_ctx, (MP_MOUSE_BTN0 + cev.data.mouse.button - 1) | MP_KEY_STATE_UP); break; diff --git a/video/out/w32_common.c b/video/out/w32_common.c index 78ea91fa1b..c2d0ac5535 100644 --- a/video/out/w32_common.c +++ b/video/out/w32_common.c @@ -279,7 +279,7 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, break; } - if (mouse_button && !vo->opts->nomouse_input) { + if (mouse_button && vo->opts->enable_mouse_movements) { int x = GET_X_LPARAM(lParam); int y = GET_Y_LPARAM(lParam); mouse_button |= mod_state(vo); diff --git a/video/out/x11_common.c b/video/out/x11_common.c index c8716d0a55..7c06ebf121 100644 --- a/video/out/x11_common.c +++ b/video/out/x11_common.c @@ -1632,7 +1632,7 @@ static void vo_x11_selectinput_witherr(struct vo *vo, Window w, long event_mask) { - if (vo->opts->nomouse_input) + if (!vo->opts->enable_mouse_movements) event_mask &= ~(ButtonPressMask | ButtonReleaseMask); XSelectInput(display, w, NoEventMask); |