kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

efl-wl: match nested wl seats based on display ordering 

a nested compositor will have a mismatch between canvas seat id and
compositor seat id, so this attempts to perform matching based on the
order that they are listed, which should be identical

@fix
This commit is contained in:
Mike Blumenkrantz 2017-08-23 14:24:11 -04:00
parent 91f513f77d
commit 2510afe821
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4149,14 +4149,27 @@ comp_seat_proxy_update(Comp_Seat *s)
{
Eina_Iterator *it;
Ecore_Wl2_Input *input;
Eina_Bool drm;
Ecore_Wl2_Window *win;
int n = 0, i = 0;
if (s->seat) return;
drm = !ecore_evas_wayland2_window_get(ecore_evas_ecore_evas_get(s->c->evas));
win = ecore_evas_wayland2_window_get(ecore_evas_ecore_evas_get(s->c->evas));
if (win)
{
Ecore_Wl2_Display *ewd = ecore_wl2_window_display_get(win);
it = ecore_wl2_display_inputs_get(ewd);
EINA_ITERATOR_FOREACH(it, input)
{
if (ecore_wl2_input_seat_id_get(input) == evas_device_seat_id_get(s->dev))
break;
n++;
}
eina_iterator_free(it);
}
it = ecore_wl2_display_inputs_get(s->c->parent_disp);
EINA_ITERATOR_FOREACH(it, input)
{
if (drm)
if (!win)
{
if (eina_streq(ecore_wl2_input_name_get(input), evas_device_name_get(s->dev)))
{
@ -4164,14 +4177,12 @@ comp_seat_proxy_update(Comp_Seat *s)
break;
}
}
else
else if (i == n)
{
if (ecore_wl2_input_seat_id_get(input) == evas_device_seat_id_get(s->dev))
{
s->seat = input;
break;
}
s->seat = input;
break;
}
i++;
}
eina_iterator_free(it);
}