summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2016-01-22 13:13:08 -0500
committerMike Blumenkrantz <zmike@osg.samsung.com>2016-02-02 13:36:56 -0500
commite84ea043ac1494189b970b5b87c4d7efd5763069 (patch)
tree5da2daccf8dbca707011dfd4662fd27dfbd23d8e
parent7e3e2db2be72beb548a66983fa0e7b472b4c240e (diff)
remove comp canvas key handler shortcuts for passing keys to wayland clients
now handled normally by disabling bindings
-rw-r--r--src/bin/e_comp_canvas.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/src/bin/e_comp_canvas.c b/src/bin/e_comp_canvas.c
index 72a108b5b..a126d0529 100644
--- a/src/bin/e_comp_canvas.c
+++ b/src/bin/e_comp_canvas.c
@@ -101,13 +101,6 @@ static Eina_Bool
101_e_comp_cb_key_down(void *data EINA_UNUSED, int ev_type EINA_UNUSED, Ecore_Event_Key *ev) 101_e_comp_cb_key_down(void *data EINA_UNUSED, int ev_type EINA_UNUSED, Ecore_Event_Key *ev)
102{ 102{
103 e_screensaver_notidle(); 103 e_screensaver_notidle();
104 if (e_menu_grab_window_get())
105 {
106#ifdef HAVE_WAYLAND
107 e_comp_wl_key_down(ev);
108#endif
109 return ECORE_CALLBACK_RENEW;
110 }
111 if ((e_comp->comp_type == E_PIXMAP_TYPE_X) && (ev->event_window != e_comp->root)) 104 if ((e_comp->comp_type == E_PIXMAP_TYPE_X) && (ev->event_window != e_comp->root))
112 { 105 {
113 E_Client *ec; 106 E_Client *ec;
@@ -131,13 +124,6 @@ static Eina_Bool
131_e_comp_cb_key_up(void *data EINA_UNUSED, int ev_type EINA_UNUSED, Ecore_Event_Key *ev) 124_e_comp_cb_key_up(void *data EINA_UNUSED, int ev_type EINA_UNUSED, Ecore_Event_Key *ev)
132{ 125{
133 e_screensaver_notidle(); 126 e_screensaver_notidle();
134 if (e_menu_grab_window_get())
135 {
136#ifdef HAVE_WAYLAND
137 e_comp_wl_key_up(ev);
138#endif
139 return ECORE_CALLBACK_RENEW;
140 }
141 if ((e_comp->comp_type == E_PIXMAP_TYPE_X) && (ev->event_window != e_comp->root)) return ECORE_CALLBACK_PASS_ON; 127 if ((e_comp->comp_type == E_PIXMAP_TYPE_X) && (ev->event_window != e_comp->root)) return ECORE_CALLBACK_PASS_ON;
142 return !e_bindings_key_up_event_handle(E_BINDING_CONTEXT_MANAGER, E_OBJECT(e_comp), ev) 128 return !e_bindings_key_up_event_handle(E_BINDING_CONTEXT_MANAGER, E_OBJECT(e_comp), ev)
143#ifdef HAVE_WAYLAND 129#ifdef HAVE_WAYLAND