diff options
Diffstat (limited to 'src/lib/edje/edje_private.h')
| -rw-r--r-- | src/lib/edje/edje_private.h | 61 |
1 files changed, 42 insertions, 19 deletions
diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h index 79737c12a7..2c12ea6a51 100644 --- a/src/lib/edje/edje_private.h +++ b/src/lib/edje/edje_private.h @@ -75,15 +75,15 @@ #endif #ifdef _WIN32 -# ifdef EFL_EDJE_BUILD +# ifdef EFL_BUILD # ifdef DLL_EXPORT # define EAPI __declspec(dllexport) # else # define EAPI -# endif /* ! DLL_EXPORT */ +# endif # else # define EAPI __declspec(dllimport) -# endif /* ! EFL_EDJE_BUILD */ +# endif #else # ifdef __GNUC__ # if __GNUC__ >= 4 @@ -429,8 +429,9 @@ typedef struct _Edje_Signal_Callback_Custom Edje_Signal_Callback_Custom; #define EDJE_IMAGE_SOURCE_TYPE_INLINE_LOSSY 2 #define EDJE_IMAGE_SOURCE_TYPE_INLINE_LOSSY_ETC1 3 #define EDJE_IMAGE_SOURCE_TYPE_INLINE_LOSSY_ETC2 4 -#define EDJE_IMAGE_SOURCE_TYPE_EXTERNAL 5 -#define EDJE_IMAGE_SOURCE_TYPE_LAST 6 +#define EDJE_IMAGE_SOURCE_TYPE_USER 5 +#define EDJE_IMAGE_SOURCE_TYPE_EXTERNAL 6 +#define EDJE_IMAGE_SOURCE_TYPE_LAST 7 #define EDJE_SOUND_SOURCE_TYPE_NONE 0 #define EDJE_SOUND_SOURCE_TYPE_INLINE_RAW 1 @@ -551,6 +552,11 @@ struct _AABB { int rel_to; }; +typedef struct Edje_Image_Hash +{ + int id; +} Edje_Image_Hash; + struct _Edje_File { const char *path; @@ -563,6 +569,10 @@ struct _Edje_File Edje_Mo_Directory *mo_dir; Edje_Gfx_Filter_Directory *filter_dir; + Eina_Hash *image_id_hash; + Eina_Stringshare **requires; + unsigned int requires_count; + Eina_List *styles; Eina_List *color_tree; @@ -600,6 +610,7 @@ struct _Edje_File int major; int minor; } efl_version; + Eina_Stringshare *id; FLOAT_T base_scale; @@ -681,6 +692,7 @@ struct _Edje_Image_Directory_Entry const char *entry; /* the nominal name of the image - if any */ int source_type; /* alternate source mode. 0 = none */ int source_param; /* extra params on encoding */ + Eina_Stringshare *external_id; int id; /* the id no. of the image */ }; @@ -2189,6 +2201,8 @@ struct _Edje_Message_Signal_Data int ref; void *data; void (*free_func)(void *); + void *seat_data; + void (*seat_free_func)(void *); }; struct _Edje_Message_Signal @@ -2376,6 +2390,7 @@ extern Eina_Cow *_edje_calc_params_map_cow; extern Eina_Cow *_edje_calc_params_physics_cow; extern Eina_Hash *_edje_file_hash; +extern Eina_Hash *_edje_id_hash; extern const char *_edje_language; extern const char *_edje_cache_path; @@ -2484,6 +2499,7 @@ EAPI void _edje_edd_shutdown(void); int _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const char *group, const char *parent, Eina_List *group_path, Eina_Array *nested); +void _edje_file_callbacks_del(Edje *ed, Evas *e); void _edje_file_del(Edje *ed); void _edje_file_free(Edje_File *edf); void _edje_file_cache_shutdown(void); @@ -2507,16 +2523,20 @@ void _edje_unref(Edje *ed); void _edje_program_run_cleanup(Edje *ed, Edje_Running_Program *runp); Eina_Bool _edje_program_run_iterate(Edje_Running_Program *runp, double tim); void _edje_program_end(Edje *ed, Edje_Running_Program *runp); -void _edje_program_run(Edje *ed, Edje_Program *pr, Eina_Bool force, const char *ssig, const char *ssrc); +void _edje_program_run(Edje *ed, Edje_Program *pr, Eina_Bool force, const char *ssig, const char *ssrc, Edje_Message_Signal_Data *mdata); void _edje_programs_patterns_clean(Edje_Part_Collection *ed); void _edje_programs_patterns_init(Edje_Part_Collection *ed); void _edje_emit(Edje *ed, const char *sig, const char *src); void _edje_seat_emit(Edje *ed, Efl_Input_Device *dev, const char *sig, const char *src); void _edje_emit_full(Edje *ed, const char *sig, const char *src, void *data, void (*free_func)(void *)); +void _edje_emit_full_data(Edje *ed, const char *sig, const char *src, Edje_Message_Signal_Data *mdata); void _edje_emit_handle(Edje *ed, const char *sig, const char *src, Edje_Message_Signal_Data *data, Eina_Bool prop); void _edje_signals_sources_patterns_clean(Edje_Signals_Sources_Patterns *ssp); const char * _edje_object_part_state_get(Edje *ed, const char *part, double *val_ret); +void _edje_signal_data_free(Edje_Message_Signal_Data *mdata); +void _edje_signal_data_ref(Edje_Message_Signal_Data *mdata); + void _edje_focused_part_set(Edje *ed, const char *seat_name, Edje_Real_Part *rp); Edje_Real_Part *_edje_focused_part_get(Edje *ed, const char *seat_name); void _edje_part_focus_set(Edje *ed, const char *seat_name, Edje_Real_Part *rp); @@ -2531,6 +2551,7 @@ void _edje_signal_callback_reset(Edje_Signal_Callback_Flags *flags, unsigned int void _edje_signal_callback_free(const Edje_Signal_Callback_Group *gp); +const char * _set_translated_string(Edje *ed, Edje_Real_Part *ep); void _edje_text_init(void); void _edje_text_part_on_add(Edje *ed, Edje_Real_Part *ep); void _edje_text_part_on_del(Edje *ed, Edje_Part *ep); @@ -2861,6 +2882,8 @@ Eina_Bool _edje_entry_input_panel_return_key_disabled_get(Edje_Real_Part *rp); void _edje_entry_input_panel_show_on_demand_set(Edje_Real_Part *rp, Eina_Bool ondemand); Eina_Bool _edje_entry_input_panel_show_on_demand_get(Edje_Real_Part *rp); void _edje_entry_prediction_hint_set(Edje_Real_Part *rp, const char *prediction_hint); +Eina_Bool _edje_entry_prediction_hint_hash_set(Edje_Real_Part *rp, const char *key, const char *value); +Eina_Bool _edje_entry_prediction_hint_hash_del(Edje_Real_Part *rp, const char *key); Eina_Bool _edje_entry_hide_visible_password(Edje *edje, Edje_Real_Part *rp); void _edje_external_init(void); @@ -3134,10 +3157,11 @@ Eina_Bool _edje_object_part_drag_step(Edje *ed, const char *part, double dx, dou Eina_Bool _edje_object_part_drag_page(Edje *ed, const char *part, double dx, double dy); /* part proxy */ -Eo *_edje_other_internal_proxy_get(Edje_Object *obj, Edje *ed, Edje_Real_Part *rp); +Eo *_edje_other_internal_proxy_get(Edje_Object *obj, Edje *ed, Edje_Real_Part *rp, const char *part); +Eo *_edje_invalid_internal_proxy_get(Edje_Object *obj, Edje *ed, Edje_Real_Part *rp, const char *part); /* part containers: box */ -Eo *_edje_box_internal_proxy_get(Edje_Object *obj, Edje *ed, Edje_Real_Part *rp); +Eo *_edje_box_internal_proxy_get(Edje_Object *obj, Edje *ed, Edje_Real_Part *rp, const char *part); Eina_Bool _edje_part_box_append(Edje *ed, const char *part, Evas_Object *child); Eina_Bool _edje_part_box_prepend(Edje *ed, const char *part, Evas_Object *child); Eina_Bool _edje_part_box_insert_before(Edje *ed, const char *part, Evas_Object *child, const Evas_Object *reference); @@ -3149,7 +3173,7 @@ Evas_Object *_edje_part_box_remove_at(Edje *ed, const char *part, unsigned int p Eina_Bool _edje_part_box_remove_all(Edje *ed, const char *part, Eina_Bool clear); /* part containers: table */ -Eo *_edje_table_internal_proxy_get(Edje_Object *obj, Edje *ed, Edje_Real_Part *rp); +Eo *_edje_table_internal_proxy_get(Edje_Object *obj, Edje *ed, Edje_Real_Part *rp, const char *part); Evas_Object *_edje_part_table_child_get(Edje *ed, const char *part, unsigned int col, unsigned int row); Eina_Bool _edje_part_table_pack(Edje *ed, const char *part, Evas_Object *child_obj, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan); Eina_Bool _edje_part_table_unpack(Edje *ed, const char *part, Evas_Object *child_obj); @@ -3157,12 +3181,12 @@ Eina_Bool _edje_part_table_col_row_size_get(Edje *ed, const char *part, int *col Eina_Bool _edje_part_table_clear(Edje *ed, const char *part, Eina_Bool clear); /* part containers: swallow */ -Eo *_edje_swallow_internal_proxy_get(Edje_Object *obj, Edje *ed, Edje_Real_Part *rp); -Efl_Gfx *_edje_efl_content_content_get(Edje *ed, const char *part); -Eina_Bool _edje_efl_content_content_set(Edje *ed, const char *part, Efl_Gfx *obj_swallow); +Eo *_edje_swallow_internal_proxy_get(Edje_Object *obj, Edje *ed, Edje_Real_Part *rp, const char *part); +Efl_Gfx_Entity *_edje_efl_content_content_get(Edje *ed, const char *part); +Eina_Bool _edje_efl_content_content_set(Edje *ed, const char *part, Efl_Gfx_Entity *obj_swallow); /* part containers: external */ -Eo *_edje_external_internal_proxy_get(Edje_Object *obj, Edje *ed, Edje_Real_Part *rp); +Eo *_edje_external_internal_proxy_get(Edje_Object *obj, Edje *ed, Edje_Real_Part *rp, const char *part); Eina_Bool _edje_object_part_external_param_set(Edje *ed, const char *part, const Edje_External_Param *param); Eina_Bool _edje_object_part_external_param_get(Edje *ed, const char *part, Edje_External_Param *param); Edje_External_Param_Type _edje_object_part_external_param_type_get(Edje *ed, const char *part, const char *param); @@ -3170,9 +3194,9 @@ Evas_Object *_edje_object_part_external_object_get(Edje *ed, const char *part); Evas_Object *_edje_object_part_external_content_get(Edje *ed, const char *part, const char *content); /* part text */ -Eo *_edje_text_internal_proxy_get(Edje_Object *obj, Edje *ed, Edje_Real_Part *rp); -Eina_Bool _edje_efl_text_set(Eo *obj, Edje *ed, const char *part, const char *text, Eina_Bool legacy, Eina_Bool set_markup); -const char *_edje_efl_text_get(Eo *obj, Edje *ed, const char *part, Eina_Bool legacy, Eina_Bool get_markup); +Eo *_edje_text_internal_proxy_get(Edje_Object *obj, Edje *ed, Edje_Real_Part *rp, const char *part); +Eina_Bool _edje_efl_text_text_set(Eo *obj, Edje *ed, const char *part, const char *text, Eina_Bool legacy, Eina_Bool set_markup); +const char *_edje_efl_text_text_get(const Eo *obj, Edje *ed, const char *part, Eina_Bool legacy, Eina_Bool get_markup); Eina_Bool _edje_efl_text_markup_set(Eo *obj, Edje *ed, const char *part, const char *markup); const char *_edje_efl_text_markup_get(Eo *obj, Edje *ed, const char *part); Evas_Textblock_Cursor *_edje_text_cursor_get(Edje_Real_Part *rp, Edje_Cursor cur); @@ -3270,12 +3294,9 @@ extern Edje_Ephysics *_edje_ephysics; #endif - - #ifdef HAVE_LIBREMIX #include <remix/remix.h> #endif -#include <Eina.h> typedef struct _Edje_Multisense_Env Edje_Multisense_Env; @@ -3291,6 +3312,8 @@ typedef Eina_Bool (*MULTISENSE_FACTORY_INIT_FUNC) (Edje_Multisense_Env *); typedef RemixBase* (*MULTISENSE_SOUND_PLAYER_GET_FUNC) (Edje_Multisense_Env *); #endif +#include "efl_canvas_layout_part_invalid.eo.h" + #undef EAPI #define EAPI |