diff options
| author | Emre Ucan <eucan@de.adit-jv.com> | 2015-05-18 11:26:42 +0200 |
|---|---|---|
| committer | Nobuhiko Tanibata <nobuhiko_tanibata@xddp.denso.co.jp> | 2015-06-15 16:23:33 +0900 |
| commit | d5503dd37fb0e0918492b10552fef27d9098b985 (patch) | |
| tree | d9168b8618a29aa78f1cd0f226dd2434a9dad27e /ivi-input-controller | |
| parent | ce8700f1c9139ed93b1f6efdbc65777cfdb08f27 (diff) | |
| download | wayland-ivi-extension-d5503dd37fb0e0918492b10552fef27d9098b985.tar.gz | |
ivi-input-controller: do not send enter/leave events at keyboard grabs
set_weston_focus is used instead
Signed-off-by: Emre Ucan <eucan@de.adit-jv.com>
Diffstat (limited to 'ivi-input-controller')
| -rw-r--r-- | ivi-input-controller/src/ivi-input-controller.c | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/ivi-input-controller/src/ivi-input-controller.c b/ivi-input-controller/src/ivi-input-controller.c index 45d37de..b76a9b0 100644 --- a/ivi-input-controller/src/ivi-input-controller.c +++ b/ivi-input-controller/src/ivi-input-controller.c @@ -228,14 +228,6 @@ keyboard_grab_key(struct weston_keyboard_grab *grab, uint32_t time, if (wl_resource_get_client(resource) != surface_client) continue; - if (grab->keyboard->focus != surface) { - if (grab->keyboard->focus != NULL) - wl_keyboard_send_leave(resource, serial, - grab->keyboard->focus->resource); - - wl_keyboard_send_enter(resource, serial, surface->resource, &grab->keyboard->keys); - grab->keyboard->focus = surface; - } wl_keyboard_send_key(resource, serial, time, key, state); } @@ -243,15 +235,6 @@ keyboard_grab_key(struct weston_keyboard_grab *grab, uint32_t time, if (wl_resource_get_client(resource) != surface_client) continue; - if (grab->keyboard->focus != surface) { - if (grab->keyboard->focus != NULL) - wl_keyboard_send_leave(resource, serial, - grab->keyboard->focus->resource); - - wl_keyboard_send_enter(resource, serial, surface->resource, - &grab->keyboard->keys); - grab->keyboard->focus = surface; - } wl_keyboard_send_key(resource, serial, time, key, state); } } @@ -290,15 +273,6 @@ keyboard_grab_modifiers(struct weston_keyboard_grab *grab, uint32_t serial, if (wl_resource_get_client(resource) != surface_client) continue; - if (grab->keyboard->focus != surface) { - if (grab->keyboard->focus != NULL) - wl_keyboard_send_leave(resource, serial, - grab->keyboard->focus->resource); - - wl_keyboard_send_enter(resource, serial, surface->resource, - &grab->keyboard->keys); - grab->keyboard->focus = surface; - } wl_keyboard_send_modifiers(resource, serial, mods_depressed, mods_latched, mods_locked, group); } @@ -307,15 +281,6 @@ keyboard_grab_modifiers(struct weston_keyboard_grab *grab, uint32_t serial, if (wl_resource_get_client(resource) != surface_client) continue; - if (grab->keyboard->focus != surface) { - if (grab->keyboard->focus != NULL) - wl_keyboard_send_leave(resource, serial, - grab->keyboard->focus->resource); - - wl_keyboard_send_enter(resource, serial, surface->resource, - &grab->keyboard->keys); - grab->keyboard->focus = surface; - } wl_keyboard_send_modifiers(resource, serial, mods_depressed, mods_latched, mods_locked, group); } |