From 750cd95d10a930a428fcf93f6687f948fbc31ddf Mon Sep 17 00:00:00 2001 From: Daniel Juyung Seo Date: Thu, 23 Jan 2014 20:08:10 +0900 Subject: [PATCH] edje_externals: Fixed formatting before working on it. --- legacy/elementary/src/edje_externals/elm.c | 64 ++-- .../src/edje_externals/elm_actionslider.c | 18 +- legacy/elementary/src/edje_externals/elm_bg.c | 8 +- .../src/edje_externals/elm_bubble.c | 109 +++--- .../src/edje_externals/elm_button.c | 155 ++++---- .../src/edje_externals/elm_calendar.c | 8 +- .../elementary/src/edje_externals/elm_check.c | 96 ++--- .../elementary/src/edje_externals/elm_clock.c | 244 +++++++------ .../elementary/src/edje_externals/elm_entry.c | 18 +- .../src/edje_externals/elm_fileselector.c | 157 ++++---- .../edje_externals/elm_fileselector_button.c | 20 +- .../edje_externals/elm_fileselector_entry.c | 19 +- .../elementary/src/edje_externals/elm_frame.c | 16 +- .../src/edje_externals/elm_gengrid.c | 19 +- .../src/edje_externals/elm_genlist.c | 294 ++++++++------- .../src/edje_externals/elm_hoversel.c | 108 +++--- .../elementary/src/edje_externals/elm_icon.c | 10 +- .../elementary/src/edje_externals/elm_index.c | 18 +- .../elementary/src/edje_externals/elm_label.c | 52 +-- .../elementary/src/edje_externals/elm_list.c | 28 +- .../elementary/src/edje_externals/elm_map.c | 146 ++++---- .../src/edje_externals/elm_multibuttonentry.c | 25 +- .../src/edje_externals/elm_naviframe.c | 8 +- .../src/edje_externals/elm_notify.c | 9 +- .../elementary/src/edje_externals/elm_panes.c | 3 +- .../src/edje_externals/elm_photocam.c | 165 +++++---- .../src/edje_externals/elm_progressbar.c | 263 ++++++------- .../elementary/src/edje_externals/elm_radio.c | 135 +++---- .../src/edje_externals/elm_scroller.c | 137 +++---- .../src/edje_externals/elm_segment_control.c | 17 +- .../src/edje_externals/elm_slider.c | 344 +++++++++--------- .../src/edje_externals/elm_slideshow.c | 171 ++++----- .../src/edje_externals/elm_spinner.c | 243 +++++++------ .../elementary/src/edje_externals/elm_thumb.c | 78 ++-- .../src/edje_externals/elm_toolbar.c | 27 +- .../elementary/src/edje_externals/elm_video.c | 18 +- .../elementary/src/edje_externals/elm_web.c | 27 +- 37 files changed, 1752 insertions(+), 1525 deletions(-) diff --git a/legacy/elementary/src/edje_externals/elm.c b/legacy/elementary/src/edje_externals/elm.c index f2016c17d3..54bbb3bafb 100644 --- a/legacy/elementary/src/edje_externals/elm.c +++ b/legacy/elementary/src/edje_externals/elm.c @@ -32,7 +32,8 @@ external_elm_shutdown(void) } static void -_external_obj_del(void *data EINA_UNUSED, Evas *evas EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) +_external_obj_del(void *data EINA_UNUSED, Evas *evas EINA_UNUSED, + Evas_Object *obj, void *event_info EINA_UNUSED) { evas_object_event_callback_del(obj, EVAS_CALLBACK_DEL, _external_obj_del); @@ -40,7 +41,8 @@ _external_obj_del(void *data EINA_UNUSED, Evas *evas EINA_UNUSED, Evas_Object *o } void -external_signal(void *data EINA_UNUSED, Evas_Object *obj, const char *sig, const char *source) +external_signal(void *data EINA_UNUSED, Evas_Object *obj, const char *sig, + const char *source) { char *_signal = strdup(sig); char *p = _signal; @@ -90,14 +92,17 @@ typedef struct { } Elm_External_Signals_Proxy_Context; static void -_external_signal_proxy_free_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +_external_signal_proxy_free_cb(void *data, Evas *e EINA_UNUSED, + Evas_Object *obj EINA_UNUSED, + void *event_info EINA_UNUSED) { Elm_External_Signals_Proxy_Context *ctxt = data; free(ctxt); } static void -_external_signal_proxy_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +_external_signal_proxy_cb(void *data, Evas_Object *obj EINA_UNUSED, + void *event_info EINA_UNUSED) { Elm_External_Signals_Proxy_Context *ctxt = data; // TODO: Is it worth to check Evas_Smart_Cb_Description and do something @@ -106,7 +111,8 @@ _external_signal_proxy_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_ } Eina_Bool -external_common_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param) +external_common_param_get(void *data EINA_UNUSED, const Evas_Object *obj, + Edje_External_Param *param) { if (!strcmp(param->name, "style")) { @@ -128,7 +134,8 @@ external_common_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_E } Eina_Bool -external_common_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param) +external_common_param_set(void *data EINA_UNUSED, Evas_Object *obj, + const Edje_External_Param *param) { if (!strcmp(param->name, "style")) { @@ -168,29 +175,31 @@ external_signals_proxy(Evas_Object *obj, Evas_Object *edje, const char *part_nam for (; cls_count > 0; cls_count--, cls_descs++, ctxt++) { - const Evas_Smart_Cb_Description *d = *cls_descs; - ctxt->emission = d->name; - ctxt->source = part_name; - ctxt->edje = edje; - evas_object_smart_callback_add - (obj, d->name, _external_signal_proxy_cb, ctxt); + const Evas_Smart_Cb_Description *d = *cls_descs; + ctxt->emission = d->name; + ctxt->source = part_name; + ctxt->edje = edje; + evas_object_smart_callback_add + (obj, d->name, _external_signal_proxy_cb, ctxt); } for (; inst_count > 0; inst_count--, inst_descs++, ctxt++) { - const Evas_Smart_Cb_Description *d = *inst_descs; - ctxt->emission = d->name; - ctxt->source = part_name; - ctxt->edje = edje; - evas_object_smart_callback_add - (obj, d->name, _external_signal_proxy_cb, ctxt); + const Evas_Smart_Cb_Description *d = *inst_descs; + ctxt->emission = d->name; + ctxt->source = part_name; + ctxt->edje = edje; + evas_object_smart_callback_add + (obj, d->name, _external_signal_proxy_cb, ctxt); } evas_object_event_callback_add(obj, EVAS_CALLBACK_DEL, _external_obj_del, NULL); } void -external_common_params_parse(void *mem, void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const Eina_List *params) +external_common_params_parse(void *mem, void *data EINA_UNUSED, + Evas_Object *obj EINA_UNUSED, + const Eina_List *params) { Elm_Params *p; const Eina_List *l; @@ -210,7 +219,9 @@ external_common_params_parse(void *mem, void *data EINA_UNUSED, Evas_Object *obj } void -external_common_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED) +external_common_state_set(void *data EINA_UNUSED, Evas_Object *obj, + const void *from_params, const void *to_params, + float pos EINA_UNUSED) { const Elm_Params *p; if (to_params) p = to_params; @@ -252,14 +263,16 @@ external_common_param_icon_get(Evas_Object *obj, const Edje_External_Param *p) } void -external_common_icon_param_parse(Evas_Object **icon, Evas_Object *obj, const Eina_List *params) +external_common_icon_param_parse(Evas_Object **icon, Evas_Object *obj, + const Eina_List *params) { Edje_External_Param *p = edje_external_param_find(params, "icon"); *icon = external_common_param_icon_get(obj, p); } Evas_Object * -external_common_param_edje_object_get(Evas_Object *obj, const Edje_External_Param *p) +external_common_param_edje_object_get(Evas_Object *obj, + const Edje_External_Param *p) { Evas_Object *edje, *parent_widget, *ret; const char *file; @@ -299,16 +312,17 @@ external_common_params_free(void *params) static Edje_External_Type_Info elm_external_types[] = { #define DEFINE_TYPE(type_name) \ - {"elm/"#type_name, &external_##type_name##_type}, + { "elm/"#type_name, &external_##type_name##_type }, #include "modules.inc" #undef DEFINE_TYPE - {NULL, NULL} + { NULL, NULL } }; static Eina_Bool elm_mod_init(void) { - _elm_ext_log_dom = eina_log_domain_register("elm-externals", EINA_COLOR_LIGHTBLUE); + _elm_ext_log_dom = eina_log_domain_register("elm-externals", + EINA_COLOR_LIGHTBLUE); edje_external_type_array_register(elm_external_types); return EINA_TRUE; } diff --git a/legacy/elementary/src/edje_externals/elm_actionslider.c b/legacy/elementary/src/edje_externals/elm_actionslider.c index 4ef628456f..166707bb56 100644 --- a/legacy/elementary/src/edje_externals/elm_actionslider.c +++ b/legacy/elementary/src/edje_externals/elm_actionslider.c @@ -7,7 +7,9 @@ typedef struct _Elm_Params_Actionslider } Elm_Params_Actionslider; static void -external_actionslider_state_set(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const void *from_params, const void *to_params, float pos EINA_UNUSED) +external_actionslider_state_set(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, + const void *from_params, const void *to_params, + float pos EINA_UNUSED) { const Elm_Params_Actionslider *p; @@ -20,7 +22,8 @@ external_actionslider_state_set(void *data EINA_UNUSED, Evas_Object *obj EINA_UN } static Eina_Bool -external_actionslider_param_set(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const Edje_External_Param *param) +external_actionslider_param_set(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, + const Edje_External_Param *param) { if ((param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) && (!strcmp(param->name, "label"))) @@ -36,7 +39,8 @@ external_actionslider_param_set(void *data EINA_UNUSED, Evas_Object *obj EINA_UN } static Eina_Bool -external_actionslider_param_get(void *data EINA_UNUSED, const Evas_Object *obj EINA_UNUSED, Edje_External_Param *param) +external_actionslider_param_get(void *data EINA_UNUSED, const Evas_Object *obj EINA_UNUSED, + Edje_External_Param *param) { if ((param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) && (!strcmp(param->name, "label"))) @@ -52,7 +56,8 @@ external_actionslider_param_get(void *data EINA_UNUSED, const Evas_Object *obj E } static void * -external_actionslider_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const Eina_List *params) +external_actionslider_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, + const Eina_List *params) { Elm_Params_Actionslider *mem; Edje_External_Param *param; @@ -90,11 +95,12 @@ external_actionslider_params_free(void *params) free(mem); } -static Edje_External_Param_Info external_actionslider_params[] = { +static Edje_External_Param_Info external_actionslider_params[] = +{ DEFINE_EXTERNAL_COMMON_PARAMS, EDJE_EXTERNAL_PARAM_INFO_STRING("label"), EDJE_EXTERNAL_PARAM_INFO_SENTINEL }; -DEFINE_EXTERNAL_ICON_ADD(actionslider, "actionslider") +DEFINE_EXTERNAL_ICON_ADD(actionslider, "actionslider"); DEFINE_EXTERNAL_TYPE_SIMPLE(actionslider, "Actionslider"); diff --git a/legacy/elementary/src/edje_externals/elm_bg.c b/legacy/elementary/src/edje_externals/elm_bg.c index 7a692786ce..3945b99e9e 100644 --- a/legacy/elementary/src/edje_externals/elm_bg.c +++ b/legacy/elementary/src/edje_externals/elm_bg.c @@ -14,7 +14,10 @@ typedef struct _Elm_Params_Bg if (!strcmp(STR, CHOICES[i])) \ return i; -static const char *_bg_options[] = {"center", "scale", "stretch", "tile", NULL}; +static const char *_bg_options[] = +{ + "center", "scale", "stretch", "tile", NULL +}; static Elm_Bg_Option _bg_option_get(const char *option) @@ -144,7 +147,8 @@ external_bg_params_free(void *params) free(mem); } -static Edje_External_Param_Info external_bg_params[] = { +static Edje_External_Param_Info external_bg_params[] = +{ DEFINE_EXTERNAL_COMMON_PARAMS, EDJE_EXTERNAL_PARAM_INFO_STRING("file"), EDJE_EXTERNAL_PARAM_INFO_STRING("option"), diff --git a/legacy/elementary/src/edje_externals/elm_bubble.c b/legacy/elementary/src/edje_externals/elm_bubble.c index bd7aee6473..5ae04bc650 100644 --- a/legacy/elementary/src/edje_externals/elm_bubble.c +++ b/legacy/elementary/src/edje_externals/elm_bubble.c @@ -10,7 +10,9 @@ typedef struct _Elm_Params_Bubble } Elm_Params_Bubble; static void -external_bubble_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED) +external_bubble_state_set(void *data EINA_UNUSED, Evas_Object *obj, + const void *from_params, const void *to_params, + float pos EINA_UNUSED) { const Elm_Params_Bubble *p; @@ -26,44 +28,45 @@ external_bubble_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void * } static Eina_Bool -external_bubble_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param) +external_bubble_param_set(void *data EINA_UNUSED, Evas_Object *obj, + const Edje_External_Param *param) { if (!strcmp(param->name, "label")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) - { - elm_object_text_set(obj, param->s); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) + { + elm_object_text_set(obj, param->s); + return EINA_TRUE; + } } else if (!strcmp(param->name, "icon")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) - { - Evas_Object *icon = external_common_param_icon_get(obj, param); - if ((strcmp(param->s, "")) && (!icon)) return EINA_FALSE; - elm_object_part_content_set(obj, "icon", icon); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) + { + Evas_Object *icon = external_common_param_icon_get(obj, param); + if ((strcmp(param->s, "")) && (!icon)) return EINA_FALSE; + elm_object_part_content_set(obj, "icon", icon); + return EINA_TRUE; + } } else if (!strcmp(param->name, "info")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) - { - elm_object_part_text_set(obj, "info", param->s); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) + { + elm_object_part_text_set(obj, "info", param->s); + return EINA_TRUE; + } } else if (!strcmp(param->name, "content")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) - { - Evas_Object *content = \ - external_common_param_edje_object_get(obj, param); - if ((strcmp(param->s, "")) && (!content)) return EINA_FALSE; - elm_object_content_set(obj, content); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) + { + Evas_Object *content = \ + external_common_param_edje_object_get(obj, param); + if ((strcmp(param->s, "")) && (!content)) return EINA_FALSE; + elm_object_content_set(obj, content); + return EINA_TRUE; + } } ERR("unknown parameter '%s' of type '%s'", @@ -73,33 +76,34 @@ external_bubble_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_E } static Eina_Bool -external_bubble_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param) +external_bubble_param_get(void *data EINA_UNUSED, const Evas_Object *obj, + Edje_External_Param *param) { if (!strcmp(param->name, "label")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) - { - param->s = elm_object_text_get(obj); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) + { + param->s = elm_object_text_get(obj); + return EINA_TRUE; + } } else if (!strcmp(param->name, "icon")) { - /* not easy to get icon name back from live object */ - return EINA_FALSE; + /* not easy to get icon name back from live object */ + return EINA_FALSE; } else if (!strcmp(param->name, "info")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) - { - param->s = elm_object_part_text_get(obj, "info"); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) + { + param->s = elm_object_part_text_get(obj, "info"); + return EINA_TRUE; + } } else if (!strcmp(param->name, "content")) { - /* not easy to get content name back from live object */ - return EINA_FALSE; + /* not easy to get content name back from live object */ + return EINA_FALSE; } ERR("unknown parameter '%s' of type '%s'", @@ -109,7 +113,8 @@ external_bubble_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_E } static void * -external_bubble_params_parse(void *data EINA_UNUSED, Evas_Object *obj, const Eina_List *params) +external_bubble_params_parse(void *data EINA_UNUSED, Evas_Object *obj, + const Eina_List *params) { Elm_Params_Bubble *mem; Edje_External_Param *param; @@ -123,19 +128,20 @@ external_bubble_params_parse(void *data EINA_UNUSED, Evas_Object *obj, const Ein EINA_LIST_FOREACH(params, l, param) { - if (!strcmp(param->name, "info")) - mem->info = eina_stringshare_add(param->s); - else if (!strcmp(param->name, "content")) - mem->content = external_common_param_edje_object_get(obj, param); - else if (!strcmp(param->name, "label")) - mem->label = eina_stringshare_add(param->s); + if (!strcmp(param->name, "info")) + mem->info = eina_stringshare_add(param->s); + else if (!strcmp(param->name, "content")) + mem->content = external_common_param_edje_object_get(obj, param); + else if (!strcmp(param->name, "label")) + mem->label = eina_stringshare_add(param->s); } return mem; } static Evas_Object *external_bubble_content_get(void *data EINA_UNUSED, - const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED) + const Evas_Object *obj EINA_UNUSED, + const char *content EINA_UNUSED) { if (!strcmp(content, "content")) return elm_object_content_get(obj); @@ -155,7 +161,8 @@ external_bubble_params_free(void *params) free(params); } -static Edje_External_Param_Info external_bubble_params[] = { +static Edje_External_Param_Info external_bubble_params[] = +{ DEFINE_EXTERNAL_COMMON_PARAMS, EDJE_EXTERNAL_PARAM_INFO_STRING("label"), EDJE_EXTERNAL_PARAM_INFO_STRING("icon"), diff --git a/legacy/elementary/src/edje_externals/elm_button.c b/legacy/elementary/src/edje_externals/elm_button.c index 5ea6f50ab3..bca4f6bac4 100644 --- a/legacy/elementary/src/edje_externals/elm_button.c +++ b/legacy/elementary/src/edje_externals/elm_button.c @@ -14,7 +14,9 @@ typedef struct _Elm_Params_Button } Elm_Params_Button; static void -external_button_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED) +external_button_state_set(void *data EINA_UNUSED, Evas_Object *obj, + const void *from_params, const void *to_params, + float pos EINA_UNUSED) { const Elm_Params_Button *p; @@ -35,49 +37,50 @@ external_button_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void * } static Eina_Bool -external_button_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param) +external_button_param_set(void *data EINA_UNUSED, Evas_Object *obj, + const Edje_External_Param *param) { if (!strcmp(param->name, "label")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) - { - elm_object_text_set(obj, param->s); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) + { + elm_object_text_set(obj, param->s); + return EINA_TRUE; + } } else if (!strcmp(param->name, "icon")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) - { - Evas_Object *icon = external_common_param_icon_get(obj, param); - if ((strcmp(param->s, "")) && (!icon)) return EINA_FALSE; - elm_object_part_content_set(obj, "icon", icon); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) + { + Evas_Object *icon = external_common_param_icon_get(obj, param); + if ((strcmp(param->s, "")) && (!icon)) return EINA_FALSE; + elm_object_part_content_set(obj, "icon", icon); + return EINA_TRUE; + } } else if (!strcmp(param->name, "autorepeat_initial")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) - { - elm_button_autorepeat_initial_timeout_set(obj, param->d); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) + { + elm_button_autorepeat_initial_timeout_set(obj, param->d); + return EINA_TRUE; + } } else if (!strcmp(param->name, "autorepeat_gap")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) - { - elm_button_autorepeat_gap_timeout_set(obj, param->d); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) + { + elm_button_autorepeat_gap_timeout_set(obj, param->d); + return EINA_TRUE; + } } else if (!strcmp(param->name, "autorepeat")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) - { - elm_button_autorepeat_set(obj, param->i); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) + { + elm_button_autorepeat_set(obj, param->i); + return EINA_TRUE; + } } ERR("unknown parameter '%s' of type '%s'", @@ -87,44 +90,45 @@ external_button_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_E } static Eina_Bool -external_button_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param) +external_button_param_get(void *data EINA_UNUSED, const Evas_Object *obj, + Edje_External_Param *param) { if (!strcmp(param->name, "label")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) - { - param->s = elm_object_text_get(obj); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) + { + param->s = elm_object_text_get(obj); + return EINA_TRUE; + } } else if (!strcmp(param->name, "icon")) { - /* not easy to get icon name back from live object */ - return EINA_FALSE; + /* not easy to get icon name back from live object */ + return EINA_FALSE; } else if (!strcmp(param->name, "autorepeat_initial")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) - { - param->d = elm_button_autorepeat_initial_timeout_get(obj); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) + { + param->d = elm_button_autorepeat_initial_timeout_get(obj); + return EINA_TRUE; + } } else if (!strcmp(param->name, "autorepeat_gap")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) - { - param->d = elm_button_autorepeat_gap_timeout_get(obj); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) + { + param->d = elm_button_autorepeat_gap_timeout_get(obj); + return EINA_TRUE; + } } else if (!strcmp(param->name, "autorepeat")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) - { - param->i = elm_button_autorepeat_get(obj); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) + { + param->i = elm_button_autorepeat_get(obj); + return EINA_TRUE; + } } ERR("unknown parameter '%s' of type '%s'", @@ -134,7 +138,8 @@ external_button_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_E } static void * -external_button_params_parse(void *data EINA_UNUSED, Evas_Object *obj, const Eina_List *params) +external_button_params_parse(void *data EINA_UNUSED, Evas_Object *obj, + const Eina_List *params) { Elm_Params_Button *mem; Edje_External_Param *param; @@ -148,33 +153,34 @@ external_button_params_parse(void *data EINA_UNUSED, Evas_Object *obj, const Ein EINA_LIST_FOREACH(params, l, param) { - if (!strcmp(param->name, "autorepeat_initial")) - { - mem->autorepeat_initial = param->d; - mem->autorepeat_initial_exists = EINA_TRUE; - } + if (!strcmp(param->name, "autorepeat_initial")) + { + mem->autorepeat_initial = param->d; + mem->autorepeat_initial_exists = EINA_TRUE; + } else if (!strcmp(param->name, "autorepeat_gap")) - { - mem->autorepeat_gap = param->d; - mem->autorepeat_gap_exists = EINA_TRUE; - } - else if (!strcmp(param->name, "autorepeat")) - { - mem->autorepeat = !!param->i; - mem->autorepeat_exists = EINA_TRUE; - } - else if (!strcmp(param->name, "label")) - mem->label = eina_stringshare_add(param->s); + { + mem->autorepeat_gap = param->d; + mem->autorepeat_gap_exists = EINA_TRUE; + } + else if (!strcmp(param->name, "autorepeat")) + { + mem->autorepeat = !!param->i; + mem->autorepeat_exists = EINA_TRUE; + } + else if (!strcmp(param->name, "label")) + mem->label = eina_stringshare_add(param->s); } return mem; } static Evas_Object *external_button_content_get(void *data EINA_UNUSED, - const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED) + const Evas_Object *obj EINA_UNUSED, + const char *content EINA_UNUSED) { - ERR("No content."); - return NULL; + ERR("No content."); + return NULL; } static void @@ -182,11 +188,12 @@ external_button_params_free(void *params) { Elm_Params_Button *mem = params; if (mem->label) - eina_stringshare_del(mem->label); + eina_stringshare_del(mem->label); free(params); } -static Edje_External_Param_Info external_button_params[] = { +static Edje_External_Param_Info external_button_params[] = +{ DEFINE_EXTERNAL_COMMON_PARAMS, EDJE_EXTERNAL_PARAM_INFO_STRING("label"), EDJE_EXTERNAL_PARAM_INFO_STRING("icon"), diff --git a/legacy/elementary/src/edje_externals/elm_calendar.c b/legacy/elementary/src/edje_externals/elm_calendar.c index a08bbe7651..b946b0e1e1 100644 --- a/legacy/elementary/src/edje_externals/elm_calendar.c +++ b/legacy/elementary/src/edje_externals/elm_calendar.c @@ -1,5 +1,4 @@ #include - #include "private.h" typedef struct _Elm_Params_Calendar @@ -17,9 +16,10 @@ typedef struct _Elm_Params_Calendar if (!strcmp(STR, CHOICES[i])) \ return i; - -static const char *_calendar_select_modes[] = {"default", "always", "none", - "ondemand", NULL}; +static const char *_calendar_select_modes[] = +{ + "default", "always", "none", "ondemand", NULL +}; static Elm_Calendar_Select_Mode _calendar_select_mode_get(const char *select_mode) diff --git a/legacy/elementary/src/edje_externals/elm_check.c b/legacy/elementary/src/edje_externals/elm_check.c index 5293a53df9..e989594ec7 100644 --- a/legacy/elementary/src/edje_externals/elm_check.c +++ b/legacy/elementary/src/edje_externals/elm_check.c @@ -10,7 +10,9 @@ typedef struct _Elm_Params_Check } Elm_Params_Check; static void -external_check_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED) +external_check_state_set(void *data EINA_UNUSED, Evas_Object *obj, + const void *from_params, const void *to_params, + float pos EINA_UNUSED) { const Elm_Params_Check *p; @@ -27,33 +29,34 @@ external_check_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *f } static Eina_Bool -external_check_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param) +external_check_param_set(void *data EINA_UNUSED, Evas_Object *obj, + const Edje_External_Param *param) { if (!strcmp(param->name, "label")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) - { - elm_object_text_set(obj, param->s); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) + { + elm_object_text_set(obj, param->s); + return EINA_TRUE; + } } else if (!strcmp(param->name, "icon")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) - { - Evas_Object *icon = external_common_param_icon_get(obj, param); - if ((strcmp(param->s, "")) && (!icon)) return EINA_FALSE; - elm_object_part_content_set(obj, "icon", icon); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) + { + Evas_Object *icon = external_common_param_icon_get(obj, param); + if ((strcmp(param->s, "")) && (!icon)) return EINA_FALSE; + elm_object_part_content_set(obj, "icon", icon); + return EINA_TRUE; + } } else if (!strcmp(param->name, "state")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) - { - elm_check_state_set(obj, param->i); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) + { + elm_check_state_set(obj, param->i); + return EINA_TRUE; + } } ERR("unknown parameter '%s' of type '%s'", @@ -63,28 +66,29 @@ external_check_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_Ex } static Eina_Bool -external_check_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param) +external_check_param_get(void *data EINA_UNUSED, const Evas_Object *obj, + Edje_External_Param *param) { if (!strcmp(param->name, "label")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) - { - param->s = elm_object_text_get(obj); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) + { + param->s = elm_object_text_get(obj); + return EINA_TRUE; + } } else if (!strcmp(param->name, "icon")) { - /* not easy to get icon name back from live object */ - return EINA_FALSE; + /* not easy to get icon name back from live object */ + return EINA_FALSE; } else if (!strcmp(param->name, "state")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) - { - param->i = elm_check_state_get(obj); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) + { + param->i = elm_check_state_get(obj); + return EINA_TRUE; + } } ERR("unknown parameter '%s' of type '%s'", @@ -94,7 +98,8 @@ external_check_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_Ex } static void * -external_check_params_parse(void *data EINA_UNUSED, Evas_Object *obj, const Eina_List *params) +external_check_params_parse(void *data EINA_UNUSED, Evas_Object *obj, + const Eina_List *params) { Elm_Params_Check *mem; Edje_External_Param *param; @@ -114,17 +119,18 @@ external_check_params_parse(void *data EINA_UNUSED, Evas_Object *obj, const Eina mem->state_exists = EINA_TRUE; } else if (!strcmp(param->name, "label")) - mem->label = eina_stringshare_add(param->s); + mem->label = eina_stringshare_add(param->s); } return mem; } static Evas_Object *external_check_content_get(void *data EINA_UNUSED, - const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED) + const Evas_Object *obj EINA_UNUSED, + const char *content EINA_UNUSED) { - ERR("No content."); - return NULL; + ERR("No content."); + return NULL; } static void @@ -132,17 +138,17 @@ external_check_params_free(void *params) { Elm_Params_Check *mem = params; if (mem->label) - eina_stringshare_del(mem->label); + eina_stringshare_del(mem->label); free(params); } static Edje_External_Param_Info external_check_params[] = { - DEFINE_EXTERNAL_COMMON_PARAMS, - EDJE_EXTERNAL_PARAM_INFO_STRING("label"), - EDJE_EXTERNAL_PARAM_INFO_STRING("icon"), - EDJE_EXTERNAL_PARAM_INFO_BOOL_FULL("state", 0, "unchecked", "checked"), - EDJE_EXTERNAL_PARAM_INFO_SENTINEL + DEFINE_EXTERNAL_COMMON_PARAMS, + EDJE_EXTERNAL_PARAM_INFO_STRING("label"), + EDJE_EXTERNAL_PARAM_INFO_STRING("icon"), + EDJE_EXTERNAL_PARAM_INFO_BOOL_FULL("state", 0, "unchecked", "checked"), + EDJE_EXTERNAL_PARAM_INFO_SENTINEL }; -DEFINE_EXTERNAL_ICON_ADD(check, "check") -DEFINE_EXTERNAL_TYPE_SIMPLE(check, "Check") +DEFINE_EXTERNAL_ICON_ADD(check, "check"); +DEFINE_EXTERNAL_TYPE_SIMPLE(check, "Check"); diff --git a/legacy/elementary/src/edje_externals/elm_clock.c b/legacy/elementary/src/edje_externals/elm_clock.c index 94812a0ad4..2e9589989f 100644 --- a/legacy/elementary/src/edje_externals/elm_clock.c +++ b/legacy/elementary/src/edje_externals/elm_clock.c @@ -13,7 +13,9 @@ typedef struct _Elm_Params_Clock } Elm_Params_Clock; static void -external_clock_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED) +external_clock_state_set(void *data EINA_UNUSED, Evas_Object *obj, + const void *from_params, const void *to_params, + float pos EINA_UNUSED) { const Elm_Params_Clock *p; @@ -25,15 +27,15 @@ external_clock_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *f elm_clock_time_set(obj, p->hrs, p->min, p->sec); else if ((p->hrs_exists) || (p->min_exists) || (p->sec_exists)) { - int hrs, min, sec; - elm_clock_time_get(obj, &hrs, &min, &sec); - if (p->hrs_exists) - hrs = p->hrs; - if (p->min_exists) - min = p->min; - if (p->sec_exists) - sec = p->sec; - elm_clock_time_set(obj, hrs, min, sec); + int hrs, min, sec; + elm_clock_time_get(obj, &hrs, &min, &sec); + if (p->hrs_exists) + hrs = p->hrs; + if (p->min_exists) + min = p->min; + if (p->sec_exists) + sec = p->sec; + elm_clock_time_set(obj, hrs, min, sec); } if (p->edit) elm_clock_edit_set(obj, p->edit); @@ -44,61 +46,62 @@ external_clock_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *f } static Eina_Bool -external_clock_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param) +external_clock_param_set(void *data EINA_UNUSED, Evas_Object *obj, + const Edje_External_Param *param) { if (!strcmp(param->name, "hours")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT) - { - int hrs, min, sec; - elm_clock_time_get(obj, &hrs, &min, &sec); - elm_clock_time_set(obj, param->i, min, sec); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT) + { + int hrs, min, sec; + elm_clock_time_get(obj, &hrs, &min, &sec); + elm_clock_time_set(obj, param->i, min, sec); + return EINA_TRUE; + } } else if (!strcmp(param->name, "minutes")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT) - { - int hrs, min, sec; - elm_clock_time_get(obj, &hrs, &min, &sec); - elm_clock_time_set(obj, hrs, param->i, sec); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT) + { + int hrs, min, sec; + elm_clock_time_get(obj, &hrs, &min, &sec); + elm_clock_time_set(obj, hrs, param->i, sec); + return EINA_TRUE; + } } else if (!strcmp(param->name, "seconds")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT) - { - int hrs, min, sec; - elm_clock_time_get(obj, &hrs, &min, &sec); - elm_clock_time_set(obj, hrs, min, param->i); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT) + { + int hrs, min, sec; + elm_clock_time_get(obj, &hrs, &min, &sec); + elm_clock_time_set(obj, hrs, min, param->i); + return EINA_TRUE; + } } else if (!strcmp(param->name, "editable")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) - { - elm_clock_edit_set(obj, param->i); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) + { + elm_clock_edit_set(obj, param->i); + return EINA_TRUE; + } } else if (!strcmp(param->name, "am/pm")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) - { - elm_clock_show_am_pm_set(obj, param->i); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) + { + elm_clock_show_am_pm_set(obj, param->i); + return EINA_TRUE; + } } else if (!strcmp(param->name, "show seconds")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) - { - elm_clock_show_seconds_set(obj, param->i); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) + { + elm_clock_show_seconds_set(obj, param->i); + return EINA_TRUE; + } } ERR("unknown parameter '%s' of type '%s'", @@ -108,64 +111,64 @@ external_clock_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_Ex } static Eina_Bool -external_clock_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param) +external_clock_param_get(void *data EINA_UNUSED, const Evas_Object *obj, + Edje_External_Param *param) { if (!strcmp(param->name, "hours")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT) - { - int hrs, min, sec; - elm_clock_time_get(obj, &hrs, &min, &sec); - param->i = hrs; - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT) + { + int hrs, min, sec; + elm_clock_time_get(obj, &hrs, &min, &sec); + param->i = hrs; + return EINA_TRUE; + } } else if (!strcmp(param->name, "minutes")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT) - { - int hrs, min, sec; - elm_clock_time_get(obj, &hrs, &min, &sec); - param->i = min; - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT) + { + int hrs, min, sec; + elm_clock_time_get(obj, &hrs, &min, &sec); + param->i = min; + return EINA_TRUE; + } } else if (!strcmp(param->name, "seconds")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT) - { - int hrs, min, sec; - elm_clock_time_get(obj, &hrs, &min, &sec); - param->i = sec; - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT) + { + int hrs, min, sec; + elm_clock_time_get(obj, &hrs, &min, &sec); + param->i = sec; + return EINA_TRUE; + } } else if (!strcmp(param->name, "editable")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) - { - param->i = elm_clock_edit_get(obj); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) + { + param->i = elm_clock_edit_get(obj); + return EINA_TRUE; + } } else if (!strcmp(param->name, "am/pm")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) - { - param->i = elm_clock_show_am_pm_get(obj); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) + { + param->i = elm_clock_show_am_pm_get(obj); + return EINA_TRUE; + } } else if (!strcmp(param->name, "show seconds")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) - { - param->i = elm_clock_show_seconds_get(obj); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) + { + param->i = elm_clock_show_seconds_get(obj); + return EINA_TRUE; + } } - ERR("unknown parameter '%s' of type '%s'", param->name, edje_external_param_type_str(param->type)); @@ -173,7 +176,8 @@ external_clock_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_Ex } static void * -external_clock_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const Eina_List *params) +external_clock_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, + const Eina_List *params) { Elm_Params_Clock *mem; Edje_External_Param *param; @@ -185,37 +189,37 @@ external_clock_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED EINA_LIST_FOREACH(params, l, param) { - if (!strcmp(param->name, "hours")) - { - mem->hrs = param->i; - mem->hrs_exists = EINA_TRUE; - } - else if (!strcmp(param->name, "minutes")) - { - mem->min = param->i; - mem->min_exists = EINA_TRUE; - } - else if (!strcmp(param->name, "seconds")) - { - mem->sec = param->i; - mem->sec_exists = EINA_TRUE; - } - else if (!strcmp(param->name, "editable")) - mem->edit = !!param->i; - else if (!strcmp(param->name, "am/pm")) - mem->ampm = !!param->i; - else if (!strcmp(param->name, "show seconds")) - mem->seconds = !!param->i; + if (!strcmp(param->name, "hours")) + { + mem->hrs = param->i; + mem->hrs_exists = EINA_TRUE; + } + else if (!strcmp(param->name, "minutes")) + { + mem->min = param->i; + mem->min_exists = EINA_TRUE; + } + else if (!strcmp(param->name, "seconds")) + { + mem->sec = param->i; + mem->sec_exists = EINA_TRUE; + } + else if (!strcmp(param->name, "editable")) + mem->edit = !!param->i; + else if (!strcmp(param->name, "am/pm")) + mem->ampm = !!param->i; + else if (!strcmp(param->name, "show seconds")) + mem->seconds = !!param->i; } return mem; } static Evas_Object *external_clock_content_get(void *data EINA_UNUSED, - const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED) + const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED) { - ERR("No content."); - return NULL; + ERR("No content."); + return NULL; } static void @@ -227,15 +231,15 @@ external_clock_params_free(void *params) } static Edje_External_Param_Info external_clock_params[] = { - DEFINE_EXTERNAL_COMMON_PARAMS, - EDJE_EXTERNAL_PARAM_INFO_INT("hours"), - EDJE_EXTERNAL_PARAM_INFO_INT("minutes"), - EDJE_EXTERNAL_PARAM_INFO_INT("seconds"), - EDJE_EXTERNAL_PARAM_INFO_BOOL("editable"), - EDJE_EXTERNAL_PARAM_INFO_BOOL("am/pm"), - EDJE_EXTERNAL_PARAM_INFO_BOOL("show seconds"), - EDJE_EXTERNAL_PARAM_INFO_SENTINEL + DEFINE_EXTERNAL_COMMON_PARAMS, + EDJE_EXTERNAL_PARAM_INFO_INT("hours"), + EDJE_EXTERNAL_PARAM_INFO_INT("minutes"), + EDJE_EXTERNAL_PARAM_INFO_INT("seconds"), + EDJE_EXTERNAL_PARAM_INFO_BOOL("editable"), + EDJE_EXTERNAL_PARAM_INFO_BOOL("am/pm"), + EDJE_EXTERNAL_PARAM_INFO_BOOL("show seconds"), + EDJE_EXTERNAL_PARAM_INFO_SENTINEL }; -DEFINE_EXTERNAL_ICON_ADD(clock, "clock") -DEFINE_EXTERNAL_TYPE_SIMPLE(clock, "Clock") +DEFINE_EXTERNAL_ICON_ADD(clock, "clock"); +DEFINE_EXTERNAL_TYPE_SIMPLE(clock, "Clock"); diff --git a/legacy/elementary/src/edje_externals/elm_entry.c b/legacy/elementary/src/edje_externals/elm_entry.c index f094a87645..973a8bb122 100644 --- a/legacy/elementary/src/edje_externals/elm_entry.c +++ b/legacy/elementary/src/edje_externals/elm_entry.c @@ -1,5 +1,4 @@ #include - #include "private.h" typedef struct _Elm_Params_Entry @@ -29,9 +28,10 @@ typedef struct _Elm_Params_Entry if (strcmp((STR), (CHOICES)[i]) == 0) \ return i - -static const char *entry_line_wrap_choices[] = {"none", "char", "word", - "mixed", NULL}; +static const char *entry_line_wrap_choices[] = +{ + "none", "char", "word", "mixed", NULL +}; static Elm_Wrap_Type _entry_line_wrap_choices_setting_get(const char *line_wrap_str) @@ -43,7 +43,9 @@ _entry_line_wrap_choices_setting_get(const char *line_wrap_str) } static void -external_entry_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED) +external_entry_state_set(void *data EINA_UNUSED, Evas_Object *obj, + const void *from_params, const void *to_params, + float pos EINA_UNUSED) { const Elm_Params_Entry *p; Eina_Bool hbounce, vbounce; @@ -85,7 +87,8 @@ external_entry_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *f } static Eina_Bool -external_entry_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param) +external_entry_param_set(void *data EINA_UNUSED, Evas_Object *obj, + const Edje_External_Param *param) { if (!strcmp(param->name, "label")) { @@ -278,7 +281,8 @@ external_entry_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_Ex } static void * -external_entry_params_parse(void *data EINA_UNUSED, Evas_Object *obj, const Eina_List *params) +external_entry_params_parse(void *data EINA_UNUSED, Evas_Object *obj, + const Eina_List *params) { Elm_Params_Entry *mem; Edje_External_Param *param; diff --git a/legacy/elementary/src/edje_externals/elm_fileselector.c b/legacy/elementary/src/edje_externals/elm_fileselector.c index 37754222c1..6884fd13ee 100644 --- a/legacy/elementary/src/edje_externals/elm_fileselector.c +++ b/legacy/elementary/src/edje_externals/elm_fileselector.c @@ -1,5 +1,4 @@ #include - #include "private.h" typedef struct _Elm_Params_Fileselector @@ -16,7 +15,9 @@ typedef struct _Elm_Params_Fileselector } Elm_Params_Fileselector; static void -external_fileselector_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED) +external_fileselector_state_set(void *data EINA_UNUSED, Evas_Object *obj, + const void *from_params, const void *to_params, + float pos EINA_UNUSED) { const Elm_Params_Fileselector *p; @@ -35,39 +36,40 @@ external_fileselector_state_set(void *data EINA_UNUSED, Evas_Object *obj, const } static Eina_Bool -external_fileselector_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param) +external_fileselector_param_set(void *data EINA_UNUSED, Evas_Object *obj, + const Edje_External_Param *param) { if (!strcmp(param->name, "save")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) - { - elm_fileselector_is_save_set(obj, param->i); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) + { + elm_fileselector_is_save_set(obj, param->i); + return EINA_TRUE; + } } else if (!strcmp(param->name, "folder only")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) - { - elm_fileselector_folder_only_set(obj, param->i); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) + { + elm_fileselector_folder_only_set(obj, param->i); + return EINA_TRUE; + } } else if (!strcmp(param->name, "show buttons")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) - { - elm_fileselector_buttons_ok_cancel_set(obj, param->i); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) + { + elm_fileselector_buttons_ok_cancel_set(obj, param->i); + return EINA_TRUE; + } } else if (!strcmp(param->name, "expandable")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) - { - elm_fileselector_expandable_set(obj, param->i); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) + { + elm_fileselector_expandable_set(obj, param->i); + return EINA_TRUE; + } } ERR("unknown parameter '%s' of type '%s'", @@ -77,39 +79,40 @@ external_fileselector_param_set(void *data EINA_UNUSED, Evas_Object *obj, const } static Eina_Bool -external_fileselector_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param) +external_fileselector_param_get(void *data EINA_UNUSED, const Evas_Object *obj, + Edje_External_Param *param) { if (!strcmp(param->name, "save")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) - { - param->i = elm_fileselector_is_save_get(obj); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) + { + param->i = elm_fileselector_is_save_get(obj); + return EINA_TRUE; + } } else if (!strcmp(param->name, "folder only")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) - { - param->i = elm_fileselector_folder_only_get(obj); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) + { + param->i = elm_fileselector_folder_only_get(obj); + return EINA_TRUE; + } } else if (!strcmp(param->name, "show buttons")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) - { - param->i = elm_fileselector_buttons_ok_cancel_get(obj); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) + { + param->i = elm_fileselector_buttons_ok_cancel_get(obj); + return EINA_TRUE; + } } else if (!strcmp(param->name, "expandable")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) - { - param->i = elm_fileselector_expandable_get(obj); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) + { + param->i = elm_fileselector_expandable_get(obj); + return EINA_TRUE; + } } ERR("unknown parameter '%s' of type '%s'", @@ -131,33 +134,34 @@ external_fileselector_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA EINA_LIST_FOREACH(params, l, param) { - if (!strcmp(param->name, "save")) - { - mem->is_save = !!param->i; - mem->is_save_set = EINA_TRUE; - } - else if (!strcmp(param->name, "folder only")) - { - mem->folder_only = !!param->i; - mem->folder_only_set = EINA_TRUE; - } - else if (!strcmp(param->name, "show buttons")) - { - mem->show_buttons = !!param->i; - mem->show_buttons_set = EINA_TRUE; - } - else if (!strcmp(param->name, "expandable")) - { - mem->expandable = !!param->i; - mem->expandable_set = EINA_TRUE; - } + if (!strcmp(param->name, "save")) + { + mem->is_save = !!param->i; + mem->is_save_set = EINA_TRUE; + } + else if (!strcmp(param->name, "folder only")) + { + mem->folder_only = !!param->i; + mem->folder_only_set = EINA_TRUE; + } + else if (!strcmp(param->name, "show buttons")) + { + mem->show_buttons = !!param->i; + mem->show_buttons_set = EINA_TRUE; + } + else if (!strcmp(param->name, "expandable")) + { + mem->expandable = !!param->i; + mem->expandable_set = EINA_TRUE; + } } return mem; } static Evas_Object *external_fileselector_content_get(void *data EINA_UNUSED, - const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED) + const Evas_Object *obj EINA_UNUSED, + const char *content EINA_UNUSED) { ERR("No content."); return NULL; @@ -171,15 +175,14 @@ external_fileselector_params_free(void *params) } static Edje_External_Param_Info external_fileselector_params[] = - { - DEFINE_EXTERNAL_COMMON_PARAMS, - EDJE_EXTERNAL_PARAM_INFO_BOOL("save"), - EDJE_EXTERNAL_PARAM_INFO_BOOL("folder only"), - EDJE_EXTERNAL_PARAM_INFO_BOOL("show buttons"), - EDJE_EXTERNAL_PARAM_INFO_BOOL("expandable"), - EDJE_EXTERNAL_PARAM_INFO_SENTINEL - }; - -DEFINE_EXTERNAL_ICON_ADD(fileselector, "fileselector") -DEFINE_EXTERNAL_TYPE_SIMPLE(fileselector, "File Selector") - +{ + DEFINE_EXTERNAL_COMMON_PARAMS, + EDJE_EXTERNAL_PARAM_INFO_BOOL("save"), + EDJE_EXTERNAL_PARAM_INFO_BOOL("folder only"), + EDJE_EXTERNAL_PARAM_INFO_BOOL("show buttons"), + EDJE_EXTERNAL_PARAM_INFO_BOOL("expandable"), + EDJE_EXTERNAL_PARAM_INFO_SENTINEL +}; + +DEFINE_EXTERNAL_ICON_ADD(fileselector, "fileselector"); +DEFINE_EXTERNAL_TYPE_SIMPLE(fileselector, "Fileselector"); diff --git a/legacy/elementary/src/edje_externals/elm_fileselector_button.c b/legacy/elementary/src/edje_externals/elm_fileselector_button.c index 5b485f63e1..4826ebb423 100644 --- a/legacy/elementary/src/edje_externals/elm_fileselector_button.c +++ b/legacy/elementary/src/edje_externals/elm_fileselector_button.c @@ -20,7 +20,10 @@ typedef struct _Elm_Params_fileselector_button } Elm_Params_fileselector_button; static void -external_fileselector_button_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED) +external_fileselector_button_state_set(void *data EINA_UNUSED, Evas_Object *obj, + const void *from_params, + const void *to_params, + float pos EINA_UNUSED) { const Elm_Params_fileselector_button *p; @@ -43,7 +46,8 @@ external_fileselector_button_state_set(void *data EINA_UNUSED, Evas_Object *obj, } static Eina_Bool -external_fileselector_button_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param) +external_fileselector_button_param_set(void *data EINA_UNUSED, Evas_Object *obj, + const Edje_External_Param *param) { if (!strcmp(param->name, "label")) { @@ -111,7 +115,9 @@ external_fileselector_button_param_set(void *data EINA_UNUSED, Evas_Object *obj, } static Eina_Bool -external_fileselector_button_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param) +external_fileselector_button_param_get(void *data EINA_UNUSED, + const Evas_Object *obj, + Edje_External_Param *param) { if (!strcmp(param->name, "label")) { @@ -174,7 +180,9 @@ external_fileselector_button_param_get(void *data EINA_UNUSED, const Evas_Object } static void * -external_fileselector_button_params_parse(void *data EINA_UNUSED, Evas_Object *obj, const Eina_List *params) +external_fileselector_button_params_parse(void *data EINA_UNUSED, + Evas_Object *obj, + const Eina_List *params) { Elm_Params_fileselector_button *mem; Edje_External_Param *param; @@ -217,7 +225,9 @@ external_fileselector_button_params_parse(void *data EINA_UNUSED, Evas_Object *o return mem; } -static Evas_Object *external_fileselector_button_content_get(void *data EINA_UNUSED, const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED) +static Evas_Object *external_fileselector_button_content_get(void *data EINA_UNUSED, + const Evas_Object *obj EINA_UNUSED, + const char *content EINA_UNUSED) { ERR("No content."); return NULL; diff --git a/legacy/elementary/src/edje_externals/elm_fileselector_entry.c b/legacy/elementary/src/edje_externals/elm_fileselector_entry.c index 62263d314c..2f36fe6737 100644 --- a/legacy/elementary/src/edje_externals/elm_fileselector_entry.c +++ b/legacy/elementary/src/edje_externals/elm_fileselector_entry.c @@ -20,7 +20,10 @@ typedef struct _Elm_Params_fileselector_entry } Elm_Params_fileselector_entry; static void -external_fileselector_entry_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED) +external_fileselector_entry_state_set(void *data EINA_UNUSED, Evas_Object *obj, + const void *from_params, + const void *to_params, + float pos EINA_UNUSED) { const Elm_Params_fileselector_entry *p; @@ -43,7 +46,8 @@ external_fileselector_entry_state_set(void *data EINA_UNUSED, Evas_Object *obj, } static Eina_Bool -external_fileselector_entry_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param) +external_fileselector_entry_param_set(void *data EINA_UNUSED, Evas_Object *obj, + const Edje_External_Param *param) { if (!strcmp(param->name, "label")) { @@ -111,7 +115,9 @@ external_fileselector_entry_param_set(void *data EINA_UNUSED, Evas_Object *obj, } static Eina_Bool -external_fileselector_entry_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param) +external_fileselector_entry_param_get(void *data EINA_UNUSED, + const Evas_Object *obj, + Edje_External_Param *param) { if (!strcmp(param->name, "label")) { @@ -174,7 +180,9 @@ external_fileselector_entry_param_get(void *data EINA_UNUSED, const Evas_Object } static void * -external_fileselector_entry_params_parse(void *data EINA_UNUSED, Evas_Object *obj, const Eina_List *params) +external_fileselector_entry_params_parse(void *data EINA_UNUSED, + Evas_Object *obj, + const Eina_List *params) { Elm_Params_fileselector_entry *mem; Edje_External_Param *param; @@ -218,7 +226,8 @@ external_fileselector_entry_params_parse(void *data EINA_UNUSED, Evas_Object *ob } static Evas_Object *external_fileselector_entry_content_get(void *data EINA_UNUSED, - const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED) + const Evas_Object *obj EINA_UNUSED, + const char *content EINA_UNUSED) { ERR("No content."); return NULL; diff --git a/legacy/elementary/src/edje_externals/elm_frame.c b/legacy/elementary/src/edje_externals/elm_frame.c index ea8a995dd7..f725da655a 100644 --- a/legacy/elementary/src/edje_externals/elm_frame.c +++ b/legacy/elementary/src/edje_externals/elm_frame.c @@ -8,7 +8,9 @@ typedef struct _Elm_Params_Frame } Elm_Params_Frame; static void -external_frame_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED) +external_frame_state_set(void *data EINA_UNUSED, Evas_Object *obj, + const void *from_params, const void *to_params, + float pos EINA_UNUSED) { const Elm_Params_Frame *p; @@ -21,7 +23,8 @@ external_frame_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *f } static Eina_Bool -external_frame_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param) +external_frame_param_set(void *data EINA_UNUSED, Evas_Object *obj, + const Edje_External_Param *param) { if (!strcmp(param->name, "label")) { @@ -50,7 +53,8 @@ external_frame_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_Ex } static Eina_Bool -external_frame_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param) +external_frame_param_get(void *data EINA_UNUSED, const Evas_Object *obj, + Edje_External_Param *param) { if (!strcmp(param->name, "label")) { @@ -73,7 +77,8 @@ external_frame_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_Ex } static void * -external_frame_params_parse(void *data EINA_UNUSED, Evas_Object *obj, const Eina_List *params) +external_frame_params_parse(void *data EINA_UNUSED, Evas_Object *obj, + const Eina_List *params) { Elm_Params_Frame *mem; Edje_External_Param *param; @@ -95,7 +100,8 @@ external_frame_params_parse(void *data EINA_UNUSED, Evas_Object *obj, const Eina } static Evas_Object *external_frame_content_get(void *data EINA_UNUSED, - const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED) + const Evas_Object *obj EINA_UNUSED, + const char *content EINA_UNUSED) { if (!strcmp(content, "content")) return elm_object_content_get(obj); diff --git a/legacy/elementary/src/edje_externals/elm_gengrid.c b/legacy/elementary/src/edje_externals/elm_gengrid.c index ea720c82d6..7373942234 100644 --- a/legacy/elementary/src/edje_externals/elm_gengrid.c +++ b/legacy/elementary/src/edje_externals/elm_gengrid.c @@ -1,5 +1,4 @@ #include - #include "private.h" typedef struct _Elm_Params_Gengrid @@ -32,7 +31,9 @@ typedef struct _Elm_Params_Gengrid } Elm_Params_Gengrid; static void -external_gengrid_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED) +external_gengrid_state_set(void *data EINA_UNUSED, Evas_Object *obj, + const void *from_params, const void *to_params, + float pos EINA_UNUSED) { const Elm_Params_Gengrid *p; @@ -108,7 +109,8 @@ external_gengrid_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void } static Eina_Bool -external_gengrid_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param) +external_gengrid_param_set(void *data EINA_UNUSED, Evas_Object *obj, + const Edje_External_Param *param) { if (!strcmp(param->name, "multi select")) { @@ -231,7 +233,8 @@ external_gengrid_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_ } static Eina_Bool -external_gengrid_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param) +external_gengrid_param_get(void *data EINA_UNUSED, const Evas_Object *obj, + Edje_External_Param *param) { if (!strcmp(param->name, "multi select")) { @@ -356,7 +359,9 @@ external_gengrid_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_ } static void * -external_gengrid_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const Eina_List *params) +external_gengrid_params_parse(void *data EINA_UNUSED, + Evas_Object *obj EINA_UNUSED, + const Eina_List *params) { Elm_Params_Gengrid *mem; Edje_External_Param *param; @@ -434,7 +439,9 @@ external_gengrid_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUS } static Evas_Object * -external_gengrid_content_get(void *data EINA_UNUSED, const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED) +external_gengrid_content_get(void *data EINA_UNUSED, + const Evas_Object *obj EINA_UNUSED, + const char *content EINA_UNUSED) { ERR("No content."); return NULL; diff --git a/legacy/elementary/src/edje_externals/elm_genlist.c b/legacy/elementary/src/edje_externals/elm_genlist.c index 6a6f6dff8f..8ea6f6f69d 100644 --- a/legacy/elementary/src/edje_externals/elm_genlist.c +++ b/legacy/elementary/src/edje_externals/elm_genlist.c @@ -1,5 +1,4 @@ #include - #include "private.h" typedef struct _Elm_Params_Genlist @@ -21,25 +20,32 @@ typedef struct _Elm_Params_Genlist Eina_Bool v_bounce_exists:1; } Elm_Params_Genlist; -static const char* list_horizontal_choices[] = {"compress", "scroll", "limit", "expand", NULL}; +static const char* list_horizontal_choices[] = +{ + "compress", "scroll", "limit", "expand", + NULL +}; static Elm_List_Mode _list_horizontal_setting_get(const char *horizontal_str) { unsigned int i; - assert(sizeof(list_horizontal_choices)/sizeof(list_horizontal_choices[0]) == ELM_LIST_LAST + 1); + assert(sizeof(list_horizontal_choices) / sizeof(list_horizontal_choices[0]) + == ELM_LIST_LAST + 1); for (i = 0; i < ELM_LIST_LAST; i++) { - if (!strcmp(horizontal_str, list_horizontal_choices[i])) - return i; + if (!strcmp(horizontal_str, list_horizontal_choices[i])) + return i; } return ELM_LIST_LAST; } static void -external_genlist_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED) +external_genlist_state_set(void *data EINA_UNUSED, Evas_Object *obj, + const void *from_params, const void *to_params, + float pos EINA_UNUSED) { const Elm_Params_Genlist *p; @@ -49,10 +55,10 @@ external_genlist_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void if (p->horizontal) { - Elm_List_Mode set = _list_horizontal_setting_get(p->horizontal); + Elm_List_Mode set = _list_horizontal_setting_get(p->horizontal); - if (set != ELM_LIST_LAST) - elm_genlist_mode_set(obj, set); + if (set != ELM_LIST_LAST) + elm_genlist_mode_set(obj, set); } if (p->multi_exists) elm_genlist_multi_select_set(obj, p->multi); @@ -76,87 +82,88 @@ external_genlist_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void elm_scroller_bounce_set(obj, p->h_bounce, p->v_bounce); else if ((p->h_bounce_exists) || (p->v_bounce_exists)) { - Eina_Bool h_bounce, v_bounce; + Eina_Bool h_bounce, v_bounce; - elm_scroller_bounce_get(obj, &h_bounce, &v_bounce); - if (p->h_bounce_exists) - elm_scroller_bounce_set(obj, p->h_bounce, v_bounce); - else - elm_scroller_bounce_set(obj, h_bounce, p->v_bounce); + elm_scroller_bounce_get(obj, &h_bounce, &v_bounce); + if (p->h_bounce_exists) + elm_scroller_bounce_set(obj, p->h_bounce, v_bounce); + else + elm_scroller_bounce_set(obj, h_bounce, p->v_bounce); } } static Eina_Bool -external_genlist_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param) +external_genlist_param_set(void *data EINA_UNUSED, Evas_Object *obj, + const Edje_External_Param *param) { if (!strcmp(param->name, "horizontal mode")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_CHOICE) - { - Elm_List_Mode set = _list_horizontal_setting_get(param->s); + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_CHOICE) + { + Elm_List_Mode set = _list_horizontal_setting_get(param->s); - if (set == ELM_LIST_LAST) return EINA_FALSE; - elm_genlist_mode_set(obj, set); - return EINA_TRUE; - } + if (set == ELM_LIST_LAST) return EINA_FALSE; + elm_genlist_mode_set(obj, set); + return EINA_TRUE; + } } else if (!strcmp(param->name, "multi select")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) - { - elm_genlist_multi_select_set(obj, param->i); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) + { + elm_genlist_multi_select_set(obj, param->i); + return EINA_TRUE; + } } else if (!strcmp(param->name, "always select")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) - { + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) + { if (param->i) elm_genlist_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_ALWAYS); else elm_genlist_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_DEFAULT); - return EINA_TRUE; - } + return EINA_TRUE; + } } else if (!strcmp(param->name, "no select")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) - { + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) + { if (param->i) elm_genlist_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_NONE); else elm_genlist_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_DEFAULT); - return EINA_TRUE; - } + return EINA_TRUE; + } } else if (!strcmp(param->name, "homogeneous")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) - { - elm_genlist_homogeneous_set(obj, param->i); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) + { + elm_genlist_homogeneous_set(obj, param->i); + return EINA_TRUE; + } } else if (!strcmp(param->name, "height bounce")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) - { - Eina_Bool h_bounce, v_bounce; - elm_scroller_bounce_get(obj, &h_bounce, &v_bounce); - elm_scroller_bounce_set(obj, param->i, v_bounce); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) + { + Eina_Bool h_bounce, v_bounce; + elm_scroller_bounce_get(obj, &h_bounce, &v_bounce); + elm_scroller_bounce_set(obj, param->i, v_bounce); + return EINA_TRUE; + } } else if (!strcmp(param->name, "width bounce")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) - { - Eina_Bool h_bounce, v_bounce; - elm_scroller_bounce_get(obj, &h_bounce, &v_bounce); - elm_scroller_bounce_set(obj, h_bounce, param->i); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) + { + Eina_Bool h_bounce, v_bounce; + elm_scroller_bounce_get(obj, &h_bounce, &v_bounce); + elm_scroller_bounce_set(obj, h_bounce, param->i); + return EINA_TRUE; + } } ERR("unknown parameter '%s' of type '%s'", @@ -166,80 +173,81 @@ external_genlist_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_ } static Eina_Bool -external_genlist_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param) +external_genlist_param_get(void *data EINA_UNUSED, const Evas_Object *obj, + Edje_External_Param *param) { if (!strcmp(param->name, "horizontal mode")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_CHOICE) - { - Elm_List_Mode list_horizontal_set = elm_genlist_mode_get(obj); + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_CHOICE) + { + Elm_List_Mode list_horizontal_set = elm_genlist_mode_get(obj); - if (list_horizontal_set == ELM_LIST_LAST) - return EINA_FALSE; + if (list_horizontal_set == ELM_LIST_LAST) + return EINA_FALSE; - param->s = list_horizontal_choices[list_horizontal_set]; - return EINA_TRUE; - } + param->s = list_horizontal_choices[list_horizontal_set]; + return EINA_TRUE; + } } else if (!strcmp(param->name, "multi select")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) - { - param->i = elm_genlist_multi_select_get(obj); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) + { + param->i = elm_genlist_multi_select_get(obj); + return EINA_TRUE; + } } else if (!strcmp(param->name, "always select")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) - { + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) + { if (elm_genlist_select_mode_get (obj) == ELM_OBJECT_SELECT_MODE_ALWAYS) param->i = EINA_TRUE; else param->i = EINA_FALSE; - return EINA_TRUE; - } + return EINA_TRUE; + } } else if (!strcmp(param->name, "no select")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) - { + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) + { if (elm_genlist_select_mode_get (obj) == ELM_OBJECT_SELECT_MODE_NONE) param->i = EINA_TRUE; else param->i = EINA_FALSE; - return EINA_TRUE; - } + return EINA_TRUE; + } } else if (!strcmp(param->name, "homogeneous")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) - { - param->i = elm_genlist_homogeneous_get(obj); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) + { + param->i = elm_genlist_homogeneous_get(obj); + return EINA_TRUE; + } } else if (!strcmp(param->name, "height bounce")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) - { - Eina_Bool h_bounce, v_bounce; - elm_scroller_bounce_get(obj, &h_bounce, &v_bounce); - param->i = h_bounce; - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) + { + Eina_Bool h_bounce, v_bounce; + elm_scroller_bounce_get(obj, &h_bounce, &v_bounce); + param->i = h_bounce; + return EINA_TRUE; + } } else if (!strcmp(param->name, "width bounce")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) - { - Eina_Bool h_bounce, v_bounce; - elm_scroller_bounce_get(obj, &h_bounce, &v_bounce); - param->i = v_bounce; - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) + { + Eina_Bool h_bounce, v_bounce; + elm_scroller_bounce_get(obj, &h_bounce, &v_bounce); + param->i = v_bounce; + return EINA_TRUE; + } } ERR("unknown parameter '%s' of type '%s'", @@ -249,7 +257,9 @@ external_genlist_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_ } static void * -external_genlist_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const Eina_List *params) +external_genlist_params_parse(void *data EINA_UNUSED, + Evas_Object *obj EINA_UNUSED, + const Eina_List *params) { Elm_Params_Genlist *mem; Edje_External_Param *param; @@ -261,48 +271,49 @@ external_genlist_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUS EINA_LIST_FOREACH(params, l, param) { - if (!strcmp(param->name, "horizontal mode")) - mem->horizontal = eina_stringshare_add(param->s); - else if (!strcmp(param->name, "multi select")) - { - mem->multi = !!param->i; - mem->multi_exists = EINA_TRUE; - } - else if (!strcmp(param->name, "always select")) - { - mem->always_select = !!param->i; - mem->always_select_exists = EINA_TRUE; - } - else if (!strcmp(param->name, "no select")) - { - mem->no_select = !!param->i; - mem->no_select_exists = EINA_TRUE; - } - else if (!strcmp(param->name, "homogeneous")) - { - mem->homogeneous = !!param->i; - mem->homogeneous_exists = EINA_TRUE; - } - else if (!strcmp(param->name, "height bounce")) - { - mem->h_bounce = !!param->i; - mem->h_bounce_exists = EINA_TRUE; - } - else if (!strcmp(param->name, "width bounce")) - { - mem->v_bounce = !!param->i; - mem->v_bounce_exists = EINA_TRUE; - } + if (!strcmp(param->name, "horizontal mode")) + mem->horizontal = eina_stringshare_add(param->s); + else if (!strcmp(param->name, "multi select")) + { + mem->multi = !!param->i; + mem->multi_exists = EINA_TRUE; + } + else if (!strcmp(param->name, "always select")) + { + mem->always_select = !!param->i; + mem->always_select_exists = EINA_TRUE; + } + else if (!strcmp(param->name, "no select")) + { + mem->no_select = !!param->i; + mem->no_select_exists = EINA_TRUE; + } + else if (!strcmp(param->name, "homogeneous")) + { + mem->homogeneous = !!param->i; + mem->homogeneous_exists = EINA_TRUE; + } + else if (!strcmp(param->name, "height bounce")) + { + mem->h_bounce = !!param->i; + mem->h_bounce_exists = EINA_TRUE; + } + else if (!strcmp(param->name, "width bounce")) + { + mem->v_bounce = !!param->i; + mem->v_bounce_exists = EINA_TRUE; + } } return mem; } static Evas_Object *external_genlist_content_get(void *data EINA_UNUSED, - const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED) + const Evas_Object *obj EINA_UNUSED, + const char *content EINA_UNUSED) { - ERR("No content."); - return NULL; + ERR("No content."); + return NULL; } static void @@ -317,15 +328,16 @@ external_genlist_params_free(void *params) } static Edje_External_Param_Info external_genlist_params[] = { - DEFINE_EXTERNAL_COMMON_PARAMS, - EDJE_EXTERNAL_PARAM_INFO_CHOICE_FULL("horizontal mode", "scroll", list_horizontal_choices), - EDJE_EXTERNAL_PARAM_INFO_BOOL("multi select"), - EDJE_EXTERNAL_PARAM_INFO_BOOL("always select"), - EDJE_EXTERNAL_PARAM_INFO_BOOL("no select"), - EDJE_EXTERNAL_PARAM_INFO_BOOL("homogeneous"), - EDJE_EXTERNAL_PARAM_INFO_BOOL("height bounce"), - EDJE_EXTERNAL_PARAM_INFO_BOOL("width bounce"), - EDJE_EXTERNAL_PARAM_INFO_SENTINEL + DEFINE_EXTERNAL_COMMON_PARAMS, + EDJE_EXTERNAL_PARAM_INFO_CHOICE_FULL("horizontal mode", "scroll", + list_horizontal_choices), + EDJE_EXTERNAL_PARAM_INFO_BOOL("multi select"), + EDJE_EXTERNAL_PARAM_INFO_BOOL("always select"), + EDJE_EXTERNAL_PARAM_INFO_BOOL("no select"), + EDJE_EXTERNAL_PARAM_INFO_BOOL("homogeneous"), + EDJE_EXTERNAL_PARAM_INFO_BOOL("height bounce"), + EDJE_EXTERNAL_PARAM_INFO_BOOL("width bounce"), + EDJE_EXTERNAL_PARAM_INFO_SENTINEL }; DEFINE_EXTERNAL_ICON_ADD(genlist, "genlist"); diff --git a/legacy/elementary/src/edje_externals/elm_hoversel.c b/legacy/elementary/src/edje_externals/elm_hoversel.c index b6e94a9abd..725b5236da 100644 --- a/legacy/elementary/src/edje_externals/elm_hoversel.c +++ b/legacy/elementary/src/edje_externals/elm_hoversel.c @@ -10,7 +10,9 @@ typedef struct _Elm_Params_Hoversel } Elm_Params_Hoversel; static void -external_hoversel_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED) +external_hoversel_state_set(void *data EINA_UNUSED, Evas_Object *obj, + const void *from_params, const void *to_params, + float pos EINA_UNUSED) { const Elm_Params_Hoversel *p; @@ -23,37 +25,38 @@ external_hoversel_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void if (p->icon) elm_object_part_content_set(obj, "icon", p->icon); if (p->horizontal_exists) - elm_hoversel_horizontal_set(obj, p->horizontal); + elm_hoversel_horizontal_set(obj, p->horizontal); } static Eina_Bool -external_hoversel_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param) +external_hoversel_param_set(void *data EINA_UNUSED, Evas_Object *obj, + const Edje_External_Param *param) { if (!strcmp(param->name, "label")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) - { - elm_object_text_set(obj, param->s); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) + { + elm_object_text_set(obj, param->s); + return EINA_TRUE; + } } else if (!strcmp(param->name, "icon")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) - { - Evas_Object *icon = external_common_param_icon_get(obj, param); - if ((strcmp(param->s, "")) && (!icon)) return EINA_FALSE; - elm_object_part_content_set(obj, "icon", icon); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) + { + Evas_Object *icon = external_common_param_icon_get(obj, param); + if ((strcmp(param->s, "")) && (!icon)) return EINA_FALSE; + elm_object_part_content_set(obj, "icon", icon); + return EINA_TRUE; + } } else if (!strcmp(param->name, "horizontal")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) - { - elm_hoversel_horizontal_set(obj, param->i); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) + { + elm_hoversel_horizontal_set(obj, param->i); + return EINA_TRUE; + } } ERR("unknown parameter '%s' of type '%s'", @@ -63,28 +66,29 @@ external_hoversel_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje } static Eina_Bool -external_hoversel_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param) +external_hoversel_param_get(void *data EINA_UNUSED, const Evas_Object *obj, + Edje_External_Param *param) { if (!strcmp(param->name, "label")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) - { - param->s = elm_object_text_get(obj); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) + { + param->s = elm_object_text_get(obj); + return EINA_TRUE; + } } else if (!strcmp(param->name, "icon")) { - /* not easy to get icon name back from live object */ - return EINA_FALSE; + /* not easy to get icon name back from live object */ + return EINA_FALSE; } else if (!strcmp(param->name, "horizontal")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) - { - param->i = elm_hoversel_horizontal_get(obj); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) + { + param->i = elm_hoversel_horizontal_get(obj); + return EINA_TRUE; + } } ERR("unknown parameter '%s' of type '%s'", @@ -94,7 +98,8 @@ external_hoversel_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje } static void * -external_hoversel_params_parse(void *data EINA_UNUSED, Evas_Object *obj, const Eina_List *params) +external_hoversel_params_parse(void *data EINA_UNUSED, Evas_Object *obj, + const Eina_List *params) { Elm_Params_Hoversel *mem; Edje_External_Param *param; @@ -108,40 +113,41 @@ external_hoversel_params_parse(void *data EINA_UNUSED, Evas_Object *obj, const E EINA_LIST_FOREACH(params, l, param) { - if (!strcmp(param->name, "horizontal")) - { - mem->horizontal = !!param->i; - mem->horizontal_exists = EINA_TRUE; - } - else if (!strcmp(param->name, "label")) - mem->label = eina_stringshare_add(param->s); + if (!strcmp(param->name, "horizontal")) + { + mem->horizontal = !!param->i; + mem->horizontal_exists = EINA_TRUE; + } + else if (!strcmp(param->name, "label")) + mem->label = eina_stringshare_add(param->s); } return mem; } static Evas_Object *external_hoversel_content_get(void *data EINA_UNUSED, - const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED) + const Evas_Object *obj EINA_UNUSED, + const char *content EINA_UNUSED) { - ERR("No content."); - return NULL; + ERR("No content."); + return NULL; } - static void +static void external_hoversel_params_free(void *params) { Elm_Params_Hoversel *mem = params; if (mem->label) - eina_stringshare_del(mem->label); + eina_stringshare_del(mem->label); free(params); } static Edje_External_Param_Info external_hoversel_params[] = { - DEFINE_EXTERNAL_COMMON_PARAMS, - EDJE_EXTERNAL_PARAM_INFO_STRING("label"), - EDJE_EXTERNAL_PARAM_INFO_STRING("icon"), - EDJE_EXTERNAL_PARAM_INFO_BOOL("horizontal"), - EDJE_EXTERNAL_PARAM_INFO_SENTINEL + DEFINE_EXTERNAL_COMMON_PARAMS, + EDJE_EXTERNAL_PARAM_INFO_STRING("label"), + EDJE_EXTERNAL_PARAM_INFO_STRING("icon"), + EDJE_EXTERNAL_PARAM_INFO_BOOL("horizontal"), + EDJE_EXTERNAL_PARAM_INFO_SENTINEL }; DEFINE_EXTERNAL_ICON_ADD(hoversel, "hoversel"); diff --git a/legacy/elementary/src/edje_externals/elm_icon.c b/legacy/elementary/src/edje_externals/elm_icon.c index 50ca8300c7..1ac65b53ac 100644 --- a/legacy/elementary/src/edje_externals/elm_icon.c +++ b/legacy/elementary/src/edje_externals/elm_icon.c @@ -97,12 +97,12 @@ external_icon_param_set(void *data EINA_UNUSED, Evas_Object *obj, const char *file; if (!strcmp(param->name, "file") - && param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) + && param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) { Eina_Bool ret = elm_image_file_set(obj, param->s, NULL); - if (ret) - param_icon->file = param->s; - return ret; + if (ret) + param_icon->file = param->s; + return ret; } else if (!strcmp(param->name, "smooth") && param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) @@ -171,7 +171,7 @@ external_icon_param_get(void *data EINA_UNUSED, Edje_External_Param *param) { if (!strcmp(param->name, "file") - && param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) + && param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) { param->s = param_icon->file; return EINA_TRUE; diff --git a/legacy/elementary/src/edje_externals/elm_index.c b/legacy/elementary/src/edje_externals/elm_index.c index 62a7d7cd2f..30994e2667 100644 --- a/legacy/elementary/src/edje_externals/elm_index.c +++ b/legacy/elementary/src/edje_externals/elm_index.c @@ -9,7 +9,9 @@ typedef struct _Elm_Params_Index } Elm_Params_Index; static void -external_index_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED) +external_index_state_set(void *data EINA_UNUSED, Evas_Object *obj, + const void *from_params, const void *to_params, + float pos EINA_UNUSED) { const Elm_Params_Index *p; @@ -22,7 +24,8 @@ external_index_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *f } static Eina_Bool -external_index_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param) +external_index_param_set(void *data EINA_UNUSED, Evas_Object *obj, + const Edje_External_Param *param) { if (!strcmp(param->name, "active")) { @@ -39,7 +42,8 @@ external_index_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_Ex } static Eina_Bool -external_index_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param) +external_index_param_get(void *data EINA_UNUSED, const Evas_Object *obj, + Edje_External_Param *param) { if (!strcmp(param->name, "active")) { @@ -57,7 +61,8 @@ external_index_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_Ex } static void * -external_index_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const Eina_List *params) +external_index_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, + const Eina_List *params) { Elm_Params_Index *mem; Edje_External_Param *param; @@ -80,7 +85,8 @@ external_index_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED } static Evas_Object *external_index_content_get(void *data EINA_UNUSED, - const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED) + const Evas_Object *obj EINA_UNUSED, + const char *content EINA_UNUSED) { ERR("No content."); return NULL; @@ -100,4 +106,4 @@ static Edje_External_Param_Info external_index_params[] = { }; DEFINE_EXTERNAL_ICON_ADD(index, "index"); -DEFINE_EXTERNAL_TYPE_SIMPLE(index, "index"); +DEFINE_EXTERNAL_TYPE_SIMPLE(index, "Index"); diff --git a/legacy/elementary/src/edje_externals/elm_label.c b/legacy/elementary/src/edje_externals/elm_label.c index cd05a19e94..af655b0221 100644 --- a/legacy/elementary/src/edje_externals/elm_label.c +++ b/legacy/elementary/src/edje_externals/elm_label.c @@ -7,7 +7,9 @@ typedef struct _Elm_Params_Label } Elm_Params_Label; static void -external_label_state_set(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const void *from_params, const void *to_params, float pos EINA_UNUSED) +external_label_state_set(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, + const void *from_params, const void *to_params, + float pos EINA_UNUSED) { const Elm_Params_Label *p; @@ -19,15 +21,16 @@ external_label_state_set(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, c } static Eina_Bool -external_label_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param) +external_label_param_set(void *data EINA_UNUSED, Evas_Object *obj, + const Edje_External_Param *param) { if (!strcmp(param->name, "label")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) - { - elm_object_text_set(obj, param->s); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) + { + elm_object_text_set(obj, param->s); + return EINA_TRUE; + } } ERR("unknown parameter '%s' of type '%s'", @@ -37,15 +40,16 @@ external_label_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_Ex } static Eina_Bool -external_label_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param) +external_label_param_get(void *data EINA_UNUSED, const Evas_Object *obj, + Edje_External_Param *param) { if (!strcmp(param->name, "label")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) - { - param->s = elm_object_text_get(obj); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) + { + param->s = elm_object_text_get(obj); + return EINA_TRUE; + } } ERR("unknown parameter '%s' of type '%s'", @@ -55,7 +59,8 @@ external_label_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_Ex } static void * -external_label_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const Eina_List *params EINA_UNUSED) +external_label_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, + const Eina_List *params EINA_UNUSED) { Elm_Params_Label *mem; Edje_External_Param *param; @@ -68,17 +73,18 @@ external_label_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED EINA_LIST_FOREACH(params, l, param) { if (!strcmp(param->name, "label")) - mem->label = eina_stringshare_add(param->s); + mem->label = eina_stringshare_add(param->s); } return mem; } static Evas_Object *external_label_content_get(void *data EINA_UNUSED, - const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED) + const Evas_Object *obj EINA_UNUSED, + const char *content EINA_UNUSED) { - ERR("no content"); - return NULL; + ERR("no content"); + return NULL; } static void @@ -86,15 +92,15 @@ external_label_params_free(void *params) { Elm_Params_Label *mem = params; if (mem->label) - eina_stringshare_del(mem->label); + eina_stringshare_del(mem->label); free(params); } static Edje_External_Param_Info external_label_params[] = { - DEFINE_EXTERNAL_COMMON_PARAMS, - EDJE_EXTERNAL_PARAM_INFO_STRING("label"), - EDJE_EXTERNAL_PARAM_INFO_SENTINEL + DEFINE_EXTERNAL_COMMON_PARAMS, + EDJE_EXTERNAL_PARAM_INFO_STRING("label"), + EDJE_EXTERNAL_PARAM_INFO_SENTINEL }; DEFINE_EXTERNAL_ICON_ADD(label, "label"); -DEFINE_EXTERNAL_TYPE_SIMPLE(label, "label"); +DEFINE_EXTERNAL_TYPE_SIMPLE(label, "Label"); diff --git a/legacy/elementary/src/edje_externals/elm_list.c b/legacy/elementary/src/edje_externals/elm_list.c index b824de187b..a37a22525e 100644 --- a/legacy/elementary/src/edje_externals/elm_list.c +++ b/legacy/elementary/src/edje_externals/elm_list.c @@ -1,5 +1,4 @@ #include - #include "private.h" typedef struct _Elm_Params_List @@ -22,9 +21,11 @@ typedef struct _Elm_Params_List if (strcmp(STR, CHOICES[i]) == 0) \ return i -static const char *scroller_policy_choices[] = {"auto", "on", "off", NULL}; -static const char *list_mode_choices[] = {"compress", "scroll", "limit", - "expand", NULL}; +static const char *scroller_policy_choices[] = { "auto", "on", "off", NULL }; +static const char *list_mode_choices[] = +{ + "compress", "scroll", "limit", "expand", NULL +}; static Elm_Scroller_Policy _scroller_policy_choices_setting_get(const char *policy_str) @@ -45,7 +46,9 @@ _list_mode_setting_get(const char *mode_str) } static void -external_list_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED) +external_list_state_set(void *data EINA_UNUSED, Evas_Object *obj, + const void *from_params, const void *to_params, + float pos EINA_UNUSED) { const Elm_Params_List *p; Elm_Scroller_Policy policy_h, policy_v; @@ -97,7 +100,8 @@ external_list_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *fr } static Eina_Bool -external_list_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param) +external_list_param_set(void *data EINA_UNUSED, Evas_Object *obj, + const Edje_External_Param *param) { if (!strcmp(param->name, "list mode")) { @@ -168,7 +172,8 @@ external_list_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_Ext } static Eina_Bool -external_list_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param) +external_list_param_get(void *data EINA_UNUSED, const Evas_Object *obj, + Edje_External_Param *param) { if (!strcmp(param->name, "horizontal mode")) { @@ -241,7 +246,8 @@ external_list_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_Ext } static void * -external_list_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const Eina_List *params) +external_list_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, + const Eina_List *params) { Elm_Params_List *mem; Edje_External_Param *param; @@ -278,7 +284,9 @@ external_list_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, return mem; } -static Evas_Object *external_list_content_get(void *data EINA_UNUSED, const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED) +static Evas_Object *external_list_content_get(void *data EINA_UNUSED, + const Evas_Object *obj EINA_UNUSED, + const char *content EINA_UNUSED) { ERR("No content."); return NULL; @@ -313,5 +321,5 @@ static Edje_External_Param_Info external_list_params[] = { EDJE_EXTERNAL_PARAM_INFO_SENTINEL }; -DEFINE_EXTERNAL_ICON_ADD(list, "list") +DEFINE_EXTERNAL_ICON_ADD(list, "list"); DEFINE_EXTERNAL_TYPE_SIMPLE(list, "List"); diff --git a/legacy/elementary/src/edje_externals/elm_map.c b/legacy/elementary/src/edje_externals/elm_map.c index a9bc4d2d3c..0863c3b9cf 100644 --- a/legacy/elementary/src/edje_externals/elm_map.c +++ b/legacy/elementary/src/edje_externals/elm_map.c @@ -1,5 +1,4 @@ #include - #include "private.h" typedef struct _Elm_Params_Map @@ -11,10 +10,12 @@ typedef struct _Elm_Params_Map Eina_Bool zoom_set:1; } Elm_Params_Map; -static const char *zoom_choices[] = {"manual", "auto fit", "auto fill", NULL}; +static const char *zoom_choices[] = { "manual", "auto fit", "auto fill", NULL }; static const char *source_choices[] = - {"Mapnik", "Osmarender", "CycleMap", "Maplint"}; +{ + "Mapnik", "Osmarender", "CycleMap", "Maplint" +}; static Elm_Map_Zoom_Mode _zoom_mode_get(const char *map_src) @@ -22,7 +23,7 @@ _zoom_mode_get(const char *map_src) unsigned int i; assert(sizeof(zoom_choices)/sizeof(zoom_choices[0]) == - ELM_MAP_ZOOM_MODE_LAST + 1); + ELM_MAP_ZOOM_MODE_LAST + 1); for (i = 0; i < ELM_MAP_ZOOM_MODE_LAST; i++) if (!strcmp(map_src, zoom_choices[i])) return i; @@ -31,7 +32,9 @@ _zoom_mode_get(const char *map_src) } static void -external_map_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED) +external_map_state_set(void *data EINA_UNUSED, Evas_Object *obj, + const void *from_params, const void *to_params, + float pos EINA_UNUSED) { const Elm_Params_Map *p; @@ -41,45 +44,46 @@ external_map_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *fro if (p->map_source) { - elm_map_source_set(obj, ELM_MAP_SOURCE_TYPE_TILE, p->map_source); + elm_map_source_set(obj, ELM_MAP_SOURCE_TYPE_TILE, p->map_source); } if (p->zoom_mode) { - Elm_Map_Zoom_Mode set = _zoom_mode_get(p->zoom_mode); - if (set == ELM_MAP_ZOOM_MODE_LAST) return; - elm_map_zoom_mode_set(obj, set); + Elm_Map_Zoom_Mode set = _zoom_mode_get(p->zoom_mode); + if (set == ELM_MAP_ZOOM_MODE_LAST) return; + elm_map_zoom_mode_set(obj, set); } if (p->zoom_set) elm_map_zoom_set(obj, p->zoom); } static Eina_Bool -external_map_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param) +external_map_param_set(void *data EINA_UNUSED, Evas_Object *obj, + const Edje_External_Param *param) { if (!strcmp(param->name, "map source")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_CHOICE) - { - elm_map_source_set(obj, ELM_MAP_SOURCE_TYPE_TILE, param->s); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_CHOICE) + { + elm_map_source_set(obj, ELM_MAP_SOURCE_TYPE_TILE, param->s); + return EINA_TRUE; + } } else if (!strcmp(param->name, "zoom mode")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_CHOICE) - { - Elm_Map_Zoom_Mode set = _zoom_mode_get(param->s); - if (set == ELM_MAP_ZOOM_MODE_LAST) return EINA_FALSE; - elm_map_zoom_mode_set(obj, set); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_CHOICE) + { + Elm_Map_Zoom_Mode set = _zoom_mode_get(param->s); + if (set == ELM_MAP_ZOOM_MODE_LAST) return EINA_FALSE; + elm_map_zoom_mode_set(obj, set); + return EINA_TRUE; + } } else if (!strcmp(param->name, "zoom level")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) - { - elm_map_zoom_set(obj, param->d); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) + { + elm_map_zoom_set(obj, param->d); + return EINA_TRUE; + } } ERR("unknown parameter '%s' of type '%s'", @@ -89,34 +93,35 @@ external_map_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_Exte } static Eina_Bool -external_map_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param) +external_map_param_get(void *data EINA_UNUSED, const Evas_Object *obj, + Edje_External_Param *param) { if (!strcmp(param->name, "map source")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_CHOICE) - { - const char *set = elm_map_source_get(obj, ELM_MAP_SOURCE_TYPE_TILE); - param->s = set; - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_CHOICE) + { + const char *set = elm_map_source_get(obj, ELM_MAP_SOURCE_TYPE_TILE); + param->s = set; + return EINA_TRUE; + } } else if (!strcmp(param->name, "zoom mode")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_CHOICE) - { - Elm_Map_Zoom_Mode set = elm_map_zoom_mode_get(obj); - if (set == ELM_MAP_ZOOM_MODE_LAST) return EINA_FALSE; - param->s = zoom_choices[set]; - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_CHOICE) + { + Elm_Map_Zoom_Mode set = elm_map_zoom_mode_get(obj); + if (set == ELM_MAP_ZOOM_MODE_LAST) return EINA_FALSE; + param->s = zoom_choices[set]; + return EINA_TRUE; + } } else if (!strcmp(param->name, "zoom level")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) - { - param->d = elm_map_zoom_get(obj); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) + { + param->d = elm_map_zoom_get(obj); + return EINA_TRUE; + } } ERR("unknown parameter '%s' of type '%s'", @@ -126,7 +131,8 @@ external_map_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_Exte } static void * -external_map_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const Eina_List *params) +external_map_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, + const Eina_List *params) { Elm_Params_Map *mem; Edje_External_Param *param; @@ -138,25 +144,26 @@ external_map_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, EINA_LIST_FOREACH(params, l, param) { - if (!strcmp(param->name, "map source")) - mem->map_source = eina_stringshare_add(param->s); - if (!strcmp(param->name, "zoom mode")) - mem->zoom_mode = eina_stringshare_add(param->s); - else if (!strcmp(param->name, "zoom level")) - { - mem->zoom = param->d; - mem->zoom_set = EINA_TRUE; - } + if (!strcmp(param->name, "map source")) + mem->map_source = eina_stringshare_add(param->s); + if (!strcmp(param->name, "zoom mode")) + mem->zoom_mode = eina_stringshare_add(param->s); + else if (!strcmp(param->name, "zoom level")) + { + mem->zoom = param->d; + mem->zoom_set = EINA_TRUE; + } } return mem; } static Evas_Object *external_map_content_get(void *data EINA_UNUSED, - const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED) + const Evas_Object *obj EINA_UNUSED, + const char *content EINA_UNUSED) { - ERR("No content."); - return NULL; + ERR("No content."); + return NULL; } static void @@ -172,14 +179,13 @@ external_map_params_free(void *params) } static Edje_External_Param_Info external_map_params[] = - { - DEFINE_EXTERNAL_COMMON_PARAMS, - EDJE_EXTERNAL_PARAM_INFO_CHOICE_FULL("map source", "Mapnik", source_choices), - EDJE_EXTERNAL_PARAM_INFO_CHOICE_FULL("zoom mode", "manual", zoom_choices), - EDJE_EXTERNAL_PARAM_INFO_DOUBLE("zoom level"), - EDJE_EXTERNAL_PARAM_INFO_SENTINEL - }; - -DEFINE_EXTERNAL_ICON_ADD(map, "map") -DEFINE_EXTERNAL_TYPE_SIMPLE(map, "Map") - +{ + DEFINE_EXTERNAL_COMMON_PARAMS, + EDJE_EXTERNAL_PARAM_INFO_CHOICE_FULL("map source", "Mapnik", source_choices), + EDJE_EXTERNAL_PARAM_INFO_CHOICE_FULL("zoom mode", "manual", zoom_choices), + EDJE_EXTERNAL_PARAM_INFO_DOUBLE("zoom level"), + EDJE_EXTERNAL_PARAM_INFO_SENTINEL +}; + +DEFINE_EXTERNAL_ICON_ADD(map, "map"); +DEFINE_EXTERNAL_TYPE_SIMPLE(map, "Map"); diff --git a/legacy/elementary/src/edje_externals/elm_multibuttonentry.c b/legacy/elementary/src/edje_externals/elm_multibuttonentry.c index a0249b8ba4..5c62a85c70 100644 --- a/legacy/elementary/src/edje_externals/elm_multibuttonentry.c +++ b/legacy/elementary/src/edje_externals/elm_multibuttonentry.c @@ -7,7 +7,10 @@ typedef struct _Elm_Params_Multibuttonentry } Elm_Params_Multibuttonentry; static void -external_multibuttonentry_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED) +external_multibuttonentry_state_set(void *data EINA_UNUSED, Evas_Object *obj, + const void *from_params, + const void *to_params, + float pos EINA_UNUSED) { const Elm_Params_Multibuttonentry *p; @@ -22,7 +25,8 @@ external_multibuttonentry_state_set(void *data EINA_UNUSED, Evas_Object *obj, co } static Eina_Bool -external_multibuttonentry_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param) +external_multibuttonentry_param_set(void *data EINA_UNUSED, Evas_Object *obj, + const Edje_External_Param *param) { if (!strcmp(param->name, "label")) { @@ -48,7 +52,9 @@ external_multibuttonentry_param_set(void *data EINA_UNUSED, Evas_Object *obj, co } static Eina_Bool -external_multibuttonentry_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param) +external_multibuttonentry_param_get(void *data EINA_UNUSED, + const Evas_Object *obj, + Edje_External_Param *param) { if (!strcmp(param->name, "label")) { @@ -74,7 +80,9 @@ external_multibuttonentry_param_get(void *data EINA_UNUSED, const Evas_Object *o } static void * -external_multibuttonentry_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const Eina_List *params) +external_multibuttonentry_params_parse(void *data EINA_UNUSED, + Evas_Object *obj EINA_UNUSED, + const Eina_List *params) { Elm_Params_Multibuttonentry *mem = NULL; Edje_External_Param *param; @@ -95,7 +103,9 @@ external_multibuttonentry_params_parse(void *data EINA_UNUSED, Evas_Object *obj return mem; } -static Evas_Object *external_multibuttonentry_content_get(void *data EINA_UNUSED, const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED) +static Evas_Object *external_multibuttonentry_content_get(void *data EINA_UNUSED, + const Evas_Object *obj EINA_UNUSED, + const char *content EINA_UNUSED) { ERR("so content"); return NULL; @@ -120,6 +130,5 @@ static Edje_External_Param_Info external_multibuttonentry_params[] = { EDJE_EXTERNAL_PARAM_INFO_SENTINEL }; -DEFINE_EXTERNAL_ICON_ADD(multibuttonentry, "multibuttonentry") -DEFINE_EXTERNAL_TYPE_SIMPLE(multibuttonentry, "Multibuttonentry") - +DEFINE_EXTERNAL_ICON_ADD(multibuttonentry, "multibuttonentry"); +DEFINE_EXTERNAL_TYPE_SIMPLE(multibuttonentry, "Multibuttonentry"); diff --git a/legacy/elementary/src/edje_externals/elm_naviframe.c b/legacy/elementary/src/edje_externals/elm_naviframe.c index 4f65d4c38b..79479cfb7c 100644 --- a/legacy/elementary/src/edje_externals/elm_naviframe.c +++ b/legacy/elementary/src/edje_externals/elm_naviframe.c @@ -10,8 +10,9 @@ typedef struct _Elm_Params_Naviframe } Elm_Params_Naviframe; static void -external_naviframe_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, - const void *to_params, float pos EINA_UNUSED) +external_naviframe_state_set(void *data EINA_UNUSED, Evas_Object *obj, + const void *from_params, const void *to_params, + float pos EINA_UNUSED) { const Elm_Params_Naviframe *p; @@ -80,7 +81,8 @@ external_naviframe_param_get(void *data EINA_UNUSED, const Evas_Object *obj, } static void * -external_naviframe_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, +external_naviframe_params_parse(void *data EINA_UNUSED, + Evas_Object *obj EINA_UNUSED, const Eina_List *params) { Elm_Params_Naviframe *mem; diff --git a/legacy/elementary/src/edje_externals/elm_notify.c b/legacy/elementary/src/edje_externals/elm_notify.c index 42376ffee1..06c7aef8c6 100644 --- a/legacy/elementary/src/edje_externals/elm_notify.c +++ b/legacy/elementary/src/edje_externals/elm_notify.c @@ -234,7 +234,8 @@ external_notify_param_get(void *data EINA_UNUSED, static void * external_notify_params_parse(void *data EINA_UNUSED, Evas_Object *obj, - const Eina_List *params) { + const Eina_List *params) +{ Elm_Params_Notify *mem; Edje_External_Param *param; const Eina_List *l; @@ -276,11 +277,13 @@ external_notify_content_get(void *data EINA_UNUSED, } static void -external_notify_params_free(void *params) { +external_notify_params_free(void *params) +{ free(params); } -static Edje_External_Param_Info external_notify_params[] = { +static Edje_External_Param_Info external_notify_params[] = +{ DEFINE_EXTERNAL_COMMON_PARAMS, EDJE_EXTERNAL_PARAM_INFO_STRING("content"), EDJE_EXTERNAL_PARAM_INFO_BOOL("allow_events"), diff --git a/legacy/elementary/src/edje_externals/elm_panes.c b/legacy/elementary/src/edje_externals/elm_panes.c index 4c9b0c8c70..153117cca4 100644 --- a/legacy/elementary/src/edje_externals/elm_panes.c +++ b/legacy/elementary/src/edje_externals/elm_panes.c @@ -1,7 +1,6 @@ #include "private.h" #include - typedef struct _Elm_Params_Panes Elm_Params_Panes; struct _Elm_Params_Panes { @@ -195,4 +194,4 @@ static Edje_External_Param_Info external_panes_params[] = { }; DEFINE_EXTERNAL_ICON_ADD(panes, "panes"); -DEFINE_EXTERNAL_TYPE_SIMPLE(panes, "panes"); +DEFINE_EXTERNAL_TYPE_SIMPLE(panes, "Panes"); diff --git a/legacy/elementary/src/edje_externals/elm_photocam.c b/legacy/elementary/src/edje_externals/elm_photocam.c index 50a3d98579..8da3616ef1 100644 --- a/legacy/elementary/src/edje_externals/elm_photocam.c +++ b/legacy/elementary/src/edje_externals/elm_photocam.c @@ -1,5 +1,4 @@ #include - #include "private.h" typedef struct _Elm_Params_Photocam @@ -13,7 +12,7 @@ typedef struct _Elm_Params_Photocam Eina_Bool zoom_exists:1; } Elm_Params_Photocam; -static const char* choices[] = {"manual", "auto fit", "auto fill", NULL}; +static const char* choices[] = { "manual", "auto fit", "auto fill", NULL }; static Elm_Photocam_Zoom_Mode _zoom_mode_setting_get(const char *zoom_mode_str) @@ -24,14 +23,16 @@ _zoom_mode_setting_get(const char *zoom_mode_str) for (i = 0; i < ELM_PHOTOCAM_ZOOM_MODE_LAST; i++) { - if (!strcmp(zoom_mode_str, choices[i])) - return i; + if (!strcmp(zoom_mode_str, choices[i])) + return i; } return ELM_PHOTOCAM_ZOOM_MODE_LAST; } static void -external_photocam_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED) +external_photocam_state_set(void *data EINA_UNUSED, Evas_Object *obj, + const void *from_params, const void *to_params, + float pos EINA_UNUSED) { const Elm_Params_Photocam *p; @@ -45,50 +46,51 @@ external_photocam_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void elm_photocam_zoom_set(obj, p->zoom); if (p->zoom_mode) { - Elm_Photocam_Zoom_Mode set = _zoom_mode_setting_get(p->zoom_mode); - if (set == ELM_PHOTOCAM_ZOOM_MODE_LAST) return; - elm_photocam_zoom_mode_set(obj, set); + Elm_Photocam_Zoom_Mode set = _zoom_mode_setting_get(p->zoom_mode); + if (set == ELM_PHOTOCAM_ZOOM_MODE_LAST) return; + elm_photocam_zoom_mode_set(obj, set); } if (p->paused_exists) elm_photocam_paused_set(obj, p->paused); } static Eina_Bool -external_photocam_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param) +external_photocam_param_set(void *data EINA_UNUSED, Evas_Object *obj, + const Edje_External_Param *param) { if (!strcmp(param->name, "file")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) - { - elm_photocam_file_set(obj, param->s); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) + { + elm_photocam_file_set(obj, param->s); + return EINA_TRUE; + } } else if (!strcmp(param->name, "zoom")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) - { - elm_photocam_zoom_set(obj, param->d); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) + { + elm_photocam_zoom_set(obj, param->d); + return EINA_TRUE; + } } else if (!strcmp(param->name, "zoom mode")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) - { - Elm_Photocam_Zoom_Mode set = _zoom_mode_setting_get(param->s); - if (set == ELM_PHOTOCAM_ZOOM_MODE_LAST) return EINA_FALSE; - elm_photocam_zoom_mode_set(obj, set); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) + { + Elm_Photocam_Zoom_Mode set = _zoom_mode_setting_get(param->s); + if (set == ELM_PHOTOCAM_ZOOM_MODE_LAST) return EINA_FALSE; + elm_photocam_zoom_mode_set(obj, set); + return EINA_TRUE; + } } else if (!strcmp(param->name, "paused")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) - { - elm_photocam_paused_set(obj, param->i); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) + { + elm_photocam_paused_set(obj, param->i); + return EINA_TRUE; + } } ERR("unknown parameter '%s' of type '%s'", @@ -98,44 +100,46 @@ external_photocam_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje } static Eina_Bool -external_photocam_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param) +external_photocam_param_get(void *data EINA_UNUSED, const Evas_Object *obj, + Edje_External_Param *param) { if (!strcmp(param->name, "file")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) - { - param->s = elm_photocam_file_get(obj); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) + { + param->s = elm_photocam_file_get(obj); + return EINA_TRUE; + } } else if (!strcmp(param->name, "zoom")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) - { - param->d = elm_photocam_zoom_get(obj); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) + { + param->d = elm_photocam_zoom_get(obj); + return EINA_TRUE; + } } else if (!strcmp(param->name, "zoom mode")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) - { - Elm_Photocam_Zoom_Mode zoom_mode_set = elm_photocam_zoom_mode_get(obj); + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) + { + Elm_Photocam_Zoom_Mode zoom_mode_set = + elm_photocam_zoom_mode_get(obj); - if (zoom_mode_set == ELM_PHOTOCAM_ZOOM_MODE_LAST) - return EINA_FALSE; + if (zoom_mode_set == ELM_PHOTOCAM_ZOOM_MODE_LAST) + return EINA_FALSE; - param->s = choices[zoom_mode_set]; - return EINA_TRUE; - } + param->s = choices[zoom_mode_set]; + return EINA_TRUE; + } } else if (!strcmp(param->name, "paused")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) - { - param->i = elm_photocam_paused_get(obj); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) + { + param->i = elm_photocam_paused_get(obj); + return EINA_TRUE; + } } ERR("unknown parameter '%s' of type '%s'", @@ -145,7 +149,9 @@ external_photocam_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje } static void * -external_photocam_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const Eina_List *params) +external_photocam_params_parse(void *data EINA_UNUSED, + Evas_Object *obj EINA_UNUSED, + const Eina_List *params) { Elm_Params_Photocam *mem; Edje_External_Param *param; @@ -157,30 +163,31 @@ external_photocam_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNU EINA_LIST_FOREACH(params, l, param) { - if (!strcmp(param->name, "file")) - mem->file = eina_stringshare_add(param->s); - else if (!strcmp(param->name, "zoom")) - { - mem->zoom = param->d; - mem->zoom_exists = EINA_TRUE; - } - else if (!strcmp(param->name, "zoom mode")) - mem->zoom_mode = eina_stringshare_add(param->s); - else if (!strcmp(param->name, "paused")) - { - mem->paused = !!param->i; - mem->paused_exists = EINA_TRUE; - } + if (!strcmp(param->name, "file")) + mem->file = eina_stringshare_add(param->s); + else if (!strcmp(param->name, "zoom")) + { + mem->zoom = param->d; + mem->zoom_exists = EINA_TRUE; + } + else if (!strcmp(param->name, "zoom mode")) + mem->zoom_mode = eina_stringshare_add(param->s); + else if (!strcmp(param->name, "paused")) + { + mem->paused = !!param->i; + mem->paused_exists = EINA_TRUE; + } } return mem; } static Evas_Object *external_photocam_content_get(void *data EINA_UNUSED, - const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED) + const Evas_Object *obj EINA_UNUSED, + const char *content EINA_UNUSED) { - ERR("No content."); - return NULL; + ERR("No content."); + return NULL; } static void @@ -196,12 +203,12 @@ external_photocam_params_free(void *params) } static Edje_External_Param_Info external_photocam_params[] = { - DEFINE_EXTERNAL_COMMON_PARAMS, - EDJE_EXTERNAL_PARAM_INFO_STRING("file"), - EDJE_EXTERNAL_PARAM_INFO_DOUBLE("zoom"), - EDJE_EXTERNAL_PARAM_INFO_CHOICE_FULL("zoom mode", "manual", choices), - EDJE_EXTERNAL_PARAM_INFO_BOOL("paused"), - EDJE_EXTERNAL_PARAM_INFO_SENTINEL + DEFINE_EXTERNAL_COMMON_PARAMS, + EDJE_EXTERNAL_PARAM_INFO_STRING("file"), + EDJE_EXTERNAL_PARAM_INFO_DOUBLE("zoom"), + EDJE_EXTERNAL_PARAM_INFO_CHOICE_FULL("zoom mode", "manual", choices), + EDJE_EXTERNAL_PARAM_INFO_BOOL("paused"), + EDJE_EXTERNAL_PARAM_INFO_SENTINEL }; DEFINE_EXTERNAL_ICON_ADD(photocam, "photocam"); diff --git a/legacy/elementary/src/edje_externals/elm_progressbar.c b/legacy/elementary/src/edje_externals/elm_progressbar.c index 87a88d6141..63666d0392 100644 --- a/legacy/elementary/src/edje_externals/elm_progressbar.c +++ b/legacy/elementary/src/edje_externals/elm_progressbar.c @@ -19,7 +19,9 @@ typedef struct _Elm_Params_Progressbar } Elm_Params_Progressbar; static void -external_progressbar_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED) +external_progressbar_state_set(void *data EINA_UNUSED, Evas_Object *obj, + const void *from_params, const void *to_params, + float pos EINA_UNUSED) { const Elm_Params_Progressbar *p; @@ -46,73 +48,74 @@ external_progressbar_state_set(void *data EINA_UNUSED, Evas_Object *obj, const v } static Eina_Bool -external_progressbar_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param) +external_progressbar_param_set(void *data EINA_UNUSED, Evas_Object *obj, + const Edje_External_Param *param) { if (!strcmp(param->name, "label")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) - { - elm_object_text_set(obj, param->s); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) + { + elm_object_text_set(obj, param->s); + return EINA_TRUE; + } } else if (!strcmp(param->name, "icon")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) - { - Evas_Object *icon = external_common_param_icon_get(obj, param); - if ((strcmp(param->s, "")) && (!icon)) return EINA_FALSE; - elm_object_part_content_set(obj, "icon", icon); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) + { + Evas_Object *icon = external_common_param_icon_get(obj, param); + if ((strcmp(param->s, "")) && (!icon)) return EINA_FALSE; + elm_object_part_content_set(obj, "icon", icon); + return EINA_TRUE; + } } else if (!strcmp(param->name, "value")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) - { - elm_progressbar_value_set(obj, param->d); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) + { + elm_progressbar_value_set(obj, param->d); + return EINA_TRUE; + } } else if (!strcmp(param->name, "horizontal")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) - { - elm_progressbar_horizontal_set(obj, param->i); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) + { + elm_progressbar_horizontal_set(obj, param->i); + return EINA_TRUE; + } } else if (!strcmp(param->name, "pulse")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) - { - elm_progressbar_pulse(obj, param->i); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) + { + elm_progressbar_pulse(obj, param->i); + return EINA_TRUE; + } } else if (!strcmp(param->name, "inverted")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) - { - elm_progressbar_inverted_set(obj, param->i); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) + { + elm_progressbar_inverted_set(obj, param->i); + return EINA_TRUE; + } } else if (!strcmp(param->name, "span")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT) - { - elm_progressbar_span_size_set(obj, param->i); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT) + { + elm_progressbar_span_size_set(obj, param->i); + return EINA_TRUE; + } } else if (!strcmp(param->name, "unit format")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) - { - elm_progressbar_unit_format_set(obj, param->s); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) + { + elm_progressbar_unit_format_set(obj, param->s); + return EINA_TRUE; + } } ERR("unknown parameter '%s' of type '%s'", @@ -122,68 +125,69 @@ external_progressbar_param_set(void *data EINA_UNUSED, Evas_Object *obj, const E } static Eina_Bool -external_progressbar_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param) +external_progressbar_param_get(void *data EINA_UNUSED, const Evas_Object *obj, + Edje_External_Param *param) { if (!strcmp(param->name, "label")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) - { - param->s = elm_object_text_get(obj); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) + { + param->s = elm_object_text_get(obj); + return EINA_TRUE; + } } else if (!strcmp(param->name, "icon")) { - /* not easy to get icon name back from live object */ - return EINA_FALSE; + /* not easy to get icon name back from live object */ + return EINA_FALSE; } else if (!strcmp(param->name, "value")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) - { - param->d = elm_progressbar_value_get(obj); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) + { + param->d = elm_progressbar_value_get(obj); + return EINA_TRUE; + } } else if (!strcmp(param->name, "horizontal")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) - { - param->i = elm_progressbar_horizontal_get(obj); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) + { + param->i = elm_progressbar_horizontal_get(obj); + return EINA_TRUE; + } } else if (!strcmp(param->name, "pulse")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) - { - param->i = elm_progressbar_pulse_get(obj); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) + { + param->i = elm_progressbar_pulse_get(obj); + return EINA_TRUE; + } } else if (!strcmp(param->name, "inverted")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) - { - param->i = elm_progressbar_inverted_get(obj); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) + { + param->i = elm_progressbar_inverted_get(obj); + return EINA_TRUE; + } } else if (!strcmp(param->name, "span")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT) - { - param->i = elm_progressbar_span_size_get(obj); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT) + { + param->i = elm_progressbar_span_size_get(obj); + return EINA_TRUE; + } } else if (!strcmp(param->name, "unit format")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) - { - param->s = elm_progressbar_unit_format_get(obj); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) + { + param->s = elm_progressbar_unit_format_get(obj); + return EINA_TRUE; + } } ERR("unknown parameter '%s' of type '%s'", @@ -193,7 +197,9 @@ external_progressbar_param_get(void *data EINA_UNUSED, const Evas_Object *obj, E } static void * -external_progressbar_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const Eina_List *params) +external_progressbar_params_parse(void *data EINA_UNUSED, + Evas_Object *obj EINA_UNUSED, + const Eina_List *params) { Elm_Params_Progressbar *mem; Edje_External_Param *param; @@ -207,45 +213,46 @@ external_progressbar_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_ EINA_LIST_FOREACH(params, l, param) { - if (!strcmp(param->name, "span")) - { - mem->span = param->i; - mem->span_exists = EINA_TRUE; - } - else if (!strcmp(param->name, "value")) - { - mem->value = param->d; - mem->value_exists = EINA_TRUE; - } - else if (!strcmp(param->name, "inverted")) - { - mem->inverted = !!param->i; - mem->inverted_exists = EINA_TRUE; - } - else if (!strcmp(param->name, "horizontal")) - { - mem->horizontal = !!param->i; - mem->horizontal_exists = EINA_TRUE; - } - else if (!strcmp(param->name, "pulse")) - { - mem->pulse = !!param->i; - mem->pulse_exists = EINA_TRUE; - } - else if (!strcmp(param->name, "unit format")) - mem->unit = eina_stringshare_add(param->s); - else if (!strcmp(param->name, "label")) - mem->label = eina_stringshare_add(param->s); + if (!strcmp(param->name, "span")) + { + mem->span = param->i; + mem->span_exists = EINA_TRUE; + } + else if (!strcmp(param->name, "value")) + { + mem->value = param->d; + mem->value_exists = EINA_TRUE; + } + else if (!strcmp(param->name, "inverted")) + { + mem->inverted = !!param->i; + mem->inverted_exists = EINA_TRUE; + } + else if (!strcmp(param->name, "horizontal")) + { + mem->horizontal = !!param->i; + mem->horizontal_exists = EINA_TRUE; + } + else if (!strcmp(param->name, "pulse")) + { + mem->pulse = !!param->i; + mem->pulse_exists = EINA_TRUE; + } + else if (!strcmp(param->name, "unit format")) + mem->unit = eina_stringshare_add(param->s); + else if (!strcmp(param->name, "label")) + mem->label = eina_stringshare_add(param->s); } return mem; } static Evas_Object *external_progressbar_content_get(void *data EINA_UNUSED, - const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED) + const Evas_Object *obj EINA_UNUSED, + const char *content EINA_UNUSED) { - ERR("No content."); - return NULL; + ERR("No content."); + return NULL; } static void @@ -256,22 +263,22 @@ external_progressbar_params_free(void *params) if (mem->unit) eina_stringshare_del(mem->unit); if (mem->label) - eina_stringshare_del(mem->label); + eina_stringshare_del(mem->label); free(params); } static Edje_External_Param_Info external_progressbar_params[] = { - DEFINE_EXTERNAL_COMMON_PARAMS, - EDJE_EXTERNAL_PARAM_INFO_STRING("label"), - EDJE_EXTERNAL_PARAM_INFO_STRING("icon"), - EDJE_EXTERNAL_PARAM_INFO_DOUBLE("value"), - EDJE_EXTERNAL_PARAM_INFO_BOOL("horizontal"), - EDJE_EXTERNAL_PARAM_INFO_BOOL("pulse"), - EDJE_EXTERNAL_PARAM_INFO_BOOL("inverted"), - EDJE_EXTERNAL_PARAM_INFO_INT("span"), - EDJE_EXTERNAL_PARAM_INFO_STRING_DEFAULT("unit format", "%1.2f"), - EDJE_EXTERNAL_PARAM_INFO_SENTINEL + DEFINE_EXTERNAL_COMMON_PARAMS, + EDJE_EXTERNAL_PARAM_INFO_STRING("label"), + EDJE_EXTERNAL_PARAM_INFO_STRING("icon"), + EDJE_EXTERNAL_PARAM_INFO_DOUBLE("value"), + EDJE_EXTERNAL_PARAM_INFO_BOOL("horizontal"), + EDJE_EXTERNAL_PARAM_INFO_BOOL("pulse"), + EDJE_EXTERNAL_PARAM_INFO_BOOL("inverted"), + EDJE_EXTERNAL_PARAM_INFO_INT("span"), + EDJE_EXTERNAL_PARAM_INFO_STRING_DEFAULT("unit format", "%1.2f"), + EDJE_EXTERNAL_PARAM_INFO_SENTINEL }; -DEFINE_EXTERNAL_ICON_ADD(progressbar, "progressbar") -DEFINE_EXTERNAL_TYPE_SIMPLE(progressbar, "Progressbar") +DEFINE_EXTERNAL_ICON_ADD(progressbar, "progressbar"); +DEFINE_EXTERNAL_TYPE_SIMPLE(progressbar, "Progressbar"); diff --git a/legacy/elementary/src/edje_externals/elm_radio.c b/legacy/elementary/src/edje_externals/elm_radio.c index e459e71843..576e67f944 100644 --- a/legacy/elementary/src/edje_externals/elm_radio.c +++ b/legacy/elementary/src/edje_externals/elm_radio.c @@ -11,7 +11,9 @@ typedef struct _Elm_Params_Radio } Elm_Params_Radio; static void -external_radio_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED) +external_radio_state_set(void *data EINA_UNUSED, Evas_Object *obj, + const void *from_params, const void *to_params, + float pos EINA_UNUSED) { const Elm_Params_Radio *p; @@ -27,50 +29,51 @@ external_radio_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *f elm_radio_state_value_set(obj, p->value); if (p->group_name) { - Evas_Object *ed = evas_object_smart_parent_get(obj); - Evas_Object *group = edje_object_part_swallow_get(ed, p->group_name); - elm_radio_group_add(obj, group); + Evas_Object *ed = evas_object_smart_parent_get(obj); + Evas_Object *group = edje_object_part_swallow_get(ed, p->group_name); + elm_radio_group_add(obj, group); } } static Eina_Bool -external_radio_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param) +external_radio_param_set(void *data EINA_UNUSED, Evas_Object *obj, + const Edje_External_Param *param) { if (!strcmp(param->name, "label")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) - { - elm_object_text_set(obj, param->s); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) + { + elm_object_text_set(obj, param->s); + return EINA_TRUE; + } } else if (!strcmp(param->name, "icon")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) - { - Evas_Object *icon = external_common_param_icon_get(obj, param); - if ((strcmp(param->s, "")) && (!icon)) return EINA_FALSE; - elm_object_part_content_set(obj, "icon", icon); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) + { + Evas_Object *icon = external_common_param_icon_get(obj, param); + if ((strcmp(param->s, "")) && (!icon)) return EINA_FALSE; + elm_object_part_content_set(obj, "icon", icon); + return EINA_TRUE; + } } else if (!strcmp(param->name, "value")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT) - { - elm_radio_value_set(obj, param->i); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT) + { + elm_radio_value_set(obj, param->i); + return EINA_TRUE; + } } else if (!strcmp(param->name, "group")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) - { - Evas_Object *ed = evas_object_smart_parent_get(obj); - Evas_Object *group = edje_object_part_swallow_get(ed, param->s); - elm_radio_group_add(obj, group); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) + { + Evas_Object *ed = evas_object_smart_parent_get(obj); + Evas_Object *group = edje_object_part_swallow_get(ed, param->s); + elm_radio_group_add(obj, group); + return EINA_TRUE; + } } ERR("unknown parameter '%s' of type '%s'", @@ -80,33 +83,34 @@ external_radio_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_Ex } static Eina_Bool -external_radio_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param) +external_radio_param_get(void *data EINA_UNUSED, const Evas_Object *obj, + Edje_External_Param *param) { if (!strcmp(param->name, "label")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) - { - param->s = elm_object_text_get(obj); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) + { + param->s = elm_object_text_get(obj); + return EINA_TRUE; + } } else if (!strcmp(param->name, "icon")) { - /* not easy to get icon name back from live object */ - return EINA_FALSE; + /* not easy to get icon name back from live object */ + return EINA_FALSE; } else if (!strcmp(param->name, "value")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT) - { - param->i = elm_radio_value_get(obj); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT) + { + param->i = elm_radio_value_get(obj); + return EINA_TRUE; + } } else if (!strcmp(param->name, "group")) { - /* not easy to get group name back from live object */ - return EINA_FALSE; + /* not easy to get group name back from live object */ + return EINA_FALSE; } ERR("unknown parameter '%s' of type '%s'", @@ -130,25 +134,26 @@ external_radio_params_parse(void *data EINA_UNUSED, Evas_Object *obj, const Eina EINA_LIST_FOREACH(params, l, param) { - if (!strcmp(param->name, "group")) - mem->group_name = eina_stringshare_add(param->s); - else if (!strcmp(param->name, "value")) - { - mem->value = param->i; - mem->value_exists = EINA_TRUE; - } - else if (!strcmp(param->name, "label")) - mem->label = eina_stringshare_add(param->s); + if (!strcmp(param->name, "group")) + mem->group_name = eina_stringshare_add(param->s); + else if (!strcmp(param->name, "value")) + { + mem->value = param->i; + mem->value_exists = EINA_TRUE; + } + else if (!strcmp(param->name, "label")) + mem->label = eina_stringshare_add(param->s); } return mem; } static Evas_Object *external_radio_content_get(void *data EINA_UNUSED, - const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED) + const Evas_Object *obj EINA_UNUSED, + const char *content EINA_UNUSED) { - ERR("No content."); - return NULL; + ERR("No content."); + return NULL; } static void @@ -159,18 +164,18 @@ external_radio_params_free(void *params) if (mem->group_name) eina_stringshare_del(mem->group_name); if (mem->label) - eina_stringshare_del(mem->label); + eina_stringshare_del(mem->label); free(params); } static Edje_External_Param_Info external_radio_params[] = { - DEFINE_EXTERNAL_COMMON_PARAMS, - EDJE_EXTERNAL_PARAM_INFO_STRING("label"), - EDJE_EXTERNAL_PARAM_INFO_STRING("icon"), - EDJE_EXTERNAL_PARAM_INFO_STRING("group"), - EDJE_EXTERNAL_PARAM_INFO_INT("value"), - EDJE_EXTERNAL_PARAM_INFO_SENTINEL + DEFINE_EXTERNAL_COMMON_PARAMS, + EDJE_EXTERNAL_PARAM_INFO_STRING("label"), + EDJE_EXTERNAL_PARAM_INFO_STRING("icon"), + EDJE_EXTERNAL_PARAM_INFO_STRING("group"), + EDJE_EXTERNAL_PARAM_INFO_INT("value"), + EDJE_EXTERNAL_PARAM_INFO_SENTINEL }; -DEFINE_EXTERNAL_ICON_ADD(radio, "radio") -DEFINE_EXTERNAL_TYPE_SIMPLE(radio, "Radio") +DEFINE_EXTERNAL_ICON_ADD(radio, "radio"); +DEFINE_EXTERNAL_TYPE_SIMPLE(radio, "Radio"); diff --git a/legacy/elementary/src/edje_externals/elm_scroller.c b/legacy/elementary/src/edje_externals/elm_scroller.c index 67c8ca5e5c..81c5f30900 100644 --- a/legacy/elementary/src/edje_externals/elm_scroller.c +++ b/legacy/elementary/src/edje_externals/elm_scroller.c @@ -1,104 +1,109 @@ #include "private.h" #include - typedef struct _Elm_Params_Scroller Elm_Params_Scroller; -struct _Elm_Params_Scroller { - Elm_Params base; - Evas_Object *content; +struct _Elm_Params_Scroller +{ + Elm_Params base; + Evas_Object *content; }; - - static void external_scroller_state_set(void *data EINA_UNUSED, - Evas_Object *obj, const void *from_params, - const void *to_params, float pos EINA_UNUSED) + Evas_Object *obj, + const void *from_params, + const void *to_params, + float pos EINA_UNUSED) { - const Elm_Params_Scroller *p; + const Elm_Params_Scroller *p; - if (to_params) p = to_params; - else if (from_params) p = from_params; - else return; + if (to_params) p = to_params; + else if (from_params) p = from_params; + else return; - if (p->content) { - elm_object_content_set(obj, p->content); - } + if (p->content) + elm_object_content_set(obj, p->content); } static Eina_Bool external_scroller_param_set(void *data EINA_UNUSED, - Evas_Object *obj, const Edje_External_Param *param) + Evas_Object *obj, + const Edje_External_Param *param) { - if (!strcmp(param->name, "content") - && param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) - { - Evas_Object *content = external_common_param_edje_object_get(obj, param); - if ((strcmp(param->s, "")) && (!content)) - return EINA_FALSE; - elm_object_content_set(obj, content); - return EINA_TRUE; - } - - ERR("unknown parameter '%s' of type '%s'", - param->name, edje_external_param_type_str(param->type)); - - return EINA_FALSE; + if (!strcmp(param->name, "content") + && param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) + { + Evas_Object *content = external_common_param_edje_object_get(obj, param); + if ((strcmp(param->s, "")) && (!content)) + return EINA_FALSE; + elm_object_content_set(obj, content); + return EINA_TRUE; + } + + ERR("unknown parameter '%s' of type '%s'", + param->name, edje_external_param_type_str(param->type)); + + return EINA_FALSE; } static Eina_Bool external_scroller_param_get(void *data EINA_UNUSED, - const Evas_Object *obj EINA_UNUSED, Edje_External_Param *param) + const Evas_Object *obj EINA_UNUSED, + Edje_External_Param *param) { - if (!strcmp(param->name, "content")) - { - /* not easy to get content name back from live object */ - return EINA_FALSE; - } + if (!strcmp(param->name, "content")) + { + /* not easy to get content name back from live object */ + return EINA_FALSE; + } - ERR("unknown parameter '%s' of type '%s'", - param->name, edje_external_param_type_str(param->type)); + ERR("unknown parameter '%s' of type '%s'", + param->name, edje_external_param_type_str(param->type)); - return EINA_FALSE; + return EINA_FALSE; } -static void * external_scroller_params_parse(void *data EINA_UNUSED, Evas_Object *obj, - const Eina_List *params) { - Elm_Params_Scroller *mem; - Edje_External_Param *param; - const Eina_List *l; +static void * external_scroller_params_parse(void *data EINA_UNUSED, + Evas_Object *obj, + const Eina_List *params) +{ + Elm_Params_Scroller *mem; + Edje_External_Param *param; + const Eina_List *l; - mem = ELM_NEW(Elm_Params_Scroller); - if (!mem) - return NULL; + mem = ELM_NEW(Elm_Params_Scroller); + if (!mem) + return NULL; - EINA_LIST_FOREACH(params, l, param) - { - if (!strcmp(param->name, "content")) - mem->content = external_common_param_edje_object_get(obj, param); - } + EINA_LIST_FOREACH(params, l, param) + { + if (!strcmp(param->name, "content")) + mem->content = external_common_param_edje_object_get(obj, param); + } - return mem; + return mem; } static Evas_Object *external_scroller_content_get(void *data EINA_UNUSED, - const Evas_Object *obj, const char *content) + const Evas_Object *obj, + const char *content) { - if (!strcmp(content, "content")) - return elm_object_content_get(obj); + if (!strcmp(content, "content")) + return elm_object_content_get(obj); - ERR("unknown content '%s'", content); - return NULL; + ERR("unknown content '%s'", content); + return NULL; } -static void external_scroller_params_free(void *params) { - external_common_params_free(params); +static void external_scroller_params_free(void *params) +{ + external_common_params_free(params); } -static Edje_External_Param_Info external_scroller_params[] = { - DEFINE_EXTERNAL_COMMON_PARAMS, - EDJE_EXTERNAL_PARAM_INFO_STRING("content"), - EDJE_EXTERNAL_PARAM_INFO_SENTINEL +static Edje_External_Param_Info external_scroller_params[] = +{ + DEFINE_EXTERNAL_COMMON_PARAMS, + EDJE_EXTERNAL_PARAM_INFO_STRING("content"), + EDJE_EXTERNAL_PARAM_INFO_SENTINEL }; DEFINE_EXTERNAL_ICON_ADD(scroller, "scroller"); -DEFINE_EXTERNAL_TYPE_SIMPLE(scroller, "Scroller") -; +DEFINE_EXTERNAL_TYPE_SIMPLE(scroller, "Scroller"); diff --git a/legacy/elementary/src/edje_externals/elm_segment_control.c b/legacy/elementary/src/edje_externals/elm_segment_control.c index 7ab4aeb8af..ee44d2ee9c 100644 --- a/legacy/elementary/src/edje_externals/elm_segment_control.c +++ b/legacy/elementary/src/edje_externals/elm_segment_control.c @@ -16,7 +16,9 @@ external_segment_control_state_set(void *data EINA_UNUSED, } static Eina_Bool -external_segment_control_param_set(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const Edje_External_Param *param) +external_segment_control_param_set(void *data EINA_UNUSED, + Evas_Object *obj EINA_UNUSED, + const Edje_External_Param *param) { ERR("unknown parameter '%s' of type '%s'", param->name, edje_external_param_type_str(param->type)); @@ -25,7 +27,9 @@ external_segment_control_param_set(void *data EINA_UNUSED, Evas_Object *obj EINA } static Eina_Bool -external_segment_control_param_get(void *data EINA_UNUSED, const Evas_Object *obj EINA_UNUSED, Edje_External_Param *param) +external_segment_control_param_get(void *data EINA_UNUSED, + const Evas_Object *obj EINA_UNUSED, + Edje_External_Param *param) { ERR("unknown parameter '%s' of type '%s'", param->name, edje_external_param_type_str(param->type)); @@ -34,7 +38,9 @@ external_segment_control_param_get(void *data EINA_UNUSED, const Evas_Object *ob } static void * -external_segment_control_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const Eina_List *params EINA_UNUSED) +external_segment_control_params_parse(void *data EINA_UNUSED, + Evas_Object *obj EINA_UNUSED, + const Eina_List *params EINA_UNUSED) { Elm_Params_Segment_Control *mem; //Edje_External_Param *param; @@ -53,7 +59,8 @@ external_segment_control_params_parse(void *data EINA_UNUSED, Evas_Object *obj E } static Evas_Object *external_segment_control_content_get(void *data EINA_UNUSED, - const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED) + const Evas_Object *obj EINA_UNUSED, + const char *content EINA_UNUSED) { ERR("No content."); return NULL; @@ -72,4 +79,4 @@ static Edje_External_Param_Info external_segment_control_params[] = { }; DEFINE_EXTERNAL_ICON_ADD(segment_control, "segment_control"); -DEFINE_EXTERNAL_TYPE_SIMPLE(segment_control, "segment_control"); +DEFINE_EXTERNAL_TYPE_SIMPLE(segment_control, "Segment Control"); diff --git a/legacy/elementary/src/edje_externals/elm_slider.c b/legacy/elementary/src/edje_externals/elm_slider.c index f5c0e4d634..1818712452 100644 --- a/legacy/elementary/src/edje_externals/elm_slider.c +++ b/legacy/elementary/src/edje_externals/elm_slider.c @@ -19,7 +19,9 @@ typedef struct _Elm_Params_Slider } Elm_Params_Slider; static void -external_slider_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED) +external_slider_state_set(void *data EINA_UNUSED, Evas_Object *obj, + const void *from_params, const void *to_params, + float pos EINA_UNUSED) { const Elm_Params_Slider *p; @@ -37,12 +39,12 @@ external_slider_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void * elm_slider_min_max_set(obj, p->min, p->max); else if ((p->min_exists) || (p->max_exists)) { - double min, max; - elm_slider_min_max_get(obj, &min, &max); - if (p->min_exists) - elm_slider_min_max_set(obj, p->min, max); - else - elm_slider_min_max_set(obj, min, p->max); + double min, max; + elm_slider_min_max_get(obj, &min, &max); + if (p->min_exists) + elm_slider_min_max_set(obj, p->min, max); + else + elm_slider_min_max_set(obj, min, p->max); } if (p->value_exists) elm_slider_value_set(obj, p->value); @@ -57,93 +59,94 @@ external_slider_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void * } static Eina_Bool -external_slider_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param) +external_slider_param_set(void *data EINA_UNUSED, Evas_Object *obj, + const Edje_External_Param *param) { if (!strcmp(param->name, "label")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) - { - elm_object_text_set(obj, param->s); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) + { + elm_object_text_set(obj, param->s); + return EINA_TRUE; + } } else if (!strcmp(param->name, "icon")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) - { - Evas_Object *icon = external_common_param_icon_get(obj, param); - if ((strcmp(param->s, "")) && (!icon)) return EINA_FALSE; - elm_object_part_content_set(obj, "icon", icon); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) + { + Evas_Object *icon = external_common_param_icon_get(obj, param); + if ((strcmp(param->s, "")) && (!icon)) return EINA_FALSE; + elm_object_part_content_set(obj, "icon", icon); + return EINA_TRUE; + } } else if (!strcmp(param->name, "min")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) - { - double min, max; - elm_slider_min_max_get(obj, &min, &max); - elm_slider_min_max_set(obj, param->d, max); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) + { + double min, max; + elm_slider_min_max_get(obj, &min, &max); + elm_slider_min_max_set(obj, param->d, max); + return EINA_TRUE; + } } else if (!strcmp(param->name, "max")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) - { - double min, max; - elm_slider_min_max_get(obj, &min, &max); - elm_slider_min_max_set(obj, min, param->d); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) + { + double min, max; + elm_slider_min_max_get(obj, &min, &max); + elm_slider_min_max_set(obj, min, param->d); + return EINA_TRUE; + } } else if (!strcmp(param->name, "value")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) - { - elm_slider_value_set(obj, param->d); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) + { + elm_slider_value_set(obj, param->d); + return EINA_TRUE; + } } else if (!strcmp(param->name, "horizontal")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) - { - elm_slider_horizontal_set(obj, param->i); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) + { + elm_slider_horizontal_set(obj, param->i); + return EINA_TRUE; + } } else if (!strcmp(param->name, "inverted")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) - { - elm_slider_inverted_set(obj, param->i); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) + { + elm_slider_inverted_set(obj, param->i); + return EINA_TRUE; + } } else if (!strcmp(param->name, "span")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT) - { - elm_slider_span_size_set(obj, param->i); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT) + { + elm_slider_span_size_set(obj, param->i); + return EINA_TRUE; + } } else if (!strcmp(param->name, "unit format")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) - { - elm_slider_unit_format_set(obj, param->s); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) + { + elm_slider_unit_format_set(obj, param->s); + return EINA_TRUE; + } } else if (!strcmp(param->name, "indicator format")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) - { - elm_slider_indicator_format_set(obj, param->s); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) + { + elm_slider_indicator_format_set(obj, param->s); + return EINA_TRUE; + } } ERR("unknown parameter '%s' of type '%s'", @@ -157,84 +160,84 @@ external_slider_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_E { if (!strcmp(param->name, "label")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) - { - param->s = elm_object_text_get(obj); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) + { + param->s = elm_object_text_get(obj); + return EINA_TRUE; + } } else if (!strcmp(param->name, "icon")) { - /* not easy to get icon name back from live object */ - return EINA_FALSE; + /* not easy to get icon name back from live object */ + return EINA_FALSE; } else if (!strcmp(param->name, "min")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) - { - double min, max; - elm_slider_min_max_get(obj, &min, &max); - param->d = min; - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) + { + double min, max; + elm_slider_min_max_get(obj, &min, &max); + param->d = min; + return EINA_TRUE; + } } else if (!strcmp(param->name, "max")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) - { - double min, max; - elm_slider_min_max_get(obj, &min, &max); - param->d = max; - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) + { + double min, max; + elm_slider_min_max_get(obj, &min, &max); + param->d = max; + return EINA_TRUE; + } } else if (!strcmp(param->name, "value")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) - { - param->d = elm_slider_value_get(obj); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) + { + param->d = elm_slider_value_get(obj); + return EINA_TRUE; + } } else if (!strcmp(param->name, "horizontal")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) - { - param->i = elm_slider_horizontal_get(obj); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) + { + param->i = elm_slider_horizontal_get(obj); + return EINA_TRUE; + } } else if (!strcmp(param->name, "inverted")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) - { - param->i = elm_slider_inverted_get(obj); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) + { + param->i = elm_slider_inverted_get(obj); + return EINA_TRUE; + } } else if (!strcmp(param->name, "span")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT) - { - param->i = elm_slider_span_size_get(obj); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT) + { + param->i = elm_slider_span_size_get(obj); + return EINA_TRUE; + } } else if (!strcmp(param->name, "unit format")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) - { - param->s = elm_slider_unit_format_get(obj); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) + { + param->s = elm_slider_unit_format_get(obj); + return EINA_TRUE; + } } else if (!strcmp(param->name, "indicator format")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) - { - param->s = elm_slider_indicator_format_get(obj); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) + { + param->s = elm_slider_indicator_format_get(obj); + return EINA_TRUE; + } } ERR("unknown parameter '%s' of type '%s'", @@ -244,7 +247,9 @@ external_slider_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_E } static void * -external_slider_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const Eina_List *params) +external_slider_params_parse(void *data EINA_UNUSED, + Evas_Object *obj EINA_UNUSED, + const Eina_List *params) { Elm_Params_Slider *mem; Edje_External_Param *param; @@ -258,52 +263,53 @@ external_slider_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSE EINA_LIST_FOREACH(params, l, param) { - if (!strcmp(param->name, "span")) - { - mem->span = param->i; - mem->span_exists = EINA_TRUE; - } - else if (!strcmp(param->name, "min")) - { - mem->min = param->d; - mem->min_exists = EINA_TRUE; - } - else if (!strcmp(param->name, "max")) - { - mem->max = param->d; - mem->max_exists = EINA_TRUE; - } - else if (!strcmp(param->name, "value")) - { - mem->value = param->d; - mem->value_exists = EINA_TRUE; - } - else if (!strcmp(param->name, "inverted")) - { - mem->inverted = param->i; - mem->inverted_exists = EINA_TRUE; - } - else if (!strcmp(param->name, "horizontal")) - { - mem->horizontal = param->i; - mem->horizontal_exists = EINA_TRUE; - } - else if (!strcmp(param->name, "unit format")) - mem->unit = eina_stringshare_add(param->s); - else if (!strcmp(param->name, "indicator format")) - mem->indicator = eina_stringshare_add(param->s); - else if (!strcmp(param->name, "label")) - mem->label = eina_stringshare_add(param->s); + if (!strcmp(param->name, "span")) + { + mem->span = param->i; + mem->span_exists = EINA_TRUE; + } + else if (!strcmp(param->name, "min")) + { + mem->min = param->d; + mem->min_exists = EINA_TRUE; + } + else if (!strcmp(param->name, "max")) + { + mem->max = param->d; + mem->max_exists = EINA_TRUE; + } + else if (!strcmp(param->name, "value")) + { + mem->value = param->d; + mem->value_exists = EINA_TRUE; + } + else if (!strcmp(param->name, "inverted")) + { + mem->inverted = param->i; + mem->inverted_exists = EINA_TRUE; + } + else if (!strcmp(param->name, "horizontal")) + { + mem->horizontal = param->i; + mem->horizontal_exists = EINA_TRUE; + } + else if (!strcmp(param->name, "unit format")) + mem->unit = eina_stringshare_add(param->s); + else if (!strcmp(param->name, "indicator format")) + mem->indicator = eina_stringshare_add(param->s); + else if (!strcmp(param->name, "label")) + mem->label = eina_stringshare_add(param->s); } return mem; } static Evas_Object *external_slider_content_get(void *data EINA_UNUSED, - const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED) + const Evas_Object *obj EINA_UNUSED, + const char *content EINA_UNUSED) { - ERR("No content."); - return NULL; + ERR("No content."); + return NULL; } static void @@ -321,19 +327,19 @@ external_slider_params_free(void *params) } static Edje_External_Param_Info external_slider_params[] = { - DEFINE_EXTERNAL_COMMON_PARAMS, - EDJE_EXTERNAL_PARAM_INFO_STRING("label"), - EDJE_EXTERNAL_PARAM_INFO_STRING("icon"), - EDJE_EXTERNAL_PARAM_INFO_DOUBLE("min"), - EDJE_EXTERNAL_PARAM_INFO_DOUBLE_DEFAULT("max", 10.0), - EDJE_EXTERNAL_PARAM_INFO_DOUBLE("value"), - EDJE_EXTERNAL_PARAM_INFO_BOOL("horizontal"), - EDJE_EXTERNAL_PARAM_INFO_BOOL("inverted"), - EDJE_EXTERNAL_PARAM_INFO_INT("span"), - EDJE_EXTERNAL_PARAM_INFO_STRING_DEFAULT("unit format", "%1.2f"), - EDJE_EXTERNAL_PARAM_INFO_STRING_DEFAULT("indicator format", "%1.2f"), - EDJE_EXTERNAL_PARAM_INFO_SENTINEL + DEFINE_EXTERNAL_COMMON_PARAMS, + EDJE_EXTERNAL_PARAM_INFO_STRING("label"), + EDJE_EXTERNAL_PARAM_INFO_STRING("icon"), + EDJE_EXTERNAL_PARAM_INFO_DOUBLE("min"), + EDJE_EXTERNAL_PARAM_INFO_DOUBLE_DEFAULT("max", 10.0), + EDJE_EXTERNAL_PARAM_INFO_DOUBLE("value"), + EDJE_EXTERNAL_PARAM_INFO_BOOL("horizontal"), + EDJE_EXTERNAL_PARAM_INFO_BOOL("inverted"), + EDJE_EXTERNAL_PARAM_INFO_INT("span"), + EDJE_EXTERNAL_PARAM_INFO_STRING_DEFAULT("unit format", "%1.2f"), + EDJE_EXTERNAL_PARAM_INFO_STRING_DEFAULT("indicator format", "%1.2f"), + EDJE_EXTERNAL_PARAM_INFO_SENTINEL }; -DEFINE_EXTERNAL_ICON_ADD(slider, "slider") -DEFINE_EXTERNAL_TYPE_SIMPLE(slider, "Slider") +DEFINE_EXTERNAL_ICON_ADD(slider, "slider"); +DEFINE_EXTERNAL_TYPE_SIMPLE(slider, "Slider"); diff --git a/legacy/elementary/src/edje_externals/elm_slideshow.c b/legacy/elementary/src/edje_externals/elm_slideshow.c index 0048bf32e7..fff85b83ba 100644 --- a/legacy/elementary/src/edje_externals/elm_slideshow.c +++ b/legacy/elementary/src/edje_externals/elm_slideshow.c @@ -11,12 +11,16 @@ typedef struct _Elm_Params_Slideshow Eina_Bool loop_exists:1; } Elm_Params_Slideshow; -static const char *transitions[] = { "fade", "black_fade", "horizontal", - "vertical", "square", NULL}; -static const char *layout[] = { "fullscreen", "not_fullscreen", NULL}; +static const char *transitions[] = +{ + "fade", "black_fade", "horizontal", "vertical", "square", NULL +}; +static const char *layout[] = { "fullscreen", "not_fullscreen", NULL }; static void -external_slideshow_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED) +external_slideshow_state_set(void *data EINA_UNUSED, Evas_Object *obj, + const void *from_params, const void *to_params, + float pos EINA_UNUSED) { const Elm_Params_Slideshow *p; @@ -28,49 +32,48 @@ external_slideshow_state_set(void *data EINA_UNUSED, Evas_Object *obj, const voi elm_slideshow_timeout_set(obj , p->timeout); if (p->loop_exists) elm_slideshow_loop_set(obj, p->loop); - if (p->transition) { - elm_slideshow_transition_set(obj, p->transition); - } - if (p->layout) { - elm_slideshow_layout_set(obj, p->layout); - } + if (p->transition) + elm_slideshow_transition_set(obj, p->transition); + if (p->layout) + elm_slideshow_layout_set(obj, p->layout); } static Eina_Bool -external_slideshow_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param) +external_slideshow_param_set(void *data EINA_UNUSED, Evas_Object *obj, + const Edje_External_Param *param) { if (!strcmp(param->name, "timeout")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) - { - elm_slideshow_timeout_set(obj, param->d); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) + { + elm_slideshow_timeout_set(obj, param->d); + return EINA_TRUE; + } } else if (!strcmp(param->name, "loop")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) - { - elm_slideshow_loop_set(obj, param->i); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) + { + elm_slideshow_loop_set(obj, param->i); + return EINA_TRUE; + } } else if (!strcmp(param->name, "transition")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) - { - elm_slideshow_transition_set(obj, param->s); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) + { + elm_slideshow_transition_set(obj, param->s); + return EINA_TRUE; + } } else if (!strcmp(param->name, "layout")) - { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) - { - elm_slideshow_layout_set(obj, param->s); - return EINA_TRUE; - } - } + { + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) + { + elm_slideshow_layout_set(obj, param->s); + return EINA_TRUE; + } + } ERR("unknown parameter '%s' of type '%s'", param->name, edje_external_param_type_str(param->type)); @@ -79,40 +82,41 @@ external_slideshow_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edj } static Eina_Bool -external_slideshow_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param) +external_slideshow_param_get(void *data EINA_UNUSED, const Evas_Object *obj, + Edje_External_Param *param) { if (!strcmp(param->name, "timeout")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) - { - param->d = elm_slideshow_timeout_get(obj); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) + { + param->d = elm_slideshow_timeout_get(obj); + return EINA_TRUE; + } } else if (!strcmp(param->name, "loop")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) - { - param->i = elm_slideshow_loop_get(obj); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) + { + param->i = elm_slideshow_loop_get(obj); + return EINA_TRUE; + } } else if (!strcmp(param->name, "transition")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) - { - param->s = elm_slideshow_transition_get(obj); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) + { + param->s = elm_slideshow_transition_get(obj); + return EINA_TRUE; + } } else if (!strcmp(param->name, "layout")) - { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) - { - param->s = elm_slideshow_layout_get(obj); - return EINA_TRUE; - } - } + { + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) + { + param->s = elm_slideshow_layout_get(obj); + return EINA_TRUE; + } + } ERR("unknown parameter '%s' of type '%s'", param->name, edje_external_param_type_str(param->type)); @@ -133,34 +137,35 @@ external_slideshow_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UN EINA_LIST_FOREACH(params, l, param) { - if (!strcmp(param->name, "timeout")) - { - mem->timeout = param->d; - mem->timeout_exists = EINA_TRUE; - } - else if (!strcmp(param->name, "loop")) - { - mem->loop = param->i; - mem->loop_exists = EINA_TRUE; - } - else if (!strcmp(param->name, "transition")) - { - mem->transition = param->s; - } - else if (!strcmp(param->name, "layout")) - { - mem->layout = param->s; - } + if (!strcmp(param->name, "timeout")) + { + mem->timeout = param->d; + mem->timeout_exists = EINA_TRUE; + } + else if (!strcmp(param->name, "loop")) + { + mem->loop = param->i; + mem->loop_exists = EINA_TRUE; + } + else if (!strcmp(param->name, "transition")) + { + mem->transition = param->s; + } + else if (!strcmp(param->name, "layout")) + { + mem->layout = param->s; + } } return mem; } static Evas_Object *external_slideshow_content_get(void *data EINA_UNUSED, - const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED) + const Evas_Object *obj EINA_UNUSED, + const char *content EINA_UNUSED) { - ERR("No content."); - return NULL; + ERR("No content."); + return NULL; } static void @@ -170,12 +175,12 @@ external_slideshow_params_free(void *params EINA_UNUSED) } static Edje_External_Param_Info external_slideshow_params[] = { - DEFINE_EXTERNAL_COMMON_PARAMS, - EDJE_EXTERNAL_PARAM_INFO_DOUBLE("timeout"), - EDJE_EXTERNAL_PARAM_INFO_BOOL("loop"), - EDJE_EXTERNAL_PARAM_INFO_CHOICE_FULL("transition", "fade", transitions), - EDJE_EXTERNAL_PARAM_INFO_CHOICE_FULL("layout", "fullscreen", layout), - EDJE_EXTERNAL_PARAM_INFO_SENTINEL + DEFINE_EXTERNAL_COMMON_PARAMS, + EDJE_EXTERNAL_PARAM_INFO_DOUBLE("timeout"), + EDJE_EXTERNAL_PARAM_INFO_BOOL("loop"), + EDJE_EXTERNAL_PARAM_INFO_CHOICE_FULL("transition", "fade", transitions), + EDJE_EXTERNAL_PARAM_INFO_CHOICE_FULL("layout", "fullscreen", layout), + EDJE_EXTERNAL_PARAM_INFO_SENTINEL }; DEFINE_EXTERNAL_ICON_ADD(slideshow, "slideshow"); diff --git a/legacy/elementary/src/edje_externals/elm_spinner.c b/legacy/elementary/src/edje_externals/elm_spinner.c index 85a602afae..e5b4150baa 100644 --- a/legacy/elementary/src/edje_externals/elm_spinner.c +++ b/legacy/elementary/src/edje_externals/elm_spinner.c @@ -14,7 +14,9 @@ typedef struct _Elm_Params_Spinner } Elm_Params_Spinner; static void -external_spinner_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED) +external_spinner_state_set(void *data EINA_UNUSED, Evas_Object *obj, + const void *from_params, const void *to_params, + float pos EINA_UNUSED) { const Elm_Params_Spinner *p; @@ -28,12 +30,12 @@ external_spinner_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void elm_spinner_min_max_set(obj, p->min, p->max); else if ((p->min_exists) || (p->max_exists)) { - double min, max; - elm_spinner_min_max_get(obj, &min, &max); - if (p->min_exists) - elm_spinner_min_max_set(obj, p->min, max); - else - elm_spinner_min_max_set(obj, min, p->max); + double min, max; + elm_spinner_min_max_get(obj, &min, &max); + if (p->min_exists) + elm_spinner_min_max_set(obj, p->min, max); + else + elm_spinner_min_max_set(obj, min, p->max); } if (p->step_exists) elm_spinner_step_set(obj, p->step); @@ -44,59 +46,60 @@ external_spinner_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void } static Eina_Bool -external_spinner_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param) +external_spinner_param_set(void *data EINA_UNUSED, Evas_Object *obj, + const Edje_External_Param *param) { if (!strcmp(param->name, "label format")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) - { - elm_spinner_label_format_set(obj, param->s); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) + { + elm_spinner_label_format_set(obj, param->s); + return EINA_TRUE; + } } else if (!strcmp(param->name, "min")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) - { - double min, max; - elm_spinner_min_max_get(obj, &min, &max); - elm_spinner_min_max_set(obj, param->d, max); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) + { + double min, max; + elm_spinner_min_max_get(obj, &min, &max); + elm_spinner_min_max_set(obj, param->d, max); + return EINA_TRUE; + } } else if (!strcmp(param->name, "max")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) - { - double min, max; - elm_spinner_min_max_get(obj, &min, &max); - elm_spinner_min_max_set(obj, min, param->d); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) + { + double min, max; + elm_spinner_min_max_get(obj, &min, &max); + elm_spinner_min_max_set(obj, min, param->d); + return EINA_TRUE; + } } else if (!strcmp(param->name, "step")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) - { - elm_spinner_step_set(obj, param->d); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) + { + elm_spinner_step_set(obj, param->d); + return EINA_TRUE; + } } else if (!strcmp(param->name, "value")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) - { - elm_spinner_value_set(obj, param->d); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) + { + elm_spinner_value_set(obj, param->d); + return EINA_TRUE; + } } else if (!strcmp(param->name, "wrap")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) - { - elm_spinner_wrap_set(obj, param->i); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) + { + elm_spinner_wrap_set(obj, param->i); + return EINA_TRUE; + } } ERR("unknown parameter '%s' of type '%s'", @@ -106,59 +109,60 @@ external_spinner_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_ } static Eina_Bool -external_spinner_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param) +external_spinner_param_get(void *data EINA_UNUSED, const Evas_Object *obj, + Edje_External_Param *param) { if (!strcmp(param->name, "label format")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) - { - param->s = elm_spinner_label_format_get(obj); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) + { + param->s = elm_spinner_label_format_get(obj); + return EINA_TRUE; + } } else if (!strcmp(param->name, "min")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) - { - double min, max; - elm_spinner_min_max_get(obj, &min, &max); - param->d = min; - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) + { + double min, max; + elm_spinner_min_max_get(obj, &min, &max); + param->d = min; + return EINA_TRUE; + } } else if (!strcmp(param->name, "max")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) - { - double min, max; - elm_spinner_min_max_get(obj, &min, &max); - param->d = max; - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) + { + double min, max; + elm_spinner_min_max_get(obj, &min, &max); + param->d = max; + return EINA_TRUE; + } } else if (!strcmp(param->name, "step")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) - { - param->d = elm_spinner_step_get(obj); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) + { + param->d = elm_spinner_step_get(obj); + return EINA_TRUE; + } } else if (!strcmp(param->name, "value")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) - { - param->d = elm_spinner_value_get(obj); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) + { + param->d = elm_spinner_value_get(obj); + return EINA_TRUE; + } } else if (!strcmp(param->name, "wrap")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) - { - param->i = elm_spinner_value_get(obj); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) + { + param->i = elm_spinner_value_get(obj); + return EINA_TRUE; + } } ERR("unknown parameter '%s' of type '%s'", @@ -168,7 +172,9 @@ external_spinner_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_ } static void * -external_spinner_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const Eina_List *params) +external_spinner_params_parse(void *data EINA_UNUSED, + Evas_Object *obj EINA_UNUSED, + const Eina_List *params) { Elm_Params_Spinner *mem; Edje_External_Param *param; @@ -180,43 +186,44 @@ external_spinner_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUS EINA_LIST_FOREACH(params, l, param) { - if (!strcmp(param->name, "label format")) - mem->label_format = eina_stringshare_add(param->s); - else if (!strcmp(param->name, "min")) - { - mem->min = param->d; - mem->min_exists = EINA_TRUE; - } - else if (!strcmp(param->name, "max")) - { - mem->max = param->d; - mem->max_exists = EINA_TRUE; - } - else if (!strcmp(param->name, "step")) - { - mem->step = param->d; - mem->step_exists = EINA_TRUE; - } - else if (!strcmp(param->name, "value")) - { - mem->value = param->d; - mem->value_exists = EINA_TRUE; - } - else if (!strcmp(param->name, "wrap")) - { - mem->wrap = param->i; - mem->wrap_exists = EINA_TRUE; - } + if (!strcmp(param->name, "label format")) + mem->label_format = eina_stringshare_add(param->s); + else if (!strcmp(param->name, "min")) + { + mem->min = param->d; + mem->min_exists = EINA_TRUE; + } + else if (!strcmp(param->name, "max")) + { + mem->max = param->d; + mem->max_exists = EINA_TRUE; + } + else if (!strcmp(param->name, "step")) + { + mem->step = param->d; + mem->step_exists = EINA_TRUE; + } + else if (!strcmp(param->name, "value")) + { + mem->value = param->d; + mem->value_exists = EINA_TRUE; + } + else if (!strcmp(param->name, "wrap")) + { + mem->wrap = param->i; + mem->wrap_exists = EINA_TRUE; + } } return mem; } static Evas_Object *external_spinner_content_get(void *data EINA_UNUSED, - const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED) + const Evas_Object *obj EINA_UNUSED, + const char *content EINA_UNUSED) { - ERR("No content."); - return NULL; + ERR("No content."); + return NULL; } static void @@ -230,15 +237,15 @@ external_spinner_params_free(void *params) } static Edje_External_Param_Info external_spinner_params[] = { - DEFINE_EXTERNAL_COMMON_PARAMS, - EDJE_EXTERNAL_PARAM_INFO_STRING_DEFAULT("label format", "%1.2f"), - EDJE_EXTERNAL_PARAM_INFO_DOUBLE("min"), - EDJE_EXTERNAL_PARAM_INFO_DOUBLE_DEFAULT("max", 100.0), - EDJE_EXTERNAL_PARAM_INFO_DOUBLE_DEFAULT("step", 1.0), - EDJE_EXTERNAL_PARAM_INFO_DOUBLE("value"), - EDJE_EXTERNAL_PARAM_INFO_BOOL("wrap"), - EDJE_EXTERNAL_PARAM_INFO_SENTINEL + DEFINE_EXTERNAL_COMMON_PARAMS, + EDJE_EXTERNAL_PARAM_INFO_STRING_DEFAULT("label format", "%1.2f"), + EDJE_EXTERNAL_PARAM_INFO_DOUBLE("min"), + EDJE_EXTERNAL_PARAM_INFO_DOUBLE_DEFAULT("max", 100.0), + EDJE_EXTERNAL_PARAM_INFO_DOUBLE_DEFAULT("step", 1.0), + EDJE_EXTERNAL_PARAM_INFO_DOUBLE("value"), + EDJE_EXTERNAL_PARAM_INFO_BOOL("wrap"), + EDJE_EXTERNAL_PARAM_INFO_SENTINEL }; -DEFINE_EXTERNAL_ICON_ADD(spinner, "spinner") -DEFINE_EXTERNAL_TYPE_SIMPLE(spinner, "Spinner") +DEFINE_EXTERNAL_ICON_ADD(spinner, "spinner"); +DEFINE_EXTERNAL_TYPE_SIMPLE(spinner, "Spinner"); diff --git a/legacy/elementary/src/edje_externals/elm_thumb.c b/legacy/elementary/src/edje_externals/elm_thumb.c index c444e33177..165596f8d1 100644 --- a/legacy/elementary/src/edje_externals/elm_thumb.c +++ b/legacy/elementary/src/edje_externals/elm_thumb.c @@ -1,5 +1,4 @@ #include - #include "private.h" typedef struct _Elm_Params_Thumb @@ -8,7 +7,7 @@ typedef struct _Elm_Params_Thumb const char *animate; } Elm_Params_Thumb; -static const char* choices[] = {"loop", "start", "stop", NULL}; +static const char* choices[] = { "loop", "start", "stop", NULL }; static Elm_Thumb_Animation_Setting _anim_setting_get(const char *anim_str) @@ -19,14 +18,16 @@ _anim_setting_get(const char *anim_str) for (i = 0; i < ELM_THUMB_ANIMATION_LAST; i++) { - if (!strcmp(anim_str, choices[i])) - return i; + if (!strcmp(anim_str, choices[i])) + return i; } return ELM_THUMB_ANIMATION_LAST; } static void -external_thumb_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED) +external_thumb_state_set(void *data EINA_UNUSED, Evas_Object *obj, + const void *from_params, const void *to_params, + float pos EINA_UNUSED) { const Elm_Params_Thumb *p; @@ -36,24 +37,25 @@ external_thumb_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *f if (p->animate) { - Elm_Thumb_Animation_Setting set = _anim_setting_get(p->animate); - if (set != ELM_THUMB_ANIMATION_LAST) - elm_thumb_animate_set(obj, set); + Elm_Thumb_Animation_Setting set = _anim_setting_get(p->animate); + if (set != ELM_THUMB_ANIMATION_LAST) + elm_thumb_animate_set(obj, set); } } static Eina_Bool -external_thumb_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param) +external_thumb_param_set(void *data EINA_UNUSED, Evas_Object *obj, + const Edje_External_Param *param) { if (!strcmp(param->name, "animate")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_CHOICE) - { - Elm_Thumb_Animation_Setting set = _anim_setting_get(param->s); - if (set == ELM_THUMB_ANIMATION_LAST) return EINA_FALSE; - elm_thumb_animate_set(obj, set); - return EINA_TRUE; - } + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_CHOICE) + { + Elm_Thumb_Animation_Setting set = _anim_setting_get(param->s); + if (set == ELM_THUMB_ANIMATION_LAST) return EINA_FALSE; + elm_thumb_animate_set(obj, set); + return EINA_TRUE; + } } ERR("unknown parameter '%s' of type '%s'", @@ -63,20 +65,21 @@ external_thumb_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_Ex } static Eina_Bool -external_thumb_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param) +external_thumb_param_get(void *data EINA_UNUSED, const Evas_Object *obj, + Edje_External_Param *param) { if (!strcmp(param->name, "animate")) { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_CHOICE) - { - Elm_Thumb_Animation_Setting anim_set = elm_thumb_animate_get(obj); + if (param->type == EDJE_EXTERNAL_PARAM_TYPE_CHOICE) + { + Elm_Thumb_Animation_Setting anim_set = elm_thumb_animate_get(obj); - if (anim_set == ELM_THUMB_ANIMATION_LAST) - return EINA_FALSE; + if (anim_set == ELM_THUMB_ANIMATION_LAST) + return EINA_FALSE; - param->s = choices[anim_set]; - return EINA_TRUE; - } + param->s = choices[anim_set]; + return EINA_TRUE; + } } ERR("unknown parameter '%s' of type '%s'", @@ -86,7 +89,9 @@ external_thumb_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_Ex } static void * -external_thumb_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const Eina_List *params) +external_thumb_params_parse(void *data EINA_UNUSED, + Evas_Object *obj EINA_UNUSED, + const Eina_List *params) { Elm_Params_Thumb *mem; Edje_External_Param *param; @@ -98,18 +103,19 @@ external_thumb_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED EINA_LIST_FOREACH(params, l, param) { - if (!strcmp(param->name, "animate")) - mem->animate = eina_stringshare_add(param->s); + if (!strcmp(param->name, "animate")) + mem->animate = eina_stringshare_add(param->s); } return mem; } static Evas_Object *external_thumb_content_get(void *data EINA_UNUSED, - const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED) + const Evas_Object *obj EINA_UNUSED, + const char *content EINA_UNUSED) { - ERR("No content."); - return NULL; + ERR("No content."); + return NULL; } static void @@ -129,10 +135,10 @@ static Edje_External_Param_Info external_thumb_params[] = EDJE_EXTERNAL_PARAM_INFO_SENTINEL }; -DEFINE_EXTERNAL_ICON_ADD(thumb, "thumb") - static Evas_Object * -external_thumb_add(void *data EINA_UNUSED, Evas *evas EINA_UNUSED, Evas_Object *edje, const Eina_List *params EINA_UNUSED, const char *part_name) +external_thumb_add(void *data EINA_UNUSED, Evas *evas EINA_UNUSED, + Evas_Object *edje, const Eina_List *params EINA_UNUSED, + const char *part_name) { Evas_Object *parent, *obj; external_elm_init(); @@ -143,4 +149,6 @@ external_thumb_add(void *data EINA_UNUSED, Evas *evas EINA_UNUSED, Evas_Object * external_signals_proxy(obj, edje, part_name); return obj; } -DEFINE_EXTERNAL_TYPE(thumb, "Thumbnail") + +DEFINE_EXTERNAL_ICON_ADD(thumb, "thumb"); +DEFINE_EXTERNAL_TYPE(thumb, "Thumb"); diff --git a/legacy/elementary/src/edje_externals/elm_toolbar.c b/legacy/elementary/src/edje_externals/elm_toolbar.c index 98b783f3b0..6a75fc5f3d 100644 --- a/legacy/elementary/src/edje_externals/elm_toolbar.c +++ b/legacy/elementary/src/edje_externals/elm_toolbar.c @@ -26,8 +26,10 @@ typedef struct _Elm_Params_Toolbar if (!strcmp(STR, CHOICES[i])) \ return i; -static const char *_toolbar_shrink_modes[] = {"none", "hide", - "scroll", "menu", NULL}; +static const char *_toolbar_shrink_modes[] = +{ + "none", "hide", "scroll", "menu", NULL +}; static Elm_Toolbar_Shrink_Mode _toolbar_shrink_choices_setting_get(const char *shrink_mode_str) @@ -39,7 +41,9 @@ _toolbar_shrink_choices_setting_get(const char *shrink_mode_str) } static void -external_toolbar_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED) +external_toolbar_state_set(void *data EINA_UNUSED, Evas_Object *obj, + const void *from_params, const void *to_params, + float pos EINA_UNUSED) { const Elm_Params_Toolbar *p; Elm_Toolbar_Shrink_Mode shrink_mode; @@ -78,7 +82,8 @@ external_toolbar_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void } static Eina_Bool -external_toolbar_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param) +external_toolbar_param_set(void *data EINA_UNUSED, Evas_Object *obj, + const Edje_External_Param *param) { Elm_Toolbar_Shrink_Mode shrink_mode; @@ -153,7 +158,8 @@ external_toolbar_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_ } static Eina_Bool -external_toolbar_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param) +external_toolbar_param_get(void *data EINA_UNUSED, const Evas_Object *obj, + Edje_External_Param *param) { if (!strcmp(param->name, "icon size")) { @@ -229,7 +235,9 @@ external_toolbar_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_ } static void * -external_toolbar_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const Eina_List *params) +external_toolbar_params_parse(void *data EINA_UNUSED, + Evas_Object *obj EINA_UNUSED, + const Eina_List *params) { Elm_Params_Toolbar *mem; Edje_External_Param *param; @@ -279,10 +287,11 @@ external_toolbar_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUS } static Evas_Object *external_toolbar_content_get(void *data EINA_UNUSED, - const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED) + const Evas_Object *obj EINA_UNUSED, + const char *content EINA_UNUSED) { - ERR("No content."); - return NULL; + ERR("No content."); + return NULL; } static void diff --git a/legacy/elementary/src/edje_externals/elm_video.c b/legacy/elementary/src/edje_externals/elm_video.c index d9e0941df1..8d003d647e 100644 --- a/legacy/elementary/src/edje_externals/elm_video.c +++ b/legacy/elementary/src/edje_externals/elm_video.c @@ -22,7 +22,9 @@ typedef struct _Elm_Params_Video } Elm_Params_Video; static void -external_video_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED) +external_video_state_set(void *data EINA_UNUSED, Evas_Object *obj, + const void *from_params, const void *to_params, + float pos EINA_UNUSED) { const Elm_Params_Video *p; @@ -44,7 +46,8 @@ external_video_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *f } static Eina_Bool -external_video_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param) +external_video_param_set(void *data EINA_UNUSED, Evas_Object *obj, + const Edje_External_Param *param) { if ((param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) && (!strcmp(param->name, "file"))) @@ -111,7 +114,8 @@ external_video_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_Ex } static Eina_Bool -external_video_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param) +external_video_param_get(void *data EINA_UNUSED, const Evas_Object *obj, + Edje_External_Param *param) { if ((param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) && (!strcmp(param->name, "file"))) @@ -181,7 +185,9 @@ external_video_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_Ex return EINA_FALSE; } -static void * external_video_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const Eina_List *params) +static void * external_video_params_parse(void *data EINA_UNUSED, + Evas_Object *obj EINA_UNUSED, + const Eina_List *params) { Elm_Params_Video *mem; Edje_External_Param *param; @@ -235,7 +241,9 @@ static void * external_video_params_parse(void *data EINA_UNUSED, Evas_Object *o return mem; } -static Evas_Object *external_video_content_get(void *data EINA_UNUSED, const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED) +static Evas_Object *external_video_content_get(void *data EINA_UNUSED, + const Evas_Object *obj EINA_UNUSED, + const char *content EINA_UNUSED) { ERR("No content."); return NULL; diff --git a/legacy/elementary/src/edje_externals/elm_web.c b/legacy/elementary/src/edje_externals/elm_web.c index 8ff2b878ce..d4459bb052 100644 --- a/legacy/elementary/src/edje_externals/elm_web.c +++ b/legacy/elementary/src/edje_externals/elm_web.c @@ -11,7 +11,7 @@ typedef struct _Elm_Params_Web Eina_Bool inwin_mode_set:1; } Elm_Params_Web; -static const char *zoom_choices[] = {"manual", "auto fit", "auto fill", NULL}; +static const char *zoom_choices[] = { "manual", "auto fit", "auto fill", NULL }; static Elm_Web_Zoom_Mode _zoom_mode_get(const char *zoom) @@ -25,7 +25,9 @@ _zoom_mode_get(const char *zoom) } static void -external_web_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED) +external_web_state_set(void *data EINA_UNUSED, Evas_Object *obj, + const void *from_params, const void *to_params, + float pos EINA_UNUSED) { const Elm_Params_Web *p; @@ -44,7 +46,8 @@ external_web_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *fro } static Eina_Bool -external_web_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param) +external_web_param_set(void *data EINA_UNUSED, Evas_Object *obj, + const Edje_External_Param *param) { if (!strcmp(param->name, "uri")) { @@ -89,7 +92,8 @@ external_web_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_Exte } static Eina_Bool -external_web_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param) +external_web_param_get(void *data EINA_UNUSED, const Evas_Object *obj, + Edje_External_Param *param) { if (!strcmp(param->name, "uri")) { @@ -134,7 +138,8 @@ external_web_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_Exte } static void * -external_web_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const Eina_List *params) +external_web_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, + const Eina_List *params) { Elm_Params_Web *mem; Edje_External_Param *param; @@ -177,7 +182,9 @@ external_web_params_free(void *params) } static Evas_Object * -external_web_content_get(void *data EINA_UNUSED, const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED) +external_web_content_get(void *data EINA_UNUSED, + const Evas_Object *obj EINA_UNUSED, + const char *content EINA_UNUSED) { return NULL; } @@ -192,7 +199,9 @@ static Edje_External_Param_Info external_web_params[] = }; static Evas_Object * -external_web_add(void *data EINA_UNUSED, Evas *evas EINA_UNUSED, Evas_Object *edje, const Eina_List *params EINA_UNUSED, const char *part_name) +external_web_add(void *data EINA_UNUSED, Evas *evas EINA_UNUSED, + Evas_Object *edje, const Eina_List *params EINA_UNUSED, + const char *part_name) { Evas_Object *parent, *obj; external_elm_init(); @@ -204,5 +213,5 @@ external_web_add(void *data EINA_UNUSED, Evas *evas EINA_UNUSED, Evas_Object *ed return obj; } -DEFINE_EXTERNAL_ICON_ADD(web, "web") -DEFINE_EXTERNAL_TYPE(web, "Web") +DEFINE_EXTERNAL_ICON_ADD(web, "web"); +DEFINE_EXTERNAL_TYPE(web, "Web");