vtorri
/
enventor
forked from enlightenment/enventor
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

enventor - code refactoring. 

removed unnencessary variables.
move group_name_get() to stats.
This commit is contained in:
ChunEon Park 2013-09-19 01:43:10 +09:00
parent 83504f88e5
commit 15b6b18bf5
4 changed files with 17 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/bin/edc_editor.c
View File

@ -22,7 +22,6 @@ struct editor_s
int cur_line;
int line_max;
Eina_Stringshare *group_name;
Ecore_Idler *syntax_color_timer;
@ -750,7 +749,6 @@ edit_term(edit_data *ed)
syntax_helper *sh = ed->sh;
parser_data *pd = ed->pd;
if (ed->group_name) eina_stringshare_del(ed->group_name);
if (ed->syntax_color_timer) ecore_timer_del(ed->syntax_color_timer);
free(ed);
@ -795,10 +793,10 @@ edit_edc_read(edit_data *ed, const char *file_path)
elm_entry_entry_append(ed->en_edit, eina_strbuf_string_get(strbuf));
ed->line_max = line_num;
if (ed->group_name) eina_stringshare_del(ed->group_name);
ed->group_name = parser_first_group_name_get(ed->pd, ed->en_edit);
Eina_Stringshare *group_name =
parser_first_group_name_get(ed->pd, ed->en_edit);
stats_edc_file_set(ed->sd, ed->group_name);
stats_edc_file_set(ed->sd, group_name);
ecore_animator_add(syntax_color_animator_cb, ed);
err:
@ -852,12 +850,6 @@ edit_new(edit_data *ed)
stats_info_msg_update(ed->sd, buf);
}
const char *
edit_group_name_get(edit_data *ed)
{
return ed->group_name;
}
void
edit_font_size_update(edit_data *ed, Eina_Bool msg)
{

16
src/bin/edc_parser.c
View File

@ -298,8 +298,6 @@ part_name_thread_blocking(void *data, Ecore_Thread *thread EINA_UNUSED)
const char *part_name = NULL;
int group_name_len = 0;
int part_name_len = 0;
Eina_Bool group_in = EINA_FALSE;
Eina_Bool part_in = EINA_FALSE;
while (p <= end)
{
@ -325,16 +323,8 @@ part_name_thread_blocking(void *data, Ecore_Thread *thread EINA_UNUSED)
bracket--;
p++;
if (bracket == 1)
{
group_name = NULL;
group_in = EINA_FALSE;
}
else if (bracket == 3)
{
part_name = NULL;
part_in = EINA_FALSE;
}
if (bracket == 1) group_name = NULL;
else if (bracket == 3) part_name = NULL;
continue;
}
@ -353,7 +343,6 @@ part_name_thread_blocking(void *data, Ecore_Thread *thread EINA_UNUSED)
part_name = name_begin;
part_name_len = name_end - name_begin;
p = name_end + quot_len;
part_in = EINA_TRUE;
bracket++;
continue;
}
@ -371,7 +360,6 @@ part_name_thread_blocking(void *data, Ecore_Thread *thread EINA_UNUSED)
group_name = name_begin;
group_name_len = name_end - name_begin;
p = name_end + quot_len;
group_in = EINA_TRUE;
bracket++;
continue;
}

4
src/bin/main.c
View File

@ -423,7 +423,7 @@ edc_edit_set(app_data *ad, stats_data *sd, config_data *cd)
static void
edc_view_set(app_data *ad, config_data *cd, stats_data *sd)
{
const char *group = edit_group_name_get(ad->ed);
const char *group = stats_group_name_get(ad->sd);
view_data *vd = view_init(ad->panes, group, sd, cd);
elm_object_part_content_set(ad->panes, "left", view_obj_get(vd));
ad->vd = vd;
@ -456,7 +456,7 @@ config_update_cb(void *data, config_data *cd)
{
rebuild_edc();
edit_changed_set(ad->ed, EINA_FALSE);
view_new(ad->vd, edit_group_name_get(ad->ed));
view_new(ad->vd, stats_group_name_get(ad->sd));
part_changed_cb(ad, NULL);
if (ad->edc_monitor) eio_monitor_del(ad->edc_monitor);
ad->edc_monitor = eio_monitor_add(config_edc_path_get(ad->cd));

11
src/bin/statusbar.c
View File

@ -4,6 +4,7 @@
struct statusbar_s
{
Evas_Object *layout;
Eina_Stringshare *group_name;
config_data *cd;
};
@ -17,12 +18,14 @@ stats_line_num_update(stats_data *sd, int cur_line, int max_line)
}
void
stats_edc_file_set(stats_data *sd, const char *group_name)
stats_edc_file_set(stats_data *sd, Eina_Stringshare *group_name)
{
char buf[PATH_MAX];
const char *filename = ecore_file_file_get(config_edc_path_get(sd->cd));
snprintf(buf, sizeof(buf), "<align=right>File [<color=#000000>%s</color>] Group [<color=#000000>%s</color>]</align>", filename, group_name);
elm_object_part_text_set(sd->layout, "elm.text.file_group_name", buf);
sd->group_name = eina_stringshare_add(group_name);
}
stats_data *
@ -52,10 +55,16 @@ stats_obj_get(stats_data *sd)
return sd->layout;
}
Eina_Stringshare *stats_group_name_get(stats_data *sd)
{
return sd->group_name;
}
void
stats_term(stats_data *sd)
{
if (!sd) return;
eina_stringshare_del(sd->group_name);
free(sd);
}