diff --git a/Makefile_Eolian_Cxx_Helper.am b/Makefile_Eolian_Cxx_Helper.am deleted file mode 100644 index 12ac58e..0000000 --- a/Makefile_Eolian_Cxx_Helper.am +++ /dev/null @@ -1,19 +0,0 @@ - -if HAVE_EOLIAN_CXX -EOLIAN_CXX = @eolian_cxx@ -_EOLIAN_CXX_DEP = @eolian_cxx@ -else -EOLIAN_CXX = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/eolian_cxx/eolian_cxx${EXEEXT} -_EOLIAN_CXX_DEP = bin/eolian_cxx/eolian_cxx${EXEEXT} -endif - -AM_V_EOLCXX = $(am__v_EOLCXX_@AM_V@) -am__v_EOLCXX_ = $(am__v_EOLCXX_@AM_DEFAULT_V@) -am__v_EOLCXX_0 = @echo " EOLCXX " $@; - -SUFFIXES += .eo.hh - -%.eo.hh: %.eo $(_EOLIAN_CXX_DEP) - $(AM_V_EOLCXX)$(EOLIAN_CXX) $(EOLIAN_FLAGS) -o $@ $< - -CLEANFILES += $(BUILT_SOURCES) diff --git a/Makefile_Eolian_Helper.am b/Makefile_Eolian_Helper.am deleted file mode 100644 index 3b4bf7a..0000000 --- a/Makefile_Eolian_Helper.am +++ /dev/null @@ -1,24 +0,0 @@ -if HAVE_EOLIAN_GEN -EOLIAN_GEN = @eolian_gen@ -_EOLIAN_GEN_DEP = @eolian_gen@ -else -EOLIAN_GEN = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/eolian/eolian_gen${EXEEXT} -_EOLIAN_GEN_DEP = bin/eolian/eolian_gen${EXEEXT} -endif - -AM_V_EOL = $(am__v_EOL_@AM_V@) -am__v_EOL_ = $(am__v_EOL_@AM_DEFAULT_V@) -am__v_EOL_0 = @echo " EOLIAN " $@; - -SUFFIXES = .eo .eo.c .eo.h .eo.legacy.h - -%.eo.c: %.eo ${_EOLIAN_GEN_DEP} - $(AM_V_EOL) $(EOLIAN_GEN) $(EOLIAN_FLAGS) -gc -o c:$@ $< - -%.eo.h: %.eo ${_EOLIAN_GEN_DEP} - $(AM_V_EOL)$(EOLIAN_GEN) $(EOLIAN_FLAGS) -gh -o h:$@ $< - -%.eo.legacy.h: %.eo ${_EOLIAN_GEN_DEP} - $(AM_V_EOL)$(EOLIAN_GEN) $(EOLIAN_FLAGS) -gl -o l:$@ $< - -CLEANFILES += $(BUILT_SOURCES) diff --git a/configure.ac b/configure.ac index 0582fc9..f6595a8 100644 --- a/configure.ac +++ b/configure.ac @@ -69,7 +69,6 @@ ENVENTOR_VERSION_MINOR=v_min AC_SUBST(ENVENTOR_VERSION_MAJOR) AC_SUBST(ENVENTOR_VERSION_MINOR) -EFL_ENABLE_EO_API_SUPPORT EFL_ENABLE_BETA_API_SUPPORT AC_DEFINE_UNQUOTED(ENVENTOR_WIN32_BUILD_SUPPORT, 1, "Support Win32 dllexport") AC_DEFINE_UNQUOTED(ENVENTOR_BETA_API_SUPPORT, 1, "Enable access to unstable ENVENTOR API that are still in beta") @@ -78,6 +77,7 @@ AC_DEFINE_UNQUOTED(EFL_UI_FOCUS_OBJECT_PROTECTED, 1, "Enable Focus Protected API efl_version="1.18.0" requirement_enventor=" \ eo >= ${efl_version} \ +efl >= ${efl_version} \ eina >= ${efl_version} \ eet >= ${efl_version} \ elementary >= ${efl_version} \ @@ -94,21 +94,11 @@ PKG_CHECK_MODULES([ENVENTOR], [${requirement_enventor}]) ### Checks for linker characteristics -# Needs to be moved into a macro, and also, needs a way to automatically fetch from all the dependencies using the Requires. -DEPS_EOLIAN_FLAGS=`${PKG_CONFIG} --variable=eolian_flags eo evas edje ecore elementary efl` -AC_SUBST([DEPS_EOLIAN_FLAGS]) - EFL_ATTRIBUTE_UNUSED # Check edje_cc EFL_WITH_BIN([eet], [eet-eet], [eet]) EFL_WITH_BIN([edje], [edje-cc], [edje_cc]) -EFL_WITH_BIN([eolian], [eolian-gen], [eolian_gen]) -EFL_WITH_BIN([eolian-cxx], [eolian-cxx], [eolian_cxx]) - -# Force the helper to try external eolian generator -AM_CONDITIONAL([HAVE_EOLIAN_GEN], [true]) -AM_CONDITIONAL([HAVE_EOLIAN_CXX], [true]) AC_CONFIG_FILES([ po/Makefile.in diff --git a/src/lib/Enventor.h.in b/src/lib/Enventor.h.in index 6ecf7c6..9bb5944 100644 --- a/src/lib/Enventor.h.in +++ b/src/lib/Enventor.h.in @@ -27,12 +27,28 @@ extern "C" # else # define EAPI __declspec(dllimport) # endif -# ifdef EOAPI -# undef EOAPI -# endif -#define EOAPI EAPI #endif +/** + * Enventor emits the following signals + * @li "cursor,line,changed": + * @li "cursor,group,changed": + * @li "live_view,updated": + * @li "live_view,loaded": + * @li "live_view,cursor,moved": + * @li "live_view,resized": + * @li "max_line,changed": + * @li "compile,error": + * @li "ctxpopup,activated": + * @li "ctxpopup,changed": + * @li "ctxpopup,dismissed": + * @li "edc,modified": + * @li "focused": + * @li "file,open,requested": +*/ + +typedef struct _Enventor_Item_Data Enventor_Item; + typedef enum { ENVENTOR_CTXPOPUP_TYPE_SLIDER = 0, @@ -97,13 +113,36 @@ typedef enum { EAPI int enventor_init(int argc, char **argv); EAPI int enventor_shutdown(void); -#ifndef EFL_NOLEGACY_API_SUPPORT -#include "Enventor_Legacy.h" -#endif - -#ifdef EFL_EO_API_SUPPORT -#include "Enventor_Eo.h" -#endif +EAPI Evas_Object *enventor_object_add(Evas_Object *parent); +EAPI Enventor_Item *enventor_object_main_item_set(Evas_Object *obj, const char *file); +EAPI Enventor_Item *enventor_object_sub_item_add(Evas_Object *obj, const char *file); +EAPI Enventor_Item *enventor_object_main_item_get(const Evas_Object *obj); +EAPI const Eina_List *enventor_object_sub_items_get(const Evas_Object *obj); +EAPI Evas_Object *enventor_item_editor_get(const Enventor_Item *it); +EAPI const char *enventor_item_file_get(const Enventor_Item *it); +EAPI Enventor_Item *enventor_object_focused_item_get(const Evas_Object *obj); +EAPI Eina_Bool enventor_item_represent(Enventor_Item *it); +EAPI int enventor_item_max_line_get(const Enventor_Item *it); +EAPI Eina_Bool enventor_item_line_goto(Enventor_Item *it, int line); +EAPI Eina_Bool enventor_item_syntax_color_full_apply(Enventor_Item *it, Eina_Bool force); +EAPI Eina_Bool enventor_item_syntax_color_partial_apply(Enventor_Item *it, double interval); +EAPI Eina_Bool enventor_item_select_region_set(Enventor_Item *it, int start, int end); +EAPI Eina_Bool enventor_item_select_none(Enventor_Item *it); +EAPI Eina_Bool enventor_item_cursor_pos_set(Enventor_Item *it, int position); +EAPI int enventor_item_cursor_pos_get(const Enventor_Item *it); +EAPI const char *enventor_item_selection_get(const Enventor_Item *it); +EAPI Eina_Bool enventor_item_text_insert(Enventor_Item *it, const char *text); +EAPI const char * enventor_item_text_get(const Enventor_Item *it); +EAPI Eina_Bool enventor_item_line_delete(Enventor_Item *it); +EAPI Eina_Bool enventor_item_file_save(Enventor_Item *it, const char *file); +EAPI Eina_Bool enventor_item_modified_get(const Enventor_Item *it); +EAPI void enventor_item_modified_set(Enventor_Item *it, Eina_Bool modified); +EAPI Eina_Bool enventor_item_del(Enventor_Item *it); +EAPI Eina_Bool enventor_item_template_insert(Enventor_Item *it, char *syntax, size_t n); +EAPI Eina_Bool enventor_item_template_part_insert(Enventor_Item *it, Edje_Part_Type part, Enventor_Template_Insert_Type insert_type, Eina_Bool fixed_w, Eina_Bool fixed_h, char *rel1_x_to, char *rel1_y_to, char *rel2_x_to, char *rel2_y_to, float align_x, float align_y, int min_w, int min_h, float rel1_x, float rel1_y, float rel2_x,float rel2_y, char *syntax, size_t n); +EAPI Eina_Bool enventor_item_redo(Enventor_Item *it); +EAPI Eina_Bool enventor_item_undo(Enventor_Item *it); +EAPI Eina_List *enventor_item_group_list_get(Enventor_Item *it); #ifdef __cplusplus } diff --git a/src/lib/Enventor_Eo.h b/src/lib/Enventor_Eo.h deleted file mode 100644 index 76f204c..0000000 --- a/src/lib/Enventor_Eo.h +++ /dev/null @@ -1,19 +0,0 @@ -/*** - * Compatible ABI for Win32 - ***/ -#ifdef _WIN32 -# ifdef EAPI -# undef EAPI -# endif -# ifdef EOAPI -# undef EOAPI -# endif -# ifdef ENVENTOR_WIN32_BUILD_SUPPORT -# define EAPI __declspec(dllexport) -# define EOAPI __declspec(dllexport) -# else -# define EAPI __declspec(dllimport) -# define EOAPI __declspec(dllimport) -# endif -#endif -#include "enventor_object.eo.h" diff --git a/src/lib/Enventor_Legacy.h b/src/lib/Enventor_Legacy.h deleted file mode 100644 index 5b43685..0000000 --- a/src/lib/Enventor_Legacy.h +++ /dev/null @@ -1,36 +0,0 @@ -typedef struct _Enventor_Item_Data Enventor_Item; - -EAPI Evas_Object *enventor_object_add(Evas_Object *parent); - -//FIXME: Eofy. -EAPI Enventor_Item *enventor_object_main_item_set(Evas_Object *obj, const char *file); -EAPI Enventor_Item *enventor_object_sub_item_add(Evas_Object *obj, const char *file); -EAPI Enventor_Item *enventor_object_main_item_get(const Evas_Object *obj); -EAPI const Eina_List *enventor_object_sub_items_get(const Evas_Object *obj); -EAPI Evas_Object *enventor_item_editor_get(const Enventor_Item *it); -EAPI const char *enventor_item_file_get(const Enventor_Item *it); -EAPI Enventor_Item *enventor_object_focused_item_get(const Evas_Object *obj); -EAPI Eina_Bool enventor_item_represent(Enventor_Item *it); -EAPI int enventor_item_max_line_get(const Enventor_Item *it); -EAPI Eina_Bool enventor_item_line_goto(Enventor_Item *it, int line); -EAPI Eina_Bool enventor_item_syntax_color_full_apply(Enventor_Item *it, Eina_Bool force); -EAPI Eina_Bool enventor_item_syntax_color_partial_apply(Enventor_Item *it, double interval); -EAPI Eina_Bool enventor_item_select_region_set(Enventor_Item *it, int start, int end); -EAPI Eina_Bool enventor_item_select_none(Enventor_Item *it); -EAPI Eina_Bool enventor_item_cursor_pos_set(Enventor_Item *it, int position); -EAPI int enventor_item_cursor_pos_get(const Enventor_Item *it); -EAPI const char *enventor_item_selection_get(const Enventor_Item *it); -EAPI Eina_Bool enventor_item_text_insert(Enventor_Item *it, const char *text); -EAPI const char * enventor_item_text_get(const Enventor_Item *it); -EAPI Eina_Bool enventor_item_line_delete(Enventor_Item *it); -EAPI Eina_Bool enventor_item_file_save(Enventor_Item *it, const char *file); -EAPI Eina_Bool enventor_item_modified_get(const Enventor_Item *it); -EAPI void enventor_item_modified_set(Enventor_Item *it, Eina_Bool modified); -EAPI Eina_Bool enventor_item_del(Enventor_Item *it); -EAPI Eina_Bool enventor_item_template_insert(Enventor_Item *it, char *syntax, size_t n); -EAPI Eina_Bool enventor_item_template_part_insert(Enventor_Item *it, Edje_Part_Type part, Enventor_Template_Insert_Type insert_type, Eina_Bool fixed_w, Eina_Bool fixed_h, char *rel1_x_to, char *rel1_y_to, char *rel2_x_to, char *rel2_y_to, float align_x, float align_y, int min_w, int min_h, float rel1_x, float rel1_y, float rel2_x,float rel2_y, char *syntax, size_t n); -EAPI Eina_Bool enventor_item_redo(Enventor_Item *it); -EAPI Eina_Bool enventor_item_undo(Enventor_Item *it); -EAPI Eina_List *enventor_item_group_list_get(Enventor_Item *it); - -#include "enventor_object.eo.legacy.h" diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 4206f10..b596b55 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -3,12 +3,6 @@ MAINTAINERCLEANFILES = Makefile.in CLEANFILES = -EOLIAN_FLAGS = @DEPS_EOLIAN_FLAGS@ \ - -I$(top_srcdir)/src/lib - -include $(top_srcdir)/Makefile_Eolian_Helper.am -include $(top_srcdir)/Makefile_Eolian_Cxx_Helper.am - AM_CPPFLAGS = -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \ -DPACKAGE_BIN_DIR=\"$(bindir)\" \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ @@ -19,11 +13,7 @@ AM_CPPFLAGS = -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \ lib_LTLIBRARIES = libenventor.la includes_HEADERS = \ - Enventor_Legacy.h \ Enventor.h \ - Enventor_Eo.h \ - enventor_object.eo.h \ - enventor_object.eo.legacy.h includesdir = $(includedir)/enventor-@ENVENTOR_VERSION_MAJOR@ libenventor_la_SOURCES = \ @@ -52,12 +42,3 @@ libenventor_la_CFLAGS = @ENVENTOR_CFLAGS@ libenventor_la_LIBADD = @ENVENTOR_LIBS@ libenventor_la_LDFLAGS = $(LTLIBINTL) -version-info @version_info@ -no-undefined - -BUILT_SOURCES = \ - enventor_object.eo.c \ - enventor_object.eo.h \ - enventor_object.eo.legacy.h - -enventoreolianfilesdir = $(datadir)/eolian/include/enventor-@ENVENTOR_VERSION_MAJOR@ -enventoreolianfiles_DATA = enventor_object.eo -EXTRA_DIST = ${enventoreolianfiles_DATA} diff --git a/src/lib/enventor_object.eo b/src/lib/enventor_object.eo deleted file mode 100644 index 7ea72f4..0000000 --- a/src/lib/enventor_object.eo +++ /dev/null @@ -1,249 +0,0 @@ -type Enventor_Path_Type: __undefined_type; -type Enventor_Syntax_Color_Type: __undefined_type; -type Enventor_Template_Insert_Type: __undefined_type; -type Edje_Part_Type: __undefined_type; - -class Enventor.Object extends Efl.Ui.Widget implements Efl.File, Efl.Ui.Focus.Object -{ - legacy_prefix: enventor_object; - eo_prefix: enventor_obj; - methods { - @property part_highlight { - set { - } - get { - } - values { - part_highlight: bool; - } - } - @property live_view_scale { - set { - } - get { - } - values { - scale: double; - } - } - @property dummy_parts { - set { - } - get { - } - values { - dummy_parts: bool; - } - } - @property wireframes { - set { - } - get { - } - values { - wireframe: bool; - } - } - @property mirror_mode { - set { - } - get { - } - values { - mirror_mode: bool; - } - } - @property auto_complete { - set { - } - get { - } - values { - auto_complete: bool; - } - } - @property auto_indent { - set { - } - get { - } - values { - auto_indent: bool; - } - } - @property ctxpopup { - set { - } - get { - } - values { - ctxpopup: bool; - } - } - @property font_scale { - set { - } - get { - } - values { - font_scale: double; - } - } - @property linenumber { - set { - } - get { - } - values { - linenumber: bool; - } - } - @property smart_undo_redo { - set { - } - get { - } - values { - smart_undo_redo: bool; - } - } - path_set { - return: bool; - params { - @in type: Enventor_Path_Type; - @in pathes: list< stringshare @owned > @owned ; - } - } - path_get { - return: const (list< stringshare @owned >) @owned ; - params { - @in type: Enventor_Path_Type; - } - } - programs_list_get { - return: list; - } - part_states_list_get { - return: list; - params { - @in type: string; - } - } - parts_list_get { - return: list; - } - live_view_get { - return: Efl.Canvas.Object; - } - programs_stop { - } - program_run { - params { - @in program: string; - } - } - syntax_color_set { - params { - @in color_type: Enventor_Syntax_Color_Type; - @in val: string; - } - } - syntax_color_get { - return: string; - params { - @in color_type: Enventor_Syntax_Color_Type; - } - } - ctxpopup_visible_get { - return: bool; - } - ctxpopup_dismiss { - } - disabled_set { - params { - @in disabled: bool; - } - } - live_view_size_set { - params { - @in w: int; - @in h: int; - } - } - live_view_size_get { - params { - @in w: ptr(int); - @in h: ptr(int); - } - } - part_type_get { - return: Edje_Part_Type; - params { - @in part_name: string; - } - } - font_set { - params { - @in font_name: string; - @in font_style: string; - } - } - font_get { - params { - @out font_name: string; - @out font_style: string; - } - } - auto_complete_list_show { - } - keyword_reference_show { - } - base_scale_get { - return: double; - } - } - implements { - class.constructor; - Efl.Object.constructor; - Efl.Object.destructor; - Efl.Gfx.Entity.visible { set; } - Efl.Gfx.Entity.position { set; } - Efl.Gfx.Entity.size { set; } - Efl.Canvas.Object.clipper { set; } - Efl.Canvas.Group.group_member_add; - Efl.File.file { set; } - Efl.Ui.Focus.Object.focus { set; get; } - } - events { - cursor,line,changed: void; - cursor,group,changed: void; - live_view,updated: void; - live_view,loaded: void; - live_view,cursor,moved: void; - live_view,resized: void; - max_line,changed: void; - compile,error: void; - ctxpopup,activated: void; - ctxpopup,changed: void; - ctxpopup,dismissed: void; - edc,modified: void; - focused: void; - file,open,requested: void; -/* - cursor,line,changed: Enventor.Cursor_Line; - cursor,group,changed: Eina_String; - live_view,updated: Enventor.Item; - live_view,loaded: Enventor.Item; - live_view,cursor,moved: Enventor.Live_View_Cursor; - live_view,resized: Enventor.Live_View_Size; - max_line,changed: Enventor.Cursor_Line; - compile,error: char; - ctxpopup,activated: Enventor.Ctxpopup_Type; - ctxpopup,changed: Enventor.Item; - ctxpopup,dismissed: Enventor.Item; - edc,modified: Enventor.EDC_Modified; - focused: void; - file,open,requested: char; -*/ - } -} diff --git a/src/lib/enventor_smart.c b/src/lib/enventor_smart.c index 13c45a1..ab65633 100644 --- a/src/lib/enventor_smart.c +++ b/src/lib/enventor_smart.c @@ -254,18 +254,18 @@ _enventor_part_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *ei) /*****************************************************************************/ -/* Internal Eo object required routines */ +/* Externally accessible calls */ /*****************************************************************************/ -EOLIAN static void -_enventor_object_class_constructor(Efl_Class *klass) +EAPI void +enventor_object_class_constructor(Efl_Class *klass) { evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); ENVENTOR_FILE_SET_ERROR_GENERIC = eina_error_msg_static_register("Generic load error"); } -EOLIAN static void -_enventor_object_efl_canvas_group_group_member_add(Eo *obj, Enventor_Object_Data *pd EINA_UNUSED, Evas_Object *child) +EAPI void +enventor_object_efl_canvas_group_group_member_add(Eo *obj, Enventor_Object_Data *pd EINA_UNUSED, Evas_Object *child) { //Don't go through elm_widget to avoid color set. evas_object_data_set(child, "_elm_leaveme", (void*)1); @@ -279,8 +279,8 @@ _enventor_object_efl_canvas_group_group_member_add(Eo *obj, Enventor_Object_Data evas_object_clip_set(child, evas_object_clip_get(obj)); } -EOLIAN static void -_enventor_object_efl_gfx_entity_position_set(Eo *obj, Enventor_Object_Data *pd EINA_UNUSED, Eina_Position2D pos) +EAPI void +enventor_object_efl_gfx_entity_position_set(Eo *obj, Enventor_Object_Data *pd EINA_UNUSED, Eina_Position2D pos) { efl_gfx_entity_position_set(efl_super(obj, MY_CLASS), pos); @@ -291,8 +291,8 @@ _enventor_object_efl_gfx_entity_position_set(Eo *obj, Enventor_Object_Data *pd E eina_iterator_free(it); } -EOLIAN static void -_enventor_object_efl_gfx_entity_size_set(Eo *obj, Enventor_Object_Data *pd EINA_UNUSED, Eina_Size2D size) +EAPI void +enventor_object_efl_gfx_entity_size_set(Eo *obj, Enventor_Object_Data *pd EINA_UNUSED, Eina_Size2D size) { efl_gfx_entity_size_set(efl_super(obj, MY_CLASS), size); @@ -303,8 +303,8 @@ _enventor_object_efl_gfx_entity_size_set(Eo *obj, Enventor_Object_Data *pd EINA_ eina_iterator_free(it); } -EOLIAN static void -_enventor_object_efl_gfx_entity_visible_set(Eo *obj EINA_UNUSED, Enventor_Object_Data *pd, Eina_Bool vis) +EAPI void +enventor_object_efl_gfx_entity_visible_set(Eo *obj EINA_UNUSED, Enventor_Object_Data *pd, Eina_Bool vis) { efl_gfx_entity_visible_set(efl_super(obj, MY_CLASS), vis); @@ -316,8 +316,8 @@ _enventor_object_efl_gfx_entity_visible_set(Eo *obj EINA_UNUSED, Enventor_Object evas_object_hide(o); } -EOLIAN static void -_enventor_object_efl_canvas_object_clipper_set(Eo *obj, Enventor_Object_Data *pd EINA_UNUSED, Evas_Object *clip) +EAPI void +enventor_object_efl_canvas_object_clipper_set(Eo *obj, Enventor_Object_Data *pd EINA_UNUSED, Evas_Object *clip) { efl_canvas_object_clipper_set(efl_super(obj, MY_CLASS), clip); @@ -328,8 +328,8 @@ _enventor_object_efl_canvas_object_clipper_set(Eo *obj, Enventor_Object_Data *pd eina_iterator_free(it); } -EOLIAN static Eo * -_enventor_object_efl_object_constructor(Eo *obj, Enventor_Object_Data *pd) +EAPI Eo * +enventor_object_efl_object_constructor(Eo *obj, Enventor_Object_Data *pd) { obj = efl_constructor(efl_super(obj, MY_CLASS)); @@ -365,8 +365,8 @@ _enventor_object_efl_object_constructor(Eo *obj, Enventor_Object_Data *pd) return obj; } -EOLIAN static void -_enventor_object_efl_object_destructor(Eo *obj, Enventor_Object_Data *pd) +EAPI void +enventor_object_efl_object_destructor(Eo *obj, Enventor_Object_Data *pd) { int i; for (i = ENVENTOR_SYNTAX_COLOR_STRING; i < ENVENTOR_SYNTAX_COLOR_LAST; i++) @@ -389,10 +389,10 @@ _enventor_object_efl_object_destructor(Eo *obj, Enventor_Object_Data *pd) efl_destructor(efl_super(obj, MY_CLASS)); } -EOLIAN static Eina_Error -_enventor_object_efl_file_file_set(Eo *obj EINA_UNUSED, - Enventor_Object_Data *pd, - const char *file) +EAPI Eina_Error +enventor_object_efl_file_file_set(Eo *obj EINA_UNUSED, + Enventor_Object_Data *pd, + const char *file) { build_edc_path_set(file); if (!file) goto err; @@ -407,39 +407,39 @@ err: return 1; } -EOLIAN static Eina_List * -_enventor_object_programs_list_get(Eo *obj EINA_UNUSED, - Enventor_Object_Data *pd EINA_UNUSED) +EAPI Eina_List * +enventor_object_programs_list_get(Eo *obj EINA_UNUSED, + Enventor_Object_Data *pd EINA_UNUSED) { return view_programs_list_get(VIEW_DATA); } -EOLIAN static Eina_List * -_enventor_object_part_states_list_get(Eo *obj EINA_UNUSED, - Enventor_Object_Data *pd EINA_UNUSED, - const char *part) +EAPI Eina_List * +enventor_object_part_states_list_get(Eo *obj EINA_UNUSED, + Enventor_Object_Data *pd EINA_UNUSED, + const char *part) { return view_part_states_list_get(VIEW_DATA, part); } -EOLIAN static Edje_Part_Type -_enventor_object_part_type_get(Eo *obj EINA_UNUSED, - Enventor_Object_Data *pd EINA_UNUSED, - const char *part_name) +EAPI Edje_Part_Type +enventor_object_part_type_get(Eo *obj EINA_UNUSED, + Enventor_Object_Data *pd EINA_UNUSED, + const char *part_name) { return view_part_type_get(VIEW_DATA, part_name); } -EOLIAN static Eina_List * -_enventor_object_parts_list_get(Eo *obj EINA_UNUSED, - Enventor_Object_Data *pd EINA_UNUSED) +EAPI Eina_List * +enventor_object_parts_list_get(Eo *obj EINA_UNUSED, + Enventor_Object_Data *pd EINA_UNUSED) { return view_parts_list_get(VIEW_DATA); } -EOLIAN static void -_enventor_object_linenumber_set(Eo *obj EINA_UNUSED, Enventor_Object_Data *pd, - Eina_Bool linenumber) +EAPI void +enventor_object_linenumber_set(Eo *obj EINA_UNUSED, Enventor_Object_Data *pd, + Eina_Bool linenumber) { linenumber = !!linenumber; @@ -453,115 +453,115 @@ _enventor_object_linenumber_set(Eo *obj EINA_UNUSED, Enventor_Object_Data *pd, pd->linenumber = linenumber; } -EOLIAN static Eina_Bool -_enventor_object_linenumber_get(const Eo *obj EINA_UNUSED, - Enventor_Object_Data *pd) +EAPI Eina_Bool +enventor_object_linenumber_get(const Eo *obj EINA_UNUSED, + Enventor_Object_Data *pd) { return pd->linenumber; } -EOLIAN static void -_enventor_object_smart_undo_redo_set(Eo *obj EINA_UNUSED, - Enventor_Object_Data *pd, - Eina_Bool smart_undo_redo) +EAPI void +enventor_object_smart_undo_redo_set(Eo *obj EINA_UNUSED, + Enventor_Object_Data *pd, + Eina_Bool smart_undo_redo) { smart_undo_redo = !!smart_undo_redo; pd->smart_undo_redo = smart_undo_redo; } -EOLIAN static Eina_Bool -_enventor_object_smart_undo_redo_get(const Eo *obj EINA_UNUSED, - Enventor_Object_Data *pd) +EAPI Eina_Bool +enventor_object_smart_undo_redo_get(const Eo *obj EINA_UNUSED, + Enventor_Object_Data *pd) { return pd->smart_undo_redo; } -EOLIAN static void -_enventor_object_auto_indent_set(Eo *obj EINA_UNUSED, Enventor_Object_Data *pd, - Eina_Bool auto_indent) +EAPI void +enventor_object_auto_indent_set(Eo *obj EINA_UNUSED, Enventor_Object_Data *pd, + Eina_Bool auto_indent) { pd->auto_indent = !!auto_indent; } -EOLIAN static Eina_Bool -_enventor_object_auto_indent_get(const Eo *obj EINA_UNUSED, Enventor_Object_Data *pd) +EAPI Eina_Bool +enventor_object_auto_indent_get(const Eo *obj EINA_UNUSED, Enventor_Object_Data *pd) { return pd->auto_indent; } -EOLIAN static void -_enventor_object_auto_complete_set(Eo *obj EINA_UNUSED, - Enventor_Object_Data *pd EINA_UNUSED, - Eina_Bool auto_complete) +EAPI void +enventor_object_auto_complete_set(Eo *obj EINA_UNUSED, + Enventor_Object_Data *pd EINA_UNUSED, + Eina_Bool auto_complete) { autocomp_enabled_set(auto_complete); } -EOLIAN static Eina_Bool +EAPI Eina_Bool _enventor_object_auto_complete_get(const Eo *obj EINA_UNUSED, Enventor_Object_Data *pd EINA_UNUSED) { return autocomp_enabled_get(); } -EOLIAN static void -_enventor_object_auto_complete_list_show(Eo *obj EINA_UNUSED, - Enventor_Object_Data *pd EINA_UNUSED) +EAPI void +enventor_object_auto_complete_list_show(Eo *obj EINA_UNUSED, + Enventor_Object_Data *pd EINA_UNUSED) { autocomp_list_show(); } -EOLIAN static Eina_Bool -_enventor_object_path_set(Eo *obj EINA_UNUSED, - Enventor_Object_Data *pd EINA_UNUSED, - Enventor_Path_Type type, Eina_List *pathes) +EAPI Eina_Bool +enventor_object_path_set(Eo *obj EINA_UNUSED, + Enventor_Object_Data *pd EINA_UNUSED, + Enventor_Path_Type type, Eina_List *pathes) { return build_path_set(type, pathes); } -EOLIAN static const Eina_List * -_enventor_object_path_get(Eo *obj EINA_UNUSED, - Enventor_Object_Data *pd EINA_UNUSED, - Enventor_Path_Type type) +EAPI const Eina_List * +enventor_object_path_get(Eo *obj EINA_UNUSED, + Enventor_Object_Data *pd EINA_UNUSED, + Enventor_Path_Type type) { return build_path_get(type); } -EOLIAN static void -_enventor_object_live_view_scale_set(Eo *obj EINA_UNUSED, - Enventor_Object_Data *pd EINA_UNUSED, - double scale) +EAPI void +enventor_object_live_view_scale_set(Eo *obj EINA_UNUSED, + Enventor_Object_Data *pd EINA_UNUSED, + double scale) { view_scale_set(VIEW_DATA, scale); } -EOLIAN static void -_enventor_object_live_view_size_set(Eo *obj EINA_UNUSED, - Enventor_Object_Data *pd EINA_UNUSED, - Evas_Coord w, Evas_Coord h) +EAPI void +enventor_object_live_view_size_set(Eo *obj EINA_UNUSED, + Enventor_Object_Data *pd EINA_UNUSED, + Evas_Coord w, Evas_Coord h) { view_size_set(VIEW_DATA, w, h); } -EOLIAN static void -_enventor_object_live_view_size_get(Eo *obj EINA_UNUSED, - Enventor_Object_Data *pd EINA_UNUSED, - Evas_Coord *w, Evas_Coord *h) +EAPI void +enventor_object_live_view_size_get(Eo *obj EINA_UNUSED, + Enventor_Object_Data *pd EINA_UNUSED, + Evas_Coord *w, Evas_Coord *h) { view_size_get(VIEW_DATA, w, h); } -EOLIAN static double -_enventor_object_live_view_scale_get(const Eo *obj EINA_UNUSED, - Enventor_Object_Data *pd EINA_UNUSED) +EAPI double +enventor_object_live_view_scale_get(const Eo *obj EINA_UNUSED, + Enventor_Object_Data *pd EINA_UNUSED) { return view_scale_get(VIEW_DATA); } -EOLIAN static void -_enventor_object_dummy_parts_set(Eo *obj EINA_UNUSED, - Enventor_Object_Data *pd, - Eina_Bool dummy_parts) +EAPI void +enventor_object_dummy_parts_set(Eo *obj EINA_UNUSED, + Enventor_Object_Data *pd, + Eina_Bool dummy_parts) { dummy_parts = !!dummy_parts; if (pd->dummy_parts == dummy_parts) return; @@ -570,48 +570,48 @@ _enventor_object_dummy_parts_set(Eo *obj EINA_UNUSED, pd->dummy_parts = dummy_parts; } -EOLIAN static Eina_Bool -_enventor_object_ctxpopup_get(const Eo *obj EINA_UNUSED, - Enventor_Object_Data *pd) +EAPI Eina_Bool +enventor_object_ctxpopup_get(const Eo *obj EINA_UNUSED, + Enventor_Object_Data *pd) { return pd->ctxpopup; } -EOLIAN static void -_enventor_object_ctxpopup_set(Eo *obj EINA_UNUSED, Enventor_Object_Data *pd, - Eina_Bool ctxpopup) +EAPI void +enventor_object_ctxpopup_set(Eo *obj EINA_UNUSED, Enventor_Object_Data *pd, + Eina_Bool ctxpopup) { ctxpopup = !!ctxpopup; pd->ctxpopup = ctxpopup; } -EOLIAN static Eina_Bool -_enventor_object_ctxpopup_visible_get(Eo *obj EINA_UNUSED, - Enventor_Object_Data *pd) +EAPI Eina_Bool +enventor_object_ctxpopup_visible_get(Eo *obj EINA_UNUSED, + Enventor_Object_Data *pd) { if (!pd->focused_it) return EINA_FALSE; return edit_ctxpopup_visible_get(pd->focused_it->ed); } -EOLIAN static void -_enventor_object_ctxpopup_dismiss(Eo *obj EINA_UNUSED, - Enventor_Object_Data *pd) +EAPI void +enventor_object_ctxpopup_dismiss(Eo *obj EINA_UNUSED, + Enventor_Object_Data *pd) { if (!pd->focused_it) return; edit_ctxpopup_dismiss(pd->focused_it->ed); } -EOLIAN static Eina_Bool -_enventor_object_dummy_parts_get(const Eo *obj EINA_UNUSED, - Enventor_Object_Data *pd) +EAPI Eina_Bool +enventor_object_dummy_parts_get(const Eo *obj EINA_UNUSED, + Enventor_Object_Data *pd) { return pd->dummy_parts; } -EOLIAN static void -_enventor_object_wireframes_set(Eo *obj EINA_UNUSED, - Enventor_Object_Data *pd, - Eina_Bool wireframes) +EAPI void +enventor_object_wireframes_set(Eo *obj EINA_UNUSED, + Enventor_Object_Data *pd, + Eina_Bool wireframes) { wireframes = !!wireframes; @@ -619,18 +619,18 @@ _enventor_object_wireframes_set(Eo *obj EINA_UNUSED, pd->wireframes = wireframes; } -EOLIAN static Eina_Bool -_enventor_object_wireframes_get(const Eo *obj EINA_UNUSED, - Enventor_Object_Data *pd) +EAPI Eina_Bool +enventor_object_wireframes_get(const Eo *obj EINA_UNUSED, + Enventor_Object_Data *pd) { return pd->wireframes; } -EOLIAN static void -_enventor_object_part_highlight_set(Eo *obj EINA_UNUSED, - Enventor_Object_Data *pd, - Eina_Bool part_highlight) +EAPI void +enventor_object_part_highlight_set(Eo *obj EINA_UNUSED, + Enventor_Object_Data *pd, + Eina_Bool part_highlight) { part_highlight = !!part_highlight; if (pd->part_highlight == part_highlight) return; @@ -643,50 +643,50 @@ _enventor_object_part_highlight_set(Eo *obj EINA_UNUSED, else view_part_highlight_set(VIEW_DATA, NULL); } -EOLIAN static Eina_Bool -_enventor_object_part_highlight_get(const Eo *obj EINA_UNUSED, - Enventor_Object_Data *pd) +EAPI Eina_Bool +enventor_object_part_highlight_get(const Eo *obj EINA_UNUSED, + Enventor_Object_Data *pd) { return pd->part_highlight; } -EOLIAN static void -_enventor_object_mirror_mode_set(Eo *obj EINA_UNUSED, - Enventor_Object_Data *pd, - Eina_Bool mirror_mode) +EAPI void +enventor_object_mirror_mode_set(Eo *obj EINA_UNUSED, + Enventor_Object_Data *pd, + Eina_Bool mirror_mode) { pd->mirror_mode = !!mirror_mode; view_mirror_mode_update(VIEW_DATA); } -EOLIAN static Eina_Bool -_enventor_object_mirror_mode_get(const Eo *obj EINA_UNUSED, - Enventor_Object_Data *pd) +EAPI Eina_Bool +enventor_object_mirror_mode_get(const Eo *obj EINA_UNUSED, + Enventor_Object_Data *pd) { return pd->mirror_mode; } -EOLIAN static void -_enventor_object_efl_ui_focus_object_focus_set(Eo *obj EINA_UNUSED, - Enventor_Object_Data *pd EINA_UNUSED, - Eina_Bool focus) +EAPI void +enventor_object_efl_ui_focus_object_focus_set(Eo *obj EINA_UNUSED, + Enventor_Object_Data *pd EINA_UNUSED, + Eina_Bool focus) { if (!pd->focused_it) return; edit_focus_set(pd->focused_it->ed, focus); } -EOLIAN static Eina_Bool -_enventor_object_efl_ui_focus_object_focus_get(const Eo *obj EINA_UNUSED, - Enventor_Object_Data *pd) +EAPI Eina_Bool +enventor_object_efl_ui_focus_object_focus_get(const Eo *obj EINA_UNUSED, + Enventor_Object_Data *pd) { if (!pd->focused_it) return EINA_FALSE; return edit_focus_get(pd->focused_it->ed); } -EOLIAN static void -_enventor_object_font_scale_set(Eo *obj EINA_UNUSED, Enventor_Object_Data *pd, - double font_scale) +EAPI void +enventor_object_font_scale_set(Eo *obj EINA_UNUSED, Enventor_Object_Data *pd, + double font_scale) { if (pd->font_scale == font_scale) return; pd->font_scale = font_scale; @@ -695,16 +695,16 @@ _enventor_object_font_scale_set(Eo *obj EINA_UNUSED, Enventor_Object_Data *pd, edit_font_scale_set(pd->focused_it->ed, font_scale); } -EOLIAN static double -_enventor_object_font_scale_get(const Eo *obj EINA_UNUSED, - Enventor_Object_Data *pd) +EAPI double +enventor_object_font_scale_get(const Eo *obj EINA_UNUSED, + Enventor_Object_Data *pd) { return pd->font_scale; } -EOLIAN static void -_enventor_object_font_set(Eo *obj EINA_UNUSED, Enventor_Object_Data *pd, - const char *font_name, const char *font_style) +EAPI void +enventor_object_font_set(Eo *obj EINA_UNUSED, Enventor_Object_Data *pd, + const char *font_name, const char *font_style) { if (!font_name) return; if ((font_name == pd->font_name) && (font_style == pd->font_style)) return; @@ -720,19 +720,19 @@ _enventor_object_font_set(Eo *obj EINA_UNUSED, Enventor_Object_Data *pd, elm_font_fontconfig_name_free(font); } -EOLIAN static void -_enventor_object_font_get(Eo *obj EINA_UNUSED, Enventor_Object_Data *pd, - const char **font_name, const char **font_style) +EAPI void +enventor_object_font_get(Eo *obj EINA_UNUSED, Enventor_Object_Data *pd, + const char **font_name, const char **font_style) { if (font_name) *font_name = pd->font_name; if (font_style) *font_style = pd->font_style; } -EOLIAN static void -_enventor_object_syntax_color_set(Eo *obj EINA_UNUSED, - Enventor_Object_Data *pd, - Enventor_Syntax_Color_Type color_type, - const char *val) +EAPI void +enventor_object_syntax_color_set(Eo *obj EINA_UNUSED, + Enventor_Object_Data *pd, + Enventor_Syntax_Color_Type color_type, + const char *val) { EINA_SAFETY_ON_NULL_RETURN(val); @@ -757,10 +757,10 @@ _enventor_object_syntax_color_set(Eo *obj EINA_UNUSED, edit_syntax_color_set(it->ed, color_type, val); } -EOLIAN static const char * -_enventor_object_syntax_color_get(Eo *obj EINA_UNUSED, - Enventor_Object_Data *pd, - Enventor_Syntax_Color_Type color_type) +EAPI const char * +enventor_object_syntax_color_get(Eo *obj EINA_UNUSED, + Enventor_Object_Data *pd, + Enventor_Syntax_Color_Type color_type) { if ((color_type < ENVENTOR_SYNTAX_COLOR_STRING) || (color_type >= ENVENTOR_SYNTAX_COLOR_LAST)) @@ -776,17 +776,17 @@ _enventor_object_syntax_color_get(Eo *obj EINA_UNUSED, return color_value_get(color_type); } -EOLIAN static Eo * -_enventor_object_live_view_get(Eo *obj EINA_UNUSED, - Enventor_Object_Data *pd EINA_UNUSED) +EAPI Eo * +enventor_object_live_view_get(Eo *obj EINA_UNUSED, + Enventor_Object_Data *pd EINA_UNUSED) { return edj_mgr_obj_get(); } -EOLIAN static void -_enventor_object_disabled_set(Eo *obj EINA_UNUSED, - Enventor_Object_Data *pd, - Eina_Bool disabled) +EAPI void +enventor_object_disabled_set(Eo *obj EINA_UNUSED, + Enventor_Object_Data *pd, + Eina_Bool disabled) { disabled = !!disabled; if (pd->disabled == disabled) return; @@ -797,39 +797,36 @@ _enventor_object_disabled_set(Eo *obj EINA_UNUSED, pd->disabled = !!disabled; } -EOLIAN static void -_enventor_object_program_run(Eo *obj EINA_UNUSED, - Enventor_Object_Data *pd EINA_UNUSED, - const char *program) +EAPI void +enventor_object_program_run(Eo *obj EINA_UNUSED, + Enventor_Object_Data *pd EINA_UNUSED, + const char *program) { view_program_run(VIEW_DATA, program); } -EOLIAN static void -_enventor_object_programs_stop(Eo *obj EINA_UNUSED, - Enventor_Object_Data *pd EINA_UNUSED) +EAPI void +enventor_object_programs_stop(Eo *obj EINA_UNUSED, + Enventor_Object_Data *pd EINA_UNUSED) { view_programs_stop(VIEW_DATA); } -EOLIAN static void -_enventor_object_keyword_reference_show(Eo *obj EINA_UNUSED, - Enventor_Object_Data *pd) +EAPI void +enventor_object_keyword_reference_show(Eo *obj EINA_UNUSED, + Enventor_Object_Data *pd) { if (!pd->focused_it) return; ref_show(pd->focused_it->ed); } -EOLIAN static double -_enventor_object_base_scale_get(Eo *obj EINA_UNUSED, - Enventor_Object_Data *pd EINA_UNUSED) +EAPI double +enventor_object_base_scale_get(Eo *obj EINA_UNUSED, + Enventor_Object_Data *pd EINA_UNUSED) { return view_base_scale_get(VIEW_DATA); } -/*****************************************************************************/ -/* Externally accessible calls */ -/*****************************************************************************/ EAPI Enventor_Object * enventor_object_add(Enventor_Object *parent) { @@ -930,6 +927,8 @@ enventor_object_sub_items_get(const Enventor_Object *obj) EAPI Enventor_Item * enventor_object_focused_item_get(const Enventor_Object *obj) { + EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EINA_FALSE); + Enventor_Object_Data *pd = efl_data_scope_get(obj, ENVENTOR_OBJECT_CLASS); return pd->focused_it; } @@ -1251,5 +1250,3 @@ enventor_item_group_list_get(Enventor_Item *it) return edit_group_list_get(it->ed); } - -#include "enventor_object.eo.c"