[EGIT] [core/enlightenment] enlightenment-0.22 41/45: don't do x11 window grab for fps counter when running in wayland mode

[Mike Blumenkrantz]

discomfitor pushed a commit to branch enlightenment-0.22.

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

commit a0985dc6c004e3bd5d613802e08934fb8afaecb7
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Mon Jan 22 16:21:28 2018 -0500

    don't do x11 window grab for fps counter when running in wayland mode
    
    this crashes older efl
---
 src/bin/e_comp_x.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c
index bce81bef2..5ba087032 100644
--- a/src/bin/e_comp_x.c
+++ b/src/bin/e_comp_x.c
@@ -5376,9 +5376,10 @@ _e_comp_x_del(E_Comp *c)
 {
    unsigned int i;
 
-   ecore_x_window_key_ungrab(c->root, "F", ECORE_EVENT_MODIFIER_SHIFT |
-                             ECORE_EVENT_MODIFIER_CTRL |
-                             ECORE_EVENT_MODIFIER_ALT, 0);
+   if (!e_comp_wl)
+     ecore_x_window_key_ungrab(c->root, "F", ECORE_EVENT_MODIFIER_SHIFT |
+                               ECORE_EVENT_MODIFIER_CTRL |
+                               ECORE_EVENT_MODIFIER_ALT, 0);
    if (c->grabbed)
      {
         c->grabbed = 0;
@@ -5697,10 +5698,6 @@ _e_comp_x_setup(Ecore_X_Window root, int w, int h)
 
    ecore_x_composite_redirect_subwindows(root, 
ECORE_X_COMPOSITE_UPDATE_MANUAL);
 
-   ecore_x_window_key_grab(root, "F", ECORE_EVENT_MODIFIER_SHIFT |
-                           ECORE_EVENT_MODIFIER_CTRL |
-                           ECORE_EVENT_MODIFIER_ALT, 0);
-
    ecore_evas_data_set(e_comp->ee, "comp", e_comp);
    e_comp->bindings_grab_cb = _e_comp_x_bindings_grab_cb;
    e_comp->bindings_ungrab_cb = _e_comp_x_bindings_ungrab_cb;
@@ -5708,6 +5705,9 @@ _e_comp_x_setup(Ecore_X_Window root, int w, int h)
    if (e_comp->comp_type == E_PIXMAP_TYPE_NONE)
      {
         if (!e_comp_canvas_init(w, h)) return EINA_FALSE;
+        ecore_x_window_key_grab(root, "F", ECORE_EVENT_MODIFIER_SHIFT |
+                        ECORE_EVENT_MODIFIER_CTRL |
+                        ECORE_EVENT_MODIFIER_ALT, 0);
      }
 
    if (e_comp->comp_type == E_PIXMAP_TYPE_X)

--