diff --git a/src/bin/config_data.c b/src/bin/config_data.c index f641897..daf21d9 100644 --- a/src/bin/config_data.c +++ b/src/bin/config_data.c @@ -40,7 +40,6 @@ typedef struct config_s static config_data *g_cd = NULL; static Eet_Data_Descriptor *edd_base = NULL; -static Eet_Data_Descriptor *edd_color = NULL; static void config_edj_path_update(config_data *cd) diff --git a/src/bin/live_edit.c b/src/bin/live_edit.c index c3082bf..2018237 100644 --- a/src/bin/live_edit.c +++ b/src/bin/live_edit.c @@ -241,7 +241,8 @@ ctrl_pt_update(live_data *ld) } static void -cp_top_mouse_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, +cp_top_mouse_move_cb(void *data, Evas *e EINA_UNUSED, + Evas_Object *obj EINA_UNUSED, void *event_info) { live_data *ld = data; @@ -266,8 +267,9 @@ cp_top_mouse_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, } static void -cp_bottom_mouse_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, - void *event_info) +cp_bottom_mouse_move_cb(void *data, Evas *e EINA_UNUSED, + Evas_Object *obj EINA_UNUSED, + void *event_info) { live_data *ld = data; Evas_Event_Mouse_Move *ev = event_info; @@ -328,7 +330,8 @@ align_line_update(live_data *ld) } static void -cp_rel1_mouse_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, +cp_rel1_mouse_move_cb(void *data, Evas *e EINA_UNUSED, + Evas_Object *obj EINA_UNUSED, void *event_info) { live_data *ld = data; @@ -359,7 +362,8 @@ cp_rel1_mouse_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, } static void -cp_rel2_mouse_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, +cp_rel2_mouse_move_cb(void *data, Evas *e EINA_UNUSED, + Evas_Object *obj EINA_UNUSED, void *event_info) { live_data *ld = data; @@ -391,7 +395,8 @@ cp_rel2_mouse_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, } static void -cp_rel3_mouse_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, +cp_rel3_mouse_move_cb(void *data, Evas *e EINA_UNUSED, + Evas_Object *obj EINA_UNUSED, void *event_info) { live_data *ld = data; @@ -426,7 +431,8 @@ cp_rel3_mouse_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, } static void -cp_rel4_mouse_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, +cp_rel4_mouse_move_cb(void *data, Evas *e EINA_UNUSED, + Evas_Object *obj EINA_UNUSED, void *event_info) { live_data *ld = data; @@ -462,7 +468,8 @@ cp_rel4_mouse_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, } static void -cp_left_mouse_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, +cp_left_mouse_move_cb(void *data, Evas *e EINA_UNUSED, + Evas_Object *obj EINA_UNUSED, void *event_info) { live_data *ld = data; @@ -488,7 +495,8 @@ cp_left_mouse_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, } static void -cp_right_mouse_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, +cp_right_mouse_move_cb(void *data, Evas *e EINA_UNUSED, + Evas_Object *obj EINA_UNUSED, void *event_info) { live_data *ld = data; @@ -549,6 +557,8 @@ cp_mouse_move_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) case Ctrl_Pt_Right: cp_right_mouse_move_cb(data, e, obj, event_info); break; + case Ctrl_Pt_Cnt: //for avoiding compiler warning. + break; } live_edit_update(ld); } @@ -841,10 +851,10 @@ live_edit_layer_set(live_data *ld) } static void -ctxpopup_it_selected_cb(void *data, Evas_Object *obj, void *event_info) +ctxpopup_it_selected_cb(void *data, Evas_Object *obj, + void *event_info EINA_UNUSED) { live_data *ld = g_ld; - const Elm_Object_Item *it = event_info; ld->part_info.type = (unsigned int) data; live_edit_layer_set(ld); diff --git a/src/bin/main.c b/src/bin/main.c index ec2881f..3ce2e2f 100644 --- a/src/bin/main.c +++ b/src/bin/main.c @@ -143,7 +143,6 @@ syntax_color_init(Evas_Object *enventor) { const char *config_color; const char *enventor_color; - Eina_Bool color_changed = EINA_FALSE; Enventor_Syntax_Color_Type color_type; color_type = ENVENTOR_SYNTAX_COLOR_STRING; @@ -465,7 +464,7 @@ enventor_live_view_resized_cb(void *data EINA_UNUSED, static void enventor_live_view_loaded_cb(void *data EINA_UNUSED, Evas_Object *obj, - void *event_info) + void *event_info EINA_UNUSED) { if (!config_view_size_configurable_get()) return; diff --git a/src/bin/text_setting.c b/src/bin/text_setting.c index 1e72339..18c7764 100644 --- a/src/bin/text_setting.c +++ b/src/bin/text_setting.c @@ -6,7 +6,7 @@ #define SYNTAX_TEMPLATE_FONT_SIZE 10 #define SYNTAX_COLOR_LEN 7 -static char color_val[ENVENTOR_SYNTAX_COLOR_LAST][SYNTAX_COLOR_LEN] = {0}; +static char color_val[ENVENTOR_SYNTAX_COLOR_LAST][SYNTAX_COLOR_LEN] = {{0}}; static int color_type_list[COLOR_KEYWORD_MAX_CNT] = { @@ -219,7 +219,7 @@ color_btn_down_cb(void *data, Evas_Object *obj EINA_UNUSED, } static void -color_ctxpopup_dismiss_cb(void *data, Evas_Object *obj, +color_ctxpopup_dismiss_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) { evas_object_del(obj); @@ -397,13 +397,12 @@ convert_hexadecimal_to_decimal(char *hexadecimal) static void color_slider_layout_set(Evas_Object *ctxpopup) { - text_setting_data *tsd = g_tsd; Eina_Array *type_array; Eina_Stringshare *type; Eina_Array_Iterator itr; unsigned int i; const char *color; - char color_rgb_str[3][3] = {0}; + char color_rgb_str[3][3] = {{0}}; int color_rgb_val[3]; color_keyword *selected_color_keyword; selected_color_keyword = evas_object_data_get(ctxpopup, "color_keyword"); diff --git a/src/bin/tools.c b/src/bin/tools.c index b6bee38..75c90d2 100644 --- a/src/bin/tools.c +++ b/src/bin/tools.c @@ -5,10 +5,9 @@ #include "common.h" 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()) goto_close(); @@ -86,7 +85,8 @@ console_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, } static void -live_edit_cb(void *data, Evas_Object *obj, void *event_info) +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(); diff --git a/src/include/base_gui.h b/src/include/base_gui.h index 42aadb4..a32acbd 100644 --- a/src/include/base_gui.h +++ b/src/include/base_gui.h @@ -19,3 +19,5 @@ void base_enventor_set(Evas_Object *enventor); void base_gui_term(void); void base_console_reset(void); void base_error_msg_set(const char *msg); +void base_console_full_view(void); + diff --git a/src/include/config_data.h b/src/include/config_data.h index 8e74359..a2de4c8 100644 --- a/src/include/config_data.h +++ b/src/include/config_data.h @@ -52,5 +52,7 @@ Eina_Bool config_config_get(void); void config_config_set(Eina_Bool enabled); double config_console_size_get(void); void config_console_size_set(double size); +Eina_Bool config_console_get(void); +void config_console_set(Eina_Bool enabled); void config_win_size_get(Evas_Coord *w, Evas_Coord *h); void config_win_size_set(Evas_Coord w, Evas_Coord h); diff --git a/src/include/text_setting.h b/src/include/text_setting.h index 8ee0d45..0636e62 100644 --- a/src/include/text_setting.h +++ b/src/include/text_setting.h @@ -38,3 +38,5 @@ void text_setting_font_scale_set(double font_scale); void text_setting_linenumber_set(Eina_Bool enabled); void text_setting_auto_indent_set(Eina_Bool enabled); void text_setting_auto_complete_set(Eina_Bool enabled); +void text_setting_term(void); +void text_setting_init(void); diff --git a/src/lib/ctxpopup.c b/src/lib/ctxpopup.c index 82dd7b1..a93ad7d 100644 --- a/src/lib/ctxpopup.c +++ b/src/lib/ctxpopup.c @@ -165,7 +165,7 @@ ctxpopup_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, } static void -slider_changed_cb(void *data, Evas_Object *obj, void *event_info) +slider_changed_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED) { Evas_Object *entry = data; double val = elm_slider_value_get(obj); @@ -178,7 +178,7 @@ slider_changed_cb(void *data, Evas_Object *obj, void *event_info) } static void -entry_changed_cb(void *data, Evas_Object *obj, void *event_info) +entry_changed_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED) { Evas_Object *slider = data; double text_val, val, min_val, max_val; diff --git a/src/lib/edc_parser.c b/src/lib/edc_parser.c index 4731483..ff38e58 100644 --- a/src/lib/edc_parser.c +++ b/src/lib/edc_parser.c @@ -392,26 +392,26 @@ type_init_thread_blocking(void *data, Ecore_Thread *thread EINA_UNUSED) attr.value.append_str = ATTR_APPEND_SEMICOLON; eina_inarray_push(td->attrs, &attr); - Eina_Array *signal = eina_array_new(15); - eina_array_push(signal, eina_stringshare_add("\"mouse,down,*\"")); - eina_array_push(signal, eina_stringshare_add("\"mouse,down,1\"")); - eina_array_push(signal, eina_stringshare_add("\"mouse,down,2\"")); - eina_array_push(signal, eina_stringshare_add("\"mouse,down,3\"")); - eina_array_push(signal, eina_stringshare_add("\"mouse,up,*\"")); - eina_array_push(signal, eina_stringshare_add("\"mouse,up,1\"")); - eina_array_push(signal, eina_stringshare_add("\"mouse,up,2\"")); - eina_array_push(signal, eina_stringshare_add("\"mouse,up,3\"")); - eina_array_push(signal, eina_stringshare_add("\"mouse,clicked,*\"")); - eina_array_push(signal, eina_stringshare_add("\"mouse,clicked,1\"")); - eina_array_push(signal, eina_stringshare_add("\"mouse,clicked,2\"")); - eina_array_push(signal, eina_stringshare_add("\"mouse,clicked,3\"")); - eina_array_push(signal, eina_stringshare_add("\"mouse,move\"")); - eina_array_push(signal, eina_stringshare_add("\"mouse,in\"")); - eina_array_push(signal, eina_stringshare_add("\"mouse,out\"")); + Eina_Array *sig = eina_array_new(15); + eina_array_push(sig, eina_stringshare_add("\"mouse,down,*\"")); + eina_array_push(sig, eina_stringshare_add("\"mouse,down,1\"")); + eina_array_push(sig, eina_stringshare_add("\"mouse,down,2\"")); + eina_array_push(sig, eina_stringshare_add("\"mouse,down,3\"")); + eina_array_push(sig, eina_stringshare_add("\"mouse,up,*\"")); + eina_array_push(sig, eina_stringshare_add("\"mouse,up,1\"")); + eina_array_push(sig, eina_stringshare_add("\"mouse,up,2\"")); + eina_array_push(sig, eina_stringshare_add("\"mouse,up,3\"")); + eina_array_push(sig, eina_stringshare_add("\"mouse,clicked,*\"")); + eina_array_push(sig, eina_stringshare_add("\"mouse,clicked,1\"")); + eina_array_push(sig, eina_stringshare_add("\"mouse,clicked,2\"")); + eina_array_push(sig, eina_stringshare_add("\"mouse,clicked,3\"")); + eina_array_push(sig, eina_stringshare_add("\"mouse,move\"")); + eina_array_push(sig, eina_stringshare_add("\"mouse,in\"")); + eina_array_push(sig, eina_stringshare_add("\"mouse,out\"")); memset(&attr, 0x00, sizeof(parser_attr)); attr.keyword = eina_stringshare_add("signal"); - attr.value.strs = signal; + attr.value.strs = sig; attr.value.type = ATTR_VALUE_CONSTANT; attr.value.prepend_str = ATTR_PREPEND_COLON; attr.value.append_str = ATTR_APPEND_SEMICOLON; @@ -644,12 +644,12 @@ type_init_thread_blocking(void *data, Ecore_Thread *thread EINA_UNUSED) attr.value.append_str = ATTR_APPEND_SEMICOLON; eina_inarray_push(td->attrs, &attr); - Eina_Array *time = eina_array_new(1); - eina_array_push(time, eina_stringshare_add("Time:")); + Eina_Array *duration = eina_array_new(1); + eina_array_push(duration, eina_stringshare_add("Time:")); memset(&attr, 0x00, sizeof(parser_attr)); attr.keyword = eina_stringshare_add("LINEAR"); - attr.value.strs = time; + attr.value.strs = duration; attr.value.cnt = 1; attr.value.min = 0.0; attr.value.max = 5.0; @@ -658,12 +658,12 @@ type_init_thread_blocking(void *data, Ecore_Thread *thread EINA_UNUSED) attr.value.append_str = ATTR_APPEND_SEMICOLON; eina_inarray_push(td->attrs, &attr); - time = eina_array_new(1); - eina_array_push(time, eina_stringshare_add("Time:")); + duration = eina_array_new(1); + eina_array_push(duration, eina_stringshare_add("Time:")); memset(&attr, 0x00, sizeof(parser_attr)); attr.keyword = eina_stringshare_add("ACCELERATE"); - attr.value.strs = time; + attr.value.strs = duration; attr.value.cnt = 1; attr.value.min = 0.0; attr.value.max = 5.0; @@ -672,12 +672,12 @@ type_init_thread_blocking(void *data, Ecore_Thread *thread EINA_UNUSED) attr.value.append_str = ATTR_APPEND_SEMICOLON; eina_inarray_push(td->attrs, &attr); - time = eina_array_new(1); - eina_array_push(time, eina_stringshare_add("Time:")); + duration = eina_array_new(1); + eina_array_push(duration, eina_stringshare_add("Time:")); memset(&attr, 0x00, sizeof(parser_attr)); attr.keyword = eina_stringshare_add("DECELERATE"); - attr.value.strs = time; + attr.value.strs = duration; attr.value.cnt = 1; attr.value.min = 0.0; attr.value.max = 5.0; @@ -686,12 +686,12 @@ type_init_thread_blocking(void *data, Ecore_Thread *thread EINA_UNUSED) attr.value.append_str = ATTR_APPEND_SEMICOLON; eina_inarray_push(td->attrs, &attr); - time = eina_array_new(1); - eina_array_push(time, eina_stringshare_add("Time:")); + duration = eina_array_new(1); + eina_array_push(duration, eina_stringshare_add("Time:")); memset(&attr, 0x00, sizeof(parser_attr)); attr.keyword = eina_stringshare_add("SINUSOIDAL"); - attr.value.strs = time; + attr.value.strs = duration; attr.value.cnt = 1; attr.value.min = 0.0; attr.value.max = 5.0; @@ -700,13 +700,13 @@ type_init_thread_blocking(void *data, Ecore_Thread *thread EINA_UNUSED) attr.value.append_str = ATTR_APPEND_SEMICOLON; eina_inarray_push(td->attrs, &attr); - Eina_Array *time_factor = eina_array_new(2); - eina_array_push(time_factor, eina_stringshare_add("Time:")); - eina_array_push(time_factor, eina_stringshare_add("Factor:")); + Eina_Array *duration_factor = eina_array_new(2); + eina_array_push(duration_factor, eina_stringshare_add("Time:")); + eina_array_push(duration_factor, eina_stringshare_add("Factor:")); memset(&attr, 0x00, sizeof(parser_attr)); attr.keyword = eina_stringshare_add("ACCELERATE_FACTOR"); - attr.value.strs = time_factor; + attr.value.strs = duration_factor; attr.value.cnt = 2; attr.value.min = 0.0; attr.value.max = 5.0; @@ -715,13 +715,13 @@ type_init_thread_blocking(void *data, Ecore_Thread *thread EINA_UNUSED) attr.value.append_str = ATTR_APPEND_SEMICOLON; eina_inarray_push(td->attrs, &attr); - time_factor = eina_array_new(2); - eina_array_push(time_factor, eina_stringshare_add("Time:")); - eina_array_push(time_factor, eina_stringshare_add("Factor:")); + duration_factor = eina_array_new(2); + eina_array_push(duration_factor, eina_stringshare_add("Time:")); + eina_array_push(duration_factor, eina_stringshare_add("Factor:")); memset(&attr, 0x00, sizeof(parser_attr)); attr.keyword = eina_stringshare_add("DECELERATE_FACTOR"); - attr.value.strs = time_factor; + attr.value.strs = duration_factor; attr.value.cnt = 2; attr.value.min = 0.0; attr.value.max = 5.0; @@ -730,13 +730,13 @@ type_init_thread_blocking(void *data, Ecore_Thread *thread EINA_UNUSED) attr.value.append_str = ATTR_APPEND_SEMICOLON; eina_inarray_push(td->attrs, &attr); - time_factor = eina_array_new(2); - eina_array_push(time_factor, eina_stringshare_add("Time:")); - eina_array_push(time_factor, eina_stringshare_add("Factor:")); + duration_factor = eina_array_new(2); + eina_array_push(duration_factor, eina_stringshare_add("Time:")); + eina_array_push(duration_factor, eina_stringshare_add("Factor:")); memset(&attr, 0x00, sizeof(parser_attr)); attr.keyword = eina_stringshare_add("SINUSOIDAL_FACTOR"); - attr.value.strs = time_factor; + attr.value.strs = duration_factor; attr.value.cnt = 2; attr.value.min = 0.0; attr.value.max = 5.0; diff --git a/src/lib/enventor_private.h b/src/lib/enventor_private.h index f78fdbf..07291fb 100644 --- a/src/lib/enventor_private.h +++ b/src/lib/enventor_private.h @@ -239,5 +239,6 @@ void edit_ctxpopup_dismiss(edit_data *ed); Eina_Bool edit_load(edit_data *ed, const char *edc_path); void edit_selection_clear(edit_data *ed); Eina_Bool edit_redoundo(edit_data *ed, Eina_Bool undo); +void edit_disabled_set(edit_data *ed, Eina_Bool disabled); #endif diff --git a/src/lib/syntax_color.c b/src/lib/syntax_color.c index 1fe0dfb..bbb6b5d 100644 --- a/src/lib/syntax_color.c +++ b/src/lib/syntax_color.c @@ -695,7 +695,8 @@ color_term(color_data *cd) } static Eina_Bool -color_hash_foreach_cb(const Eina_Hash *hash, const void *key, void *data, void *fdata) +color_hash_foreach_cb(const Eina_Hash *hash EINA_UNUSED, + const void *key EINA_UNUSED, void *data, void *fdata) { Eina_Inarray *inarray = data; color_hash_foreach_data *fd = fdata; @@ -795,6 +796,8 @@ color_set(color_data *cd, Enventor_Syntax_Color_Type color_type, const char *val cd->cols[5] = col; break; } + case ENVENTOR_SYNTAX_COLOR_LAST: //avoiding compiler warning + break; } } diff --git a/src/lib/template.c b/src/lib/template.c index 46fc16a..c735826 100644 --- a/src/lib/template.c +++ b/src/lib/template.c @@ -183,6 +183,11 @@ template_part_insert(edit_data *ed, Edje_Part_Type part_type, t = (char **) &TEMPLATE_PART_IMAGE; strncpy(syntax, "Image", n); break; + //for avoiding compiler warning. + case EDJE_PART_TYPE_MESH_NODE: + case EDJE_PART_TYPE_LIGHT: + case EDJE_PART_TYPE_CAMERA: + break; } //Insert first line of the part block with generated name.