enlightenment/enventor
enlightenment
/
enventor
7
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

temporary change for release v0.9.0

This commit is contained in:
Hermet Park 2016-06-06 17:26:42 +09:00
parent 50f0ab8602
commit 847e84b12d
5 changed files with 59 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/lib/edc_editor.c
View File

@ -423,7 +423,8 @@ edit_changed_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
parser_line_cnt_get(ed->pd, info->change.insert.content);
}
if (enventor_obj_auto_indent_get(ed->enventor))
int ret;
if (eo_do_ret(ed->enventor, ret, enventor_obj_auto_indent_get()))
{
increase =
indent_insert_apply(syntax_indent_data_get(ed->sh),
@ -434,7 +435,8 @@ edit_changed_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
}
else
{
if (enventor_obj_auto_indent_get(ed->enventor))
int ret;
if (eo_do_ret(ed->enventor, ret, enventor_obj_auto_indent_get()))
{
indent_delete_apply(syntax_indent_data_get(ed->sh),
info->change.del.content, ed->cur_line);
@ -715,7 +717,8 @@ edit_cursor_double_clicked_cb(void *data, Evas_Object *obj,
edit_data *ed = data;
if (ed->ctrl_pressed) return;
if (!enventor_obj_ctxpopup_get(ed->enventor)) return;
int ret;
if (!eo_do_ret(ed->enventor, ret, enventor_obj_ctxpopup_get())) return;
char *selected = (char *) elm_entry_selection_get(obj);
if (!selected) return;
@ -960,7 +963,8 @@ edit_edc_load(edit_data *ed, const char *file_path)
= indent_text_check(id, (const char *)utf8_edit);
//Set edc text to entry.
if (enventor_obj_auto_indent_get(ed->enventor) && !indent_correct)
int ret2;
if (eo_do_ret(ed->enventor, ret2, enventor_obj_auto_indent_get()) && !indent_correct)
//Create indented markup text from utf8 text of EDC file.
markup_edit = indent_text_create(id, (const char *)utf8_edit,
&line_num);
@ -968,13 +972,15 @@ edit_edc_load(edit_data *ed, const char *file_path)
markup_edit = elm_entry_utf8_to_markup(utf8_edit);
if (!markup_edit) goto err;
elm_entry_entry_set(ed->en_edit, markup_edit);
if (enventor_obj_auto_indent_get(ed->enventor) && !indent_correct)
int ret3;
if (eo_do_ret(ed->enventor, ret3, enventor_obj_auto_indent_get()) && !indent_correct)
edit_changed_set(ed, EINA_TRUE);
free(markup_edit);
//Append line numbers.
if (!eina_strbuf_append_char(strbuf_line, '1')) goto err;
if (enventor_obj_auto_indent_get(ed->enventor) && !indent_correct)
int ret4;
if (eo_do_ret(ed->enventor, ret4, enventor_obj_auto_indent_get()) && !indent_correct)
{
int num = 2;
//Use line_num given by indent_text_create().
@ -1664,7 +1670,12 @@ edit_disabled_set(edit_data *ed, Eina_Bool disabled)
//Turn off the part highlight in case of disable.
if (disabled) view_part_highlight_set(VIEW_DATA, NULL);
else if (enventor_obj_part_highlight_get(ed->enventor)) edit_view_sync(ed);
else
{
Eina_Bool ret;
if (eo_do_ret(ed->enventor, ret, enventor_obj_part_highlight_get()))
edit_view_sync(ed);
}
}
void

6
src/lib/edj_viewer.c
View File

@ -166,7 +166,8 @@ view_obj_create_post_job(view_data *vd)
if (vd->part_name) view_part_highlight_set(vd, vd->part_name);
if (enventor_obj_dummy_parts_get(vd->enventor))
int ret;
if (eo_do_ret(vd->enventor, ret, enventor_obj_dummy_parts_get()))
dummy_obj_new(vd->layout);
view_mirror_mode_update(vd);
@ -897,8 +898,9 @@ void
view_mirror_mode_update(view_data *vd)
{
if (!vd || !vd->layout) return;
int ret;
edje_object_mirrored_set(vd->layout,
enventor_obj_mirror_mode_get(vd->enventor));
eo_do_ret(vd->enventor, ret, enventor_obj_mirror_mode_get()));
dummy_obj_update(vd->layout);
part_obj_geom_cb(vd, evas_object_evas_get(vd->layout), vd->part_obj, NULL);
}

53
src/lib/enventor_object.eo
View File

@ -1,8 +1,3 @@
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 (Elm.Widget, Efl.File) {
legacy_prefix: enventor_object;
eo_prefix: enventor_obj;
@ -116,29 +111,29 @@ class Enventor.Object (Elm.Widget, Efl.File) {
}
}
path_set {
return: bool;
return: Eina_Bool;
params {
@in type: Enventor_Path_Type;
@in pathes: own(const(list<own(Eina_Stringshare *)>));
@in pathes: const(Eina_List) *;
}
}
path_get {
return: const(list<own(Eina_Stringshare *)>);
return: const(Eina_List) *;
params {
@in type: Enventor_Path_Type;
}
}
programs_list_get {
return: list<char *>;
return: Eina_List *;
}
part_states_list_get {
return: list<char *>;
return: Eina_List *;
params {
@in type: const(char) *;
}
}
parts_list_get {
return: list<char *>;
return: Eina_List *;
}
max_line_get {
return: int;
@ -179,7 +174,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
}
}
live_view_get {
return: Evas.Object;
return: Eo *;
}
line_goto {
params {
@ -216,14 +211,14 @@ class Enventor.Object (Elm.Widget, Efl.File) {
}
}
template_insert {
return: bool;
return: Eina_Bool;
params {
@in syntax: char *;
@in n: size;
@in n: size_t;
}
}
template_part_insert {
return: bool;
return: Eina_Bool;
params {
@in type: Edje_Part_Type;
@in insert_type: Enventor_Template_Insert_Type;
@ -242,7 +237,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@in rel2_x: float;
@in rel2_y: float;
@in syntax: char *;
@in n: size;
@in n: size_t;
}
}
ctxpopup_visible_get {
@ -257,14 +252,14 @@ class Enventor.Object (Elm.Widget, Efl.File) {
}
live_view_size_set {
params {
@in w: Evas.Coord;
@in h: Evas.Coord;
@in w: Evas_Coord;
@in h: Evas_Coord;
}
}
live_view_size_get {
params {
@in w: Evas.Coord *;
@in h: Evas.Coord *;
@in w: Evas_Coord *;
@in h: Evas_Coord *;
}
}
part_type_get {
@ -297,15 +292,15 @@ class Enventor.Object (Elm.Widget, Efl.File) {
implements {
class.constructor;
Eo.Base.constructor;
Evas.Object.Smart.add;
Evas.Object.Smart.del;
Evas.Object.Smart.move;
Evas.Object.Smart.resize;
Evas.Object.Smart.show;
Evas.Object.Smart.hide;
Evas.Object.Smart.clip.set;
Evas.Object.Smart.clip_unset;
Evas.Object.Smart.member_add;
Evas.Object_Smart.add;
Evas.Object_Smart.del;
Evas.Object_Smart.move;
Evas.Object_Smart.resize;
Evas.Object_Smart.show;
Evas.Object_Smart.hide;
Evas.Object_Smart.clip.set;
Evas.Object_Smart.clip_unset;
Evas.Object_Smart.member_add;
Efl.File.file.set;
}
events {

17
src/lib/enventor_smart.c
View File

@ -228,7 +228,7 @@ _enventor_object_evas_object_smart_add(Eo *obj, Enventor_Object_Data *pd)
pd->obj = obj;
elm_widget_sub_object_parent_add(obj);
evas_obj_smart_add(eo_super(obj, MY_CLASS));
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
build_init();
autocomp_init();
@ -258,7 +258,7 @@ _enventor_object_evas_object_smart_del(Evas_Object *obj EINA_UNUSED,
Enventor_Object_Data *pd)
{
eina_stringshare_del(pd->font_name);
eina_stringshare_del(pd->font_style);
eina_stringshare_del(pd->font_style);
eina_stringshare_del(pd->group_name);
autocomp_term();
ecore_event_handler_del(pd->key_down_handler);
@ -272,7 +272,7 @@ _enventor_object_evas_object_smart_del(Evas_Object *obj EINA_UNUSED,
EOLIAN static void
_enventor_object_evas_object_smart_member_add(Eo *obj, Enventor_Object_Data *pd EINA_UNUSED, Evas_Object *child)
{
evas_obj_smart_member_add(eo_super(obj, MY_CLASS), child);
eo_do_super(obj, MY_CLASS, evas_obj_smart_member_add(child));
if (evas_object_visible_get(obj)) evas_object_show(child);
else evas_object_hide(child);
@ -337,9 +337,10 @@ EOLIAN static Eo *
_enventor_object_eo_base_constructor(Eo *obj,
Enventor_Object_Data *pd EINA_UNUSED)
{
obj = eo_constructor(eo_super(obj, MY_CLASS));
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
eo_do(obj,
evas_obj_type_set(MY_CLASS_NAME_LEGACY),
evas_obj_smart_callbacks_descriptions_set(_smart_callbacks));
return obj;
}
@ -943,8 +944,8 @@ enventor_object_main_file_set(Enventor_Object *obj, const char *file)
pd->main_it.ed = edit_init(obj);
edit_view_sync_cb_set(pd->main_it.ed, edit_view_sync_cb, pd);
Eina_Bool ret = efl_file_set(obj, file, NULL);
if (!ret) return NULL;
Eina_Bool ret;
if (!eo_do_ret(obj, ret, efl_file_set(file, NULL))) return NULL;
//Update Editor State
if (pd->linenumber != DEFAULT_LINENUMBER)

6
src/lib/redoundo.c
View File

@ -61,7 +61,8 @@ _input_timer_cb(void *data)
static diff_data *
smart_analyser(redoundo_data *rd, diff_data *diff)
{
if (!enventor_obj_smart_undo_redo_get(rd->enventor)) return diff;
int ret;
if (!eo_do_ret(rd->enventor, ret, enventor_obj_smart_undo_redo_get())) return diff;
if (rd->smart.timer)
{
@ -71,7 +72,8 @@ smart_analyser(redoundo_data *rd, diff_data *diff)
if (!diff) return diff;
if (diff->length == 1 && enventor_obj_auto_indent_get(rd->enventor))
int ret2;
if (diff->length == 1 && eo_do_ret(rd->enventor, ret2, enventor_obj_auto_indent_get()))
{
if (strstr(diff->text, "<br/>")) diff->relative = EINA_TRUE;
else diff->relative = EINA_FALSE;