[EGIT] [tools/enventor] master 01/01: code refactoring

[Hermet Park]

hermet pushed a commit to branch master.

http://git.enlightenment.org/tools/enventor.git/commit/?id=e08cc69795bef5dd4c1474e6aab007f877e717d5

commit e08cc69795bef5dd4c1474e6aab007f877e717d5
Author: Hermet Park 
Date:   Sun May 1 20:27:08 2016 +0900

code refactoring

change declarations type of enventor object

from Evas_Object to Enventor_Object
---
 src/bin/base_gui.c   |  6 +--
 src/bin/edc_navigator.c  | 14 +++
 src/bin/live_edit.c  |  2 +-
 src/bin/main.c   | 98 
 src/bin/menu.c   |  4 +-
 src/bin/search.c | 10 ++---
 src/include/base_gui.h   |  4 +-
 src/lib/enventor_smart.c |  6 +--
 8 files changed, 71 insertions(+), 73 deletions(-)

diff --git a/src/bin/base_gui.c b/src/bin/base_gui.c
index 43a8b2a..01d4011 100644
--- a/src/bin/base_gui.c
+++ b/src/bin/base_gui.c
@@ -5,7 +5,7 @@ typedef struct base_s
Evas_Object *win;
Evas_Object *layout;
Evas_Object *console;
-   Evas_Object *enventor;
+   Enventor_Object *enventor;
Ecore_Timer *edc_navi_update_timer;
Eina_Bool console_msg : 1;
 } base_data;
@@ -343,7 +343,7 @@ base_gui_show(void)
evas_object_show(g_bd->win);
 }
 
-Evas_Object *
+Enventor_Object *
 base_enventor_get(void)
 {
base_data *bd = g_bd;
@@ -352,7 +352,7 @@ base_enventor_get(void)
 }
 
 void
-base_enventor_set(Evas_Object *enventor)
+base_enventor_set(Enventor_Object *enventor)
 {
base_data *bd = g_bd;
assert(bd);
diff --git a/src/bin/edc_navigator.c b/src/bin/edc_navigator.c
index b4f499f..39549f2 100644
--- a/src/bin/edc_navigator.c
+++ b/src/bin/edc_navigator.c
@@ -640,7 +640,7 @@ gl_state_selected_cb(void *data, Evas_Object *obj 
EINA_UNUSED,
 static void
 states_update(navi_data *nd, part_it *pit)
 {
-   Evas_Object *enventor = base_enventor_get();
+   Enventor_Object *enventor = base_enventor_get();
Eina_List *state_list = enventor_object_part_states_list_get(enventor,
 pit->name);
char *name;
@@ -742,8 +742,7 @@ static void
 program_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info)
 {
program_it *pit = data;
-   Evas_Object *enventor = base_enventor_get();
-   enventor_object_program_run(enventor, pit->name);
+   enventor_object_program_run(base_enventor_get(), pit->name);
 
if (!config_stats_bar_get()) return;
 
@@ -835,7 +834,7 @@ sub_programs_update(navi_data *nd, programs_it *pit)
 {
navigator_sub_programs_clear(pit);
 
-   Evas_Object *enventor = base_enventor_get();
+   Enventor_Object *enventor = base_enventor_get();
Eina_List *program_list = enventor_object_programs_list_get(enventor);
if (!program_list) return;
 
@@ -881,8 +880,7 @@ static void
 programs_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info)
 {
programs_it *pit = data;
-   Evas_Object *enventor = base_enventor_get();
-   enventor_object_programs_stop(enventor);
+   enventor_object_programs_stop(base_enventor_get());
 
if (!config_stats_bar_get()) return;
 
@@ -921,7 +919,7 @@ gl_programs_selected_cb(void *data, Evas_Object *obj 
EINA_UNUSED,
 static void
 programs_update(navi_data *nd, group_it *git)
 {
-   Evas_Object *enventor = base_enventor_get();
+   Enventor_Object *enventor = base_enventor_get();
Eina_List *program_list = enventor_object_programs_list_get(enventor);
 
//oh, no programs.. 
@@ -1155,7 +1153,7 @@ gl_part_selected_cb(void *data, Evas_Object *obj 
EINA_UNUSED,
 static void
 parts_update(navi_data *nd, group_it *git)
 {
-   Evas_Object *enventor = base_enventor_get();
+   Enventor_Object *enventor = base_enventor_get();
Eina_List *part_list = enventor_object_parts_list_get(enventor);
Eina_List *l, *ll;
part_it *pit;
diff --git a/src/bin/live_edit.c b/src/bin/live_edit.c
index 66d84fd..b93d261 100644
--- a/src/bin/live_edit.c
+++ b/src/bin/live_edit.c
@@ -118,7 +118,7 @@ info_text_update(live_data *ld)
Evas_Coord lx, ly, lw, lh;
evas_object_geometry_get(ld->live_view, , , , );
 
-   Evas_Object *enventor = base_enventor_get();
+   Enventor_Object *enventor = base_enventor_get();
 
//reverse coordinates if mirror mode is enabled.
double ox = ld->part_info.rel1_x;
diff --git a/src/bin/main.c b/src/bin/main.c
index 1e57ca1..7b1eea3 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -8,7 +8,6 @@
 
 typedef struct app_s
 {
-   Evas_Object *enventor;
Evas_Object *keygrabber;
Eina_Bool on_saving : 1;
Eina_Bool lazy_save : 1;
@@ -20,7 +19,7 @@ void
 auto_comp_toggle(app_data *ad)
 {
Eina_Bool toggle = !config_auto_complete_get();
-   enventor_object_auto_complete_set(ad->enventor, toggle);
+   enventor_object_auto_complete_set(base_enventor_get(), toggle);
if (toggle) stats_info_msg_update(_("Auto Completion Enabled."));
else stats_info_msg_update(_("Auto Completion Disabled."));
config_auto_complete_set(toggle);
@@ -30,7 +29,7 @@ static void
 

[EGIT] [tools/enventor] master 01/01: code refactoring.

[Hermet Park]

hermet pushed a commit to branch master.

http://git.enlightenment.org/tools/enventor.git/commit/?id=8d109970c6f3531cbcb1b35f7c0f2154fc8800aa

commit 8d109970c6f3531cbcb1b35f7c0f2154fc8800aa
Author: Hermet Park 
Date:   Tue Apr 26 23:13:42 2016 +0900

code refactoring.

sanitize duplicated error message code.
---
 src/bin/live_edit.c | 29 ++---
 src/lib/auto_comp.c | 38 +++---
 src/lib/ctxpopup.c  | 25 +
 3 files changed, 50 insertions(+), 42 deletions(-)

diff --git a/src/bin/live_edit.c b/src/bin/live_edit.c
index e837d24..5c6c9f4 100644
--- a/src/bin/live_edit.c
+++ b/src/bin/live_edit.c
@@ -935,6 +935,13 @@ info_text_init(live_data *ld)
 }
 
 static void
+key_grab_add(Evas_Object *keygrabber, const char *key)
+{
+   if (!evas_object_key_grab(keygrabber, key, 0, 0, EINA_TRUE))
+ EINA_LOG_ERR(_("Failed to grab key - %s"), key);
+}
+
+static void
 live_edit_layer_set(live_data *ld)
 {
//Keygrabber
@@ -944,25 +951,17 @@ live_edit_layer_set(live_data *ld)
   keygrabber_key_down_cb, ld);
evas_object_event_callback_add(ld->keygrabber, EVAS_CALLBACK_KEY_DOWN,
   keygrabber_direction_key_down_cb, ld);
-   if (!evas_object_key_grab(ld->keygrabber, "Return", 0, 0, EINA_TRUE))
- EINA_LOG_ERR(_("Failed to grab key - Return"));
-   if (!evas_object_key_grab(ld->keygrabber, "Delete", 0, 0, EINA_TRUE))
- EINA_LOG_ERR(_("Failed to grab key - Delete"));
-   if (!evas_object_key_grab(ld->keygrabber, "BackSpace", 0, 0, EINA_TRUE))
- EINA_LOG_ERR(_("Failed to grab key - BackSpace"));
-   if (!evas_object_key_grab(ld->keygrabber, "Up", 0, 0, EINA_TRUE))
- EINA_LOG_ERR(_("Failed to grab key - Up"));
-   if (!evas_object_key_grab(ld->keygrabber, "Down", 0, 0, EINA_TRUE))
- EINA_LOG_ERR(_("Failed to grab key - Down"));
-   if (!evas_object_key_grab(ld->keygrabber, "Left", 0, 0, EINA_TRUE))
- EINA_LOG_ERR(_("Failed to grab key - Left"));
-   if (!evas_object_key_grab(ld->keygrabber, "Right", 0, 0, EINA_TRUE))
- EINA_LOG_ERR(_("Failed to grab key - Right"));
-
evas_object_event_callback_add(ld->live_view, EVAS_CALLBACK_RESIZE,
   live_view_geom_cb, ld);
evas_object_event_callback_add(ld->live_view, EVAS_CALLBACK_MOVE,
   live_view_geom_cb, ld);
+   key_grab_add(ld->keygrabber, "Return");
+   key_grab_add(ld->keygrabber, "Delete");
+   key_grab_add(ld->keygrabber, "BackSpace");
+   key_grab_add(ld->keygrabber, "Up");
+   key_grab_add(ld->keygrabber, "Down");
+   key_grab_add(ld->keygrabber, "Left");
+   key_grab_add(ld->keygrabber, "Right");
 
//Create Live View Layout
Evas_Object *layout = elm_layout_add(ld->live_view);
diff --git a/src/lib/auto_comp.c b/src/lib/auto_comp.c
index 664db9e..ff2b186 100644
--- a/src/lib/auto_comp.c
+++ b/src/lib/auto_comp.c
@@ -362,6 +362,19 @@ init_thread_cancel_cb(void *data, Ecore_Thread *thread 
EINA_UNUSED)
 }
 
 static void
+key_grab_add(Evas_Object *keygrabber, const char *key)
+{
+   if (!evas_object_key_grab(keygrabber, key, 0, 0, EINA_TRUE))
+ EINA_LOG_ERR(_("Failed to grab key - %s"), key);
+}
+
+static void
+key_grab_del(Evas_Object *keygrabber, const char *key)
+{
+   evas_object_key_ungrab(keygrabber, key, 0, 0);
+}
+
+static void
 anchor_keygrab_set(autocomp_data *ad, Eina_Bool grab)
 {
Evas_Object *anchor = ad->anchor;
@@ -369,26 +382,21 @@ anchor_keygrab_set(autocomp_data *ad, Eina_Bool grab)
if (grab)
  {
 if (ad->on_keygrab) return;
-if (!evas_object_key_grab(anchor, "BackSpace", 0, 0, EINA_TRUE))
-  EINA_LOG_ERR("Failed to grab key - BackSpace");
-if (!evas_object_key_grab(anchor, "Return", 0, 0, EINA_TRUE))
-  EINA_LOG_ERR("Failed to grab key - Return");
-if (!evas_object_key_grab(anchor, "Tab", 0, 0, EINA_TRUE))
-  EINA_LOG_ERR("Failed to grab key - Tab");
-if (!evas_object_key_grab(anchor, "Up", 0, 0, EINA_TRUE))
-  EINA_LOG_ERR("Failed to grab key - Up");
-if (!evas_object_key_grab(anchor, "Down", 0, 0, EINA_TRUE))
-  EINA_LOG_ERR("Failed to grab key - Down");
+key_grab_add(anchor, "BackSpace");
+key_grab_add(anchor, "Return");
+key_grab_add(anchor, "Tab");
+key_grab_add(anchor, "Up");
+key_grab_add(anchor, "Down");
 ad->on_keygrab = EINA_TRUE;
  }
else
  {
 if (!ad->on_keygrab) return;
-evas_object_key_ungrab(anchor, "BackSpace", 0, 0);
-evas_object_key_ungrab(anchor, "Return", 0, 0);
-evas_object_key_ungrab(anchor, "Tab", 0, 0);
-evas_object_key_ungrab(anchor, "Up", 0, 0);
-evas_object_key_ungrab(anchor, "Down", 0, 0);
+key_grab_del(anchor, "BackSpace");
+key_grab_del(anchor, "Return");
+key_grab_del(anchor, "Tab");
+key_grab_del(anchor, 

[EGIT] [tools/enventor] master 01/01: code refactoring.

[Hermet Park]

hermet pushed a commit to branch master.

http://git.enlightenment.org/tools/enventor.git/commit/?id=14daddac74269ea99de752a0ac7f394a8590b564

commit 14daddac74269ea99de752a0ac7f394a8590b564
Author: Hermet Park 
Date:   Wed Jan 27 14:27:49 2016 +0900

code refactoring.

revise bracket logics which was newly introduced.
---
 data/themes/default/theme_ext.edc |   2 +-
 src/lib/edc_editor.c  |  74 ---
 src/lib/edc_parser.c  | 407 ++
 src/lib/enventor_private.h|  14 +-
 4 files changed, 201 insertions(+), 296 deletions(-)

diff --git a/data/themes/default/theme_ext.edc 
b/data/themes/default/theme_ext.edc
index f8593f5..7979a00 100644
--- a/data/themes/default/theme_ext.edc
+++ b/data/themes/default/theme_ext.edc
@@ -12,7 +12,7 @@
 #define PANEWID 32
 
 #define ENABLED_TEXTBLOCK_TAGS\
-   tag: "hilight" "+ style=glow glow_color=#3399ff80";\
+   tag: "hilight" "+ style=glow glow_color=#3388ddaa";\
 
 #define DISABLED_TEXTBLOCK_TAGS   \
tag: "hilight" "+ style=glow glow_color=#3399ff20";\
diff --git a/src/lib/edc_editor.c b/src/lib/edc_editor.c
index 1f3b9af..5ecb5ba 100644
--- a/src/lib/edc_editor.c
+++ b/src/lib/edc_editor.c
@@ -40,6 +40,13 @@ struct editor_s
int syntax_color_lock;
Evas_Coord scroller_h;
 
+   struct {
+  int prev_left;
+  int prev_right;
+  int left;
+  int right;
+   } bracket;
+
Ecore_Timer *syntax_color_timer;
Ecore_Thread *syntax_color_thread;
 
@@ -181,18 +188,15 @@ bracket_highlight(edit_data *ed, Evas_Object *tb)
 {
Evas_Textblock_Cursor *cur1 = evas_object_textblock_cursor_new(tb);
 
-   int left_bracket = parser_left_bracket_pos_get(ed->pd);
-   int right_bracket = parser_right_bracket_pos_get(ed->pd);
-
-   evas_textblock_cursor_pos_set(cur1, left_bracket);
-   evas_object_textblock_text_markup_prepend(cur1, 

[EGIT] [tools/enventor] master 01/01: code refactoring.

[Hermet Park]

hermet pushed a commit to branch master.

http://git.enlightenment.org/tools/enventor.git/commit/?id=8679899045d230b0374292feb26c41556c302593

commit 8679899045d230b0374292feb26c41556c302593
Author: Hermet Park 
Date:   Fri Jan 22 19:30:29 2016 +0900

code refactoring.

remove enventor reference passing. it's avaiable to be globally accessed.
---
 src/bin/goto.c  |  4 +--
 src/bin/main.c  | 26 -
 src/bin/search.c|  4 +--
 src/bin/tools.c | 83 -
 src/include/tools.h | 14 -
 5 files changed, 61 insertions(+), 70 deletions(-)

diff --git a/src/bin/goto.c b/src/bin/goto.c
index ea08885..d2be96e 100644
--- a/src/bin/goto.c
+++ b/src/bin/goto.c
@@ -199,7 +199,7 @@ goto_open(Evas_Object *enventor)
if (!evas_object_key_grab(keygrabber, "Escape", 0, 0, EINA_TRUE))
  EINA_LOG_ERR(_("Failed to grab key - Escape"));
 
-   tools_goto_update(enventor, EINA_FALSE);
+   tools_goto_update();
 
gd->win = win;
gd->layout = layout;
@@ -232,5 +232,5 @@ goto_close(void)
free(gd);
g_gd = NULL;
 
-   tools_goto_update(enventor, EINA_FALSE);
+   tools_goto_update();
 }
diff --git a/src/bin/main.c b/src/bin/main.c
index 60fc19a..415f2b7 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -37,12 +37,12 @@ auto_indent_toggle(app_data *ad)
 }
 
 static void
-enventor_tools_update(Evas_Object *enventor)
+tools_update(void)
 {
-   tools_lines_update(enventor, EINA_FALSE);
-   tools_highlight_update(enventor, EINA_FALSE);
-   tools_dummy_update(enventor, EINA_FALSE);
-   tools_status_update(enventor, EINA_FALSE);
+   tools_lines_update(EINA_FALSE);
+   tools_highlight_update(EINA_FALSE);
+   tools_dummy_update(EINA_FALSE);
+   tools_status_update(EINA_FALSE);
 }
 
 static void
@@ -128,7 +128,7 @@ config_update_cb(void *data)
Evas_Object *enventor = ad->enventor;
 
enventor_common_setup(enventor);
-   enventor_tools_update(enventor);
+   tools_update();
 
syntax_color_update(enventor);
 
@@ -214,9 +214,9 @@ main_mouse_wheel_cb(void *data, int type EINA_UNUSED, void 
*ev)
 static Evas_Object *
 tools_set(Evas_Object *enventor)
 {
-   Evas_Object *tools = tools_init(base_layout_get(), enventor);
+   Evas_Object *tools = tools_init(base_layout_get());
base_tools_set(tools);
-   enventor_tools_update(enventor);
+   tools_update();
 
return tools;
 }
@@ -644,13 +644,13 @@ ctrl_func(app_data *ad, Evas_Event_Key_Down *event)
//Part Highlight
if (!strcmp(event->key, "h") || !strcmp(event->key, "H"))
  {
-tools_highlight_update(ad->enventor, EINA_TRUE);
+tools_highlight_update(EINA_TRUE);
 return EINA_TRUE;
  }
//Swallow Dummy Object
if (!strcmp(event->key, "w") || !strcmp(event->key, "W"))
  {
-tools_dummy_update(ad->enventor, EINA_TRUE);
+tools_dummy_update(EINA_TRUE);
 return EINA_TRUE;
  }
//Template Code
@@ -765,7 +765,7 @@ keygrabber_key_down_cb(void *data, Evas *e EINA_UNUSED,
if (!strcmp(ev->key, "F5"))
  {
 enventor_object_ctxpopup_dismiss(ad->enventor);
-tools_lines_update(ad->enventor, EINA_TRUE);
+tools_lines_update(EINA_TRUE);
 return;
  }
//Tools
@@ -786,7 +786,7 @@ keygrabber_key_down_cb(void *data, Evas *e EINA_UNUSED,
if (!strcmp(ev->key, "F11"))
  {
 enventor_object_ctxpopup_dismiss(ad->enventor);
-tools_status_update(NULL, EINA_TRUE);
+tools_status_update(EINA_TRUE);
 return;
  }
//Setting
@@ -804,7 +804,7 @@ statusbar_set()
 {
Evas_Object *obj = stats_init(base_layout_get());
elm_object_part_content_set(base_layout_get(), "elm.swallow.statusbar", 
obj);
-   tools_status_update(NULL, EINA_FALSE);
+   tools_status_update(EINA_FALSE);
 
stats_view_scale_update(config_view_scale_get());
 }
diff --git a/src/bin/search.c b/src/bin/search.c
index 510d2cb..b888b79 100644
--- a/src/bin/search.c
+++ b/src/bin/search.c
@@ -413,7 +413,7 @@ search_open(Evas_Object *enventor)
btn_replace_all);
evas_object_show(win);
 
-   tools_search_update(enventor, EINA_FALSE);
+   tools_search_update();
 
//Keygrabber
Evas_Object *keygrabber =
@@ -461,5 +461,5 @@ search_close(void)
free(sd);
g_sd = NULL;
 
-   tools_search_update(enventor, EINA_FALSE);
+   tools_search_update();
 }
diff --git a/src/bin/tools.c b/src/bin/tools.c
index 379643b..00463fa 100644
--- a/src/bin/tools.c
+++ b/src/bin/tools.c
@@ -21,13 +21,12 @@ typedef struct tools_s
 static tools_data *g_td = NULL;
 
 static void
-menu_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
+menu_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
+void *event_info EINA_UNUSED)
 {
-   Evas_Object *enventor = data;
-
if (live_edit_get()) live_edit_cancel();
if (search_is_opened()) search_close();
-   if (goto_is_opened()) tools_goto_update(enventor, 

[EGIT] [tools/enventor] master 01/01: code refactoring.

[Hermet Park]

hermet pushed a commit to branch master.

http://git.enlightenment.org/tools/enventor.git/commit/?id=5c23a5b66137149a2622c9f18d15ca0ee61a2837

commit 5c23a5b66137149a2622c9f18d15ca0ee61a2837
Author: Hermet Park 
Date:   Fri Jan 22 19:59:37 2016 +0900

code refactoring.

tools_close() returns a result in order that the caller decides a next 
behavior.
---
 src/bin/live_edit.c | 6 --
 src/bin/main.c  | 3 +--
 src/bin/tools.c | 2 +-
 src/include/live_edit.h | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/bin/live_edit.c b/src/bin/live_edit.c
index c3214b5..a219d10 100644
--- a/src/bin/live_edit.c
+++ b/src/bin/live_edit.c
@@ -1006,11 +1006,11 @@ live_edit_get(void)
return ld->on;
 }
 
-void
+Eina_Bool
 live_edit_cancel(void)
 {
live_data *ld = g_ld;
-   if (!ld->on) return;
+   if (!ld->on) return EINA_FALSE;
 
if (ld->ctxpopup) elm_ctxpopup_dismiss(ld->ctxpopup);
 
@@ -1057,6 +1057,8 @@ live_edit_cancel(void)
ld->on = EINA_FALSE;
 
tools_live_update(EINA_FALSE);
+
+   return EINA_TRUE;
 }
 
 void
diff --git a/src/bin/main.c b/src/bin/main.c
index 953c720..e342f39 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -699,9 +699,8 @@ keygrabber_key_down_cb(void *data, Evas *e EINA_UNUSED,
  {
 if (stats_ctxpopup_dismiss()) return;
 
-if (live_edit_get())
+if (live_edit_cancel())
   {
- live_edit_cancel();
  enventor_object_focus_set(ad->enventor, EINA_TRUE);
  return;
   }
diff --git a/src/bin/tools.c b/src/bin/tools.c
index 968001a..1708df8 100644
--- a/src/bin/tools.c
+++ b/src/bin/tools.c
@@ -24,7 +24,7 @@ static void
 menu_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
 void *event_info EINA_UNUSED)
 {
-   if (live_edit_get()) live_edit_cancel();
+   live_edit_cancel();
if (search_is_opened()) search_close();
if (goto_is_opened()) tools_goto_update();
 
diff --git a/src/include/live_edit.h b/src/include/live_edit.h
index 6696d2c..7cf6711 100644
--- a/src/include/live_edit.h
+++ b/src/include/live_edit.h
@@ -6,6 +6,6 @@
 void live_edit_init(Evas_Object *trigger);
 void live_edit_term(void);
 void live_edit_toggle(void);
-void live_edit_cancel(void);
+Eina_Bool live_edit_cancel(void);
 Eina_Bool live_edit_get(void);
 void live_edit_update(void);

-- 

[EGIT] [tools/enventor] master 01/01: code refactoring.

[Hermet Park]

hermet pushed a commit to branch master.

http://git.enlightenment.org/tools/enventor.git/commit/?id=b50dbe2571869d36003a9eac581febf358d9b992

commit b50dbe2571869d36003a9eac581febf358d9b992
Author: Hermet Park 
Date:   Fri Jan 22 19:41:51 2016 +0900

code refactoring.

remove enventor reference passing. it's avaiable to be globally accessed.
---
 src/bin/goto.c   | 13 +
 src/bin/main.c   |  4 ++--
 src/bin/search.c | 48 ++--
 src/bin/tools.c  |  4 ++--
 src/include/goto.h   |  2 +-
 src/include/search.h |  2 +-
 6 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/src/bin/goto.c b/src/bin/goto.c
index d2be96e..a10cbe3 100644
--- a/src/bin/goto.c
+++ b/src/bin/goto.c
@@ -12,7 +12,6 @@ typedef struct goto_s
Evas_Object *layout;
Evas_Object *entry;
Evas_Object *btn;
-   Evas_Object *enventor;
Ecore_Timer *timer;
 } goto_data;
 
@@ -61,7 +60,7 @@ goto_line(goto_data *gd)
 {
   const char *txt = elm_entry_entry_get(gd->entry);
   int line = atoi(txt);
-  enventor_object_line_goto(gd->enventor, line);
+  enventor_object_line_goto(base_enventor_get(), line);
   goto_close();
 }
 
@@ -83,7 +82,8 @@ entry_changed_cb(void *data, Evas_Object *obj, void* 
event_info EINA_UNUSED)
 
int line = atoi(txt);
 
-   if ((line < 1) || (line > enventor_object_max_line_get(gd->enventor)))
+   if ((line < 1) ||
+   (line > enventor_object_max_line_get(base_enventor_get(
  {
 elm_object_part_text_set(gd->layout, "elm.text.msg",
  _("Invalid line number"));
@@ -113,7 +113,7 @@ keygrabber_key_down_cb(void *data EINA_UNUSED, Evas *e 
EINA_UNUSED,
 }
 
 void
-goto_open(Evas_Object *enventor)
+goto_open(void)
 {
static Elm_Entry_Filter_Accept_Set digits_filter_data;
goto_data *gd = g_gd;
@@ -162,7 +162,7 @@ goto_open(Evas_Object *enventor)
 
char  buf[256];
snprintf(buf, sizeof(buf), _("Enter line number [1..%d]:"),
-enventor_object_max_line_get(enventor));
+enventor_object_max_line_get(base_enventor_get()));
elm_object_part_text_set(layout, "elm.text.goto", buf);
 
//Entry (line)
@@ -205,7 +205,6 @@ goto_open(Evas_Object *enventor)
gd->layout = layout;
gd->entry = entry;
gd->btn = btn;
-   gd->enventor = enventor;
 }
 
 Eina_Bool
@@ -221,8 +220,6 @@ goto_close(void)
goto_data *gd = g_gd;
if (!gd) return;
 
-   Evas_Object *enventor = gd->enventor;
-
//Save last state
evas_object_geometry_get(gd->win, NULL, NULL, _w, _h);
elm_win_screen_position_get(gd->win, _x, _y);
diff --git a/src/bin/main.c b/src/bin/main.c
index 415f2b7..ff4bbb2 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -631,14 +631,14 @@ ctrl_func(app_data *ad, Evas_Event_Key_Down *event)
if (!strcmp(event->key, "f") || !strcmp(event->key, "F"))
  {
 live_edit_cancel();
-search_open(ad->enventor);
+search_open();
 return EINA_TRUE;
  }
//Goto Line
if (!strcmp(event->key, "l") || !strcmp(event->key, "L"))
  {
 live_edit_cancel();
-goto_open(ad->enventor);
+goto_open();
 return EINA_TRUE;
  }
//Part Highlight
diff --git a/src/bin/search.c b/src/bin/search.c
index b888b79..9e570ca 100644
--- a/src/bin/search.c
+++ b/src/bin/search.c
@@ -10,7 +10,6 @@ typedef struct search_s
Evas_Object *layout;
Evas_Object *en_find;
Evas_Object *en_replace;
-   Evas_Object *enventor;
int pos;
int len;
int syntax_color;
@@ -60,8 +59,10 @@ replace_all_proc(search_data *sd)
 
char buf[256];
int replace_cnt = 0;
+   Evas_Object *enventor = base_enventor_get();
 
-   const char *text = (const char *) enventor_object_text_get(sd->enventor);
+   const char *text =
+  (const char *) enventor_object_text_get(enventor);
char *utf8 = elm_entry_markup_to_utf8(text);
 
char *s = utf8;
@@ -71,9 +72,9 @@ replace_all_proc(search_data *sd)
while ((s = strstr(s, find)))
  {
 pos = s + (delta * replace_cnt) - utf8;
-enventor_object_select_region_set(sd->enventor, pos, (pos + find_len));
-enventor_object_text_insert(sd->enventor, replace);
-enventor_object_select_none(sd->enventor);
+enventor_object_select_region_set(enventor, pos, (pos + find_len));
+enventor_object_text_insert(enventor, replace);
+enventor_object_select_none(enventor);
 replace_cnt++;
 s++;
  }
@@ -90,7 +91,7 @@ static Eina_Bool
 selection_region_anim_cb(void *data)
 {
search_data *sd = data;
-   enventor_object_select_region_set(sd->enventor, sd->pos,
+   enventor_object_select_region_set(base_enventor_get(), sd->pos,
  (sd->pos + sd->len));
return ECORE_CALLBACK_CANCEL;
 }
@@ -103,13 +104,14 @@ find_forward_proc(search_data *sd)
 
char buf[256];
Eina_Bool need_iterate = EINA_TRUE;
+   Evas_Object 

[EGIT] [tools/enventor] master 01/01: code refactoring.

[Hermet Park]

hermet pushed a commit to branch master.

http://git.enlightenment.org/tools/enventor.git/commit/?id=ede00648d93c9ff1250052f22f2d5bcc7de0b65c

commit ede00648d93c9ff1250052f22f2d5bcc7de0b65c
Author: Hermet Park 
Date:   Fri Jan 22 19:53:32 2016 +0900

code refactoring.

remove enventor reference passing. it's avaiable to be globally accessed.
---
 src/bin/file_mgr.c  | 20 +---
 src/bin/live_edit.c | 14 ++
 src/bin/main.c  |  6 +++---
 src/bin/menu.c  | 49 -
 src/bin/newfile.c   |  7 ---
 src/include/file_mgr.h  |  2 +-
 src/include/live_edit.h |  2 +-
 src/include/menu.h  |  2 +-
 src/include/newfile.h   |  2 +-
 9 files changed, 50 insertions(+), 54 deletions(-)

diff --git a/src/bin/file_mgr.c b/src/bin/file_mgr.c
index 530b037..e6bd9b0 100644
--- a/src/bin/file_mgr.c
+++ b/src/bin/file_mgr.c
@@ -6,7 +6,6 @@
 #include "common.h"
 
 typedef struct file_mgr_s {
- Evas_Object *enventor;
  Evas_Object *warning_layout;
  Eina_Bool edc_modified : 1;
 } file_mgr_data;
@@ -20,7 +19,7 @@ warning_dismiss_done(void *data, Evas_Object *obj EINA_UNUSED,
 {
file_mgr_data *fmd = data;
evas_object_del(fmd->warning_layout);
-   enventor_object_focus_set(fmd->enventor, EINA_TRUE);
+   enventor_object_focus_set(base_enventor_get(), EINA_TRUE);
fmd->warning_layout = NULL;
 }
 
@@ -35,7 +34,7 @@ warning_ignore_btn_cb(void *data, Evas_Object *obj 
EINA_UNUSED,
   void *event_info EINA_UNUSED)
 {
file_mgr_data *fmd = data;
-   enventor_object_modified_set(fmd->enventor, EINA_TRUE);
+   enventor_object_modified_set(base_enventor_get(), EINA_TRUE);
warning_close(fmd);
 }
 
@@ -44,7 +43,7 @@ warning_save_as_btn_cb(void *data, Evas_Object *obj 
EINA_UNUSED,
void *event_info EINA_UNUSED)
 {
file_mgr_data *fmd = data;
-   enventor_object_modified_set(fmd->enventor, EINA_TRUE);
+   enventor_object_modified_set(base_enventor_get(), EINA_TRUE);
menu_edc_save();
warning_close(fmd);
 }
@@ -54,7 +53,7 @@ warning_replace_btn_cb(void *data, Evas_Object *obj 
EINA_UNUSED,
void *event_info EINA_UNUSED)
 {
file_mgr_data *fmd = data;
-   enventor_object_file_set(fmd->enventor, config_input_path_get());
+   enventor_object_file_set(base_enventor_get(), config_input_path_get());
warning_close(fmd);
 }
 
@@ -148,8 +147,9 @@ file_mgr_edc_save(void)
char buf[PATH_MAX];
file_mgr_data *fmd = g_fmd;
 
-   Eina_Bool save_success = enventor_object_save(fmd->enventor, 
config_input_path_get());
-   enventor_object_modified_set(fmd->enventor, !save_success);
+   Eina_Bool save_success = enventor_object_save(base_enventor_get(),
+ config_input_path_get());
+   enventor_object_modified_set(base_enventor_get(), !save_success);
 
if (!config_stats_bar_get()) return;
 
@@ -185,7 +185,7 @@ file_mgr_warning_close(void)
 }
 
 void
-file_mgr_init(Evas_Object *enventor)
+file_mgr_init(void)
 {
file_mgr_data *fmd = calloc(1, sizeof(file_mgr_data));
if (!fmd)
@@ -195,9 +195,7 @@ file_mgr_init(Evas_Object *enventor)
  }
g_fmd = fmd;
 
-   fmd->enventor = enventor;
-
-   evas_object_smart_callback_add(enventor, "edc,modified",
+   evas_object_smart_callback_add(base_enventor_get(), "edc,modified",
   enventor_edc_modified_cb, fmd);
 }
 
diff --git a/src/bin/live_edit.c b/src/bin/live_edit.c
index c44c939..c3214b5 100644
--- a/src/bin/live_edit.c
+++ b/src/bin/live_edit.c
@@ -49,7 +49,6 @@ typedef struct live_editor_s
Evas_Object *ctxpopup;
Evas_Object *layout;
Evas_Object *live_view;
-   Evas_Object *enventor;
Evas_Object *trigger;
Evas_Object *ctrl_pt[Ctrl_Pt_Cnt];
Evas_Object *align_line[Align_Line_Cnt];
@@ -193,7 +192,7 @@ static void
 live_edit_insert(live_data *ld)
 {
int type = CTXPOPUP_ITEMS[ld->part_info.type].type;
-   enventor_object_template_part_insert(ld->enventor,
+   enventor_object_template_part_insert(base_enventor_get(),
 type,
 ENVENTOR_TEMPLATE_INSERT_LIVE_EDIT,
 ld->part_info.rel1_x,
@@ -201,7 +200,7 @@ live_edit_insert(live_data *ld)
 ld->part_info.rel2_x,
 ld->part_info.rel2_y,
 NULL, 0);
-   enventor_object_save(ld->enventor, config_input_path_get());
+   enventor_object_save(base_enventor_get(), config_input_path_get());
 }
 
 static Eina_Bool
@@ -988,8 +987,8 @@ live_edit_toggle(void)
 
if (on)
  {
-enventor_object_disabled_set(ld->enventor, EINA_TRUE);
-ld->live_view = enventor_object_live_view_get(ld->enventor);
+enventor_object_disabled_set(base_enventor_get(), EINA_TRUE);
+   

[EGIT] [tools/enventor] master 01/01: code refactoring.

[Hermet Park]

hermet pushed a commit to branch master.

http://git.enlightenment.org/tools/enventor.git/commit/?id=4d3c94cf64998f0c59c2c8583daafa0aab55121b

commit 4d3c94cf64998f0c59c2c8583daafa0aab55121b
Author: Hermet Park 
Date:   Fri Jan 22 20:22:46 2016 +0900

code refactoring.

goto_close(), search_close() returns a result in order that the caller 
decides a next behavior.
---
 src/bin/goto.c   |  6 --
 src/bin/search.c |  6 --
 src/bin/tools.c  | 12 ++--
 src/include/goto.h   |  2 +-
 src/include/search.h |  2 +-
 5 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/bin/goto.c b/src/bin/goto.c
index a10cbe3..fb1245e 100644
--- a/src/bin/goto.c
+++ b/src/bin/goto.c
@@ -214,11 +214,11 @@ goto_is_opened(void)
return (gd ? EINA_TRUE : EINA_FALSE);
 }
 
-void
+Eina_Bool
 goto_close(void)
 {
goto_data *gd = g_gd;
-   if (!gd) return;
+   if (!gd) return EINA_FALSE;
 
//Save last state
evas_object_geometry_get(gd->win, NULL, NULL, _w, _h);
@@ -230,4 +230,6 @@ goto_close(void)
g_gd = NULL;
 
tools_goto_update();
+
+   return EINA_TRUE;
 }
diff --git a/src/bin/search.c b/src/bin/search.c
index 9e570ca..1d6ae13 100644
--- a/src/bin/search.c
+++ b/src/bin/search.c
@@ -443,11 +443,11 @@ search_is_opened(void)
return (sd ? EINA_TRUE : EINA_FALSE);
 }
 
-void
+Eina_Bool
 search_close(void)
 {
search_data *sd = g_sd;
-   if (!sd) return;
+   if (!sd) return EINA_FALSE;
 
Evas_Object *enventor = base_enventor_get();
 
@@ -466,4 +466,6 @@ search_close(void)
g_sd = NULL;
 
tools_search_update();
+
+   return EINA_TRUE;
 }
diff --git a/src/bin/tools.c b/src/bin/tools.c
index 1708df8..5fa5657 100644
--- a/src/bin/tools.c
+++ b/src/bin/tools.c
@@ -25,8 +25,8 @@ menu_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
 void *event_info EINA_UNUSED)
 {
live_edit_cancel();
-   if (search_is_opened()) search_close();
-   if (goto_is_opened()) tools_goto_update();
+   search_close();
+   tools_goto_update();
 
menu_toggle();
 }
@@ -63,7 +63,7 @@ find_cb(void *data, Evas_Object *obj EINA_UNUSED,
 void *event_info EINA_UNUSED)
 {
live_edit_cancel();
-   if (search_is_opened()) search_close();
+   if (search_close()) return;
else search_open();
 }
 
@@ -72,7 +72,7 @@ goto_cb(void *data, Evas_Object *obj EINA_UNUSED,
 void *event_info EINA_UNUSED)
 {
live_edit_cancel();
-   if (goto_is_opened()) goto_close();
+   if (goto_close()) return;
else goto_open();
 }
 
@@ -90,8 +90,8 @@ static void
 live_edit_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
  void *event_info EINA_UNUSED)
 {
-   if (search_is_opened()) search_close();
-   if (goto_is_opened()) goto_close();
+   search_close();
+   goto_close();
live_edit_toggle();
 }
 
diff --git a/src/include/goto.h b/src/include/goto.h
index c731e5c..18196dc 100644
--- a/src/include/goto.h
+++ b/src/include/goto.h
@@ -1,5 +1,5 @@
 #define DEFAULT_GOTO_WIN_W 330
 #define DEFAULT_GOTO_WIN_H 77
 void goto_open(void);
-void goto_close(void);
+Eina_Bool goto_close(void);
 Eina_Bool goto_is_opened(void);
diff --git a/src/include/search.h b/src/include/search.h
index 67e3694..f316cda 100644
--- a/src/include/search.h
+++ b/src/include/search.h
@@ -1,5 +1,5 @@
 #define DEFAULT_SEARCH_WIN_W 330
 #define DEFAULT_SEARCH_WIN_H 90
 void search_open(void);
-void search_close(void);
+Eina_Bool search_close(void);
 Eina_Bool search_is_opened(void);

-- 

[EGIT] [tools/enventor] master 01/01: code refactoring.

[ChunEon Park]

hermet pushed a commit to branch master.

http://git.enlightenment.org/tools/enventor.git/commit/?id=11e5dba04538d789b19df7f0a285a1061c6a3a12

commit 11e5dba04538d789b19df7f0a285a1061c6a3a12
Author: ChunEon Park her...@hermet.pe.kr
Date:   Mon Jun 22 18:25:48 2015 +0900

code refactoring.

remove duplicated logics wrt function toggles.

this is the precede work for improving tools gui.
---
 src/bin/base_gui.c  |  4 ++--
 src/bin/main.c  | 41 +-
 src/bin/tools.c | 57 ++---
 src/include/tools.h |  4 
 4 files changed, 56 insertions(+), 50 deletions(-)

diff --git a/src/bin/base_gui.c b/src/bin/base_gui.c
index ab91d03..1484e71 100644
--- a/src/bin/base_gui.c
+++ b/src/bin/base_gui.c
@@ -63,12 +63,12 @@ base_title_set(const char *path)
 }
 
 void
-base_statusbar_toggle(Eina_Bool config)
+base_statusbar_toggle(Eina_Bool toggle)
 {
base_data *bd = g_bd;
assert(bd);
 
-   if (config) config_stats_bar_set(!config_stats_bar_get());
+   if (toggle) config_stats_bar_set(!config_stats_bar_get());
 
if (config_stats_bar_get())
  elm_object_signal_emit(bd-layout, elm,state,statusbar,show, );
diff --git a/src/bin/main.c b/src/bin/main.c
index a6a1ab2..9539fe4 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -43,11 +43,13 @@ enventor_common_setup(Evas_Object *enventor)
enventor_object_font_set(enventor, font_name, font_style);
enventor_object_font_scale_set(enventor, config_font_scale_get());
enventor_object_live_view_scale_set(enventor, config_view_scale_get());
-   enventor_object_linenumber_set(enventor, config_linenumber_get());
+   tools_lines_update(enventor, EINA_FALSE);
enventor_object_part_highlight_set(enventor, config_part_highlight_get());
+   tools_highlight_update(enventor, EINA_FALSE);
enventor_object_auto_indent_set(enventor, config_auto_indent_get());
enventor_object_auto_complete_set(enventor, config_auto_complete_get());
-   enventor_object_dummy_swallow_set(enventor, config_dummy_swallow_get());
+   tools_swallow_update(enventor, EINA_FALSE);
+   tools_status_update(NULL, EINA_FALSE);
 
Eina_List *list = eina_list_append(NULL, config_edj_path_get());
enventor_object_path_set(enventor, ENVENTOR_OUT_EDJ, list);
@@ -134,7 +136,6 @@ config_update_cb(void *data)
enventor_object_live_view_size_set(enventor, w, h);
 
base_tools_toggle(EINA_FALSE);
-   base_statusbar_toggle(EINA_FALSE);
base_console_auto_hide();
 }
 
@@ -516,29 +517,6 @@ enventor_setup(app_data *ad)
 }
 
 static void
-part_highlight_toggle(app_data *ad)
-{
-   config_part_highlight_set(!config_part_highlight_get());
-   enventor_object_part_highlight_set(ad-enventor,
-  config_part_highlight_get());
-   if (config_part_highlight_get())
- stats_info_msg_update(Part Highlighting Enabled.);
-   else
- stats_info_msg_update(Part Highlighting Disabled.);
-}
-
-static void
-dummy_swallow_toggle(app_data *ad)
-{
-   config_dummy_swallow_set(!config_dummy_swallow_get());
-   enventor_object_dummy_swallow_set(ad-enventor, config_dummy_swallow_get());
-   if (config_dummy_swallow_get())
- stats_info_msg_update(Dummy Swallow Enabled.);
-   else
- stats_info_msg_update(Dummy Swallow Disabled.);
-}
-
-static void
 default_template_insert(app_data *ad)
 {
if (live_edit_get())
@@ -633,13 +611,13 @@ ctrl_func(app_data *ad, Ecore_Event_Key *event)
//Part Highlight
if (!strcmp(event-key, h) || !strcmp(event-key, H))
  {
-part_highlight_toggle(ad);
+tools_highlight_update(ad-enventor, EINA_TRUE);
 return EINA_TRUE;
  }
//Swallow Dummy Object
if (!strcmp(event-key, w) || !strcmp(event-key, W))
  {
-dummy_swallow_toggle(ad);
+tools_swallow_update(ad-enventor, EINA_TRUE);
 return EINA_TRUE;
  }
//Template Code
@@ -773,8 +751,7 @@ main_key_down_cb(void *data, int type EINA_UNUSED, void *ev)
if (!strcmp(event-key, F5))
  {
 enventor_object_ctxpopup_dismiss(ad-enventor);
-config_linenumber_set(!config_linenumber_get());
-enventor_object_linenumber_set(ad-enventor, config_linenumber_get());
+tools_lines_update(ad-enventor, EINA_TRUE);
 return ECORE_CALLBACK_DONE;
  }
//Tools
@@ -795,7 +772,7 @@ main_key_down_cb(void *data, int type EINA_UNUSED, void *ev)
if (!strcmp(event-key, F11))
  {
 enventor_object_ctxpopup_dismiss(ad-enventor);
-base_statusbar_toggle(EINA_TRUE);
+tools_status_update(NULL, EINA_TRUE);
 return ECORE_CALLBACK_DONE;
  }
//Setting
@@ -815,7 +792,7 @@ statusbar_set()
 {
Evas_Object *obj = stats_init(base_layout_get());
elm_object_part_content_set(base_layout_get(), elm.swallow.statusbar, 
obj);
-   base_statusbar_toggle(EINA_FALSE);
+   tools_status_update(NULL, EINA_FALSE);
 }
 
 static void
diff --git a/src/bin/tools.c