diff options
| author | Bruno Dilly <bdilly@profusion.mobi> | 2017-03-23 19:00:44 -0300 |
|---|---|---|
| committer | Bruno Dilly <bdilly@profusion.mobi> | 2017-03-24 14:14:38 -0300 |
| commit | e0170c2b0dbadb98d8e3c9f831b88764f1f8aa26 (patch) | |
| tree | 2fad2edc26b98dca1d00ba142b5e54b65f820f2e | |
| parent | 1a3bae8133a738effa6dd01f79d9226df2fcca9c (diff) | |
| download | efl-e0170c2b0dbadb98d8e3c9f831b88764f1f8aa26.tar.gz | |
evas_events: look for seats on hash instead of input devices
Summary:
Otherwise it won't ever find the modifier masks.
Fixes T5146
@fix
Reviewers: iscaro, Jaehyun_Cho
Subscribers: cedric, jpeg
Maniphest Tasks: T5146
Differential Revision: https://phab.enlightenment.org/D4738
| -rw-r--r-- | src/lib/evas/canvas/evas_events.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/lib/evas/canvas/evas_events.c b/src/lib/evas/canvas/evas_events.c index 82c6dd7c38..cfaee6eaca 100644 --- a/src/lib/evas/canvas/evas_events.c +++ b/src/lib/evas/canvas/evas_events.c @@ -3110,9 +3110,12 @@ _canvas_event_feed_key_down_internal(Evas_Public_Data *e, Efl_Input_Key_Data *ev Eina_List *l; Evas_Key_Grab *g; Evas_Modifier_Mask *seat_mask, modifier_mask; + Efl_Input_Device *seat = NULL; e->walking_grabs++; - seat_mask = eina_hash_find(e->modifiers.masks, &ev->device); + if (ev->device) + seat = efl_input_device_seat_get(ev->device); + seat_mask = eina_hash_find(e->modifiers.masks, &seat); modifier_mask = seat_mask ? *seat_mask : 0; EINA_LIST_FOREACH(e->grabs, l, g) { @@ -3200,9 +3203,12 @@ _canvas_event_feed_key_up_internal(Evas_Public_Data *e, Efl_Input_Key_Data *ev) Eina_List *l; Evas_Key_Grab *g; Evas_Modifier_Mask *seat_mask, modifier_mask; + Efl_Input_Device *seat = NULL; e->walking_grabs++; - seat_mask = eina_hash_find(e->modifiers.masks, &ev->device); + if (ev->device) + seat = efl_input_device_seat_get(ev->device); + seat_mask = eina_hash_find(e->modifiers.masks, &seat); modifier_mask = seat_mask ? *seat_mask : 0; EINA_LIST_FOREACH(e->grabs, l, g) { |