diff options
| -rw-r--r-- | fifo.c | 2 | ||||
| -rw-r--r-- | libvo/vo_sdl.c | 3 | ||||
| -rw-r--r-- | libvo/x11_common.c | 6 |
3 files changed, 2 insertions, 9 deletions
@@ -79,6 +79,8 @@ void mplayer_put_key(int code) { (code & ~MP_KEY_DOWN) >= MOUSE_BTN0_DBL && (code & ~MP_KEY_DOWN) <= MOUSE_BTN9_DBL) return; + // ignore mouse wheel down events since they can easily get stuck + if (code < (MOUSE_BTN3 | MP_KEY_DOWN) || code > (MOUSE_BTN4 | MP_KEY_DOWN)) mplayer_put_key_internal(code); if (code & MP_KEY_DOWN) { code &= ~MP_KEY_DOWN; diff --git a/libvo/vo_sdl.c b/libvo/vo_sdl.c index dafd845091..0f8f74046c 100644 --- a/libvo/vo_sdl.c +++ b/libvo/vo_sdl.c @@ -1190,9 +1190,6 @@ static void check_events (void) case SDL_MOUSEBUTTONDOWN: if(vo_nomouse_input) break; - if(event.button.button == 4 || event.button.button == 5) - mplayer_put_key(MOUSE_BTN0+event.button.button-1); - else mplayer_put_key((MOUSE_BTN0+event.button.button-1) | MP_KEY_DOWN); break; diff --git a/libvo/x11_common.c b/libvo/x11_common.c index 719eb43a42..3b2b821c0d 100644 --- a/libvo/x11_common.c +++ b/libvo/x11_common.c @@ -1106,12 +1106,6 @@ int vo_x11_check_events(Display * mydisplay) mouse_waiting_hide = 1; mouse_timer = GetTimerMS(); } - // Ignore mouse wheel press event. - if (Event.xbutton.button > 3) - { - mplayer_put_key(MOUSE_BTN0 + Event.xbutton.button - 1); - break; - } #ifdef HAVE_NEW_GUI // Ignore mouse button 1-3 under GUI. if (use_gui && (Event.xbutton.button >= 1) |