discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=c054506d4e8ced9f1e261614b218ea35e7dab2b2

commit c054506d4e8ced9f1e261614b218ea35e7dab2b2
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Thu Jul 2 14:30:54 2015 -0400

    block wl key events from reaching clients during client actions or key grabs
---
 src/bin/e_comp_wl.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index fcfcaa8..6e9a14c 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -883,7 +883,7 @@ _e_comp_wl_cb_key_down(void *event)
         /* update modifier state */
         e_comp_wl_input_keyboard_state_update(keycode, EINA_TRUE);
 
-        if (ec->comp_data->surface)
+        if (ec->comp_data->surface && (!e_client_action_get()) && 
(!e_comp->input_key_grabs))
           {
              struct wl_client *wc;
              struct wl_resource *res;
@@ -931,7 +931,7 @@ _e_comp_wl_cb_key_up(void *event)
    e_comp_wl_input_keyboard_state_update(keycode, EINA_FALSE);
 
    ec = e_client_focused_get();
-   if ((ec) && (ec->comp_data->surface))
+   if ((ec) && (ec->comp_data->surface) && (!e_client_action_get()) && 
(!e_comp->input_key_grabs))
      {
         wc = wl_resource_get_client(ec->comp_data->surface);
      }

-- 


Reply via email to