diff options
| author | Mike Blumenkrantz <zmike@osg.samsung.com> | 2018-01-22 16:21:28 -0500 |
|---|---|---|
| committer | Mike Blumenkrantz <zmike@osg.samsung.com> | 2018-01-22 16:21:28 -0500 |
| commit | 8ffda5f23a8552dd15400d0895e67098193184c5 (patch) | |
| tree | a102dd30a8f82e27eb0a4a909829e28b3ed3a6b7 | |
| parent | efa9f4276a16a9c91509702ad03e196402d5c341 (diff) | |
| download | enlightenment-8ffda5f23a8552dd15400d0895e67098193184c5.tar.gz | |
don't do x11 window grab for fps counter when running in wayland mode
this crashes older efl
| -rw-r--r-- | src/bin/e_comp_x.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c index 98ec60bcad..e85eb8fb99 100644 --- a/src/bin/e_comp_x.c +++ b/src/bin/e_comp_x.c @@ -5423,9 +5423,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; @@ -5696,10 +5697,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; @@ -5707,6 +5704,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) |