enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

pass keys through xkbcommon under wayland lockscreen 

ensure that key states are retained when unlocking
This commit is contained in:
Mike Blumenkrantz 2017-10-06 11:37:50 -04:00
parent 4ae2145330
commit 984a1facd9
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/bin/e_comp_canvas.c
View File

@ -112,7 +112,13 @@ _key_down(int ctx, Ecore_Event_Key *ev)
{
E_Desklock_Interface *iface = e_desklock_interface_current_get();
if (iface && iface->key_down)
return iface->key_down(ev);
{
#ifdef HAVE_WAYLAND
if (e_comp->comp_type == E_PIXMAP_TYPE_WL)
e_comp_wl_key_up(ev, NULL);
#endif
return iface->key_down(ev);
}
}
if ((e_comp->comp_type == E_PIXMAP_TYPE_X) && (ev->event_window != e_comp->root))
{
@ -156,7 +162,13 @@ _key_up(int ctx, Ecore_Event_Key *ev)
{
E_Desklock_Interface *iface = e_desklock_interface_current_get();
if (iface && iface->key_up)
return iface->key_up(ev);
{
#ifdef HAVE_WAYLAND
if (e_comp->comp_type == E_PIXMAP_TYPE_WL)
e_comp_wl_key_up(ev, NULL);
#endif
return iface->key_up(ev);
}
}
if ((e_comp->comp_type == E_PIXMAP_TYPE_X) && (ev->event_window != e_comp->root)) return ECORE_CALLBACK_PASS_ON;
return ((!e_comp->screen) ||