RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

vo_sdl: use VOCTRL_SET_CURSOR_VISIBILITY

This commit is contained in:
wm4 2013-05-16 23:37:17 +02:00
parent c76c65441a
commit 6ab719f698
1 changed files with 3 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
video/out/vo_sdl.c
View File

@ -190,7 +190,6 @@ struct priv {
int num_targets; int num_targets;
int targets_size; int targets_size;
} osd_surfaces[MAX_OSD_PARTS]; } osd_surfaces[MAX_OSD_PARTS];
unsigned int mouse_timer;
int mouse_hidden; int mouse_hidden;
int brightness, contrast; int brightness, contrast;
@ -470,28 +469,8 @@ static void flip_page(struct vo *vo)
static void check_events(struct vo *vo) static void check_events(struct vo *vo)
{ {
struct priv *vc = vo->priv;
struct mp_vo_opts *opts = vo->opts;
SDL_Event ev; SDL_Event ev;
if (opts->cursor_autohide_delay >= 0) {
if (!vc->mouse_hidden &&
(GetTimerMS() - vc->mouse_timer >= opts->cursor_autohide_delay)) {
SDL_ShowCursor(0);
vc->mouse_hidden = 1;
}
} else if (opts->cursor_autohide_delay == -1) {
if (vc->mouse_hidden) {
SDL_ShowCursor(1);
vc->mouse_hidden = 0;
}
} else if (opts->cursor_autohide_delay == -2) {
if (!vc->mouse_hidden) {
SDL_ShowCursor(0);
vc->mouse_hidden = 1;
}
}
while (SDL_PollEvent(&ev)) { while (SDL_PollEvent(&ev)) {
switch (ev.type) { switch (ev.type) {
case SDL_WINDOWEVENT: case SDL_WINDOWEVENT:
@ -554,28 +533,13 @@ static void check_events(struct vo *vo)
break; break;
} }
case SDL_MOUSEMOTION: case SDL_MOUSEMOTION:
if (opts->cursor_autohide_delay >= 0) {
SDL_ShowCursor(1);
vc->mouse_hidden = 0;
vc->mouse_timer = GetTimerMS();
}
vo_mouse_movement(vo, ev.motion.x, ev.motion.y); vo_mouse_movement(vo, ev.motion.x, ev.motion.y);
break; break;
case SDL_MOUSEBUTTONDOWN: case SDL_MOUSEBUTTONDOWN:
if (opts->cursor_autohide_delay >= 0) {
SDL_ShowCursor(1);
vc->mouse_hidden = 0;
vc->mouse_timer = GetTimerMS();
}
mplayer_put_key(vo->key_fifo, mplayer_put_key(vo->key_fifo,
(MP_MOUSE_BTN0 + ev.button.button - 1) | MP_KEY_STATE_DOWN); (MP_MOUSE_BTN0 + ev.button.button - 1) | MP_KEY_STATE_DOWN);
break; break;
case SDL_MOUSEBUTTONUP: case SDL_MOUSEBUTTONUP:
if (opts->cursor_autohide_delay >= 0) {
SDL_ShowCursor(1);
vc->mouse_hidden = 0;
vc->mouse_timer = GetTimerMS();
}
mplayer_put_key(vo->key_fifo, mplayer_put_key(vo->key_fifo,
(MP_MOUSE_BTN0 + ev.button.button - 1)); (MP_MOUSE_BTN0 + ev.button.button - 1));
break; break;
@ -793,9 +757,6 @@ static int preinit(struct vo *vo, const char *arg)
// we don't have proper event handling // we don't have proper event handling
vo->wakeup_period = 0.02; vo->wakeup_period = 0.02;
// initialize the autohide timer properly
vc->mouse_timer = GetTimerMS();
return 0; return 0;
} }
@ -1012,6 +973,9 @@ static int control(struct vo *vo, uint32_t request, void *data)
args->out_image = get_screenshot(vo); args->out_image = get_screenshot(vo);
return true; return true;
} }
case VOCTRL_SET_CURSOR_VISIBILITY:
SDL_ShowCursor(*(bool *)data);
return true;
} }
return VO_NOTIMPL; return VO_NOTIMPL;
} }