enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 6 Projects Releases Wiki Activity

Revert "Fix infinite recursion for legacy + efl ui win events" 

This reverts commit d567faa778.

This is not trying to fix the root cause for the infinite loop.
This commit is contained in:
Jean-Philippe Andre 2017-09-26 18:11:38 +09:00
parent ba12712e0d
commit e1df334caf
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/lib/elementary/efl_ui_win.c
View File

@ -1854,14 +1854,6 @@ EFL_CALLBACKS_ARRAY_DEFINE(_elm_win_evas_feed_fake_callbacks,
{ EFL_EVENT_KEY_DOWN, _evas_event_key_feed_fake_cb },
{ EFL_EVENT_KEY_UP, _evas_event_key_feed_fake_cb })
#define RECURSE_PROTECT(x) \
do { static int calling = 0; \
if (calling) return; \
calling++; \
x; \
calling--; \
} while (0)
static void
_elm_win_evas_render_post(void *data,
Evas *e EINA_UNUSED,
@ -1870,7 +1862,7 @@ _elm_win_evas_render_post(void *data,
Efl_Gfx_Event_Render_Post *ev = event_info;
Eo *win = data;
RECURSE_PROTECT(efl_event_callback_legacy_call(win, EFL_CANVAS_EVENT_RENDER_POST, ev));
efl_event_callback_legacy_call(win, EFL_CANVAS_EVENT_RENDER_POST, ev);
}
static void
@ -1881,7 +1873,7 @@ _elm_win_evas_render_pre(void *data,
Eo *win = data;
_elm_win_throttle_ok = EINA_TRUE;
RECURSE_PROTECT(efl_event_callback_legacy_call(win, EFL_CANVAS_EVENT_RENDER_PRE, NULL));
efl_event_callback_legacy_call(win, EFL_CANVAS_EVENT_RENDER_PRE, NULL);
}
static void
@ -1892,7 +1884,7 @@ _elm_win_evas_focus_in(void *data,
Eo *win = data;
_elm_win_throttle_ok = EINA_TRUE;
RECURSE_PROTECT(efl_event_callback_legacy_call(win, EFL_CANVAS_EVENT_FOCUS_IN, NULL));
efl_event_callback_legacy_call(win, EFL_CANVAS_EVENT_FOCUS_IN, NULL);
}
static void
@ -1902,7 +1894,7 @@ _elm_win_evas_focus_out(void *data,
{
Eo *win = data;
RECURSE_PROTECT(efl_event_callback_legacy_call(win, EFL_CANVAS_EVENT_FOCUS_OUT, NULL));
efl_event_callback_legacy_call(win, EFL_CANVAS_EVENT_FOCUS_OUT, NULL);
}
static void
@ -1914,7 +1906,7 @@ _elm_win_evas_object_focus_in(void *data,
Eo *win = data;
_elm_win_throttle_ok = EINA_TRUE;
RECURSE_PROTECT(efl_event_callback_legacy_call(win, EFL_CANVAS_EVENT_OBJECT_FOCUS_IN, object));
efl_event_callback_legacy_call(win, EFL_CANVAS_EVENT_OBJECT_FOCUS_IN, object);
}
static void
@ -1925,7 +1917,7 @@ _elm_win_evas_object_focus_out(void *data,
Eo *object = event_info;
Eo *win = data;
RECURSE_PROTECT(efl_event_callback_legacy_call(win, EFL_CANVAS_EVENT_OBJECT_FOCUS_OUT, object));
efl_event_callback_legacy_call(win, EFL_CANVAS_EVENT_OBJECT_FOCUS_OUT, object);
}
static void
@ -1936,7 +1928,7 @@ _elm_win_evas_device_changed(void *data,
Eo *device = event_info;
Eo *win = data;
RECURSE_PROTECT(efl_event_callback_legacy_call(win, EFL_CANVAS_EVENT_DEVICE_CHANGED, device));
efl_event_callback_legacy_call(win, EFL_CANVAS_EVENT_DEVICE_CHANGED, device);
}
static void