forked from enlightenment/enlightenment
don't do x11 window grab for fps counter when running in wayland mode
this crashes older efl
This commit is contained in:
parent
efa9f4276a
commit
8ffda5f23a
|
@ -5423,9 +5423,10 @@ _e_comp_x_del(E_Comp *c)
|
||||||
{
|
{
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
|
|
||||||
ecore_x_window_key_ungrab(c->root, "F", ECORE_EVENT_MODIFIER_SHIFT |
|
if (!e_comp_wl)
|
||||||
ECORE_EVENT_MODIFIER_CTRL |
|
ecore_x_window_key_ungrab(c->root, "F", ECORE_EVENT_MODIFIER_SHIFT |
|
||||||
ECORE_EVENT_MODIFIER_ALT, 0);
|
ECORE_EVENT_MODIFIER_CTRL |
|
||||||
|
ECORE_EVENT_MODIFIER_ALT, 0);
|
||||||
if (c->grabbed)
|
if (c->grabbed)
|
||||||
{
|
{
|
||||||
c->grabbed = 0;
|
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_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);
|
ecore_evas_data_set(e_comp->ee, "comp", e_comp);
|
||||||
e_comp->bindings_grab_cb = _e_comp_x_bindings_grab_cb;
|
e_comp->bindings_grab_cb = _e_comp_x_bindings_grab_cb;
|
||||||
e_comp->bindings_ungrab_cb = _e_comp_x_bindings_ungrab_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->comp_type == E_PIXMAP_TYPE_NONE)
|
||||||
{
|
{
|
||||||
if (!e_comp_canvas_init(w, h)) return EINA_FALSE;
|
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)
|
if (e_comp->comp_type == E_PIXMAP_TYPE_X)
|
||||||
|
|
Loading…
Reference in New Issue