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

enventor - use macro to simplify code.

This commit is contained in:
ChunEon Park 2013-09-19 13:54:45 +09:00
parent 82515d3c30
commit f471f555ba
3 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/bin/edj_mgr.c
View File

@ -1,7 +1,7 @@
#include <Elementary.h>
#include "common.h"
static edj_mgr *em;
static edj_mgr *g_em;
struct edj_mgr_s
{
@ -12,14 +12,15 @@ struct edj_mgr_s
edj_mgr *
edj_mgr_init()
{
em = calloc(1, sizeof(edj_mgr));
edj_mgr *em = calloc(1, sizeof(edj_mgr));
g_em = em;
return em;
}
edj_mgr *
edj_mgr_get()
{
return em;
return g_em;
}
void
@ -34,6 +35,7 @@ edj_mgr_term(edj_mgr *em)
view_data *
edj_mgr_view_get(edj_mgr *em, Eina_Stringshare *group)
{
if (!em) em = g_em;
if (!group) return em->vd;
view_data *vd;

22
src/bin/main.c
View File

@ -184,11 +184,7 @@ part_highlight_toggle(app_data *ad, Eina_Bool msg)
{
Eina_Bool highlight = config_part_highlight_get(ad->cd);
if (highlight) edit_view_sync(ad->ed);
else
{
view_data *vd = edj_mgr_view_get(ad->em, NULL);
view_part_highlight_set(vd, NULL);
}
else view_part_highlight_set(VIEW_DATA, NULL);
if (!msg) return;
@ -285,8 +281,7 @@ ctrl_func(app_data *ad, const char *keyname)
if (!strcmp(keyname, "w") || !strcmp(keyname, "W"))
{
config_dummy_swallow_set(ad->cd, !config_dummy_swallow_get(ad->cd));
view_data *vd = edj_mgr_view_get(ad->em, NULL);
view_dummy_toggle(vd, EINA_TRUE);
view_dummy_toggle(VIEW_DATA, EINA_TRUE);
return ECORE_CALLBACK_DONE;
}
//Full Edit View
@ -412,9 +407,7 @@ static void
view_sync_cb(void *data, Eina_Stringshare *part_name,
Eina_Stringshare *group_name)
{
app_data *ad = data;
view_data *vd = edj_mgr_view_get(ad->em, NULL);
view_part_highlight_set(vd, part_name);
view_part_highlight_set(VIEW_DATA, part_name);
}
static void
@ -456,16 +449,15 @@ config_update_cb(void *data, config_data *cd)
statusbar_toggle(ad);
part_highlight_toggle(ad, EINA_FALSE);
view_data *vd = edj_mgr_view_get(ad->em, NULL);
view_dummy_toggle(vd, EINA_FALSE);
view_dummy_toggle(VIEW_DATA, EINA_FALSE);
//previous build was failed, Need to rebuild then reload the edj.
if (view_reload_need_get(vd))
if (view_reload_need_get(VIEW_DATA))
{
rebuild_edc();
edit_changed_set(ad->ed, EINA_FALSE);
view_new(vd, stats_group_name_get(ad->sd));
view_sync_cb(ad, NULL, NULL);
view_new(VIEW_DATA, stats_group_name_get(ad->sd));
view_sync_cb(VIEW_DATA, NULL, NULL);
if (ad->edc_monitor) eio_monitor_del(ad->edc_monitor);
ad->edc_monitor = eio_monitor_add(config_edc_path_get(ad->cd));
}

8
src/bin/menu.c
View File

@ -692,9 +692,7 @@ edc_reload(menu_data *md, const char *edc_path)
{
config_edc_path_set(md->cd, edc_path);
edit_new(md->ed);
edj_mgr *em = edj_mgr_get();
view_data *vd = edj_mgr_view_get(em, NULL);
view_reload_need_set(vd, EINA_TRUE);
view_reload_need_set(VIEW_DATA, EINA_TRUE);
config_apply(md->cd);
}
@ -786,9 +784,7 @@ fileselector_save_done_cb(void *data, Evas_Object *obj EINA_UNUSED,
return;
}
edj_mgr *em = edj_mgr_get();
view_data *vd = edj_mgr_view_get(em, NULL);
view_reload_need_set(vd, EINA_TRUE);
view_reload_need_set(VIEW_DATA, EINA_TRUE);
config_apply(md->cd);
fileselector_close(md);