e_comp_wl: not sending keyevents if vkbd grabs key inputs

Change-Id: I7ff829cbeb4af1e73f88e74e8d9cbeb0ffdc39e2

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index c081fe7e751ce3eeb7e0ecda6f361fe313c4887d..896fff281e9e35c741fa1adb0c66427a15a1c9cd 100755 (executable)
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -1433,21 +1433,24 @@ _e_comp_wl_cb_key_down(void *event)
    /* update modifier state */
    e_comp_wl_input_keyboard_state_update(cdata, keycode, EINA_TRUE);
 
-   if ((ec = e_client_focused_get()))
+   if ((!e_client_action_get()) && (!e_comp->input_key_grabs) && (!e_menu_grab_window_get()))
      {
-        if (ec->comp_data->surface)
+        if ((ec = e_client_focused_get()))
           {
-             struct wl_client *wc;
-             struct wl_resource *res;
-             Eina_List *l;
-
-             wc = wl_resource_get_client(ec->comp_data->surface);
-             serial = wl_display_next_serial(cdata->wl.disp);
-             EINA_LIST_FOREACH(cdata->kbd.resources, l, res)
+             if (ec->comp_data->surface)
                {
-                  if (wl_resource_get_client(res) != wc) continue;
-                  wl_keyboard_send_key(res, serial, ev->timestamp,
-                                       keycode, WL_KEYBOARD_KEY_STATE_PRESSED);
+                  struct wl_client *wc;
+                  struct wl_resource *res;
+                  Eina_List *l;
+
+                  wc = wl_resource_get_client(ec->comp_data->surface);
+                  serial = wl_display_next_serial(cdata->wl.disp);
+                  EINA_LIST_FOREACH(cdata->kbd.resources, l, res)
+                    {
+                       if (wl_resource_get_client(res) != wc) continue;
+                       wl_keyboard_send_key(res, serial, ev->timestamp,
+                                            keycode, WL_KEYBOARD_KEY_STATE_PRESSED);
+                    }
                }
           }
      }
@@ -1480,21 +1483,24 @@ _e_comp_wl_cb_key_up(void *event)
    /* update modifier state */
    e_comp_wl_input_keyboard_state_update(cdata, keycode, EINA_FALSE);
 
-   if ((ec = e_client_focused_get()))
+   if ((!e_client_action_get()) && (!e_comp->input_key_grabs) && (!e_menu_grab_window_get()))
      {
-        if (ec->comp_data->surface)
+        if ((ec = e_client_focused_get()))
           {
-             struct wl_client *wc;
-             struct wl_resource *res;
-             Eina_List *l;
-
-             wc = wl_resource_get_client(ec->comp_data->surface);
-             serial = wl_display_next_serial(cdata->wl.disp);
-             EINA_LIST_FOREACH(cdata->kbd.resources, l, res)
+             if (ec->comp_data->surface)
                {
-                  if (wl_resource_get_client(res) != wc) continue;
-                  wl_keyboard_send_key(res, serial, ev->timestamp,
-                                       keycode, WL_KEYBOARD_KEY_STATE_RELEASED);
+                  struct wl_client *wc;
+                  struct wl_resource *res;
+                  Eina_List *l;
+
+                  wc = wl_resource_get_client(ec->comp_data->surface);
+                  serial = wl_display_next_serial(cdata->wl.disp);
+                  EINA_LIST_FOREACH(cdata->kbd.resources, l, res)
+                    {
+                       if (wl_resource_get_client(res) != wc) continue;
+                       wl_keyboard_send_key(res, serial, ev->timestamp,
+                                            keycode, WL_KEYBOARD_KEY_STATE_RELEASED);
+                    }
                }
           }
      }