summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2019-01-04 15:29:56 +0100
committerCedric BAIL <cedric.bail@free.fr>2019-01-04 11:03:38 -0800
commitefd0efb316324281ecd50c1cba2aaf0ee1feab10 (patch)
tree3a4f49f4b866e1fc6cda7b013dd340a67f692ea1
parent9c256beb2ef838049843d91376e2a4fe34ac789c (diff)
eo: move definitions of priority from Eo.h to the object
So it can be references from the later coming definition of callback_forwarder ref D7532 Reviewed-by: Cedric BAIL <cedric.bail@free.fr> Differential Revision: https://phab.enlightenment.org/D7542
-rw-r--r--src/lib/eo/Eo.h25
-rw-r--r--src/lib/eo/efl_object.eo15
2 files changed, 15 insertions, 25 deletions
diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h
index eac6bfe271..62210443a1 100644
--- a/src/lib/eo/Eo.h
+++ b/src/lib/eo/Eo.h
@@ -223,15 +223,6 @@ typedef void (*Efl_Del_Intercept) (Eo *obj_id);
223typedef void (*Efl_Event_Cb)(void *data, const Efl_Event *event); 223typedef void (*Efl_Event_Cb)(void *data, const Efl_Event *event);
224 224
225/** 225/**
226 * @brief Callback priority value. Range is -32k - 32k. The lower the number,
227 * the higher the priority.
228 *
229 * See @ref EFL_CALLBACK_PRIORITY_AFTER, @ref EFL_CALLBACK_PRIORITY_BEFORE @ref
230 * EFL_CALLBACK_PRIORITY_DEFAULT
231 */
232typedef short Efl_Callback_Priority;
233
234/**
235 * @struct _Efl_Callback_Array_Item 226 * @struct _Efl_Callback_Array_Item
236 * @brief An item in an array of callback desc/func. 227 * @brief An item in an array of callback desc/func.
237 * 228 *
@@ -1987,22 +1978,6 @@ typedef void (*efl_key_data_free_func)(void *);
1987EAPI const Efl_Event_Description *efl_object_legacy_only_event_description_get(const char *_event_name); 1978EAPI const Efl_Event_Description *efl_object_legacy_only_event_description_get(const char *_event_name);
1988 1979
1989/** 1980/**
1990 * @def EFL_CALLBACK_PRIORITY_BEFORE
1991 * Slightly more prioritized than default.
1992 */
1993#define EFL_CALLBACK_PRIORITY_BEFORE -100
1994/**
1995 * @def EFL_CALLBACK_PRIORITY_DEFAULT
1996 * Default callback priority level
1997 */
1998#define EFL_CALLBACK_PRIORITY_DEFAULT 0
1999/**
2000 * @def EFL_CALLBACK_PRIORITY_AFTER
2001 * Slightly less prioritized than default.
2002 */
2003#define EFL_CALLBACK_PRIORITY_AFTER 100
2004
2005/**
2006 * Helper for sorting callbacks array. Automatically used by 1981 * Helper for sorting callbacks array. Automatically used by
2007 * @ref EFL_CALLBACKS_ARRAY_DEFINE 1982 * @ref EFL_CALLBACKS_ARRAY_DEFINE
2008 */ 1983 */
diff --git a/src/lib/eo/efl_object.eo b/src/lib/eo/efl_object.eo
index 4bc643de4b..49a836c8e3 100644
--- a/src/lib/eo/efl_object.eo
+++ b/src/lib/eo/efl_object.eo
@@ -8,6 +8,21 @@ struct Efl.Event_Description {
8 restart: bool; [[$true if when the event is triggered again from a callback it'll start from where it was]] 8 restart: bool; [[$true if when the event is triggered again from a callback it'll start from where it was]]
9} 9}
10 10
11
12type Efl.Callback_Priority : short;
13[[
14 Callback priority. Range is -32k - 32k. The lower the number, the higher the priority.
15
16 See @Efl.Callback_Priority_Before @Efl.Callback_Priority_Default @Efl.Callback_Priority_After
17 ]]
18
19const Efl.Callback_Priority_Before : Efl.Callback_Priority = -100;
20[[Slightly more prioritized than default.]]
21const Efl.Callback_Priority_Default : Efl.Callback_Priority = 0;
22[[Default priority.]]
23const Efl.Callback_Priority_After : Efl.Callback_Priority = 100;
24[[Slightly less prioritized than default.]]
25
11abstract Efl.Object 26abstract Efl.Object
12{ 27{
13 [[Abstract Efl object class]] 28 [[Abstract Efl object class]]