summaryrefslogtreecommitdiff
path: root/src/lib/ecore_evas/ecore_evas.c
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-11 16:57:21 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-11 16:57:21 +0000
commit85f8163c3ee5b5d776d94c70ff9fbc667a615b2a (patch)
tree5428396625bf4a84d287357c6a1e9d576a421b30 /src/lib/ecore_evas/ecore_evas.c
parent9c12a585366c131560582a01e8d28f3acc47c19e (diff)
efl/ecore_evas: merge buffer into core, split extn apart.
buffer is lightweight and dependency for many engines, merge it back into core. extn is a module on its own, and it's the only one linking to ecore_ipc, no need to add that to ecore_evas. minor cosmetic changes to configure to make output consistent. SVN revision: 82648
Diffstat (limited to 'src/lib/ecore_evas/ecore_evas.c')
-rw-r--r--src/lib/ecore_evas/ecore_evas.c77
1 files changed, 3 insertions, 74 deletions
diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c
index 7d4edaef42..893f9d517b 100644
--- a/src/lib/ecore_evas/ecore_evas.c
+++ b/src/lib/ecore_evas/ecore_evas.c
@@ -105,11 +105,8 @@ ecore_evas_engine_type_supported_get(Ecore_Evas_Engine_Type engine)
105 switch (engine) 105 switch (engine)
106 { 106 {
107 case ECORE_EVAS_ENGINE_SOFTWARE_BUFFER: 107 case ECORE_EVAS_ENGINE_SOFTWARE_BUFFER:
108#ifdef BUILD_ECORE_EVAS_BUFFER
109 return EINA_TRUE; 108 return EINA_TRUE;
110#else 109
111 return EINA_FALSE;
112#endif
113 case ECORE_EVAS_ENGINE_SOFTWARE_XLIB: 110 case ECORE_EVAS_ENGINE_SOFTWARE_XLIB:
114#ifdef BUILD_ECORE_EVAS_SOFTWARE_XLIB 111#ifdef BUILD_ECORE_EVAS_SOFTWARE_XLIB
115 return EINA_TRUE; 112 return EINA_TRUE;
@@ -2669,22 +2666,6 @@ _ecore_evas_window_available_profiles_free(Ecore_Evas *ee)
2669 } 2666 }
2670} 2667}
2671 2668
2672EAPI int
2673ecore_evas_buffer_render(Ecore_Evas *ee)
2674{
2675 Ecore_Evas_Interface_Buffer *iface;
2676 iface = (Ecore_Evas_Interface_Buffer *)_ecore_evas_interface_get(ee, "buffer");
2677 EINA_SAFETY_ON_NULL_RETURN_VAL(iface, 0);
2678
2679 return iface->render(ee);
2680}
2681
2682
2683
2684
2685
2686
2687
2688EAPI Eina_List * 2669EAPI Eina_List *
2689ecore_evas_ecore_evas_list_get(void) 2670ecore_evas_ecore_evas_list_get(void)
2690{ 2671{
@@ -3050,49 +3031,10 @@ ecore_evas_x11_shape_input_apply(Ecore_Evas *ee)
3050} 3031}
3051 3032
3052EAPI Ecore_Evas * 3033EAPI Ecore_Evas *
3053ecore_evas_buffer_new(int w, int h)
3054{
3055 Ecore_Evas *(*new)(int, int);
3056 Eina_Module *m = _ecore_evas_engine_load("buffer");
3057 EINA_SAFETY_ON_NULL_RETURN_VAL(m, NULL);
3058
3059 new = eina_module_symbol_get(m, "ecore_evas_buffer_new_internal");
3060 EINA_SAFETY_ON_NULL_RETURN_VAL(new, NULL);
3061
3062 return new(w, h);
3063}
3064
3065EAPI const void *
3066ecore_evas_buffer_pixels_get(Ecore_Evas *ee)
3067{
3068 Ecore_Evas_Interface_Buffer *iface;
3069 iface = (Ecore_Evas_Interface_Buffer *)_ecore_evas_interface_get(ee, "buffer");
3070 EINA_SAFETY_ON_NULL_RETURN_VAL(iface, NULL);
3071
3072 return iface->pixels_get(ee);
3073}
3074
3075EAPI Ecore_Evas *
3076ecore_evas_buffer_allocfunc_new(int w, int h,
3077 void *(*alloc_func) (void *data, int size),
3078 void (*free_func) (void *data, void *pix),
3079 const void *data)
3080{
3081 Ecore_Evas *(*new)(int, int, void*(*)(void *, int), void(*)(void *, void *), const void *);
3082 Eina_Module *m = _ecore_evas_engine_load("buffer");
3083 EINA_SAFETY_ON_NULL_RETURN_VAL(m, NULL);
3084
3085 new = eina_module_symbol_get(m, "ecore_evas_buffer_allocfunc_new_internal");
3086 EINA_SAFETY_ON_NULL_RETURN_VAL(new, NULL);
3087
3088 return new(w, h, alloc_func, free_func, data);
3089}
3090
3091EAPI Ecore_Evas *
3092ecore_evas_extn_socket_new(int w, int h) 3034ecore_evas_extn_socket_new(int w, int h)
3093{ 3035{
3094 Ecore_Evas *(*new)(int, int); 3036 Ecore_Evas *(*new)(int, int);
3095 Eina_Module *m = _ecore_evas_engine_load("buffer"); 3037 Eina_Module *m = _ecore_evas_engine_load("extn");
3096 EINA_SAFETY_ON_NULL_RETURN_VAL(m, NULL); 3038 EINA_SAFETY_ON_NULL_RETURN_VAL(m, NULL);
3097 3039
3098 new = eina_module_symbol_get(m, "ecore_evas_extn_socket_new_internal"); 3040 new = eina_module_symbol_get(m, "ecore_evas_extn_socket_new_internal");
@@ -3145,7 +3087,7 @@ EAPI Evas_Object *
3145ecore_evas_extn_plug_new(Ecore_Evas *ee_target) 3087ecore_evas_extn_plug_new(Ecore_Evas *ee_target)
3146{ 3088{
3147 Evas_Object *(*new)(Ecore_Evas *); 3089 Evas_Object *(*new)(Ecore_Evas *);
3148 Eina_Module *m = _ecore_evas_engine_load("buffer"); 3090 Eina_Module *m = _ecore_evas_engine_load("extn");
3149 EINA_SAFETY_ON_NULL_RETURN_VAL(m, NULL); 3091 EINA_SAFETY_ON_NULL_RETURN_VAL(m, NULL);
3150 3092
3151 new = eina_module_symbol_get(m, "ecore_evas_extn_plug_new_internal"); 3093 new = eina_module_symbol_get(m, "ecore_evas_extn_plug_new_internal");
@@ -3169,19 +3111,6 @@ ecore_evas_extn_plug_connect(Evas_Object *obj, const char *svcname, int svcnum,
3169 return iface->connect(ee, svcname, svcnum, svcsys); 3111 return iface->connect(ee, svcname, svcnum, svcsys);
3170} 3112}
3171 3113
3172EAPI Evas_Object *
3173ecore_evas_object_image_new(Ecore_Evas *ee_target)
3174{
3175 Evas_Object *(*new)(Ecore_Evas *ee_target);
3176 Eina_Module *m = _ecore_evas_engine_load("buffer");
3177 EINA_SAFETY_ON_NULL_RETURN_VAL(m, NULL);
3178
3179 new = eina_module_symbol_get(m, "ecore_evas_object_image_new_internal");
3180 EINA_SAFETY_ON_NULL_RETURN_VAL(new, NULL);
3181
3182 return new(ee_target);
3183}
3184
3185EAPI Ecore_Evas * 3114EAPI Ecore_Evas *
3186ecore_evas_sdl_new(const char* name, int w, int h, int fullscreen, 3115ecore_evas_sdl_new(const char* name, int w, int h, int fullscreen,
3187 int hwsurface, int noframe, int alpha) 3116 int hwsurface, int noframe, int alpha)