enventor - code clean up

src/bin/Makefile.am

@@ -22,7 +22,8 @@ enventor_SOURCES = \
 	syntax_color.c \
 	ctxpopup.c \
 	syntax_helper.c \
-	indent.c
+	indent.c \
+	shared_res.c
 
 # QuickLaunch                                                
 enventorql_SOURCES = $(enventor_SOURCES)

src/bin/edc_editor.c

@@ -90,9 +90,6 @@ line_decrease(edit_data *ed, int cnt)
    elm_entry_calc_force(ed->en_line);
 
    ed->line_max -= cnt;
-
-DFUNC_NAME();
-
 }
 
 static void
@@ -118,7 +115,6 @@ syntax_color_apply(edit_data *ed)
 //FIXME: don't know why this api reset the entry cursor.
 //   elm_entry_entry_set(ed->en_edit, translated);
    elm_entry_cursor_pos_set(ed->en_edit, pos);
-DFUNC_NAME();
    free(utf8);
 }
 

src/include/common.h

@@ -1,20 +1,12 @@
 #ifndef __COMMON_H__
 #define __COMMON_H__
 
-#define DEBUG_MODE 1
-
-#ifdef DEBUG_MODE
-  #define DFUNC_BEGIN() printf("%s - begin\n", __func__)
-  #define DFUNC_END() printf("%s - end\n", __func__)
-  #define DFUNC_NAME() printf("%s(%d)\n", __func__, __LINE__)
-#else
-  #define DFUNC_BEGIN()
-  #define DFUNC_END()
-  #define DFUNC_NAME()
-#endif
-
 #define MAX_FONT_SIZE 5.0
 #define MIN_FONT_SIZE 0.5
+#define QUOT "\""
+#define QUOT_C '\"'
+#define QUOT_LEN 1
+#define SHARED_BUF_SIZE 1024
 
 extern const char *PROTO_EDC_PATH;
 extern char EDJE_PATH[PATH_MAX];
@@ -52,5 +44,6 @@ typedef struct indent_s indent_data;
 #include "dummy_obj.h"
 #include "ctxpopup.h"
 #include "indent.h"
+#include "shared_res.h"
 
 #endif

src/include/config_data.h

@@ -1,6 +1,4 @@
-config_data *config_init(const char *edc_path, const char *edc_img_path,
-                         const char *edc_snd_path, const char *edc_fnt_path,
-                         const char *edc_data_path);
+config_data *config_init(const char *edc_path, const char *edc_img_path, const char *edc_snd_path, const char *edc_fnt_path, const char *edc_data_path);
 void config_term(config_data *cd);
 const char *config_edc_path_get(config_data *cd);
 const char *config_edj_path_get(config_data *cd);
@@ -16,9 +14,7 @@ Eina_List *config_edc_img_path_list_get(config_data *cd);
 Eina_List *config_edc_snd_path_list_get(config_data *cd);
 Eina_List *config_edc_fnt_path_list_get(config_data *cd);
 Eina_List *config_edc_data_path_list_get(config_data *cd);
-void config_update_cb_set(config_data *cd,
-                          void (*cb)(void *data, config_data *cd),
-                          void *data);
+void config_update_cb_set(config_data *cd, void (*cb)(void *data, config_data *cd), void *data);
 void config_stats_bar_set(config_data *cd, Eina_Bool enabled);
 void config_linenumber_set(config_data *cd, Eina_Bool enabled);
 Eina_Bool config_stats_bar_get(config_data *cd);

src/include/edc_editor.h

@@ -1,4 +1,3 @@
-
 edit_data *edit_init(Evas_Object *win, stats_data *sd, config_data *cd);
 void edit_term(edit_data *ed);
 void edit_edc_read(edit_data *ed, const char *file_path);

src/include/edc_parser.h

@@ -1,7 +1,3 @@
-#define QUOT "\""
-#define QUOT_C '\"'
-#define QUOT_LEN 1
-
 parser_data *parser_init();
 void parser_term(parser_data *pd);
 Eina_Stringshare *parser_group_name_get(parser_data *pd, Evas_Object *entry);

src/include/edj_viewer.h

@@ -1,5 +1,4 @@
-view_data * view_init(Evas_Object *parent, const char *group, stats_data *sd,
-                      config_data *cd);
+view_data * view_init(Evas_Object *parent, const char *group, stats_data *sd, config_data *cd);
 void view_term(view_data *vd);
 Evas_Object *view_obj_get(view_data *vd);
 void view_new(view_data *vd, const char *group);

src/include/statusbar.h

@@ -1,8 +1,7 @@
 stats_data *stats_init(Evas_Object *parent, config_data *cd);
 void stats_term(stats_data *sd);
 void stats_view_size_update(stats_data *sd);
-void stats_cursor_pos_update(stats_data *sd, Evas_Coord x, Evas_Coord y,
-                             float rel_x, float rel_y);
+void stats_cursor_pos_update(stats_data *sd, Evas_Coord x, Evas_Coord y, float rel_x, float rel_y);
 void stats_info_msg_update(stats_data *sd, const char *msg);
 void stats_line_num_update(stats_data *sd, int cur_line, int max_line);
 Evas_Object *stats_obj_get(stats_data *sd);

src/include/syntax_color.h

@@ -1,6 +1,5 @@
 color_data *color_init(Eina_Strbuf *strbuf);
 void color_term(color_data *cd);
 const char *color_cancel(color_data *cd, const char *str, int length);
-const char *color_apply(color_data *cd, const char *str, int length,
-                        Eina_Bool realtime);
+const char *color_apply(color_data *cd, const char *str, int length, Eina_Bool realtime);