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

block compositor keybinds using more accurate x11 detection 

blocking based on event window here is only valid for true x11 compositors
and not just compositors with root windows

fixes keybind activation when running xwayland clients
This commit is contained in:
Mike Blumenkrantz 2015-07-20 13:26:09 -04:00
parent 35938839bd
commit f2d71ad903
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bin/e_comp_canvas.c
View File

@ -95,7 +95,7 @@ static Eina_Bool
_e_comp_cb_key_down(void *data EINA_UNUSED, int ev_type EINA_UNUSED, Ecore_Event_Key *ev)
{
if (e_menu_grab_window_get()) return ECORE_CALLBACK_RENEW;
if (e_comp->root && (ev->event_window != e_comp->root))
if ((e_comp->comp_type == E_PIXMAP_TYPE_X) && (ev->event_window != e_comp->root))
{
E_Client *ec;
@ -114,7 +114,7 @@ static Eina_Bool
_e_comp_cb_key_up(void *data EINA_UNUSED, int ev_type EINA_UNUSED, Ecore_Event_Key *ev)
{
if (e_menu_grab_window_get()) return ECORE_CALLBACK_RENEW;
if (e_comp->root && (ev->event_window != e_comp->root)) return ECORE_CALLBACK_PASS_ON;
if ((e_comp->comp_type == E_PIXMAP_TYPE_X) && (ev->event_window != e_comp->root)) return ECORE_CALLBACK_PASS_ON;
return !e_bindings_key_up_event_handle(E_BINDING_CONTEXT_MANAGER, E_OBJECT(e_comp), ev);
}