summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYossi Kantor <yossi.kantor@samsung.com>2014-04-07 11:28:53 +0300
committerDaniel Zaoui <daniel.zaoui@samsung.com>2014-04-23 15:44:17 +0300
commitd48c884045ab770a278784e3b4e48eee8f3900f5 (patch)
tree84d34b7e4b550e5754cff7149241a46dda9b4816
parentd7ff6085c2a098099471b4617bfe6400a6b91243 (diff)
Eolian: Legacy integration of Ecore
-rw-r--r--src/Makefile_Ecore.am12
-rw-r--r--src/lib/ecore/Ecore_Eo.h333
-rw-r--r--src/lib/ecore/Ecore_Legacy.h36
3 files changed, 30 insertions, 351 deletions
diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am
index d6c7731..d861e5f 100644
--- a/src/Makefile_Ecore.am
+++ b/src/Makefile_Ecore.am
@@ -4,18 +4,23 @@
4BUILT_SOURCES += \ 4BUILT_SOURCES += \
5 lib/ecore/ecore_timer.eo.c \ 5 lib/ecore/ecore_timer.eo.c \
6 lib/ecore/ecore_timer.eo.h \ 6 lib/ecore/ecore_timer.eo.h \
7 lib/ecore/ecore_timer.eo.legacy.h \
7 lib/ecore/ecore_poll.eo.c \ 8 lib/ecore/ecore_poll.eo.c \
8 lib/ecore/ecore_poll.eo.h \ 9 lib/ecore/ecore_poll.eo.h \
10 lib/ecore/ecore_poll.eo.legacy.h \
9 lib/ecore/ecore_job.eo.c \ 11 lib/ecore/ecore_job.eo.c \
10 lib/ecore/ecore_job.eo.h \ 12 lib/ecore/ecore_job.eo.h \
13 lib/ecore/ecore_job.eo.legacy.h \
11 lib/ecore/ecore_idler.eo.c \ 14 lib/ecore/ecore_idler.eo.c \
12 lib/ecore/ecore_idler.eo.h \ 15 lib/ecore/ecore_idler.eo.h \
16 lib/ecore/ecore_idler.eo.legacy.h \
13 lib/ecore/ecore_idle_enterer.eo.c \ 17 lib/ecore/ecore_idle_enterer.eo.c \
14 lib/ecore/ecore_idle_enterer.eo.h \ 18 lib/ecore/ecore_idle_enterer.eo.h \
15 lib/ecore/ecore_idle_exiter.eo.c \ 19 lib/ecore/ecore_idle_exiter.eo.c \
16 lib/ecore/ecore_idle_exiter.eo.h \ 20 lib/ecore/ecore_idle_exiter.eo.h \
17 lib/ecore/ecore_animator.eo.c \ 21 lib/ecore/ecore_animator.eo.c \
18 lib/ecore/ecore_animator.eo.h \ 22 lib/ecore/ecore_animator.eo.h \
23 lib/ecore/ecore_animator.eo.legacy.h \
19 lib/ecore/ecore_parent.eo.c \ 24 lib/ecore/ecore_parent.eo.c \
20 lib/ecore/ecore_parent.eo.h 25 lib/ecore/ecore_parent.eo.h
21 26
@@ -51,7 +56,12 @@ nodist_installed_ecoremainheaders_DATA = \
51 lib/ecore/ecore_idle_enterer.eo.h \ 56 lib/ecore/ecore_idle_enterer.eo.h \
52 lib/ecore/ecore_idle_exiter.eo.h \ 57 lib/ecore/ecore_idle_exiter.eo.h \
53 lib/ecore/ecore_animator.eo.h \ 58 lib/ecore/ecore_animator.eo.h \
54 lib/ecore/ecore_parent.eo.h 59 lib/ecore/ecore_parent.eo.h \
60 lib/ecore/ecore_timer.eo.legacy.h \
61 lib/ecore/ecore_poll.eo.legacy.h \
62 lib/ecore/ecore_job.eo.legacy.h \
63 lib/ecore/ecore_idler.eo.legacy.h \
64 lib/ecore/ecore_animator.eo.legacy.h
55 65
56lib_ecore_libecore_la_SOURCES = \ 66lib_ecore_libecore_la_SOURCES = \
57lib/ecore/ecore.c \ 67lib/ecore/ecore.c \
diff --git a/src/lib/ecore/Ecore_Eo.h b/src/lib/ecore/Ecore_Eo.h
index 38e8c93..70c8ac9 100644
--- a/src/lib/ecore/Ecore_Eo.h
+++ b/src/lib/ecore/Ecore_Eo.h
@@ -10,62 +10,9 @@ extern "C" {
10 * 10 *
11 * @{ 11 * @{
12 */ 12 */
13#include "ecore_poll.eo.h"
14#if 0
15#define ECORE_POLLER_CLASS ecore_poller_class_get()
16const Eo_Class *ecore_poller_class_get(void) EINA_CONST;
17extern EAPI Eo_Op ECORE_POLLER_BASE_ID;
18
19enum
20{
21 ECORE_POLLER_SUB_ID_CONSTRUCTOR,
22 ECORE_POLLER_SUB_ID_INTERVAL_SET,
23 ECORE_POLLER_SUB_ID_INTERVAL_GET,
24 ECORE_POLLER_SUB_ID_LAST,
25};
26
27#define ECORE_POLLER_ID(sub_id) (ECORE_POLLER_BASE_ID + sub_id)
28
29/**
30 * @def ecore_poller_constructor
31 * @since 1.8
32 *
33 * Contructor with parameters for Ecore Poller.
34 *
35 * @param[in] type
36 * @param[in] interval
37 * @param[in] func
38 * @param[in] data
39 *
40 */
41#define ecore_poller_constructor(type, interval, func, data) ECORE_POLLER_ID(ECORE_POLLER_SUB_ID_CONSTRUCTOR), EO_TYPECHECK(Ecore_Poller_Type, type), EO_TYPECHECK(int, interval), EO_TYPECHECK(Ecore_Task_Cb, func), EO_TYPECHECK(const void *, data)
42 13
43/** 14#include "ecore_poll.eo.h"
44 * @def ecore_poller_interval_set
45 * @since 1.8
46 *
47 * Changes the polling interval rate of poller.
48 *
49 * @param[in] interval
50 * @param[out] ret
51 *
52 * @see ecore_poller_poller_interval_set
53 */
54#define ecore_poller_interval_set(interval, ret) ECORE_POLLER_ID(ECORE_POLLER_SUB_ID_INTERVAL_SET), EO_TYPECHECK(int, interval), EO_TYPECHECK(Eina_Bool *, ret)
55
56/**
57 * @def ecore_poller_interval_get
58 * @since 1.8
59 *
60 * Gets the polling interval rate of poller.
61 *
62 * @param[out] ret
63 *
64 * @see ecore_poller_poller_interval_get
65 */
66#define ecore_poller_interval_get(ret) ECORE_POLLER_ID(ECORE_POLLER_SUB_ID_INTERVAL_GET), EO_TYPECHECK(int *, ret)
67 15
68#endif
69/** 16/**
70 * @} 17 * @}
71 */ 18 */
@@ -75,49 +22,10 @@ enum
75 * 22 *
76 * @{ 23 * @{
77 */ 24 */
78#include "ecore_animator.eo.h"
79#if 0
80
81#define ECORE_ANIMATOR_CLASS ecore_animator_class_get()
82const Eo_Class *ecore_animator_class_get(void) EINA_CONST;
83 25
84extern EAPI Eo_Op ECORE_ANIMATOR_BASE_ID; 26#include "ecore_animator.eo.h"
85
86enum
87{
88 ECORE_ANIMATOR_SUB_ID_CONSTRUCTOR,
89 ECORE_ANIMATOR_SUB_ID_TIMELINE_CONSTRUCTOR,
90 ECORE_ANIMATOR_SUB_ID_LAST
91};
92
93#define ECORE_ANIMATOR_ID(sub_id) (ECORE_ANIMATOR_BASE_ID + sub_id)
94
95/**
96 * @def ecore_animator_constructor
97 * @since 1.8
98 *
99 * Contructor.
100 *
101 * @param[in] func
102 * @param[in] data
103 *
104 */
105#define ecore_animator_constructor(func, data) ECORE_ANIMATOR_ID(ECORE_ANIMATOR_SUB_ID_CONSTRUCTOR), EO_TYPECHECK(Ecore_Task_Cb, func), EO_TYPECHECK(const void *, data)
106 27
107/** 28/**
108 * @def ecore_animator_timeline_constructor
109 * @since 1.8
110 *
111 * Contructor.
112 *
113 * @param[in] runtime
114 * @param[in] func
115 * @param[in] data
116 *
117 */
118#define ecore_animator_timeline_constructor(runtime, func, data) ECORE_ANIMATOR_ID(ECORE_ANIMATOR_SUB_ID_TIMELINE_CONSTRUCTOR), EO_TYPECHECK(double, runtime), EO_TYPECHECK(Ecore_Timeline_Cb, func), EO_TYPECHECK(const void *, data)
119#endif
120/**
121 * @} 29 * @}
122 */ 30 */
123 31
@@ -126,112 +34,10 @@ enum
126 * 34 *
127 * @{ 35 * @{
128 */ 36 */
129#include "ecore_timer.eo.h"
130#if 0
131
132#define ECORE_TIMER_CLASS ecore_timer_class_get()
133const Eo_Class *ecore_timer_class_get(void) EINA_CONST;
134extern EAPI Eo_Op ECORE_TIMER_BASE_ID;
135
136enum
137{
138 ECORE_TIMER_SUB_ID_CONSTRUCTOR,
139 ECORE_TIMER_SUB_ID_LOOP_CONSTRUCTOR,
140 ECORE_TIMER_SUB_ID_INTERVAL_SET,
141 ECORE_TIMER_SUB_ID_INTERVAL_GET,
142 ECORE_TIMER_SUB_ID_DELAY,
143 ECORE_TIMER_SUB_ID_RESET,
144 ECORE_TIMER_SUB_ID_PENDING_GET,
145 ECORE_TIMER_SUB_ID_LAST,
146};
147
148#define ECORE_TIMER_ID(sub_id) (ECORE_TIMER_BASE_ID + sub_id)
149
150/**
151 * @def ecore_timer_constructor
152 * @since 1.8
153 *
154 * Contructor.
155 *
156 * @param[in] in
157 * @param[in] func
158 * @param[in] data
159 *
160 */
161#define ecore_timer_constructor(in, func, data) ECORE_TIMER_ID(ECORE_TIMER_SUB_ID_CONSTRUCTOR), EO_TYPECHECK(double, in), EO_TYPECHECK(Ecore_Task_Cb, func), EO_TYPECHECK(const void *, data)
162
163/**
164 * @def ecore_timer_loop_constructor
165 * @since 1.8
166 *
167 * Contructor.
168 *
169 * @param[in] in
170 * @param[in] func
171 * @param[in] data
172 *
173 */
174#define ecore_timer_loop_constructor(in, func, data) ECORE_TIMER_ID(ECORE_TIMER_SUB_ID_LOOP_CONSTRUCTOR), EO_TYPECHECK(double, in), EO_TYPECHECK(Ecore_Task_Cb, func), EO_TYPECHECK(const void *, data)
175
176/**
177 * @def ecore_obj_timer_interval_set
178 * @since 1.8
179 *
180 * Change the interval the timer ticks of.
181 *
182 * @param[in] in
183 *
184 * @see ecore_timer_interval_set
185 */
186#define ecore_obj_timer_interval_set(in) ECORE_TIMER_ID(ECORE_TIMER_SUB_ID_INTERVAL_SET), EO_TYPECHECK(double, in)
187
188/**
189 * @def ecore_obj_timer_interval_get
190 * @since 1.8
191 *
192 * Get the interval the timer ticks on.
193 *
194 * @param[out] ret
195 *
196 * @see ecore_timer_interval_get
197 */
198#define ecore_obj_timer_interval_get(ret) ECORE_TIMER_ID(ECORE_TIMER_SUB_ID_INTERVAL_GET), EO_TYPECHECK(double *, ret)
199
200/**
201 * @def ecore_obj_timer_delay
202 * @since 1.8
203 *
204 * Add some delay for the next occurrence of a timer.
205 *
206 * @param[in] add
207 *
208 * @see ecore_timer_delay
209 */
210#define ecore_obj_timer_delay(add) ECORE_TIMER_ID(ECORE_TIMER_SUB_ID_DELAY), EO_TYPECHECK(double, add)
211 37
212/** 38#include "ecore_timer.eo.h"
213 * @def ecore_obj_timer_reset
214 * @since 1.8
215 *
216 * Reset a timer to its full interval.
217 *
218 * @see ecore_timer_reset
219 */
220#define ecore_obj_timer_reset() ECORE_TIMER_ID(ECORE_TIMER_SUB_ID_RESET)
221 39
222/** 40/**
223 * @def ecore_obj_timer_pending_get
224 * @since 1.8
225 *
226 * Get the pending time regarding a timer.
227 *
228 * @param[out] ret
229 *
230 * @see ecore_timer_pending_get
231 */
232#define ecore_obj_timer_pending_get(ret) ECORE_TIMER_ID(ECORE_TIMER_SUB_ID_PENDING_GET), EO_TYPECHECK(double *, ret)
233#endif
234/**
235 * @} 41 * @}
236 */ 42 */
237 43
@@ -240,112 +46,11 @@ enum
240 * 46 *
241 * @{ 47 * @{
242 */ 48 */
243#include "ecore_idler.eo.h"
244#if 0
245
246#define ECORE_IDLER_CLASS ecore_idler_class_get()
247const Eo_Class *ecore_idler_class_get(void) EINA_CONST;
248
249extern EAPI Eo_Op ECORE_IDLER_BASE_ID;
250
251enum
252{
253 ECORE_IDLER_SUB_ID_CONSTRUCTOR,
254 ECORE_IDLER_SUB_ID_LAST
255};
256 49
257#define ECORE_IDLER_ID(sub_id) (ECORE_IDLER_BASE_ID + sub_id) 50#include "ecore_idler.eo.h"
258
259/**
260 * @def ecore_idler_constructor
261 * @since 1.8
262 *
263 * Contructor.
264 *
265 * @param[in] func
266 * @param[in] data
267 *
268 */
269#define ecore_idler_constructor(func, data) ECORE_IDLER_ID(ECORE_IDLER_SUB_ID_CONSTRUCTOR), EO_TYPECHECK(Ecore_Task_Cb, func), EO_TYPECHECK(const void *, data)
270
271#endif
272/**
273 *
274 */
275#include "ecore_idle_enterer.eo.h"
276#if 0
277
278#define ECORE_IDLE_ENTERER_CLASS ecore_idle_enterer_class_get()
279const Eo_Class *ecore_idle_enterer_class_get(void) EINA_CONST;
280
281extern EAPI Eo_Op ECORE_IDLE_ENTERER_BASE_ID;
282
283enum
284{
285 ECORE_IDLE_ENTERER_SUB_ID_AFTER_CONSTRUCTOR,
286 ECORE_IDLE_ENTERER_SUB_ID_BEFORE_CONSTRUCTOR,
287 ECORE_IDLE_ENTERER_SUB_ID_LAST
288};
289
290#define ECORE_IDLE_ENTERER_ID(sub_id) (ECORE_IDLE_ENTERER_BASE_ID + sub_id)
291
292/**
293 * @def ecore_idle_enterer_after_constructor
294 * @since 1.8
295 *
296 * Contructor. Will insert the handler at the end of the list.
297 *
298 * @param[in] func
299 * @param[in] data
300 *
301 */
302#define ecore_idle_enterer_after_constructor(func, data) ECORE_IDLE_ENTERER_ID(ECORE_IDLE_ENTERER_SUB_ID_AFTER_CONSTRUCTOR), EO_TYPECHECK(Ecore_Task_Cb, func), EO_TYPECHECK(const void *, data)
303
304/**
305 * @def ecore_idle_enterer_before_constructor
306 * @since 1.8
307 *
308 * Contructor. Will insert the handler at the beginning of the list.
309 *
310 * @param[in] func
311 * @param[in] data
312 *
313 */
314#define ecore_idle_enterer_before_constructor(func, data) ECORE_IDLE_ENTERER_ID(ECORE_IDLE_ENTERER_SUB_ID_BEFORE_CONSTRUCTOR), EO_TYPECHECK(Ecore_Task_Cb, func), EO_TYPECHECK(const void *, data)
315
316#endif
317/**
318 *
319 */
320#include "ecore_idle_exiter.eo.h" 51#include "ecore_idle_exiter.eo.h"
321#if 0 52#include "ecore_idle_enterer.eo.h"
322
323#define ECORE_IDLE_EXITER_CLASS ecore_idle_exiter_class_get()
324const Eo_Class *ecore_idle_exiter_class_get(void) EINA_CONST;
325
326extern EAPI Eo_Op ECORE_IDLE_EXITER_BASE_ID;
327
328enum
329{
330 ECORE_IDLE_EXITER_SUB_ID_CONSTRUCTOR,
331 ECORE_IDLE_EXITER_SUB_ID_LAST
332};
333
334#define ECORE_IDLE_EXITER_ID(sub_id) (ECORE_IDLE_EXITER_BASE_ID + sub_id)
335
336/**
337 * @def ecore_idle_exiter_constructor
338 * @since 1.8
339 *
340 * Contructor.
341 *
342 * @param[in] func
343 * @param[in] data
344 *
345 */
346#define ecore_idle_exiter_constructor(func, data) ECORE_IDLE_EXITER_ID(ECORE_IDLE_EXITER_SUB_ID_CONSTRUCTOR), EO_TYPECHECK(Ecore_Task_Cb, func), EO_TYPECHECK(const void *, data)
347 53
348#endif
349/** 54/**
350 * @} 55 * @}
351 */ 56 */
@@ -355,35 +60,9 @@ enum
355 * 60 *
356 * @{ 61 * @{
357 */ 62 */
358#include "ecore_job.eo.h"
359#if 0
360
361#define ECORE_JOB_CLASS ecore_job_class_get()
362const Eo_Class *ecore_job_class_get(void) EINA_CONST;
363
364extern EAPI Eo_Op ECORE_JOB_BASE_ID;
365 63
366enum 64#include "ecore_job.eo.h"
367{
368 ECORE_JOB_SUB_ID_CONSTRUCTOR,
369 ECORE_JOB_SUB_ID_LAST
370};
371
372#define ECORE_JOB_ID(sub_id) (ECORE_JOB_BASE_ID + sub_id)
373
374/**
375 * @def ecore_job_constructor
376 * @since 1.8
377 *
378 * Contructor.
379 *
380 * @param[in] func
381 * @param[in] data
382 *
383 */
384#define ecore_job_constructor(func, data) ECORE_JOB_ID(ECORE_JOB_SUB_ID_CONSTRUCTOR), EO_TYPECHECK(Ecore_Cb, func), EO_TYPECHECK(const void *, data)
385 65
386#endif
387/** 66/**
388 * @} 67 * @}
389 */ 68 */
diff --git a/src/lib/ecore/Ecore_Legacy.h b/src/lib/ecore/Ecore_Legacy.h
index 381f0e8..66a50e3 100644
--- a/src/lib/ecore/Ecore_Legacy.h
+++ b/src/lib/ecore/Ecore_Legacy.h
@@ -9,24 +9,6 @@ extern "C" {
9 */ 9 */
10 10
11/** 11/**
12 * @brief Changes the polling interval rate of @p poller.
13 * @param poller The Ecore_Poller to change the interval of.
14 * @param interval The tick interval to set; must be a power of 2 and <= 32768.
15 * @return Returns true on success, false on failure.
16 *
17 * This allows the changing of a poller's polling interval. It is useful when
18 * you want to alter a poll rate without deleting and re-creating a poller.
19 */
20EAPI Eina_Bool ecore_poller_poller_interval_set(Ecore_Poller *poller, int interval);
21/**
22 * @brief Gets the polling interval rate of @p poller.
23 * @param poller The Ecore_Poller to change the interval of.
24 * @return Returns the interval, in ticks, that @p poller polls at.
25 *
26 * This returns a poller's polling interval, or 0 on error.
27 */
28EAPI int ecore_poller_poller_interval_get(const Ecore_Poller *poller);
29/**
30 * @brief Creates a poller to call the given function at a particular tick interval. 12 * @brief Creates a poller to call the given function at a particular tick interval.
31 * @param type The ticker type to attach the poller to. Must be ECORE_POLLER_CORE. 13 * @param type The ticker type to attach the poller to. Must be ECORE_POLLER_CORE.
32 * @param interval The poll interval. 14 * @param interval The poll interval.
@@ -63,6 +45,8 @@ EAPI Ecore_Poller *ecore_poller_add(Ecore_Poller_Type type, int interval, Ecore_
63 */ 45 */
64EAPI void *ecore_poller_del(Ecore_Poller *poller); 46EAPI void *ecore_poller_del(Ecore_Poller *poller);
65 47
48#include "ecore_poll.eo.legacy.h"
49
66/** 50/**
67 * @} 51 * @}
68 */ 52 */
@@ -164,6 +148,8 @@ EAPI void ecore_animator_freeze(Ecore_Animator *animator);
164 */ 148 */
165EAPI void ecore_animator_thaw(Ecore_Animator *animator); 149EAPI void ecore_animator_thaw(Ecore_Animator *animator);
166 150
151#include "ecore_animator.eo.legacy.h"
152
167/** 153/**
168 * @} 154 * @}
169 */ 155 */
@@ -176,14 +162,12 @@ EAPI void ecore_animator_thaw(Ecore_Animator *animator);
176EAPI Ecore_Timer *ecore_timer_add(double in, Ecore_Task_Cb func, const void *data); 162EAPI Ecore_Timer *ecore_timer_add(double in, Ecore_Task_Cb func, const void *data);
177EAPI Ecore_Timer *ecore_timer_loop_add(double in, Ecore_Task_Cb func, const void *data); 163EAPI Ecore_Timer *ecore_timer_loop_add(double in, Ecore_Task_Cb func, const void *data);
178EAPI void *ecore_timer_del(Ecore_Timer *timer); 164EAPI void *ecore_timer_del(Ecore_Timer *timer);
179EAPI void ecore_timer_interval_set(Ecore_Timer *timer, double in);
180EAPI double ecore_timer_interval_get(const Ecore_Timer *timer);
181EAPI void ecore_timer_freeze(Ecore_Timer *timer); 165EAPI void ecore_timer_freeze(Ecore_Timer *timer);
182EAPI Eina_Bool ecore_timer_freeze_get(Ecore_Timer *timer); 166EAPI Eina_Bool ecore_timer_freeze_get(Ecore_Timer *timer);
183EAPI void ecore_timer_thaw(Ecore_Timer *timer); 167EAPI void ecore_timer_thaw(Ecore_Timer *timer);
184EAPI void ecore_timer_delay(Ecore_Timer *timer, double add); 168
185EAPI void ecore_timer_reset(Ecore_Timer *timer); 169#include "ecore_timer.eo.legacy.h"
186EAPI double ecore_timer_pending_get(const Ecore_Timer *timer); 170
187/** 171/**
188 * @} 172 * @}
189 */ 173 */
@@ -223,6 +207,9 @@ EAPI void *ecore_idle_enterer_del(Ecore_Idle_Enterer *idle_enterer);
223 207
224EAPI Ecore_Idle_Exiter *ecore_idle_exiter_add(Ecore_Task_Cb func, const void *data); 208EAPI Ecore_Idle_Exiter *ecore_idle_exiter_add(Ecore_Task_Cb func, const void *data);
225EAPI void *ecore_idle_exiter_del(Ecore_Idle_Exiter *idle_exiter); 209EAPI void *ecore_idle_exiter_del(Ecore_Idle_Exiter *idle_exiter);
210
211#include "ecore_idler.eo.legacy.h"
212
226/** 213/**
227 * @} 214 * @}
228 */ 215 */
@@ -234,6 +221,9 @@ EAPI void *ecore_idle_exiter_del(Ecore_Idle_Exiter *idle_exiter);
234 */ 221 */
235EAPI Ecore_Job *ecore_job_add(Ecore_Cb func, const void *data); 222EAPI Ecore_Job *ecore_job_add(Ecore_Cb func, const void *data);
236EAPI void *ecore_job_del(Ecore_Job *obj); 223EAPI void *ecore_job_del(Ecore_Job *obj);
224
225#include "ecore_job.eo.legacy.h"
226
237/** 227/**
238 * @} 228 * @}
239 */ 229 */