From aebdcff51396c16bcf44050c3f1790f329014eb1 Mon Sep 17 00:00:00 2001 From: ChunEon Park Date: Thu, 23 Jan 2014 17:24:19 +0900 Subject: [PATCH] elementary - use the focused/unfocused string in widget defined. Now, it will share the strings so that reduce the binary size also user uses it in one way. --- legacy/elementary/src/lib/elc_ctxpopup.c | 4 ++-- legacy/elementary/src/lib/elc_fileselector.c | 4 ++-- legacy/elementary/src/lib/elc_fileselector_button.c | 4 ++-- legacy/elementary/src/lib/elc_naviframe.c | 4 ++-- legacy/elementary/src/lib/elc_player.c | 4 ++-- legacy/elementary/src/lib/elc_popup.c | 4 ++-- legacy/elementary/src/lib/elm_bubble.c | 4 ++-- legacy/elementary/src/lib/elm_button.c | 4 ++-- legacy/elementary/src/lib/elm_calendar.c | 4 ++-- legacy/elementary/src/lib/elm_check.c | 4 ++-- legacy/elementary/src/lib/elm_clock.c | 4 ++-- legacy/elementary/src/lib/elm_colorselector.c | 4 ++-- legacy/elementary/src/lib/elm_datetime.c | 4 ++-- legacy/elementary/src/lib/elm_diskselector.c | 4 ++-- legacy/elementary/src/lib/elm_flipselector.c | 4 ++-- legacy/elementary/src/lib/elm_gengrid.c | 4 ++-- legacy/elementary/src/lib/elm_genlist.c | 4 ++-- legacy/elementary/src/lib/elm_hover.c | 4 ++-- legacy/elementary/src/lib/elm_index.c | 4 ++-- legacy/elementary/src/lib/elm_list.c | 4 ++-- legacy/elementary/src/lib/elm_map.c | 4 ++-- legacy/elementary/src/lib/elm_panel.c | 4 ++-- legacy/elementary/src/lib/elm_photocam.c | 4 ++-- legacy/elementary/src/lib/elm_priv.h | 2 ++ legacy/elementary/src/lib/elm_progressbar.c | 4 ++-- legacy/elementary/src/lib/elm_radio.c | 4 ++-- legacy/elementary/src/lib/elm_scroller.c | 4 ++-- legacy/elementary/src/lib/elm_slider.c | 4 ++-- legacy/elementary/src/lib/elm_slideshow.c | 4 ++-- legacy/elementary/src/lib/elm_spinner.c | 4 ++-- legacy/elementary/src/lib/elm_toolbar.c | 4 ++-- legacy/elementary/src/lib/elm_video.c | 4 ++-- legacy/elementary/src/lib/elm_web.c | 4 ++-- legacy/elementary/src/lib/elm_web2.c | 4 ++-- legacy/elementary/src/lib/elm_widget.c | 7 +++++-- 35 files changed, 73 insertions(+), 68 deletions(-) diff --git a/legacy/elementary/src/lib/elc_ctxpopup.c b/legacy/elementary/src/lib/elc_ctxpopup.c index 06ec1fbbb2..34afd593cd 100644 --- a/legacy/elementary/src/lib/elc_ctxpopup.c +++ b/legacy/elementary/src/lib/elc_ctxpopup.c @@ -24,8 +24,8 @@ ELM_PRIV_CTXPOPUP_SIGNALS(ELM_PRIV_STATIC_VARIABLE_DECLARE); static const Evas_Smart_Cb_Description _smart_callbacks[] = { ELM_PRIV_CTXPOPUP_SIGNALS(ELM_PRIV_SMART_CALLBACKS_DESC) - {"focused", ""}, /**< handled by elm_widget */ - {"unfocused", ""}, /**< handled by elm_widget */ + {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */ + {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */ {NULL, NULL} }; #undef ELM_PRIV_CTXPOPUP_SIGNALS diff --git a/legacy/elementary/src/lib/elc_fileselector.c b/legacy/elementary/src/lib/elc_fileselector.c index 835afefe90..040ae04591 100644 --- a/legacy/elementary/src/lib/elc_fileselector.c +++ b/legacy/elementary/src/lib/elc_fileselector.c @@ -38,8 +38,8 @@ ELM_PRIV_FILESELECTOR_SIGNALS(ELM_PRIV_STATIC_VARIABLE_DECLARE); static const Evas_Smart_Cb_Description _smart_callbacks[] = { ELM_PRIV_FILESELECTOR_SIGNALS(ELM_PRIV_SMART_CALLBACKS_DESC) - {"focused", ""}, /**< handled by elm_widget */ - {"unfocused", ""}, /**< handled by elm_widget */ + {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */ + {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */ {NULL, NULL} }; #undef ELM_PRIV_FILESELECTOR_SIGNALS diff --git a/legacy/elementary/src/lib/elc_fileselector_button.c b/legacy/elementary/src/lib/elc_fileselector_button.c index 40c12b5a93..30275ddad0 100644 --- a/legacy/elementary/src/lib/elc_fileselector_button.c +++ b/legacy/elementary/src/lib/elc_fileselector_button.c @@ -24,8 +24,8 @@ ELM_PRIV_FILESELECTOR_BUTTON_SIGNALS(ELM_PRIV_STATIC_VARIABLE_DECLARE); static const Evas_Smart_Cb_Description _smart_callbacks[] = { ELM_PRIV_FILESELECTOR_BUTTON_SIGNALS(ELM_PRIV_SMART_CALLBACKS_DESC) - {"focused", ""}, /**< handled by elm_widget */ - {"unfocused", ""}, /**< handled by elm_widget */ + {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */ + {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */ {NULL, NULL} }; #undef ELM_PRIV_FILESELECTOR_BUTTON_SIGNALS diff --git a/legacy/elementary/src/lib/elc_naviframe.c b/legacy/elementary/src/lib/elc_naviframe.c index 16b320e7bc..d248346658 100644 --- a/legacy/elementary/src/lib/elc_naviframe.c +++ b/legacy/elementary/src/lib/elc_naviframe.c @@ -30,8 +30,8 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = { {SIG_TRANSITION_FINISHED, ""}, {SIG_TITLE_TRANSITION_FINISHED, ""}, {SIG_TITLE_CLICKED, ""}, - {"focused", ""}, /**< handled by elm_widget */ - {"unfocused", ""}, /**< handled by elm_widget */ + {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */ + {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */ {NULL, NULL} }; diff --git a/legacy/elementary/src/lib/elc_player.c b/legacy/elementary/src/lib/elc_player.c index 2b6eff387d..8e4dcdaa46 100644 --- a/legacy/elementary/src/lib/elc_player.c +++ b/legacy/elementary/src/lib/elc_player.c @@ -50,8 +50,8 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = { { SIG_EJECT_CLICKED, "" }, { SIG_VOLUME_CLICKED, "" }, { SIG_MUTE_CLICKED, "" }, - {"focused", ""}, /**< handled by elm_widget */ - {"unfocused", ""}, /**< handled by elm_widget */ + { SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */ + { SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */ { NULL, NULL } }; diff --git a/legacy/elementary/src/lib/elc_popup.c b/legacy/elementary/src/lib/elc_popup.c index f1f4da3a24..bec020a2a6 100644 --- a/legacy/elementary/src/lib/elc_popup.c +++ b/legacy/elementary/src/lib/elc_popup.c @@ -29,8 +29,8 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = { {SIG_BLOCK_CLICKED, ""}, {SIG_TIMEOUT, ""}, {SIG_LANG_CHANGED, ""}, - {"focused", ""}, /**< handled by elm_widget */ - {"unfocused", ""}, /**< handled by elm_widget */ + {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */ + {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */ {NULL, NULL} }; diff --git a/legacy/elementary/src/lib/elm_bubble.c b/legacy/elementary/src/lib/elm_bubble.c index ffee3acb60..0f0ea7d977 100644 --- a/legacy/elementary/src/lib/elm_bubble.c +++ b/legacy/elementary/src/lib/elm_bubble.c @@ -19,8 +19,8 @@ static const char SIG_CLICKED[] = "clicked"; static const Evas_Smart_Cb_Description _smart_callbacks[] = { {SIG_CLICKED, ""}, - {"focused", ""}, /**< handled by elm_widget */ - {"unfocused", ""}, /**< handled by elm_widget */ + {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */ + {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */ {NULL, NULL} }; diff --git a/legacy/elementary/src/lib/elm_button.c b/legacy/elementary/src/lib/elm_button.c index df235793ba..d09b12fa2d 100644 --- a/legacy/elementary/src/lib/elm_button.c +++ b/legacy/elementary/src/lib/elm_button.c @@ -26,8 +26,8 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = { {SIG_REPEATED, ""}, {SIG_PRESSED, ""}, {SIG_UNPRESSED, ""}, - {"focused", ""}, /**< handled by elm_widget */ - {"unfocused", ""}, /**< handled by elm_widget */ + {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */ + {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */ {NULL, NULL} }; diff --git a/legacy/elementary/src/lib/elm_calendar.c b/legacy/elementary/src/lib/elm_calendar.c index c177b764f9..6da468d8e2 100644 --- a/legacy/elementary/src/lib/elm_calendar.c +++ b/legacy/elementary/src/lib/elm_calendar.c @@ -19,8 +19,8 @@ static const char SIG_DISPLAY_CHANGED[] = "display,changed"; static const Evas_Smart_Cb_Description _smart_callbacks[] = { {SIG_CHANGED, ""}, {SIG_DISPLAY_CHANGED, ""}, - {"focused", ""}, /**< handled by elm_widget */ - {"unfocused", ""}, /**< handled by elm_widget */ + {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */ + {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */ {NULL, NULL} }; diff --git a/legacy/elementary/src/lib/elm_check.c b/legacy/elementary/src/lib/elm_check.c index 9bc9ac9282..0ceecdea2a 100644 --- a/legacy/elementary/src/lib/elm_check.c +++ b/legacy/elementary/src/lib/elm_check.c @@ -33,8 +33,8 @@ static const char SIG_CHANGED[] = "changed"; /* smart callbacks coming from elm check objects: */ static const Evas_Smart_Cb_Description _smart_callbacks[] = { {SIG_CHANGED, ""}, - {"focused", ""}, /**< handled by elm_widget */ - {"unfocused", ""}, /**< handled by elm_widget */ + {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */ + {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */ {NULL, NULL} }; diff --git a/legacy/elementary/src/lib/elm_clock.c b/legacy/elementary/src/lib/elm_clock.c index c63c7e030d..5aec5b2340 100644 --- a/legacy/elementary/src/lib/elm_clock.c +++ b/legacy/elementary/src/lib/elm_clock.c @@ -20,8 +20,8 @@ static const char SIG_CHANGED[] = "changed"; static const Evas_Smart_Cb_Description _smart_callbacks[] = { {SIG_CHANGED, ""}, - {"focused", ""}, /**< handled by elm_widget */ - {"unfocused", ""}, /**< handled by elm_widget */ + {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */ + {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */ {NULL, NULL} }; diff --git a/legacy/elementary/src/lib/elm_colorselector.c b/legacy/elementary/src/lib/elm_colorselector.c index 9efb495385..bf454129ba 100644 --- a/legacy/elementary/src/lib/elm_colorselector.c +++ b/legacy/elementary/src/lib/elm_colorselector.c @@ -29,8 +29,8 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {SIG_COLOR_ITEM_SELECTED, ""}, {SIG_COLOR_ITEM_LONGPRESSED, ""}, {SIG_CHANGED, ""}, - {"focused", ""}, /**< handled by elm_widget */ - {"unfocused", ""}, /**< handled by elm_widget */ + {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */ + {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */ {NULL, NULL} }; diff --git a/legacy/elementary/src/lib/elm_datetime.c b/legacy/elementary/src/lib/elm_datetime.c index 414516fe70..865961669a 100644 --- a/legacy/elementary/src/lib/elm_datetime.c +++ b/legacy/elementary/src/lib/elm_datetime.c @@ -67,8 +67,8 @@ static const char SIG_LANG_CHANGED[] = "language,changed"; static const Evas_Smart_Cb_Description _smart_callbacks[] = { {SIG_CHANGED, ""}, {SIG_LANG_CHANGED, ""}, - {"focused", ""}, /**< handled by elm_widget */ - {"unfocused", ""}, /**< handled by elm_widget */ + {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */ + {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */ {NULL, NULL} }; diff --git a/legacy/elementary/src/lib/elm_diskselector.c b/legacy/elementary/src/lib/elm_diskselector.c index 04b41b1d07..44cf9c4323 100644 --- a/legacy/elementary/src/lib/elm_diskselector.c +++ b/legacy/elementary/src/lib/elm_diskselector.c @@ -38,8 +38,8 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = { {SIG_SCROLL_ANIM_STOP, ""}, {SIG_SCROLL_DRAG_START, ""}, {SIG_SCROLL_DRAG_STOP, ""}, - {"focused", ""}, /**< handled by elm_widget */ - {"unfocused", ""}, /**< handled by elm_widget */ + {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */ + {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */ {NULL, NULL} }; diff --git a/legacy/elementary/src/lib/elm_flipselector.c b/legacy/elementary/src/lib/elm_flipselector.c index 9bb8803da2..ce51c207d6 100644 --- a/legacy/elementary/src/lib/elm_flipselector.c +++ b/legacy/elementary/src/lib/elm_flipselector.c @@ -42,8 +42,8 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = { {SIG_SELECTED, ""}, {SIG_UNDERFLOWED, ""}, {SIG_OVERFLOWED, ""}, - {"focused", ""}, /**< handled by elm_widget */ - {"unfocused", ""}, /**< handled by elm_widget */ + {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */ + {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */ {NULL, NULL} }; diff --git a/legacy/elementary/src/lib/elm_gengrid.c b/legacy/elementary/src/lib/elm_gengrid.c index 4040810cdc..c78e8b69d9 100644 --- a/legacy/elementary/src/lib/elm_gengrid.c +++ b/legacy/elementary/src/lib/elm_gengrid.c @@ -75,8 +75,8 @@ ELM_PRIV_GENGRID_SIGNALS(ELM_PRIV_STATIC_VARIABLE_DECLARE); static const Evas_Smart_Cb_Description _smart_callbacks[] = { ELM_PRIV_GENGRID_SIGNALS(ELM_PRIV_SMART_CALLBACKS_DESC) - {"focused", ""}, /**< handled by elm_widget */ - {"unfocused", ""}, /**< handled by elm_widget */ + {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */ + {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */ {NULL, NULL} }; diff --git a/legacy/elementary/src/lib/elm_genlist.c b/legacy/elementary/src/lib/elm_genlist.c index 72b676560d..2d1ec7c7cd 100644 --- a/legacy/elementary/src/lib/elm_genlist.c +++ b/legacy/elementary/src/lib/elm_genlist.c @@ -94,8 +94,8 @@ ELM_PRIV_GENLIST_SIGNALS(ELM_PRIV_STATIC_VARIABLE_DECLARE); static const Evas_Smart_Cb_Description _smart_callbacks[] = { ELM_PRIV_GENLIST_SIGNALS(ELM_PRIV_SMART_CALLBACKS_DESC) - {"focused", ""}, /**< handled by elm_widget */ - {"unfocused", ""}, /**< handled by elm_widget */ + {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */ + {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */ {NULL, NULL} }; diff --git a/legacy/elementary/src/lib/elm_hover.c b/legacy/elementary/src/lib/elm_hover.c index ca41279daa..a77dbb51f3 100644 --- a/legacy/elementary/src/lib/elm_hover.c +++ b/legacy/elementary/src/lib/elm_hover.c @@ -54,8 +54,8 @@ ELM_PRIV_HOVER_SIGNALS(ELM_PRIV_STATIC_VARIABLE_DECLARE); static const Evas_Smart_Cb_Description _smart_callbacks[] = { ELM_PRIV_HOVER_SIGNALS(ELM_PRIV_SMART_CALLBACKS_DESC) - {"focused", ""}, /**< handled by elm_widget */ - {"unfocused", ""}, /**< handled by elm_widget */ + {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */ + {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */ {NULL, NULL} }; #undef ELM_PRIV_HOVER_SIGNALS diff --git a/legacy/elementary/src/lib/elm_index.c b/legacy/elementary/src/lib/elm_index.c index 5b9597eb4b..d188d31ee3 100644 --- a/legacy/elementary/src/lib/elm_index.c +++ b/legacy/elementary/src/lib/elm_index.c @@ -32,8 +32,8 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = { {SIG_LEVEL_UP, ""}, {SIG_LEVEL_DOWN, ""}, {SIG_LANG_CHANGED, ""}, - {"focused", ""}, /**< handled by elm_widget */ - {"unfocused", ""}, /**< handled by elm_widget */ + {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */ + {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */ {NULL, NULL} }; diff --git a/legacy/elementary/src/lib/elm_list.c b/legacy/elementary/src/lib/elm_list.c index 13fd480753..06be224e2d 100644 --- a/legacy/elementary/src/lib/elm_list.c +++ b/legacy/elementary/src/lib/elm_list.c @@ -42,8 +42,8 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = { {SIG_SWIPE, ""}, {SIG_HIGHLIGHTED, ""}, {SIG_UNHIGHLIGHTED, ""}, - {"focused", ""}, /**< handled by elm_widget */ - {"unfocused", ""}, /**< handled by elm_widget */ + {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */ + {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */ {NULL, NULL} }; diff --git a/legacy/elementary/src/lib/elm_map.c b/legacy/elementary/src/lib/elm_map.c index 0b92054841..3f47b9087a 100644 --- a/legacy/elementary/src/lib/elm_map.c +++ b/legacy/elementary/src/lib/elm_map.c @@ -338,8 +338,8 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = { {SIG_OVERLAY_CLICKED, ""}, {SIG_OVERLAY_DEL, ""}, {SIG_LANG_CHANGED, ""}, - {"focused", ""}, /**< handled by elm_widget */ - {"unfocused", ""}, /**< handled by elm_widget */ + {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */ + {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */ {NULL, NULL} }; diff --git a/legacy/elementary/src/lib/elm_panel.c b/legacy/elementary/src/lib/elm_panel.c index 0600d03479..62cd4aa5b6 100644 --- a/legacy/elementary/src/lib/elm_panel.c +++ b/legacy/elementary/src/lib/elm_panel.c @@ -15,8 +15,8 @@ EAPI Eo_Op ELM_OBJ_PANEL_BASE_ID = EO_NOOP; #define MY_CLASS_NAME_LEGACY "elm_panel" static const Evas_Smart_Cb_Description _smart_callbacks[] = { - {"focused", ""}, /**< handled by elm_widget */ - {"unfocused", ""}, /**< handled by elm_widget */ + {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */ + {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */ {NULL, NULL} }; diff --git a/legacy/elementary/src/lib/elm_photocam.c b/legacy/elementary/src/lib/elm_photocam.c index 2639d7228a..fa1e03eb8d 100644 --- a/legacy/elementary/src/lib/elm_photocam.c +++ b/legacy/elementary/src/lib/elm_photocam.c @@ -72,8 +72,8 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = { {SIG_DOWNLOAD_PROGRESS, ""}, {SIG_DOWNLOAD_DONE, ""}, {SIG_DOWNLOAD_ERROR, ""}, - {"focused", ""}, /**< handled by elm_widget */ - {"unfocused", ""}, /**< handled by elm_widget */ + {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */ + {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */ {NULL, NULL} }; diff --git a/legacy/elementary/src/lib/elm_priv.h b/legacy/elementary/src/lib/elm_priv.h index 0c997edd66..45717b3f8b 100644 --- a/legacy/elementary/src/lib/elm_priv.h +++ b/legacy/elementary/src/lib/elm_priv.h @@ -487,6 +487,8 @@ extern int _elm_log_dom; extern Eina_List *_elm_win_list; extern int _elm_win_deferred_free; extern const char *_elm_preferred_engine; +extern const char SIG_WIDGET_FOCUSED[]; +extern const char SIG_WIDGET_UNFOCUSED[]; #ifdef ENABLE_NLS /* Our gettext wrapper, used to disable translation of elm if the app diff --git a/legacy/elementary/src/lib/elm_progressbar.c b/legacy/elementary/src/lib/elm_progressbar.c index c38287529e..3df94d3c89 100644 --- a/legacy/elementary/src/lib/elm_progressbar.c +++ b/legacy/elementary/src/lib/elm_progressbar.c @@ -24,8 +24,8 @@ static const char SIG_CHANGED[] = "changed"; * ones coming from elm layout): */ static const Evas_Smart_Cb_Description _smart_callbacks[] = { {SIG_CHANGED, ""}, - {"focused", ""}, /**< handled by elm_widget */ - {"unfocused", ""}, /**< handled by elm_widget */ + {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */ + {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */ {NULL, NULL} }; diff --git a/legacy/elementary/src/lib/elm_radio.c b/legacy/elementary/src/lib/elm_radio.c index 8f6620daab..fbe03c9f19 100644 --- a/legacy/elementary/src/lib/elm_radio.c +++ b/legacy/elementary/src/lib/elm_radio.c @@ -30,8 +30,8 @@ static const Elm_Layout_Part_Alias_Description _text_aliases[] = static const char SIG_CHANGED[] = "changed"; static const Evas_Smart_Cb_Description _smart_callbacks[] = { {SIG_CHANGED, ""}, - {"focused", ""}, /**< handled by elm_widget */ - {"unfocused", ""}, /**< handled by elm_widget */ + {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */ + {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */ {NULL, NULL} }; diff --git a/legacy/elementary/src/lib/elm_scroller.c b/legacy/elementary/src/lib/elm_scroller.c index 00d61f9074..410056a5bf 100644 --- a/legacy/elementary/src/lib/elm_scroller.c +++ b/legacy/elementary/src/lib/elm_scroller.c @@ -42,8 +42,8 @@ ELM_PRIV_SCROLLER_SIGNALS(ELM_PRIV_STATIC_VARIABLE_DECLARE); static const Evas_Smart_Cb_Description _smart_callbacks[] = { ELM_PRIV_SCROLLER_SIGNALS(ELM_PRIV_SMART_CALLBACKS_DESC) - {"focused", ""}, /**< handled by elm_widget */ - {"unfocused", ""}, /**< handled by elm_widget */ + {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */ + {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */ {NULL, NULL} }; #undef ELM_PRIV_SCROLLER_SIGNALS diff --git a/legacy/elementary/src/lib/elm_slider.c b/legacy/elementary/src/lib/elm_slider.c index f529e5814e..2b3583ade6 100644 --- a/legacy/elementary/src/lib/elm_slider.c +++ b/legacy/elementary/src/lib/elm_slider.c @@ -39,8 +39,8 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = { {SIG_DELAY_CHANGED, ""}, {SIG_DRAG_START, ""}, {SIG_DRAG_STOP, ""}, - {"focused", ""}, /**< handled by elm_widget */ - {"unfocused", ""}, /**< handled by elm_widget */ + {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */ + {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */ {NULL, NULL} }; diff --git a/legacy/elementary/src/lib/elm_slideshow.c b/legacy/elementary/src/lib/elm_slideshow.c index f2eb4d285c..3331d0917e 100644 --- a/legacy/elementary/src/lib/elm_slideshow.c +++ b/legacy/elementary/src/lib/elm_slideshow.c @@ -20,8 +20,8 @@ static const char SIG_TRANSITION_END[] = "transition,end"; static const Evas_Smart_Cb_Description _smart_callbacks[] = { {SIG_CHANGED, ""}, {SIG_TRANSITION_END, ""}, - {"focused", ""}, /**< handled by elm_widget */ - {"unfocused", ""}, /**< handled by elm_widget */ + {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */ + {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */ {NULL, NULL} }; diff --git a/legacy/elementary/src/lib/elm_spinner.c b/legacy/elementary/src/lib/elm_spinner.c index c8b237e563..201dcf90be 100644 --- a/legacy/elementary/src/lib/elm_spinner.c +++ b/legacy/elementary/src/lib/elm_spinner.c @@ -31,8 +31,8 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = { {SIG_LANG_CHANGED, ""}, {SIG_DRAG_START, ""}, {SIG_DRAG_STOP, ""}, - {"focused", ""}, /**< handled by elm_widget */ - {"unfocused", ""}, /**< handled by elm_widget */ + {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */ + {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */ {NULL, NULL} }; diff --git a/legacy/elementary/src/lib/elm_toolbar.c b/legacy/elementary/src/lib/elm_toolbar.c index 15a77e6402..dff9b8aac5 100644 --- a/legacy/elementary/src/lib/elm_toolbar.c +++ b/legacy/elementary/src/lib/elm_toolbar.c @@ -36,8 +36,8 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = { {SIG_LONGPRESSED, ""}, {SIG_CLICKED_DOUBLE, ""}, {SIG_LANG_CHANGED, ""}, - {"focused", ""}, /**< handled by elm_widget */ - {"unfocused", ""}, /**< handled by elm_widget */ + {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */ + {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */ {NULL, NULL} }; diff --git a/legacy/elementary/src/lib/elm_video.c b/legacy/elementary/src/lib/elm_video.c index 491e3e5abf..5416a6672a 100644 --- a/legacy/elementary/src/lib/elm_video.c +++ b/legacy/elementary/src/lib/elm_video.c @@ -21,8 +21,8 @@ EAPI Eo_Op ELM_OBJ_VIDEO_BASE_ID = EO_NOOP; #define MY_CLASS_NAME_LEGACY "elm_video" static const Evas_Smart_Cb_Description _smart_callbacks[] = { - {"focused", ""}, /**< handled by elm_widget */ - {"unfocused", ""}, /**< handled by elm_widget */ + {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */ + {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */ {NULL, NULL} }; diff --git a/legacy/elementary/src/lib/elm_web.c b/legacy/elementary/src/lib/elm_web.c index 4ff13a10b9..38f70e8d8d 100644 --- a/legacy/elementary/src/lib/elm_web.c +++ b/legacy/elementary/src/lib/elm_web.c @@ -74,8 +74,8 @@ static const Evas_Smart_Cb_Description _elm_web_smart_callbacks[] = { { "view,resized", "" }, { "windows,close,request", ""}, { "zoom,animated,end", "" }, - { "focused", ""}, /**< handled by elm_widget */ - { "unfocused", ""}, /**< handled by elm_widget */ + { SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */ + { SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */ { NULL, NULL } }; diff --git a/legacy/elementary/src/lib/elm_web2.c b/legacy/elementary/src/lib/elm_web2.c index b042ec1bc6..a9afd0d5d5 100644 --- a/legacy/elementary/src/lib/elm_web2.c +++ b/legacy/elementary/src/lib/elm_web2.c @@ -26,8 +26,8 @@ static const char SIG_URL_CHANGED[] = "url,changed"; static const Evas_Smart_Cb_Description _elm_web_smart_callbacks[] = { { SIG_URI_CHANGED, "s" }, { SIG_URL_CHANGED, "s" }, - { "focused", ""}, /**< handled by elm_widget */ - { "unfocused", ""}, /**< handled by elm_widget */ + { SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */ + { SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */ { NULL, NULL } }; diff --git a/legacy/elementary/src/lib/elm_widget.c b/legacy/elementary/src/lib/elm_widget.c index 80676f5473..0da2e9f570 100644 --- a/legacy/elementary/src/lib/elm_widget.c +++ b/legacy/elementary/src/lib/elm_widget.c @@ -29,6 +29,9 @@ EAPI Eo_Op ELM_WIDGET_BASE_ID = EO_NOOP; ((_elm_access_auto_highlight_get()) ? (elm_widget_highlight_get(obj)) : \ (elm_widget_focus_get(obj))) +const char SIG_WIDGET_FOCUSED[] = "focused"; +const char SIG_WIDGET_UNFOCUSED[] = "unfocused"; + typedef struct _Elm_Event_Cb_Data Elm_Event_Cb_Data; typedef struct _Elm_Label_Data Elm_Label_Data; typedef struct _Elm_Translate_String_Data Elm_Translate_String_Data; @@ -6235,13 +6238,13 @@ _elm_widget_on_focus(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list) { if (!sd->resize_obj) evas_object_focus_set(obj, EINA_TRUE); - evas_object_smart_callback_call(obj, "focused", NULL); + evas_object_smart_callback_call(obj, SIG_WIDGET_FOCUSED, NULL); } else { if (!sd->resize_obj) evas_object_focus_set(obj, EINA_FALSE); - evas_object_smart_callback_call(obj, "unfocused", NULL); + evas_object_smart_callback_call(obj, SIG_WIDGET_UNFOCUSED, NULL); } } else