From f2d71ad903786ee532d82b3ded9d0df0e7d37034 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Mon, 20 Jul 2015 13:26:09 -0400 Subject: [PATCH] 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 --- src/bin/e_comp_canvas.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bin/e_comp_canvas.c b/src/bin/e_comp_canvas.c index 70f610115..d494bafa3 100644 --- a/src/bin/e_comp_canvas.c +++ b/src/bin/e_comp_canvas.c @@ -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); }