From cdbfb514f845b47728d01de978afb8a1d46db250 Mon Sep 17 00:00:00 2001 From: ChunEon Park Date: Thu, 19 Sep 2013 02:05:46 +0900 Subject: [PATCH] enventor - code refactoring before implementing futher group switching feature. --- src/bin/edc_editor.c | 18 +++++++++++------- src/bin/main.c | 7 ++++--- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/bin/edc_editor.c b/src/bin/edc_editor.c index 5e47741..7ef6df3 100644 --- a/src/bin/edc_editor.c +++ b/src/bin/edc_editor.c @@ -25,8 +25,9 @@ struct editor_s Ecore_Idler *syntax_color_timer; - void (*part_changed_cb)(void *data, const char *part_name); - void *part_changed_cb_data; + void (*view_sync_cb)(void *data, Eina_Stringshare *part_name, + Eina_Stringshare *group_name); + void *view_sync_cb_data; Eina_Bool edit_changed : 1; Eina_Bool linenumber : 1; @@ -596,8 +597,9 @@ cur_name_get_cb(void *data, Eina_Stringshare *part_name, Eina_Stringshare *group_name) { edit_data *ed = data; - if (ed->part_changed_cb) - ed->part_changed_cb(ed->part_changed_cb_data, part_name); + + if (ed->view_sync_cb) + ed->view_sync_cb(ed->view_sync_cb_data, part_name, group_name); } void @@ -618,10 +620,12 @@ edit_cursor_changed_cb(void *data, Evas_Object *obj EINA_UNUSED, } void -edit_part_changed_cb_set(edit_data *ed, void (*cb)(void *data, const char *part_name), void *data) +edit_view_sync_cb_set(edit_data *ed, + void (*cb)(void *data, Eina_Stringshare *part_name, + Eina_Stringshare *group_name), void *data) { - ed->part_changed_cb = cb; - ed->part_changed_cb_data = data; + ed->view_sync_cb = cb; + ed->view_sync_cb_data = data; } static Eina_Bool diff --git a/src/bin/main.c b/src/bin/main.c index 43e50fe..5a6a74f 100644 --- a/src/bin/main.c +++ b/src/bin/main.c @@ -404,7 +404,8 @@ main_key_down_cb(void *data, int type EINA_UNUSED, void *ev) } static void -part_changed_cb(void *data, const char *part_name) +view_sync_cb(void *data, Eina_Stringshare *part_name, + Eina_Stringshare *group_name) { app_data *ad = data; view_part_highlight_set(ad->vd, part_name); @@ -416,7 +417,7 @@ edc_edit_set(app_data *ad, stats_data *sd, config_data *cd) edit_data *ed = edit_init(ad->panes, sd, cd); edit_edc_read(ed, config_edc_path_get(cd)); elm_object_part_content_set(ad->panes, "right", edit_obj_get(ed)); - edit_part_changed_cb_set(ed, part_changed_cb, ad); + edit_view_sync_cb_set(ed, view_sync_cb, ad); ad->ed = ed; } @@ -457,7 +458,7 @@ config_update_cb(void *data, config_data *cd) rebuild_edc(); edit_changed_set(ad->ed, EINA_FALSE); view_new(ad->vd, stats_group_name_get(ad->sd)); - part_changed_cb(ad, NULL); + view_sync_cb(ad, NULL, NULL); if (ad->edc_monitor) eio_monitor_del(ad->edc_monitor); ad->edc_monitor = eio_monitor_add(config_edc_path_get(ad->cd)); }