summaryrefslogtreecommitdiff
path: root/src/lib/ecore_evas
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2012-12-05 23:11:46 +0000
committerCarsten Haitzler <raster@rasterman.com>2012-12-05 23:11:46 +0000
commit7b7a611805a17e2552300e5eb67e4f1a0f97e973 (patch)
tree84c783ddc171a18541bf795d2237b6664a3a4aeb /src/lib/ecore_evas
parentad7579c1294222d0647673499f062b137d30d270 (diff)
if you are going to use symbols implicitly from a module provided by a
lib.. you have to EAPI them! SVN revision: 80283
Diffstat (limited to 'src/lib/ecore_evas')
-rw-r--r--src/lib/ecore_evas/ecore_evas.c60
-rw-r--r--src/lib/ecore_evas/ecore_evas_private.h56
2 files changed, 61 insertions, 55 deletions
diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c
index 7fed5299c2..619d944397 100644
--- a/src/lib/ecore_evas/ecore_evas.c
+++ b/src/lib/ecore_evas/ecore_evas.c
@@ -28,8 +28,8 @@
28#include "ecore_evas_private.h" 28#include "ecore_evas_private.h"
29#include "Ecore_Evas.h" 29#include "Ecore_Evas.h"
30 30
31Eina_Bool _ecore_evas_app_comp_sync = 1; 31EAPI Eina_Bool _ecore_evas_app_comp_sync = 1;
32int _ecore_evas_log_dom = -1; 32EAPI int _ecore_evas_log_dom = -1;
33static int _ecore_evas_init_count = 0; 33static int _ecore_evas_init_count = 0;
34static Ecore_Fd_Handler *_ecore_evas_async_events_fd = NULL; 34static Ecore_Fd_Handler *_ecore_evas_async_events_fd = NULL;
35static Eina_Bool _ecore_evas_async_events_fd_handler(void *data, Ecore_Fd_Handler *fd_handler); 35static Eina_Bool _ecore_evas_async_events_fd_handler(void *data, Ecore_Fd_Handler *fd_handler);
@@ -68,7 +68,7 @@ _ecore_evas_idle_enter(void *data EINA_UNUSED)
68 return ECORE_CALLBACK_RENEW; 68 return ECORE_CALLBACK_RENEW;
69} 69}
70 70
71Ecore_Evas_Interface * 71EAPI Ecore_Evas_Interface *
72_ecore_evas_interface_get(const Ecore_Evas *ee, const char *iname) 72_ecore_evas_interface_get(const Ecore_Evas *ee, const char *iname)
73{ 73{
74 Eina_List *l; 74 Eina_List *l;
@@ -2307,7 +2307,7 @@ static int _ecore_evas_fps_debug_init_count = 0;
2307static int _ecore_evas_fps_debug_fd = -1; 2307static int _ecore_evas_fps_debug_fd = -1;
2308unsigned int *_ecore_evas_fps_rendertime_mmap = NULL; 2308unsigned int *_ecore_evas_fps_rendertime_mmap = NULL;
2309 2309
2310void 2310EAPI void
2311_ecore_evas_fps_debug_init(void) 2311_ecore_evas_fps_debug_init(void)
2312{ 2312{
2313 char buf[4096]; 2313 char buf[4096];
@@ -2362,7 +2362,7 @@ _ecore_evas_fps_debug_init(void)
2362 } 2362 }
2363} 2363}
2364 2364
2365void 2365EAPI void
2366_ecore_evas_fps_debug_shutdown(void) 2366_ecore_evas_fps_debug_shutdown(void)
2367{ 2367{
2368 _ecore_evas_fps_debug_init_count--; 2368 _ecore_evas_fps_debug_init_count--;
@@ -2383,7 +2383,7 @@ _ecore_evas_fps_debug_shutdown(void)
2383 } 2383 }
2384} 2384}
2385 2385
2386void 2386EAPI void
2387_ecore_evas_fps_debug_rendertime_add(double t) 2387_ecore_evas_fps_debug_rendertime_add(double t)
2388{ 2388{
2389 static double rtime = 0.0; 2389 static double rtime = 0.0;
@@ -2413,7 +2413,7 @@ _ecore_evas_fps_debug_rendertime_add(double t)
2413 } 2413 }
2414} 2414}
2415 2415
2416void 2416EAPI void
2417_ecore_evas_register(Ecore_Evas *ee) 2417_ecore_evas_register(Ecore_Evas *ee)
2418{ 2418{
2419 ee->registered = 1; 2419 ee->registered = 1;
@@ -2421,13 +2421,13 @@ _ecore_evas_register(Ecore_Evas *ee)
2421 (EINA_INLIST_GET(ecore_evases), EINA_INLIST_GET(ee)); 2421 (EINA_INLIST_GET(ecore_evases), EINA_INLIST_GET(ee));
2422} 2422}
2423 2423
2424void 2424EAPI void
2425_ecore_evas_ref(Ecore_Evas *ee) 2425_ecore_evas_ref(Ecore_Evas *ee)
2426{ 2426{
2427 ee->refcount++; 2427 ee->refcount++;
2428} 2428}
2429 2429
2430void 2430EAPI void
2431_ecore_evas_unref(Ecore_Evas *ee) 2431_ecore_evas_unref(Ecore_Evas *ee)
2432{ 2432{
2433 ee->refcount--; 2433 ee->refcount--;
@@ -2439,7 +2439,7 @@ _ecore_evas_unref(Ecore_Evas *ee)
2439 ERR("Ecore_Evas %p->refcount=%d < 0", ee, ee->refcount); 2439 ERR("Ecore_Evas %p->refcount=%d < 0", ee, ee->refcount);
2440} 2440}
2441 2441
2442void 2442EAPI void
2443_ecore_evas_free(Ecore_Evas *ee) 2443_ecore_evas_free(Ecore_Evas *ee)
2444{ 2444{
2445 Ecore_Evas_Interface *iface; 2445 Ecore_Evas_Interface *iface;
@@ -2507,7 +2507,7 @@ _ecore_evas_async_events_fd_handler(void *data EINA_UNUSED, Ecore_Fd_Handler *fd
2507 return ECORE_CALLBACK_RENEW; 2507 return ECORE_CALLBACK_RENEW;
2508} 2508}
2509 2509
2510void 2510EAPI void
2511_ecore_evas_idle_timeout_update(Ecore_Evas *ee) 2511_ecore_evas_idle_timeout_update(Ecore_Evas *ee)
2512{ 2512{
2513 if (ee->engine.idle_flush_timer) 2513 if (ee->engine.idle_flush_timer)
@@ -2517,7 +2517,7 @@ _ecore_evas_idle_timeout_update(Ecore_Evas *ee)
2517 ee); 2517 ee);
2518} 2518}
2519 2519
2520void 2520EAPI void
2521_ecore_evas_mouse_move_process(Ecore_Evas *ee, int x, int y, unsigned int timestamp) 2521_ecore_evas_mouse_move_process(Ecore_Evas *ee, int x, int y, unsigned int timestamp)
2522{ 2522{
2523 ee->mouse.x = x; 2523 ee->mouse.x = x;
@@ -2554,7 +2554,7 @@ _ecore_evas_mouse_move_process(Ecore_Evas *ee, int x, int y, unsigned int timest
2554 evas_event_feed_mouse_move(ee->evas, y, ee->w - x - 1, timestamp, NULL); 2554 evas_event_feed_mouse_move(ee->evas, y, ee->w - x - 1, timestamp, NULL);
2555} 2555}
2556 2556
2557void 2557EAPI void
2558_ecore_evas_mouse_multi_move_process(Ecore_Evas *ee, int device, 2558_ecore_evas_mouse_multi_move_process(Ecore_Evas *ee, int device,
2559 int x, int y, 2559 int x, int y,
2560 double radius, 2560 double radius,
@@ -2602,7 +2602,7 @@ _ecore_evas_mouse_multi_move_process(Ecore_Evas *ee, int device,
2602 timestamp, NULL); 2602 timestamp, NULL);
2603} 2603}
2604 2604
2605void 2605EAPI void
2606_ecore_evas_mouse_multi_down_process(Ecore_Evas *ee, int device, 2606_ecore_evas_mouse_multi_down_process(Ecore_Evas *ee, int device,
2607 int x, int y, 2607 int x, int y,
2608 double radius, 2608 double radius,
@@ -2651,7 +2651,7 @@ _ecore_evas_mouse_multi_down_process(Ecore_Evas *ee, int device,
2651 flags, timestamp, NULL); 2651 flags, timestamp, NULL);
2652} 2652}
2653 2653
2654void 2654EAPI void
2655_ecore_evas_mouse_multi_up_process(Ecore_Evas *ee, int device, 2655_ecore_evas_mouse_multi_up_process(Ecore_Evas *ee, int device,
2656 int x, int y, 2656 int x, int y,
2657 double radius, 2657 double radius,
@@ -2700,14 +2700,14 @@ _ecore_evas_mouse_multi_up_process(Ecore_Evas *ee, int device,
2700 flags, timestamp, NULL); 2700 flags, timestamp, NULL);
2701} 2701}
2702 2702
2703void 2703EAPI void
2704_ecore_evas_window_profile_free(Ecore_Evas *ee) 2704_ecore_evas_window_profile_free(Ecore_Evas *ee)
2705{ 2705{
2706 if (ee->prop.profile.name) 2706 if (ee->prop.profile.name)
2707 eina_stringshare_del(ee->prop.profile.name); 2707 eina_stringshare_del(ee->prop.profile.name);
2708} 2708}
2709 2709
2710void 2710EAPI void
2711_ecore_evas_window_available_profiles_free(Ecore_Evas *ee) 2711_ecore_evas_window_available_profiles_free(Ecore_Evas *ee)
2712{ 2712{
2713 if (ee->prop.profile.available_list) 2713 if (ee->prop.profile.available_list)
@@ -2725,6 +2725,22 @@ _ecore_evas_window_available_profiles_free(Ecore_Evas *ee)
2725 } 2725 }
2726} 2726}
2727 2727
2728EAPI int
2729ecore_evas_buffer_render(Ecore_Evas *ee)
2730{
2731 Ecore_Evas_Interface_Buffer *iface;
2732 iface = (Ecore_Evas_Interface_Buffer *)_ecore_evas_interface_get(ee, "buffer");
2733 EINA_SAFETY_ON_NULL_RETURN_VAL(iface, 0);
2734
2735 return iface->render(ee);
2736}
2737
2738
2739
2740
2741
2742
2743
2728EAPI Eina_List * 2744EAPI Eina_List *
2729ecore_evas_ecore_evas_list_get(void) 2745ecore_evas_ecore_evas_list_get(void)
2730{ 2746{
@@ -3128,16 +3144,6 @@ ecore_evas_buffer_allocfunc_new(int w, int h,
3128 return new(w, h, alloc_func, free_func, data); 3144 return new(w, h, alloc_func, free_func, data);
3129} 3145}
3130 3146
3131int
3132ecore_evas_buffer_render(Ecore_Evas *ee)
3133{
3134 Ecore_Evas_Interface_Buffer *iface;
3135 iface = (Ecore_Evas_Interface_Buffer *)_ecore_evas_interface_get(ee, "buffer");
3136 EINA_SAFETY_ON_NULL_RETURN_VAL(iface, 0);
3137
3138 return iface->render(ee);
3139}
3140
3141EAPI Ecore_Evas * 3147EAPI Ecore_Evas *
3142ecore_evas_extn_socket_new(int w, int h) 3148ecore_evas_extn_socket_new(int w, int h)
3143{ 3149{
diff --git a/src/lib/ecore_evas/ecore_evas_private.h b/src/lib/ecore_evas/ecore_evas_private.h
index 7c3a203931..ab1dde3bde 100644
--- a/src/lib/ecore_evas/ecore_evas_private.h
+++ b/src/lib/ecore_evas/ecore_evas_private.h
@@ -17,7 +17,7 @@
17 17
18/** Log domain macros and variables **/ 18/** Log domain macros and variables **/
19 19
20extern int _ecore_evas_log_dom; 20EAPI extern int _ecore_evas_log_dom;
21 21
22#ifdef ECORE_EVAS_DEFAULT_LOG_COLOR 22#ifdef ECORE_EVAS_DEFAULT_LOG_COLOR
23# undef ECORE_EVAS_DEFAULT_LOG_COLOR 23# undef ECORE_EVAS_DEFAULT_LOG_COLOR
@@ -324,23 +324,18 @@ struct _Ecore_Evas
324 unsigned char profile_supported : 1; 324 unsigned char profile_supported : 1;
325}; 325};
326 326
327void _ecore_evas_ref(Ecore_Evas *ee); 327EAPI void _ecore_evas_ref(Ecore_Evas *ee);
328void _ecore_evas_unref(Ecore_Evas *ee); 328EAPI void _ecore_evas_unref(Ecore_Evas *ee);
329int ecore_evas_buffer_render(Ecore_Evas *ee); 329EAPI int ecore_evas_buffer_render(Ecore_Evas *ee);
330 330
331#ifdef BUILD_ECORE_EVAS_EWS 331EAPI void _ecore_evas_fps_debug_init(void);
332void _ecore_evas_ews_events_init(void); 332EAPI void _ecore_evas_fps_debug_shutdown(void);
333int _ecore_evas_ews_shutdown(void); 333EAPI void _ecore_evas_fps_debug_rendertime_add(double t);
334#endif 334EAPI void _ecore_evas_register(Ecore_Evas *ee);
335 335EAPI void _ecore_evas_free(Ecore_Evas *ee);
336void _ecore_evas_fps_debug_init(void); 336EAPI void _ecore_evas_idle_timeout_update(Ecore_Evas *ee);
337void _ecore_evas_fps_debug_shutdown(void); 337EAPI void _ecore_evas_mouse_move_process(Ecore_Evas *ee, int x, int y, unsigned int timestamp);
338void _ecore_evas_fps_debug_rendertime_add(double t); 338EAPI void _ecore_evas_mouse_multi_move_process(Ecore_Evas *ee, int device,
339void _ecore_evas_register(Ecore_Evas *ee);
340void _ecore_evas_free(Ecore_Evas *ee);
341void _ecore_evas_idle_timeout_update(Ecore_Evas *ee);
342void _ecore_evas_mouse_move_process(Ecore_Evas *ee, int x, int y, unsigned int timestamp);
343void _ecore_evas_mouse_multi_move_process(Ecore_Evas *ee, int device,
344 int x, int y, 339 int x, int y,
345 double radius, 340 double radius,
346 double radius_x, double radius_y, 341 double radius_x, double radius_y,
@@ -348,7 +343,7 @@ void _ecore_evas_mouse_multi_move_process(Ecore_Evas *ee, int device,
348 double angle, 343 double angle,
349 double mx, double my, 344 double mx, double my,
350 unsigned int timestamp); 345 unsigned int timestamp);
351void _ecore_evas_mouse_multi_down_process(Ecore_Evas *ee, int device, 346EAPI void _ecore_evas_mouse_multi_down_process(Ecore_Evas *ee, int device,
352 int x, int y, 347 int x, int y,
353 double radius, 348 double radius,
354 double radius_x, double radius_y, 349 double radius_x, double radius_y,
@@ -357,7 +352,7 @@ void _ecore_evas_mouse_multi_down_process(Ecore_Evas *ee, int device,
357 double mx, double my, 352 double mx, double my,
358 Evas_Button_Flags flags, 353 Evas_Button_Flags flags,
359 unsigned int timestamp); 354 unsigned int timestamp);
360void _ecore_evas_mouse_multi_up_process(Ecore_Evas *ee, int device, 355EAPI void _ecore_evas_mouse_multi_up_process(Ecore_Evas *ee, int device,
361 int x, int y, 356 int x, int y,
362 double radius, 357 double radius,
363 double radius_x, double radius_y, 358 double radius_x, double radius_y,
@@ -367,28 +362,33 @@ void _ecore_evas_mouse_multi_up_process(Ecore_Evas *ee, int device,
367 Evas_Button_Flags flags, 362 Evas_Button_Flags flags,
368 unsigned int timestamp); 363 unsigned int timestamp);
369 364
370extern Eina_Bool _ecore_evas_app_comp_sync; 365EAPI extern Eina_Bool _ecore_evas_app_comp_sync;
371
372 366
373Eina_Module *_ecore_evas_engine_load(const char *engine);
374void _ecore_evas_engine_init();
375void _ecore_evas_engine_shutdown();
376 367
377Ecore_Evas_Interface *_ecore_evas_interface_get(const Ecore_Evas *ee, const char *iname); 368EAPI Ecore_Evas_Interface *_ecore_evas_interface_get(const Ecore_Evas *ee, const char *iname);
378 369
379/** 370/**
380 * @brief Free the string of the window profile. 371 * @brief Free the string of the window profile.
381 * 372 *
382 * This is a helper function to free window profile. 373 * This is a helper function to free window profile.
383 */ 374 */
384void _ecore_evas_window_profile_free(Ecore_Evas *ee); 375EAPI void _ecore_evas_window_profile_free(Ecore_Evas *ee);
385 376
386/** 377/**
387 * @brief Free the string array of available window profiles. 378 * @brief Free the string array of available window profiles.
388 * 379 *
389 * This is a helper function to free available window profiles. 380 * This is a helper function to free available window profiles.
390 */ 381 */
391void _ecore_evas_window_available_profiles_free(Ecore_Evas *ee); 382EAPI void _ecore_evas_window_available_profiles_free(Ecore_Evas *ee);
383
384#ifdef BUILD_ECORE_EVAS_EWS
385void _ecore_evas_ews_events_init(void);
386int _ecore_evas_ews_shutdown(void);
387#endif
388
389Eina_Module *_ecore_evas_engine_load(const char *engine);
390void _ecore_evas_engine_init();
391void _ecore_evas_engine_shutdown();
392 392
393#endif 393#endif
394 394