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

wayland: remove mp_fifo

This commit is contained in:
Alexander Preisinger 2013-07-02 18:56:50 +02:00
parent 37c5867703
commit 8ea39d548b
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
video/out/wayland_common.c
View File

@ -276,9 +276,9 @@ static void keyboard_handle_key(void *data,
if (sym != XKB_KEY_NoSymbol && (mpkey = lookupkey(sym))) {
if (state == WL_KEYBOARD_KEY_STATE_PRESSED)
mplayer_put_key(wl->vo->key_fifo, mpkey | MP_KEY_STATE_DOWN);
mp_input_put_key(wl->vo->input_ctx, mpkey | MP_KEY_STATE_DOWN);
else
mplayer_put_key(wl->vo->key_fifo, mpkey | MP_KEY_STATE_UP);
mp_input_put_key(wl->vo->input_ctx, mpkey | MP_KEY_STATE_UP);
}
}
@ -320,7 +320,7 @@ static void pointer_handle_enter(void *data,
/* Release the left button on pointer enter again
* because after moving the shell surface no release event is sent */
mplayer_put_key(wl->vo->key_fifo, MP_MOUSE_BTN0 | MP_KEY_STATE_UP);
mp_input_put_key(wl->vo->input_ctx, MP_MOUSE_BTN0 | MP_KEY_STATE_UP);
show_cursor(wl);
}
@ -330,7 +330,7 @@ static void pointer_handle_leave(void *data,
struct wl_surface *surface)
{
struct vo_wayland_state *wl = data;
mplayer_put_key(wl->vo->key_fifo, MP_KEY_MOUSE_LEAVE);
mp_input_put_key(wl->vo->input_ctx, MP_KEY_MOUSE_LEAVE);
}
static void pointer_handle_motion(void *data,
@ -356,7 +356,7 @@ static void pointer_handle_button(void *data,
{
struct vo_wayland_state *wl = data;
mplayer_put_key(wl->vo->key_fifo, MP_MOUSE_BTN0 + (button - BTN_LEFT) |
mp_input_put_key(wl->vo->input_ctx, MP_MOUSE_BTN0 + (button - BTN_LEFT) |
((state == WL_POINTER_BUTTON_STATE_PRESSED)
? MP_KEY_STATE_DOWN : MP_KEY_STATE_UP));
@ -374,9 +374,9 @@ static void pointer_handle_axis(void *data,
if (axis == WL_POINTER_AXIS_VERTICAL_SCROLL) {
if (value > 0)
mplayer_put_key(wl->vo->key_fifo, MP_MOUSE_BTN4);
mp_input_put_key(wl->vo->input_ctx, MP_MOUSE_BTN4);
if (value < 0)
mplayer_put_key(wl->vo->key_fifo, MP_MOUSE_BTN3);
mp_input_put_key(wl->vo->input_ctx, MP_MOUSE_BTN3);
}
}