jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=ff24ac2d6ddaafba49ae5100f17fe37e5d874140
commit ff24ac2d6ddaafba49ae5100f17fe37e5d874140
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date: Tue Dec 19 11:14:37 2017 +0900
efl: Reset ecore event types on init
This fixes cycles of init/shutdown/init where ecore event types would
become invalid, since they are now stored in a dynamic array rather than
a statically stored array.
The risk here is that if a module of EFL tends to init/shutdown in a
"normal" scenario then the event type array will grow in a leaking
manner. This could be fixed by resetting those event ID's only when the
loop actually exits (EFL_EVENT_DEL on the main loop). I'm not using
EFL_EVENT_DEL in this patch as this would add too many event callbacks
to the main loop object, which may result in slightly slower event calls
to it, affecting the overall performance.
---
src/lib/ecore_evas/ecore_evas_ews.c | 1 -
src/lib/ecore_evas/ecore_evas_extn.c | 1 -
src/lib/ecore_wayland/ecore_wl.c | 35 +++++----
src/lib/ecore_win32/ecore_win32.c | 33 ++++-----
src/lib/ecore_wl2/ecore_wl2.c | 91 ++++++++++++------------
src/lib/ecore_x/ecore_x.c | 133 +++++++++++++++++------------------
src/lib/ecore_x/ecore_x_dnd.c | 15 ++--
src/lib/eeze/eeze_sensor.c | 45 ++++++------
src/lib/efreet/efreet_cache.c | 9 +--
src/lib/eio/eio_monitor.c | 25 +++----
src/lib/elementary/elm_config.c | 3 +-
src/lib/elementary/elm_main.c | 9 +--
src/lib/elementary/elm_systray.c | 3 +-
src/lib/elementary/elm_thumb.c | 3 +-
src/lib/elocation/elocation.c | 27 ++++---
src/lib/elput/elput.c | 21 +++---
src/lib/emotion/emotion_webcam.c | 9 +--
17 files changed, 211 insertions(+), 252 deletions(-)
diff --git a/src/lib/ecore_evas/ecore_evas_ews.c
b/src/lib/ecore_evas/ecore_evas_ews.c
index ee40f00d31..77a33f7094 100644
--- a/src/lib/ecore_evas/ecore_evas_ews.c
+++ b/src/lib/ecore_evas/ecore_evas_ews.c
@@ -684,7 +684,6 @@ static const Ecore_Evas_Engine_Func _ecore_ews_engine_func =
void
_ecore_evas_ews_events_init(void)
{
- if (ECORE_EVAS_EWS_EVENT_MANAGER_CHANGE != 0) return;
ECORE_EVAS_EWS_EVENT_MANAGER_CHANGE = ecore_event_type_new();
ECORE_EVAS_EWS_EVENT_ADD = ecore_event_type_new();
ECORE_EVAS_EWS_EVENT_DEL = ecore_event_type_new();
diff --git a/src/lib/ecore_evas/ecore_evas_extn.c
b/src/lib/ecore_evas/ecore_evas_extn.c
index 141bd78363..6f0beaed3b 100644
--- a/src/lib/ecore_evas/ecore_evas_extn.c
+++ b/src/lib/ecore_evas/ecore_evas_extn.c
@@ -11,7 +11,6 @@ EAPI int ECORE_EVAS_EXTN_CLIENT_DEL = 0;
void
_ecore_evas_extn_init(void)
{
- if (ECORE_EVAS_EXTN_CLIENT_ADD != 0) return ;
ECORE_EVAS_EXTN_CLIENT_ADD = ecore_event_type_new();
ECORE_EVAS_EXTN_CLIENT_DEL = ecore_event_type_new();
}
diff --git a/src/lib/ecore_wayland/ecore_wl.c b/src/lib/ecore_wayland/ecore_wl.c
index ae1bb4a8fa..3bc3125122 100644
--- a/src/lib/ecore_wayland/ecore_wl.c
+++ b/src/lib/ecore_wayland/ecore_wl.c
@@ -154,25 +154,22 @@ ecore_wl_init(const char *name)
goto exit_ecore_event;
}
- if (!ECORE_WL_EVENT_MOUSE_IN)
- {
- ECORE_WL_EVENT_MOUSE_IN = ecore_event_type_new();
- ECORE_WL_EVENT_MOUSE_OUT = ecore_event_type_new();
- ECORE_WL_EVENT_FOCUS_IN = ecore_event_type_new();
- ECORE_WL_EVENT_FOCUS_OUT = ecore_event_type_new();
- ECORE_WL_EVENT_WINDOW_CONFIGURE = ecore_event_type_new();
- ECORE_WL_EVENT_DND_ENTER = ecore_event_type_new();
- ECORE_WL_EVENT_DND_POSITION = ecore_event_type_new();
- ECORE_WL_EVENT_DND_LEAVE = ecore_event_type_new();
- ECORE_WL_EVENT_DND_DROP = ecore_event_type_new();
- ECORE_WL_EVENT_DND_OFFER = ecore_event_type_new();
- ECORE_WL_EVENT_DND_END = ecore_event_type_new();
- ECORE_WL_EVENT_DATA_SOURCE_TARGET = ecore_event_type_new();
- ECORE_WL_EVENT_DATA_SOURCE_SEND = ecore_event_type_new();
- ECORE_WL_EVENT_SELECTION_DATA_READY = ecore_event_type_new();
- ECORE_WL_EVENT_DATA_SOURCE_CANCELLED = ecore_event_type_new();
- ECORE_WL_EVENT_INTERFACES_BOUND = ecore_event_type_new();
- }
+ ECORE_WL_EVENT_MOUSE_IN = ecore_event_type_new();
+ ECORE_WL_EVENT_MOUSE_OUT = ecore_event_type_new();
+ ECORE_WL_EVENT_FOCUS_IN = ecore_event_type_new();
+ ECORE_WL_EVENT_FOCUS_OUT = ecore_event_type_new();
+ ECORE_WL_EVENT_WINDOW_CONFIGURE = ecore_event_type_new();
+ ECORE_WL_EVENT_DND_ENTER = ecore_event_type_new();
+ ECORE_WL_EVENT_DND_POSITION = ecore_event_type_new();
+ ECORE_WL_EVENT_DND_LEAVE = ecore_event_type_new();
+ ECORE_WL_EVENT_DND_DROP = ecore_event_type_new();
+ ECORE_WL_EVENT_DND_OFFER = ecore_event_type_new();
+ ECORE_WL_EVENT_DND_END = ecore_event_type_new();
+ ECORE_WL_EVENT_DATA_SOURCE_TARGET = ecore_event_type_new();
+ ECORE_WL_EVENT_DATA_SOURCE_SEND = ecore_event_type_new();
+ ECORE_WL_EVENT_SELECTION_DATA_READY = ecore_event_type_new();
+ ECORE_WL_EVENT_DATA_SOURCE_CANCELLED = ecore_event_type_new();
+ ECORE_WL_EVENT_INTERFACES_BOUND = ecore_event_type_new();
if (!(_ecore_wl_disp = calloc(1, sizeof(Ecore_Wl_Display))))
{
diff --git a/src/lib/ecore_win32/ecore_win32.c
b/src/lib/ecore_win32/ecore_win32.c
index c207f0b2ca..ec9738ee1b 100644
--- a/src/lib/ecore_win32/ecore_win32.c
+++ b/src/lib/ecore_win32/ecore_win32.c
@@ -570,24 +570,21 @@ ecore_win32_init()
goto unregister_class;
}
- if (!ECORE_WIN32_EVENT_MOUSE_IN)
- {
- ECORE_WIN32_EVENT_MOUSE_IN = ecore_event_type_new();
- ECORE_WIN32_EVENT_MOUSE_OUT = ecore_event_type_new();
- ECORE_WIN32_EVENT_WINDOW_FOCUS_IN = ecore_event_type_new();
- ECORE_WIN32_EVENT_WINDOW_FOCUS_OUT = ecore_event_type_new();
- ECORE_WIN32_EVENT_WINDOW_DAMAGE = ecore_event_type_new();
- ECORE_WIN32_EVENT_WINDOW_CREATE = ecore_event_type_new();
- ECORE_WIN32_EVENT_WINDOW_DESTROY = ecore_event_type_new();
- ECORE_WIN32_EVENT_WINDOW_SHOW = ecore_event_type_new();
- ECORE_WIN32_EVENT_WINDOW_HIDE = ecore_event_type_new();
- ECORE_WIN32_EVENT_WINDOW_CONFIGURE = ecore_event_type_new();
- ECORE_WIN32_EVENT_WINDOW_RESIZE = ecore_event_type_new();
- ECORE_WIN32_EVENT_WINDOW_PROPERTY = ecore_event_type_new();
- ECORE_WIN32_EVENT_WINDOW_DELETE_REQUEST = ecore_event_type_new();
- ECORE_WIN32_EVENT_SELECTION_CLEAR = ecore_event_type_new();
- ECORE_WIN32_EVENT_SELECTION_NOTIFY = ecore_event_type_new();
- }
+ ECORE_WIN32_EVENT_MOUSE_IN = ecore_event_type_new();
+ ECORE_WIN32_EVENT_MOUSE_OUT = ecore_event_type_new();
+ ECORE_WIN32_EVENT_WINDOW_FOCUS_IN = ecore_event_type_new();
+ ECORE_WIN32_EVENT_WINDOW_FOCUS_OUT = ecore_event_type_new();
+ ECORE_WIN32_EVENT_WINDOW_DAMAGE = ecore_event_type_new();
+ ECORE_WIN32_EVENT_WINDOW_CREATE = ecore_event_type_new();
+ ECORE_WIN32_EVENT_WINDOW_DESTROY = ecore_event_type_new();
+ ECORE_WIN32_EVENT_WINDOW_SHOW = ecore_event_type_new();
+ ECORE_WIN32_EVENT_WINDOW_HIDE = ecore_event_type_new();
+ ECORE_WIN32_EVENT_WINDOW_CONFIGURE = ecore_event_type_new();
+ ECORE_WIN32_EVENT_WINDOW_RESIZE = ecore_event_type_new();
+ ECORE_WIN32_EVENT_WINDOW_PROPERTY = ecore_event_type_new();
+ ECORE_WIN32_EVENT_WINDOW_DELETE_REQUEST = ecore_event_type_new();
+ ECORE_WIN32_EVENT_SELECTION_CLEAR = ecore_event_type_new();
+ ECORE_WIN32_EVENT_SELECTION_NOTIFY = ecore_event_type_new();
for (i = 0; i < 77; i++)
_ecore_win32_cursor_x[i] = _ecore_win32_cursor_x11_shaped_new(i);
diff --git a/src/lib/ecore_wl2/ecore_wl2.c b/src/lib/ecore_wl2/ecore_wl2.c
index ba22eb1986..c309a92b37 100644
--- a/src/lib/ecore_wl2/ecore_wl2.c
+++ b/src/lib/ecore_wl2/ecore_wl2.c
@@ -90,53 +90,50 @@ ecore_wl2_init(void)
}
/* handle creating new Ecore_Wl2 event types */
- if (!ECORE_WL2_EVENT_GLOBAL_ADDED)
- {
- ECORE_WL2_EVENT_CONNECT = ecore_event_type_new();
- ECORE_WL2_EVENT_DISCONNECT = ecore_event_type_new();
- ECORE_WL2_EVENT_GLOBAL_ADDED = ecore_event_type_new();
- ECORE_WL2_EVENT_GLOBAL_REMOVED = ecore_event_type_new();
- ECORE_WL2_EVENT_FOCUS_IN = ecore_event_type_new();
- ECORE_WL2_EVENT_FOCUS_OUT = ecore_event_type_new();
- ECORE_WL2_EVENT_DND_ENTER = ecore_event_type_new();
- ECORE_WL2_EVENT_DND_LEAVE = ecore_event_type_new();
- ECORE_WL2_EVENT_DND_MOTION = ecore_event_type_new();
- ECORE_WL2_EVENT_DND_DROP = ecore_event_type_new();
- ECORE_WL2_EVENT_DND_END = ecore_event_type_new();
- ECORE_WL2_EVENT_DATA_SOURCE_END = ecore_event_type_new();
- ECORE_WL2_EVENT_DATA_SOURCE_DROP = ecore_event_type_new();
- ECORE_WL2_EVENT_DATA_SOURCE_ACTION = ecore_event_type_new();
- ECORE_WL2_EVENT_DATA_SOURCE_TARGET = ecore_event_type_new();
- ECORE_WL2_EVENT_DATA_SOURCE_SEND = ecore_event_type_new();
- ECORE_WL2_EVENT_WINDOW_CONFIGURE = ecore_event_type_new();
- ECORE_WL2_EVENT_SYNC_DONE = ecore_event_type_new();
- ECORE_WL2_EVENT_OFFER_DATA_READY = ecore_event_type_new();
- ECORE_WL2_EVENT_SEAT_NAME_CHANGED = ecore_event_type_new();
- ECORE_WL2_EVENT_SEAT_CAPABILITIES_CHANGED = ecore_event_type_new();
- ECORE_WL2_EVENT_DEVICE_ADDED = ecore_event_type_new();
- ECORE_WL2_EVENT_DEVICE_REMOVED = ecore_event_type_new();
- _ecore_wl2_event_window_www = ecore_event_type_new();
- _ecore_wl2_event_window_www_drag = ecore_event_type_new();
- ECORE_WL2_EVENT_WINDOW_CONFIGURE_COMPLETE = ecore_event_type_new();
- ECORE_WL2_EVENT_SEAT_KEYMAP_CHANGED = ecore_event_type_new();
- ECORE_WL2_EVENT_SEAT_KEYBOARD_REPEAT_CHANGED = ecore_event_type_new();
- ECORE_WL2_EVENT_SEAT_SELECTION = ecore_event_type_new();
- ECORE_WL2_EVENT_OUTPUT_TRANSFORM = ecore_event_type_new();
- ECORE_WL2_EVENT_WINDOW_ROTATE = ecore_event_type_new();
- ECORE_WL2_EVENT_WINDOW_ROTATION_CHANGE_PREPARE =
ecore_event_type_new();
- ECORE_WL2_EVENT_WINDOW_ROTATION_CHANGE_PREPARE_DONE =
- ecore_event_type_new();
- ECORE_WL2_EVENT_WINDOW_ROTATION_CHANGE_REQUEST =
ecore_event_type_new();
- ECORE_WL2_EVENT_WINDOW_ROTATION_CHANGE_DONE = ecore_event_type_new();
- ECORE_WL2_EVENT_AUX_HINT_ALLOWED = ecore_event_type_new();
- ECORE_WL2_EVENT_AUX_HINT_SUPPORTED = ecore_event_type_new();
- ECORE_WL2_EVENT_AUX_MESSAGE = ecore_event_type_new();
- ECORE_WL2_EVENT_WINDOW_SHOW = ecore_event_type_new();
- ECORE_WL2_EVENT_WINDOW_HIDE = ecore_event_type_new();
- ECORE_WL2_EVENT_WINDOW_ACTIVATE = ecore_event_type_new();
- ECORE_WL2_EVENT_WINDOW_DEACTIVATE = ecore_event_type_new();
- ECORE_WL2_EVENT_WINDOW_ICONIFY_STATE_CHANGE = ecore_event_type_new();
- }
+ ECORE_WL2_EVENT_CONNECT = ecore_event_type_new();
+ ECORE_WL2_EVENT_DISCONNECT = ecore_event_type_new();
+ ECORE_WL2_EVENT_GLOBAL_ADDED = ecore_event_type_new();
+ ECORE_WL2_EVENT_GLOBAL_REMOVED = ecore_event_type_new();
+ ECORE_WL2_EVENT_FOCUS_IN = ecore_event_type_new();
+ ECORE_WL2_EVENT_FOCUS_OUT = ecore_event_type_new();
+ ECORE_WL2_EVENT_DND_ENTER = ecore_event_type_new();
+ ECORE_WL2_EVENT_DND_LEAVE = ecore_event_type_new();
+ ECORE_WL2_EVENT_DND_MOTION = ecore_event_type_new();
+ ECORE_WL2_EVENT_DND_DROP = ecore_event_type_new();
+ ECORE_WL2_EVENT_DND_END = ecore_event_type_new();
+ ECORE_WL2_EVENT_DATA_SOURCE_END = ecore_event_type_new();
+ ECORE_WL2_EVENT_DATA_SOURCE_DROP = ecore_event_type_new();
+ ECORE_WL2_EVENT_DATA_SOURCE_ACTION = ecore_event_type_new();
+ ECORE_WL2_EVENT_DATA_SOURCE_TARGET = ecore_event_type_new();
+ ECORE_WL2_EVENT_DATA_SOURCE_SEND = ecore_event_type_new();
+ ECORE_WL2_EVENT_WINDOW_CONFIGURE = ecore_event_type_new();
+ ECORE_WL2_EVENT_SYNC_DONE = ecore_event_type_new();
+ ECORE_WL2_EVENT_OFFER_DATA_READY = ecore_event_type_new();
+ ECORE_WL2_EVENT_SEAT_NAME_CHANGED = ecore_event_type_new();
+ ECORE_WL2_EVENT_SEAT_CAPABILITIES_CHANGED = ecore_event_type_new();
+ ECORE_WL2_EVENT_DEVICE_ADDED = ecore_event_type_new();
+ ECORE_WL2_EVENT_DEVICE_REMOVED = ecore_event_type_new();
+ _ecore_wl2_event_window_www = ecore_event_type_new();
+ _ecore_wl2_event_window_www_drag = ecore_event_type_new();
+ ECORE_WL2_EVENT_WINDOW_CONFIGURE_COMPLETE = ecore_event_type_new();
+ ECORE_WL2_EVENT_SEAT_KEYMAP_CHANGED = ecore_event_type_new();
+ ECORE_WL2_EVENT_SEAT_KEYBOARD_REPEAT_CHANGED = ecore_event_type_new();
+ ECORE_WL2_EVENT_SEAT_SELECTION = ecore_event_type_new();
+ ECORE_WL2_EVENT_OUTPUT_TRANSFORM = ecore_event_type_new();
+ ECORE_WL2_EVENT_WINDOW_ROTATE = ecore_event_type_new();
+ ECORE_WL2_EVENT_WINDOW_ROTATION_CHANGE_PREPARE = ecore_event_type_new();
+ ECORE_WL2_EVENT_WINDOW_ROTATION_CHANGE_PREPARE_DONE =
ecore_event_type_new();
+ ECORE_WL2_EVENT_WINDOW_ROTATION_CHANGE_REQUEST = ecore_event_type_new();
+ ECORE_WL2_EVENT_WINDOW_ROTATION_CHANGE_DONE = ecore_event_type_new();
+ ECORE_WL2_EVENT_AUX_HINT_ALLOWED = ecore_event_type_new();
+ ECORE_WL2_EVENT_AUX_HINT_SUPPORTED = ecore_event_type_new();
+ ECORE_WL2_EVENT_AUX_MESSAGE = ecore_event_type_new();
+ ECORE_WL2_EVENT_WINDOW_SHOW = ecore_event_type_new();
+ ECORE_WL2_EVENT_WINDOW_HIDE = ecore_event_type_new();
+ ECORE_WL2_EVENT_WINDOW_ACTIVATE = ecore_event_type_new();
+ ECORE_WL2_EVENT_WINDOW_DEACTIVATE = ecore_event_type_new();
+ ECORE_WL2_EVENT_WINDOW_ICONIFY_STATE_CHANGE = ecore_event_type_new();
+
if (!no_session_recovery)
no_session_recovery = !!getenv("EFL_NO_WAYLAND_SESSION_RECOVERY");
diff --git a/src/lib/ecore_x/ecore_x.c b/src/lib/ecore_x/ecore_x.c
index f54f3c30be..ff213a7784 100644
--- a/src/lib/ecore_x/ecore_x.c
+++ b/src/lib/ecore_x/ecore_x.c
@@ -589,74 +589,71 @@ _ecore_x_init2(void)
#endif /* ifdef ECORE_XGESTURE */
- if (!ECORE_X_EVENT_ANY)
- {
- ECORE_X_EVENT_ANY = ecore_event_type_new();
- ECORE_X_EVENT_MOUSE_IN = ecore_event_type_new();
- ECORE_X_EVENT_MOUSE_OUT = ecore_event_type_new();
- ECORE_X_EVENT_WINDOW_FOCUS_IN = ecore_event_type_new();
- ECORE_X_EVENT_WINDOW_FOCUS_OUT = ecore_event_type_new();
- ECORE_X_EVENT_WINDOW_KEYMAP = ecore_event_type_new();
- ECORE_X_EVENT_WINDOW_DAMAGE = ecore_event_type_new();
- ECORE_X_EVENT_WINDOW_VISIBILITY_CHANGE = ecore_event_type_new();
- ECORE_X_EVENT_WINDOW_CREATE = ecore_event_type_new();
- ECORE_X_EVENT_WINDOW_DESTROY = ecore_event_type_new();
- ECORE_X_EVENT_WINDOW_HIDE = ecore_event_type_new();
- ECORE_X_EVENT_WINDOW_SHOW = ecore_event_type_new();
- ECORE_X_EVENT_WINDOW_SHOW_REQUEST = ecore_event_type_new();
- ECORE_X_EVENT_WINDOW_REPARENT = ecore_event_type_new();
- ECORE_X_EVENT_WINDOW_CONFIGURE = ecore_event_type_new();
- ECORE_X_EVENT_WINDOW_CONFIGURE_REQUEST = ecore_event_type_new();
- ECORE_X_EVENT_WINDOW_GRAVITY = ecore_event_type_new();
- ECORE_X_EVENT_WINDOW_RESIZE_REQUEST = ecore_event_type_new();
- ECORE_X_EVENT_WINDOW_STACK = ecore_event_type_new();
- ECORE_X_EVENT_WINDOW_STACK_REQUEST = ecore_event_type_new();
- ECORE_X_EVENT_WINDOW_PROPERTY = ecore_event_type_new();
- ECORE_X_EVENT_WINDOW_COLORMAP = ecore_event_type_new();
- ECORE_X_EVENT_WINDOW_MAPPING = ecore_event_type_new();
- ECORE_X_EVENT_MAPPING_CHANGE = ecore_event_type_new();
- ECORE_X_EVENT_SELECTION_CLEAR = ecore_event_type_new();
- ECORE_X_EVENT_SELECTION_REQUEST = ecore_event_type_new();
- ECORE_X_EVENT_SELECTION_NOTIFY = ecore_event_type_new();
- ECORE_X_EVENT_CLIENT_MESSAGE = ecore_event_type_new();
- ECORE_X_EVENT_WINDOW_SHAPE = ecore_event_type_new();
- ECORE_X_EVENT_SCREENSAVER_NOTIFY = ecore_event_type_new();
- ECORE_X_EVENT_GESTURE_NOTIFY_FLICK = ecore_event_type_new();
- ECORE_X_EVENT_GESTURE_NOTIFY_PAN = ecore_event_type_new();
- ECORE_X_EVENT_GESTURE_NOTIFY_PINCHROTATION = ecore_event_type_new();
- ECORE_X_EVENT_GESTURE_NOTIFY_TAP = ecore_event_type_new();
- ECORE_X_EVENT_GESTURE_NOTIFY_TAPNHOLD = ecore_event_type_new();
- ECORE_X_EVENT_GESTURE_NOTIFY_HOLD = ecore_event_type_new();
- ECORE_X_EVENT_GESTURE_NOTIFY_GROUP = ecore_event_type_new();
- ECORE_X_EVENT_SYNC_COUNTER = ecore_event_type_new();
- ECORE_X_EVENT_SYNC_ALARM = ecore_event_type_new();
- ECORE_X_EVENT_SCREEN_CHANGE = ecore_event_type_new();
- ECORE_X_EVENT_RANDR_CRTC_CHANGE = ecore_event_type_new();
- ECORE_X_EVENT_RANDR_OUTPUT_CHANGE = ecore_event_type_new();
- ECORE_X_EVENT_RANDR_OUTPUT_PROPERTY_NOTIFY = ecore_event_type_new();
- ECORE_X_EVENT_DAMAGE_NOTIFY = ecore_event_type_new();
-
- ECORE_X_EVENT_WINDOW_DELETE_REQUEST = ecore_event_type_new();
-
- ECORE_X_EVENT_DESKTOP_CHANGE = ecore_event_type_new();
- ECORE_X_EVENT_WINDOW_MOVE_RESIZE_REQUEST = ecore_event_type_new();
- ECORE_X_EVENT_WINDOW_STATE_REQUEST = ecore_event_type_new();
- ECORE_X_EVENT_FRAME_EXTENTS_REQUEST = ecore_event_type_new();
- ECORE_X_EVENT_PING = ecore_event_type_new();
-
- ECORE_X_EVENT_STARTUP_SEQUENCE_NEW = ecore_event_type_new();
- ECORE_X_EVENT_STARTUP_SEQUENCE_CHANGE = ecore_event_type_new();
- ECORE_X_EVENT_STARTUP_SEQUENCE_REMOVE = ecore_event_type_new();
-
- ECORE_X_EVENT_XKB_STATE_NOTIFY = ecore_event_type_new();
- ECORE_X_EVENT_XKB_NEWKBD_NOTIFY = ecore_event_type_new();
-
- ECORE_X_EVENT_GENERIC = ecore_event_type_new();
-
- ECORE_X_RAW_BUTTON_PRESS = ecore_event_type_new();
- ECORE_X_RAW_BUTTON_RELEASE = ecore_event_type_new();
- ECORE_X_RAW_MOTION = ecore_event_type_new();
- }
+ ECORE_X_EVENT_ANY = ecore_event_type_new();
+ ECORE_X_EVENT_MOUSE_IN = ecore_event_type_new();
+ ECORE_X_EVENT_MOUSE_OUT = ecore_event_type_new();
+ ECORE_X_EVENT_WINDOW_FOCUS_IN = ecore_event_type_new();
+ ECORE_X_EVENT_WINDOW_FOCUS_OUT = ecore_event_type_new();
+ ECORE_X_EVENT_WINDOW_KEYMAP = ecore_event_type_new();
+ ECORE_X_EVENT_WINDOW_DAMAGE = ecore_event_type_new();
+ ECORE_X_EVENT_WINDOW_VISIBILITY_CHANGE = ecore_event_type_new();
+ ECORE_X_EVENT_WINDOW_CREATE = ecore_event_type_new();
+ ECORE_X_EVENT_WINDOW_DESTROY = ecore_event_type_new();
+ ECORE_X_EVENT_WINDOW_HIDE = ecore_event_type_new();
+ ECORE_X_EVENT_WINDOW_SHOW = ecore_event_type_new();
+ ECORE_X_EVENT_WINDOW_SHOW_REQUEST = ecore_event_type_new();
+ ECORE_X_EVENT_WINDOW_REPARENT = ecore_event_type_new();
+ ECORE_X_EVENT_WINDOW_CONFIGURE = ecore_event_type_new();
+ ECORE_X_EVENT_WINDOW_CONFIGURE_REQUEST = ecore_event_type_new();
+ ECORE_X_EVENT_WINDOW_GRAVITY = ecore_event_type_new();
+ ECORE_X_EVENT_WINDOW_RESIZE_REQUEST = ecore_event_type_new();
+ ECORE_X_EVENT_WINDOW_STACK = ecore_event_type_new();
+ ECORE_X_EVENT_WINDOW_STACK_REQUEST = ecore_event_type_new();
+ ECORE_X_EVENT_WINDOW_PROPERTY = ecore_event_type_new();
+ ECORE_X_EVENT_WINDOW_COLORMAP = ecore_event_type_new();
+ ECORE_X_EVENT_WINDOW_MAPPING = ecore_event_type_new();
+ ECORE_X_EVENT_MAPPING_CHANGE = ecore_event_type_new();
+ ECORE_X_EVENT_SELECTION_CLEAR = ecore_event_type_new();
+ ECORE_X_EVENT_SELECTION_REQUEST = ecore_event_type_new();
+ ECORE_X_EVENT_SELECTION_NOTIFY = ecore_event_type_new();
+ ECORE_X_EVENT_CLIENT_MESSAGE = ecore_event_type_new();
+ ECORE_X_EVENT_WINDOW_SHAPE = ecore_event_type_new();
+ ECORE_X_EVENT_SCREENSAVER_NOTIFY = ecore_event_type_new();
+ ECORE_X_EVENT_GESTURE_NOTIFY_FLICK = ecore_event_type_new();
+ ECORE_X_EVENT_GESTURE_NOTIFY_PAN = ecore_event_type_new();
+ ECORE_X_EVENT_GESTURE_NOTIFY_PINCHROTATION = ecore_event_type_new();
+ ECORE_X_EVENT_GESTURE_NOTIFY_TAP = ecore_event_type_new();
+ ECORE_X_EVENT_GESTURE_NOTIFY_TAPNHOLD = ecore_event_type_new();
+ ECORE_X_EVENT_GESTURE_NOTIFY_HOLD = ecore_event_type_new();
+ ECORE_X_EVENT_GESTURE_NOTIFY_GROUP = ecore_event_type_new();
+ ECORE_X_EVENT_SYNC_COUNTER = ecore_event_type_new();
+ ECORE_X_EVENT_SYNC_ALARM = ecore_event_type_new();
+ ECORE_X_EVENT_SCREEN_CHANGE = ecore_event_type_new();
+ ECORE_X_EVENT_RANDR_CRTC_CHANGE = ecore_event_type_new();
+ ECORE_X_EVENT_RANDR_OUTPUT_CHANGE = ecore_event_type_new();
+ ECORE_X_EVENT_RANDR_OUTPUT_PROPERTY_NOTIFY = ecore_event_type_new();
+ ECORE_X_EVENT_DAMAGE_NOTIFY = ecore_event_type_new();
+
+ ECORE_X_EVENT_WINDOW_DELETE_REQUEST = ecore_event_type_new();
+
+ ECORE_X_EVENT_DESKTOP_CHANGE = ecore_event_type_new();
+ ECORE_X_EVENT_WINDOW_MOVE_RESIZE_REQUEST = ecore_event_type_new();
+ ECORE_X_EVENT_WINDOW_STATE_REQUEST = ecore_event_type_new();
+ ECORE_X_EVENT_FRAME_EXTENTS_REQUEST = ecore_event_type_new();
+ ECORE_X_EVENT_PING = ecore_event_type_new();
+
+ ECORE_X_EVENT_STARTUP_SEQUENCE_NEW = ecore_event_type_new();
+ ECORE_X_EVENT_STARTUP_SEQUENCE_CHANGE = ecore_event_type_new();
+ ECORE_X_EVENT_STARTUP_SEQUENCE_REMOVE = ecore_event_type_new();
+
+ ECORE_X_EVENT_XKB_STATE_NOTIFY = ecore_event_type_new();
+ ECORE_X_EVENT_XKB_NEWKBD_NOTIFY = ecore_event_type_new();
+
+ ECORE_X_EVENT_GENERIC = ecore_event_type_new();
+
+ ECORE_X_RAW_BUTTON_PRESS = ecore_event_type_new();
+ ECORE_X_RAW_BUTTON_RELEASE = ecore_event_type_new();
+ ECORE_X_RAW_MOTION = ecore_event_type_new();
_ecore_x_modifiers_get();
diff --git a/src/lib/ecore_x/ecore_x_dnd.c b/src/lib/ecore_x/ecore_x_dnd.c
index 59607b8f7c..c5d6fd5cd2 100644
--- a/src/lib/ecore_x/ecore_x_dnd.c
+++ b/src/lib/ecore_x/ecore_x_dnd.c
@@ -56,15 +56,12 @@ _ecore_x_dnd_init(void)
_target->source = None;
_target->state = ECORE_X_DND_TARGET_IDLE;
- if (ECORE_X_EVENT_XDND_ENTER == 0)
- {
- ECORE_X_EVENT_XDND_ENTER = ecore_event_type_new();
- ECORE_X_EVENT_XDND_POSITION = ecore_event_type_new();
- ECORE_X_EVENT_XDND_STATUS = ecore_event_type_new();
- ECORE_X_EVENT_XDND_LEAVE = ecore_event_type_new();
- ECORE_X_EVENT_XDND_DROP = ecore_event_type_new();
- ECORE_X_EVENT_XDND_FINISHED = ecore_event_type_new();
- }
+ ECORE_X_EVENT_XDND_ENTER = ecore_event_type_new();
+ ECORE_X_EVENT_XDND_POSITION = ecore_event_type_new();
+ ECORE_X_EVENT_XDND_STATUS = ecore_event_type_new();
+ ECORE_X_EVENT_XDND_LEAVE = ecore_event_type_new();
+ ECORE_X_EVENT_XDND_DROP = ecore_event_type_new();
+ ECORE_X_EVENT_XDND_FINISHED = ecore_event_type_new();
}
_ecore_x_dnd_init_count++;
diff --git a/src/lib/eeze/eeze_sensor.c b/src/lib/eeze/eeze_sensor.c
index 17027a75e6..9705cfb4f1 100644
--- a/src/lib/eeze/eeze_sensor.c
+++ b/src/lib/eeze/eeze_sensor.c
@@ -385,30 +385,27 @@ eeze_sensor_init(void)
if (!g_handle->modules) return EINA_FALSE;
/* Make sure we create new ecore event types before using them */
- if (EEZE_SENSOR_EVENT_ACCELEROMETER == 0)
- {
- EEZE_SENSOR_EVENT_ACCELEROMETER = ecore_event_type_new();
- EEZE_SENSOR_EVENT_GRAVITY = ecore_event_type_new();
- EEZE_SENSOR_EVENT_LINEAR_ACCELERATION = ecore_event_type_new();
- EEZE_SENSOR_EVENT_DEVICE_ORIENTATION = ecore_event_type_new();
- EEZE_SENSOR_EVENT_MAGNETIC = ecore_event_type_new();
- EEZE_SENSOR_EVENT_ORIENTATION = ecore_event_type_new();
- EEZE_SENSOR_EVENT_GYROSCOPE = ecore_event_type_new();
- EEZE_SENSOR_EVENT_LIGHT = ecore_event_type_new();
- EEZE_SENSOR_EVENT_PROXIMITY = ecore_event_type_new();
- EEZE_SENSOR_EVENT_SNAP = ecore_event_type_new();
- EEZE_SENSOR_EVENT_SHAKE = ecore_event_type_new();
- EEZE_SENSOR_EVENT_DOUBLETAP = ecore_event_type_new();
- EEZE_SENSOR_EVENT_PANNING = ecore_event_type_new();
- EEZE_SENSOR_EVENT_PANNING_BROWSE = ecore_event_type_new();
- EEZE_SENSOR_EVENT_TILT = ecore_event_type_new();
- EEZE_SENSOR_EVENT_FACEDOWN = ecore_event_type_new();
- EEZE_SENSOR_EVENT_DIRECT_CALL = ecore_event_type_new();
- EEZE_SENSOR_EVENT_SMART_ALERT = ecore_event_type_new();
- EEZE_SENSOR_EVENT_NO_MOVE = ecore_event_type_new();
- EEZE_SENSOR_EVENT_BAROMETER = ecore_event_type_new();
- EEZE_SENSOR_EVENT_TEMPERATURE = ecore_event_type_new();
- }
+ EEZE_SENSOR_EVENT_ACCELEROMETER = ecore_event_type_new();
+ EEZE_SENSOR_EVENT_GRAVITY = ecore_event_type_new();
+ EEZE_SENSOR_EVENT_LINEAR_ACCELERATION = ecore_event_type_new();
+ EEZE_SENSOR_EVENT_DEVICE_ORIENTATION = ecore_event_type_new();
+ EEZE_SENSOR_EVENT_MAGNETIC = ecore_event_type_new();
+ EEZE_SENSOR_EVENT_ORIENTATION = ecore_event_type_new();
+ EEZE_SENSOR_EVENT_GYROSCOPE = ecore_event_type_new();
+ EEZE_SENSOR_EVENT_LIGHT = ecore_event_type_new();
+ EEZE_SENSOR_EVENT_PROXIMITY = ecore_event_type_new();
+ EEZE_SENSOR_EVENT_SNAP = ecore_event_type_new();
+ EEZE_SENSOR_EVENT_SHAKE = ecore_event_type_new();
+ EEZE_SENSOR_EVENT_DOUBLETAP = ecore_event_type_new();
+ EEZE_SENSOR_EVENT_PANNING = ecore_event_type_new();
+ EEZE_SENSOR_EVENT_PANNING_BROWSE = ecore_event_type_new();
+ EEZE_SENSOR_EVENT_TILT = ecore_event_type_new();
+ EEZE_SENSOR_EVENT_FACEDOWN = ecore_event_type_new();
+ EEZE_SENSOR_EVENT_DIRECT_CALL = ecore_event_type_new();
+ EEZE_SENSOR_EVENT_SMART_ALERT = ecore_event_type_new();
+ EEZE_SENSOR_EVENT_NO_MOVE = ecore_event_type_new();
+ EEZE_SENSOR_EVENT_BAROMETER = ecore_event_type_new();
+ EEZE_SENSOR_EVENT_TEMPERATURE = ecore_event_type_new();
/* Core is ready so we can load the modules from disk now */
eeze_sensor_modules_load();
diff --git a/src/lib/efreet/efreet_cache.c b/src/lib/efreet/efreet_cache.c
index e377b0e31f..0df7a7b887 100644
--- a/src/lib/efreet/efreet_cache.c
+++ b/src/lib/efreet/efreet_cache.c
@@ -283,12 +283,9 @@ efreet_cache_init(void)
ERR("Failed to create directory '%s'", buf);
}
- if (EFREET_EVENT_ICON_CACHE_UPDATE == 0)
- {
- EFREET_EVENT_ICON_CACHE_UPDATE = ecore_event_type_new();
- EFREET_EVENT_DESKTOP_CACHE_UPDATE = ecore_event_type_new();
- EFREET_EVENT_DESKTOP_CACHE_BUILD = ecore_event_type_new();
- }
+ EFREET_EVENT_ICON_CACHE_UPDATE = ecore_event_type_new();
+ EFREET_EVENT_DESKTOP_CACHE_UPDATE = ecore_event_type_new();
+ EFREET_EVENT_DESKTOP_CACHE_BUILD = ecore_event_type_new();
themes =
eina_hash_string_superfast_new(EINA_FREE_CB(efreet_cache_icon_theme_free));
icons =
eina_hash_string_superfast_new(EINA_FREE_CB(efreet_cache_icon_free));
diff --git a/src/lib/eio/eio_monitor.c b/src/lib/eio/eio_monitor.c
index ccc13c4339..66519ff2ce 100644
--- a/src/lib/eio/eio_monitor.c
+++ b/src/lib/eio/eio_monitor.c
@@ -140,20 +140,17 @@ _eio_monitor_error_cb(void *data, Eio_File *handler
EINA_UNUSED, int error)
void
eio_monitor_init(void)
{
- if (EIO_MONITOR_ERROR == 0)
- {
- EIO_MONITOR_ERROR = ecore_event_type_new();
- EIO_MONITOR_SELF_RENAME = ecore_event_type_new();
- EIO_MONITOR_SELF_DELETED = ecore_event_type_new();
- EIO_MONITOR_FILE_CREATED = ecore_event_type_new();
- EIO_MONITOR_FILE_DELETED = ecore_event_type_new();
- EIO_MONITOR_FILE_MODIFIED = ecore_event_type_new();
- EIO_MONITOR_FILE_CLOSED = ecore_event_type_new();
- EIO_MONITOR_DIRECTORY_CREATED = ecore_event_type_new();
- EIO_MONITOR_DIRECTORY_DELETED = ecore_event_type_new();
- EIO_MONITOR_DIRECTORY_MODIFIED = ecore_event_type_new();
- EIO_MONITOR_DIRECTORY_CLOSED = ecore_event_type_new();
- }
+ EIO_MONITOR_ERROR = ecore_event_type_new();
+ EIO_MONITOR_SELF_RENAME = ecore_event_type_new();
+ EIO_MONITOR_SELF_DELETED = ecore_event_type_new();
+ EIO_MONITOR_FILE_CREATED = ecore_event_type_new();
+ EIO_MONITOR_FILE_DELETED = ecore_event_type_new();
+ EIO_MONITOR_FILE_MODIFIED = ecore_event_type_new();
+ EIO_MONITOR_FILE_CLOSED = ecore_event_type_new();
+ EIO_MONITOR_DIRECTORY_CREATED = ecore_event_type_new();
+ EIO_MONITOR_DIRECTORY_DELETED = ecore_event_type_new();
+ EIO_MONITOR_DIRECTORY_MODIFIED = ecore_event_type_new();
+ EIO_MONITOR_DIRECTORY_CLOSED = ecore_event_type_new();
eio_monitor_backend_init();
eio_monitor_fallback_init();
diff --git a/src/lib/elementary/elm_config.c b/src/lib/elementary/elm_config.c
index 12837ee407..5b5481f865 100644
--- a/src/lib/elementary/elm_config.c
+++ b/src/lib/elementary/elm_config.c
@@ -4115,8 +4115,7 @@ _translation_init(void)
void
_elm_config_init(void)
{
- if (!ELM_EVENT_CONFIG_ALL_CHANGED)
- ELM_EVENT_CONFIG_ALL_CHANGED = ecore_event_type_new();
+ ELM_EVENT_CONFIG_ALL_CHANGED = ecore_event_type_new();
_desc_init();
_elm_config_profile_derived_init();
_profile_fetch_from_conf();
diff --git a/src/lib/elementary/elm_main.c b/src/lib/elementary/elm_main.c
index cf4282c2b8..f7224c5c73 100644
--- a/src/lib/elementary/elm_main.c
+++ b/src/lib/elementary/elm_main.c
@@ -755,12 +755,9 @@ elm_quicklaunch_init(int argc EINA_UNUSED,
#endif
memset(_elm_policies, 0, sizeof(_elm_policies));
- if (!ELM_EVENT_POLICY_CHANGED)
- {
- ELM_EVENT_POLICY_CHANGED = ecore_event_type_new();
- ELM_EVENT_PROCESS_BACKGROUND = ecore_event_type_new();
- ELM_EVENT_PROCESS_FOREGROUND = ecore_event_type_new();
- }
+ ELM_EVENT_POLICY_CHANGED = ecore_event_type_new();
+ ELM_EVENT_PROCESS_BACKGROUND = ecore_event_type_new();
+ ELM_EVENT_PROCESS_FOREGROUND = ecore_event_type_new();
if (!ecore_file_init())
ERR("Elementary cannot init ecore_file");
diff --git a/src/lib/elementary/elm_systray.c b/src/lib/elementary/elm_systray.c
index fadd7a29f0..bcc8c0a2e5 100644
--- a/src/lib/elementary/elm_systray.c
+++ b/src/lib/elementary/elm_systray.c
@@ -459,8 +459,7 @@ elm_need_systray(void)
if (!elm_need_eldbus()) return EINA_FALSE;
- if (!ELM_EVENT_SYSTRAY_READY)
- ELM_EVENT_SYSTRAY_READY = ecore_event_type_new();
+ ELM_EVENT_SYSTRAY_READY = ecore_event_type_new();
if (!_elm_systray_watcher_init()) return EINA_FALSE;
diff --git a/src/lib/elementary/elm_thumb.c b/src/lib/elementary/elm_thumb.c
index 862568950d..9819cc3ffe 100644
--- a/src/lib/elementary/elm_thumb.c
+++ b/src/lib/elementary/elm_thumb.c
@@ -520,8 +520,7 @@ elm_need_ethumb(void)
if (_elm_need_ethumb) return EINA_TRUE;
_elm_need_ethumb = EINA_TRUE;
- if (ELM_ECORE_EVENT_ETHUMB_CONNECT == 0)
- ELM_ECORE_EVENT_ETHUMB_CONNECT = ecore_event_type_new();
+ ELM_ECORE_EVENT_ETHUMB_CONNECT = ecore_event_type_new();
ethumb_client_init();
return EINA_TRUE;
diff --git a/src/lib/elocation/elocation.c b/src/lib/elocation/elocation.c
index 0edf925480..cb0431c1ab 100644
--- a/src/lib/elocation/elocation.c
+++ b/src/lib/elocation/elocation.c
@@ -1253,21 +1253,18 @@ elocation_init(void)
}
/* Create all ecore event types we send out to interested applications */
- if (ELOCATION_EVENT_IN == 0)
- {
- ELOCATION_EVENT_IN = ecore_event_type_new();
- ELOCATION_EVENT_OUT = ecore_event_type_new();
- ELOCATION_EVENT_STATUS = ecore_event_type_new();
- ELOCATION_EVENT_POSITION = ecore_event_type_new();
- ELOCATION_EVENT_ADDRESS = ecore_event_type_new();
- ELOCATION_EVENT_VELOCITY = ecore_event_type_new();
- ELOCATION_EVENT_GEOCODE = ecore_event_type_new();
- ELOCATION_EVENT_REVERSEGEOCODE = ecore_event_type_new();
- ELOCATION_EVENT_NMEA = ecore_event_type_new();
- ELOCATION_EVENT_SATELLITE = ecore_event_type_new();
- ELOCATION_EVENT_POI = ecore_event_type_new();
- ELOCATION_EVENT_META_READY = ecore_event_type_new();
- }
+ ELOCATION_EVENT_IN = ecore_event_type_new();
+ ELOCATION_EVENT_OUT = ecore_event_type_new();
+ ELOCATION_EVENT_STATUS = ecore_event_type_new();
+ ELOCATION_EVENT_POSITION = ecore_event_type_new();
+ ELOCATION_EVENT_ADDRESS = ecore_event_type_new();
+ ELOCATION_EVENT_VELOCITY = ecore_event_type_new();
+ ELOCATION_EVENT_GEOCODE = ecore_event_type_new();
+ ELOCATION_EVENT_REVERSEGEOCODE = ecore_event_type_new();
+ ELOCATION_EVENT_NMEA = ecore_event_type_new();
+ ELOCATION_EVENT_SATELLITE = ecore_event_type_new();
+ ELOCATION_EVENT_POI = ecore_event_type_new();
+ ELOCATION_EVENT_META_READY = ecore_event_type_new();
obj_master= eldbus_object_get(conn, GEOCLUE_DBUS_NAME, GEOCLUE_OBJECT_PATH);
if (!obj_master)
diff --git a/src/lib/elput/elput.c b/src/lib/elput/elput.c
index f3cda411ea..503e5b57f0 100644
--- a/src/lib/elput/elput.c
+++ b/src/lib/elput/elput.c
@@ -33,18 +33,15 @@ elput_init(void)
goto log_err;
}
- if (ELPUT_EVENT_SEAT_CAPS == 0)
- {
- ELPUT_EVENT_SEAT_CAPS = ecore_event_type_new();
- ELPUT_EVENT_SEAT_FRAME = ecore_event_type_new();
- ELPUT_EVENT_KEYMAP_SEND = ecore_event_type_new();
- ELPUT_EVENT_MODIFIERS_SEND = ecore_event_type_new();
- ELPUT_EVENT_DEVICE_CHANGE = ecore_event_type_new();
- ELPUT_EVENT_SESSION_ACTIVE = ecore_event_type_new();
- ELPUT_EVENT_POINTER_MOTION = ecore_event_type_new();
- ELPUT_EVENT_SWITCH = ecore_event_type_new();
- elput_event_session_ready = ecore_event_type_new();
- }
+ ELPUT_EVENT_SEAT_CAPS = ecore_event_type_new();
+ ELPUT_EVENT_SEAT_FRAME = ecore_event_type_new();
+ ELPUT_EVENT_KEYMAP_SEND = ecore_event_type_new();
+ ELPUT_EVENT_MODIFIERS_SEND = ecore_event_type_new();
+ ELPUT_EVENT_DEVICE_CHANGE = ecore_event_type_new();
+ ELPUT_EVENT_SESSION_ACTIVE = ecore_event_type_new();
+ ELPUT_EVENT_POINTER_MOTION = ecore_event_type_new();
+ ELPUT_EVENT_SWITCH = ecore_event_type_new();
+ elput_event_session_ready = ecore_event_type_new();
return _elput_init_count;
diff --git a/src/lib/emotion/emotion_webcam.c b/src/lib/emotion/emotion_webcam.c
index 7893e197e3..1e1db06d97 100644
--- a/src/lib/emotion/emotion_webcam.c
+++ b/src/lib/emotion/emotion_webcam.c
@@ -273,12 +273,9 @@ _emotion_enumerate_all_webcams(void)
Eina_Bool emotion_webcam_init(void)
{
- if (EMOTION_WEBCAM_UPDATE == 0)
- {
- EMOTION_WEBCAM_UPDATE = ecore_event_type_new();
- EMOTION_WEBCAM_ADD = ecore_event_type_new();
- EMOTION_WEBCAM_DEL = ecore_event_type_new();
- }
+ EMOTION_WEBCAM_UPDATE = ecore_event_type_new();
+ EMOTION_WEBCAM_ADD = ecore_event_type_new();
+ EMOTION_WEBCAM_DEL = ecore_event_type_new();
eet_init();
_emotion_webcams_edds_new();
--
