From e0d3dc3857797c886b3d53c13d153492531a4bcc Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 19 Jun 2013 18:45:02 +0200 Subject: mplayer: don't hide mouse cursor if mouse is inside mouse area --- core/input/input.c | 4 ++++ core/mplayer.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core/input/input.c b/core/input/input.c index ba35efd0e6..038d6507bb 100644 --- a/core/input/input.c +++ b/core/input/input.c @@ -2169,5 +2169,9 @@ int mp_input_check_interrupt(struct input_ctx *ictx, int time) unsigned int mp_input_get_mouse_event_counter(struct input_ctx *ictx) { + // Make the frontend always display the mouse cursor (as long as it's not + // forced invisible) if mouse input is desired. + if (mp_input_test_mouse_active(ictx, ictx->mouse_x, ictx->mouse_y)) + ictx->mouse_event_counter++; return ictx->mouse_event_counter; } diff --git a/core/mplayer.c b/core/mplayer.c index 567e38e285..eb99b0d2d2 100644 --- a/core/mplayer.c +++ b/core/mplayer.c @@ -3378,7 +3378,7 @@ static void run_playloop(struct MPContext *mpctx) // ================================================================ vo_check_events(vo); - double mouse_event_ts = mp_input_get_mouse_event_counter(mpctx->input); + unsigned mouse_event_ts = mp_input_get_mouse_event_counter(mpctx->input); if (mpctx->mouse_event_ts != mouse_event_ts) { mpctx->mouse_event_ts = mouse_event_ts; if (opts->vo.cursor_autohide_delay > -1) { -- cgit v1.2.3