From 0f378c933155f6da1df1283c0dc2ba222dcb95b8 Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Wed, 6 Jun 2012 12:55:53 +0000 Subject: [PATCH] Ecore_Wayland: Use the input's pointer_enter_serial instead of timestamp for setting pointer image. SVN revision: 71748 --- legacy/ecore/src/lib/ecore_wayland/ecore_wl_input.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/legacy/ecore/src/lib/ecore_wayland/ecore_wl_input.c b/legacy/ecore/src/lib/ecore_wayland/ecore_wl_input.c index 3bd12b61d0..3bc3ce1407 100644 --- a/legacy/ecore/src/lib/ecore_wayland/ecore_wl_input.c +++ b/legacy/ecore/src/lib/ecore_wayland/ecore_wl_input.c @@ -150,7 +150,8 @@ ecore_wl_input_pointer_set(Ecore_Wl_Input *input, struct wl_buffer *buffer, int LOGFN(__FILE__, __LINE__, __FUNCTION__); if (input) - wl_pointer_attach(input->pointer, input->timestamp, buffer, hot_x, hot_y); + wl_pointer_attach(input->pointer, input->pointer_enter_serial, + buffer, hot_x, hot_y); } EAPI void @@ -481,8 +482,10 @@ _ecore_wl_input_cb_keyboard_key(void *data, struct wl_keyboard *keyboard __UNUSE if ((!win) || (win->keyboard_device != input)) return; num = xkb_key_get_syms(input->display->xkb.state, code, &syms); + xkb_state_update_key(input->display->xkb.state, code, (state ? XKB_KEY_DOWN : XKB_KEY_UP)); + mask = xkb_state_serialize_mods(input->display->xkb.state, (XKB_STATE_DEPRESSED | XKB_STATE_LATCHED)); input->modifiers = 0;