usergreen
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Pull Requests Activity

efl-wl: fix no-op of setting keyboard enter on already-entered surface 

@fix
This commit is contained in:
Mike Blumenkrantz 2018-01-24 16:13:42 -05:00
parent a524ab1fe3
commit 4a32e2456e
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/lib/efl_wl/efl_wl.c
View File

@ -1107,11 +1107,13 @@ comp_seats_redo_enter(Comp *c, Comp_Surface *cs)
{ {
Eina_List *l, *ll; Eina_List *l, *ll;
struct wl_resource *res; struct wl_resource *res;
if (c->active_surface && (cs != c->active_surface)) Eina_Bool same = s->kbd.enter == cs;
if (c->active_surface && (!same))
{ {
l = seat_kbd_active_resources_get(s); l = seat_kbd_active_resources_get(s);
EINA_LIST_FOREACH(l, ll, res) EINA_LIST_FOREACH(l, ll, res)
wl_keyboard_send_leave(res, serial, c->active_surface->res); wl_keyboard_send_leave(res, serial, s->kbd.enter->res);
} }
s->active_client = client; s->active_client = client;
if (cs) if (cs)
@ -1119,12 +1121,13 @@ comp_seats_redo_enter(Comp *c, Comp_Surface *cs)
l = seat_kbd_active_resources_get(s); l = seat_kbd_active_resources_get(s);
EINA_LIST_FOREACH(l, ll, res) EINA_LIST_FOREACH(l, ll, res)
{ {
wl_keyboard_send_enter(res, serial, cs->res, &s->kbd.keys); if (!same)
wl_keyboard_send_enter(res, serial, cs->res, &s->kbd.keys);
comp_seat_send_modifiers(s, res, serial); comp_seat_send_modifiers(s, res, serial);
} }
} }
s->kbd.enter = cs; s->kbd.enter = cs;
if (s->kbd.enter && s->selection_source) if (s->kbd.enter && s->selection_source && (!same))
comp_seat_kbd_data_device_enter(s); comp_seat_kbd_data_device_enter(s);
} }
c->active_surface = cs; c->active_surface = cs;