elm: Fixed formatting about smart_event check for code consistency.

- Made it look clearer.
- Removed unnecessary local variables.
- Keep the code sequence consistent.

diff --git a/src/lib/elc_ctxpopup.c b/src/lib/elc_ctxpopup.c
index e4d110c..ec6debc 100644 (file)
--- a/src/lib/elc_ctxpopup.c
+++ b/src/lib/elc_ctxpopup.c
@@ -115,16 +115,14 @@ static void
 _elm_ctxpopup_smart_event(Eo *obj, void *_pd, va_list *list)
 {
    Evas_Object *src = va_arg(*list, Evas_Object *);
-   (void)src;
    Evas_Callback_Type type = va_arg(*list, Evas_Callback_Type);
-   void *event_info = va_arg(*list, void *);
+   Evas_Event_Key_Down *ev = va_arg(*list, void *);
    Eina_Bool *ret = va_arg(*list, Eina_Bool *);
-   if (ret) *ret = EINA_FALSE;
-
-   Evas_Event_Key_Down *ev = event_info;
-
    Elm_Ctxpopup_Smart_Data *sd = _pd;
 
+   if (ret) *ret = EINA_FALSE;
+   (void)src;
+
    if (elm_widget_disabled_get(obj)) return;
    if (type != EVAS_CALLBACK_KEY_DOWN) return;
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;

diff --git a/src/lib/elc_multibuttonentry.c b/src/lib/elc_multibuttonentry.c
index fcb1ac7..b4062d7 100644 (file)
--- a/src/lib/elc_multibuttonentry.c
+++ b/src/lib/elc_multibuttonentry.c
@@ -809,13 +809,14 @@ static void
 _elm_multibuttonentry_smart_event(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list)
 {
    Evas_Object *src = va_arg(*list, Evas_Object *);
-   (void)src;
    Evas_Callback_Type type = va_arg(*list, Evas_Callback_Type);
-   (void)type;
-   void *event_info = va_arg(*list, void *);
-   (void)event_info;
+   void *ev = va_arg(*list, void *);
    Eina_Bool *ret = va_arg(*list, Eina_Bool *);
+
    if (ret) *ret = EINA_FALSE;
+   (void)src;
+   (void)type;
+   (void)ev;
 
    // ACCESS
    if (_elm_config->access_mode == ELM_ACCESS_MODE_ON) return;

diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c
index 3a72906..3bd111c 100644 (file)
--- a/src/lib/elc_naviframe.c
+++ b/src/lib/elc_naviframe.c
@@ -1384,17 +1384,18 @@ _elm_naviframe_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
 static void
 _elm_naviframe_smart_event(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
 {
-   Evas_Object *source = va_arg(*list, Evas_Object *);
+   Evas_Object *src = va_arg(*list, Evas_Object *);
    Evas_Callback_Type type = va_arg(*list, Evas_Callback_Type);
    Evas_Event_Key_Down *ev = va_arg(*list, Evas_Event_Key_Down *);
    Eina_Bool *ret = va_arg(*list, Eina_Bool *);
    Elm_Naviframe_Item *it;
-   (void) source;
 
    if (ret) *ret = EINA_FALSE;
-   if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
+   (void)src;
+
    if (elm_widget_disabled_get(obj)) return;
    if (type != EVAS_CALLBACK_KEY_DOWN) return;
+   if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
    if (strcmp(ev->key, "BackSpace")) return;
 
    eo_do(obj, elm_obj_naviframe_top_item_get((Elm_Object_Item **)&it));

diff --git a/src/lib/elc_player.c b/src/lib/elc_player.c
index dafc32c..481b7e5 100644 (file)
--- a/src/lib/elc_player.c
+++ b/src/lib/elc_player.c
@@ -61,16 +61,14 @@ static void
 _elm_player_smart_event(Eo *obj, void *_pd, va_list *list)
 {
    Evas_Object *src = va_arg(*list, Evas_Object *);
-   (void) src;
    Evas_Callback_Type type = va_arg(*list, Evas_Callback_Type);
-   void *event_info = va_arg(*list, void *);
+   Evas_Event_Key_Down *ev = va_arg(*list, void *);
    Eina_Bool *ret = va_arg(*list, Eina_Bool *);
-   if (ret) *ret = EINA_FALSE;
-
-   Evas_Event_Key_Down *ev = event_info;
-
    Elm_Player_Smart_Data *sd = _pd;
 
+   if (ret) *ret = EINA_FALSE;
+   (void) src;
+
    if (elm_widget_disabled_get(obj)) return;
    if (type != EVAS_CALLBACK_KEY_DOWN) return;
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;

diff --git a/src/lib/elc_popup.c b/src/lib/elc_popup.c
index 85a4c92..f873cff 100644 (file)
--- a/src/lib/elc_popup.c
+++ b/src/lib/elc_popup.c
@@ -1438,13 +1438,12 @@ static void
 _elm_popup_smart_event(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
 {
    Evas_Object *src = va_arg(*list, Evas_Object *);
-   (void)src;
    Evas_Callback_Type type = va_arg(*list, Evas_Callback_Type);
-   void *event_info = va_arg(*list, void *);
+   Evas_Event_Key_Down *ev = va_arg(*list, void *);
    Eina_Bool *ret = va_arg(*list, Eina_Bool *);
-   if (ret) *ret = EINA_FALSE;
 
-   Evas_Event_Key_Down *ev = event_info;
+   if (ret) *ret = EINA_FALSE;
+   (void)src;
 
    if (elm_widget_disabled_get(obj)) return;
    if (type != EVAS_CALLBACK_KEY_DOWN) return;

diff --git a/src/lib/elm_button.c b/src/lib/elm_button.c
index ddbe165..77dce22 100644 (file)
--- a/src/lib/elm_button.c
+++ b/src/lib/elm_button.c
@@ -169,15 +169,14 @@ static void
 _elm_button_smart_event(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
 {
    Evas_Object *src = va_arg(*list, Evas_Object *);
-   (void) src;
    Evas_Callback_Type type = va_arg(*list, Evas_Callback_Type);
-   void *event_info = va_arg(*list, void *);
+   Evas_Event_Key_Down *ev = va_arg(*list, void *);
    Eina_Bool *ret = va_arg(*list, Eina_Bool *);
-   Evas_Event_Key_Down *ev = event_info;
+
    if (ret) *ret = EINA_FALSE;
+   (void) src;
 
    if (elm_widget_disabled_get(obj)) return;
-
    if (type != EVAS_CALLBACK_KEY_DOWN) return;
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
 

diff --git a/src/lib/elm_calendar.c b/src/lib/elm_calendar.c
index 9555106..17bd7f0 100644 (file)
--- a/src/lib/elm_calendar.c
+++ b/src/lib/elm_calendar.c
@@ -844,18 +844,16 @@ static void
 _elm_calendar_smart_event(Eo *obj, void *_pd, va_list *list)
 {
    Evas_Object *src = va_arg(*list, Evas_Object *);
-   (void) src;
    Evas_Callback_Type type = va_arg(*list, Evas_Callback_Type);
-   void *event_info = va_arg(*list, void *);
+   Evas_Event_Key_Down *ev = va_arg(*list, void *);
    Eina_Bool *ret = va_arg(*list, Eina_Bool *);
-   if (ret) *ret = EINA_FALSE;
-
-   Evas_Event_Key_Down *ev = event_info;
-
    Elm_Calendar_Smart_Data *sd = _pd;
 
-   if (type != EVAS_CALLBACK_KEY_DOWN) return;
+   if (ret) *ret = EINA_FALSE;
+   (void) src;
+
    if (elm_widget_disabled_get(obj)) return;
+   if (type != EVAS_CALLBACK_KEY_DOWN) return;
 
    if ((!strcmp(ev->key, "Prior")) ||
        ((!strcmp(ev->key, "KP_Prior")) && (!ev->string)))

diff --git a/src/lib/elm_check.c b/src/lib/elm_check.c
index 869c643..1e9cc3f 100644 (file)
--- a/src/lib/elm_check.c
+++ b/src/lib/elm_check.c
@@ -145,17 +145,15 @@ static void
 _elm_check_smart_event(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
 {
    Evas_Object *src = va_arg(*list, Evas_Object *);
-   (void) src;
    Evas_Callback_Type type = va_arg(*list, Evas_Callback_Type);
-   void *event_info = va_arg(*list, void *);
+   Evas_Event_Key_Down *ev = va_arg(*list, void *);
    Eina_Bool *ret = va_arg(*list, Eina_Bool *);
-   Evas_Event_Key_Down *ev = event_info;
+
    if (ret) *ret = EINA_FALSE;
+   (void) src;
 
    if (elm_widget_disabled_get(obj)) return;
-
    if (type != EVAS_CALLBACK_KEY_DOWN) return;
-
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
 
    if ((strcmp(ev->key, "Return")) &&

diff --git a/src/lib/elm_colorselector.c b/src/lib/elm_colorselector.c
index 7902c03..23294de 100644 (file)
--- a/src/lib/elm_colorselector.c
+++ b/src/lib/elm_colorselector.c
@@ -1640,24 +1640,22 @@ _palette_box_vertical_item_get(Eina_List* ref_item, enum Palette_Box_Direction d
 static void
 _elm_colorselector_smart_event(Eo *obj, void *_pd, va_list *list)
 {
+   Evas_Object *src = va_arg(*list, Evas_Object *);
+   Evas_Callback_Type type = va_arg(*list, Evas_Callback_Type);
+   Evas_Event_Key_Down *ev = va_arg(*list, void *);
+   Eina_Bool *ret = va_arg(*list, Eina_Bool *);
+   Elm_Colorselector_Smart_Data *sd = _pd;
    Eina_List *cl = NULL;
    Elm_Color_Item *item = NULL;
    char colorbar_s[128];
 
-   Evas_Object *src = va_arg(*list, Evas_Object *);
-   (void) src;
-   Evas_Callback_Type type = va_arg(*list, Evas_Callback_Type);
-   void *event_info = va_arg(*list, void *);
-   Eina_Bool *ret = va_arg(*list, Eina_Bool *);
    if (ret) *ret = EINA_FALSE;
+   (void) src;
 
+   if (elm_widget_disabled_get(obj)) return;
    if (type != EVAS_CALLBACK_KEY_DOWN) return;
-   Evas_Event_Key_Down *ev = event_info;
-   Elm_Colorselector_Smart_Data *sd = _pd;
-
-   if (!sd) return;
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
-   if (elm_widget_disabled_get(obj)) return;
+   if (!sd) return;
    if (!sd->selected) sd->selected = sd->items;
 
    if ((!strcmp(ev->key, "Left")) ||

diff --git a/src/lib/elm_diskselector.c b/src/lib/elm_diskselector.c
index 6308d52..cb97d65 100644 (file)
--- a/src/lib/elm_diskselector.c
+++ b/src/lib/elm_diskselector.c
@@ -950,21 +950,19 @@ static void
 _elm_diskselector_smart_event(Eo *obj, void *_pd, va_list *list)
 {
    Evas_Object *src = va_arg(*list, Evas_Object *);
-   (void) src;
    Evas_Callback_Type type = va_arg(*list, Evas_Callback_Type);
-   void *event_info = va_arg(*list, void *);
+   Evas_Event_Key_Down *ev = va_arg(*list, void *);
    Eina_Bool *ret = va_arg(*list, Eina_Bool *);
-   if (ret) *ret = EINA_FALSE;
-
-   Evas_Event_Key_Down *ev = event_info;
+   Elm_Diskselector_Smart_Data *sd = _pd;
    Elm_Diskselector_Item *it = NULL;
    Eina_List *l;
 
-   Elm_Diskselector_Smart_Data *sd = _pd;
+   if (ret) *ret = EINA_FALSE;
+   (void) src;
 
+   if (elm_widget_disabled_get(obj)) return;
    if (type != EVAS_CALLBACK_KEY_DOWN) return;
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
-   if (elm_widget_disabled_get(obj)) return;
 
    if (!sd->selected_item)
      {

diff --git a/src/lib/elm_flipselector.c b/src/lib/elm_flipselector.c
index 3728090..75a7279 100644 (file)
--- a/src/lib/elm_flipselector.c
+++ b/src/lib/elm_flipselector.c
@@ -434,23 +434,18 @@ _flip_down(Elm_Flipselector_Smart_Data *sd)
 static void
 _elm_flipselector_smart_event(Eo *obj, void *_pd, va_list *list)
 {
-   Evas_Event_Key_Down *ev;
-   Eina_Bool is_up = EINA_TRUE;
-
    Evas_Object *src = va_arg(*list, Evas_Object *);
-   (void) src;
    Evas_Callback_Type type = va_arg(*list, Evas_Callback_Type);
-   void *event_info = va_arg(*list, void *);
+   Evas_Event_Key_Down *ev = va_arg(*list, void *);
    Eina_Bool *ret = va_arg(*list, Eina_Bool *);
-   if (ret) *ret = EINA_FALSE;
-
    Elm_Flipselector_Smart_Data *sd = _pd;
+   Eina_Bool is_up = EINA_TRUE;
 
-   if (elm_widget_disabled_get(obj)) return;
+   if (ret) *ret = EINA_FALSE;
+   (void) src;
 
+   if (elm_widget_disabled_get(obj)) return;
    if (type != EVAS_CALLBACK_KEY_DOWN) return;
-
-   ev = event_info;
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
 
    if ((!strcmp(ev->key, "Down")) || (!strcmp(ev->key, "KP_Down")))

diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c
index c63e3e1..b315bf5 100644 (file)
--- a/src/lib/elm_gengrid.c
+++ b/src/lib/elm_gengrid.c
@@ -1688,11 +1688,13 @@ static void
 _elm_gengrid_smart_event(Eo *obj, void *_pd, va_list *list)
 {
    Evas_Object *src = va_arg(*list, Evas_Object *);
-   (void) src;
    Evas_Callback_Type type = va_arg(*list, Evas_Callback_Type);
-   void *event_info = va_arg(*list, void *);
+   Evas_Event_Key_Down *ev = va_arg(*list, void *);
    Eina_Bool *ret = va_arg(*list, Eina_Bool *);
+   Elm_Gengrid_Smart_Data *sd = _pd;
+
    if (ret) *ret = EINA_FALSE;
+   (void) src;
 
    Evas_Coord x = 0;
    Evas_Coord y = 0;
@@ -1703,14 +1705,11 @@ _elm_gengrid_smart_event(Eo *obj, void *_pd, va_list *list)
    Evas_Coord page_x = 0;
    Evas_Coord page_y = 0;
    Elm_Object_Item *it = NULL;
-   Evas_Event_Key_Down *ev = event_info;
-
-   Elm_Gengrid_Smart_Data *sd = _pd;
 
+   if (elm_widget_disabled_get(obj)) return;
    if (type != EVAS_CALLBACK_KEY_DOWN) return;
-   if (!sd->items) return;
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
-   if (elm_widget_disabled_get(obj)) return;
+   if (!sd->items) return;
 
    eo_do(obj,
          elm_scrollable_interface_content_pos_get(&x, &y),

diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index ac3f4de..ff3c8b0 100644 (file)
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -2458,11 +2458,13 @@ static void
 _elm_genlist_smart_event(Eo *obj, void *_pd, va_list *list)
 {
    Evas_Object *src = va_arg(*list, Evas_Object *);
-   (void) src;
    Evas_Callback_Type type = va_arg(*list, Evas_Callback_Type);
-   void *event_info = va_arg(*list, void *);
+   Evas_Event_Key_Down *ev = va_arg(*list, void *);
    Eina_Bool *ret = va_arg(*list, Eina_Bool *);
+   Elm_Genlist_Smart_Data *sd = _pd;
+
    if (ret) *ret = EINA_FALSE;
+   (void) src;
 
    Evas_Coord x = 0;
    Evas_Coord y = 0;
@@ -2473,15 +2475,13 @@ _elm_genlist_smart_event(Eo *obj, void *_pd, va_list *list)
    Evas_Coord page_x = 0;
    Evas_Coord page_y = 0;
    Elm_Object_Item *it = NULL;
-   Evas_Event_Key_Down *ev = event_info;
    Evas_Coord pan_max_x = 0, pan_max_y = 0;
 
-   Elm_Genlist_Smart_Data *sd = _pd;
 
+   if (elm_widget_disabled_get(obj)) return;
    if (type != EVAS_CALLBACK_KEY_DOWN) return;
-   if (!sd->items) return;
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
-   if (elm_widget_disabled_get(obj)) return;
+   if (!sd->items) return;
 
    eo_do(obj,
          elm_scrollable_interface_content_pos_get(&x, &y),

diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c
index 404867a..7ebab40 100644 (file)
--- a/src/lib/elm_list.c
+++ b/src/lib/elm_list.c
@@ -256,11 +256,13 @@ static void
 _elm_list_smart_event(Eo *obj, void *_pd, va_list *list)
 {
    Evas_Object *src = va_arg(*list, Evas_Object *);
-   (void) src;
    Evas_Callback_Type type = va_arg(*list, Evas_Callback_Type);
-   void *event_info = va_arg(*list, void *);
+   Evas_Event_Key_Down *ev = va_arg(*list, void *);
    Eina_Bool *ret = va_arg(*list, Eina_Bool *);
+   Elm_List_Smart_Data *sd = _pd;
+
    if (ret) *ret = EINA_FALSE;
+   (void) src;
 
    Evas_Coord x = 0;
    Evas_Coord y = 0;
@@ -271,14 +273,11 @@ _elm_list_smart_event(Eo *obj, void *_pd, va_list *list)
    Evas_Coord page_x = 0;
    Evas_Coord page_y = 0;
    Elm_List_Item *it = NULL;
-   Evas_Event_Key_Down *ev = event_info;
-
-   Elm_List_Smart_Data *sd = _pd;
 
    if (elm_widget_disabled_get(obj)) return;
    if (type != EVAS_CALLBACK_KEY_DOWN) return;
-   if (!sd->items) return;
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
+   if (!sd->items) return;
 
    eo_do(obj,
          elm_scrollable_interface_content_pos_get(&x, &y),

diff --git a/src/lib/elm_map.c b/src/lib/elm_map.c
index 9520f97..da2dd36 100644 (file)
--- a/src/lib/elm_map.c
+++ b/src/lib/elm_map.c
@@ -3887,19 +3887,18 @@ static void
 _elm_map_smart_event(Eo *obj, void *_pd, va_list *list)
 {
    Evas_Object *src = va_arg(*list, Evas_Object *);
-   (void) src;
    Evas_Callback_Type type = va_arg(*list, Evas_Callback_Type);
-   void *event_info = va_arg(*list, void *);
+   Evas_Event_Key_Down *ev = va_arg(*list, void *);
    Eina_Bool *ret = va_arg(*list, Eina_Bool *);
+   Elm_Map_Smart_Data *sd = _pd;
+
    if (ret) *ret = EINA_FALSE;
+   (void) src;
 
    Evas_Coord vh;
    Evas_Coord x, y;
-   Evas_Event_Key_Down *ev = event_info;
    Evas_Coord step_x, step_y, page_x, page_y;
 
-   Elm_Map_Smart_Data *sd = _pd;
-
    if (elm_widget_disabled_get(obj)) return;
    if (type != EVAS_CALLBACK_KEY_DOWN) return;
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;

diff --git a/src/lib/elm_panel.c b/src/lib/elm_panel.c
index 153afc0..4fa06b9 100644 (file)
--- a/src/lib/elm_panel.c
+++ b/src/lib/elm_panel.c
@@ -252,15 +252,15 @@ _elm_panel_smart_event(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
 
    Evas_Object *src = va_arg(*list, Evas_Object *);
    Evas_Callback_Type type = va_arg(*list, Evas_Callback_Type);
-   void *event_info = va_arg(*list, void *);
+   Evas_Event_Key_Down *ev = va_arg(*list, void *);
    Eina_Bool *ret = va_arg(*list, Eina_Bool *);
-   if (ret) *ret = EINA_FALSE;
 
-   Evas_Event_Key_Down *ev = event_info;
+   if (ret) *ret = EINA_FALSE;
 
    if (elm_widget_disabled_get(obj)) return;
-   if ((src != obj) || (type != EVAS_CALLBACK_KEY_DOWN)) return;
+   if (type != EVAS_CALLBACK_KEY_DOWN) return;
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
+   if (src != obj) return;
 
    if ((strcmp(ev->key, "Return")) &&
        (strcmp(ev->key, "KP_Enter")) &&

diff --git a/src/lib/elm_photocam.c b/src/lib/elm_photocam.c
index 2bd67f3..d50d470 100644 (file)
--- a/src/lib/elm_photocam.c
+++ b/src/lib/elm_photocam.c
@@ -967,11 +967,12 @@ static void
 _elm_photocam_smart_event(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
 {
    Evas_Object *src = va_arg(*list, Evas_Object *);
-   (void) src;
    Evas_Callback_Type type = va_arg(*list, Evas_Callback_Type);
-   void *event_info = va_arg(*list, void *);
+   Evas_Event_Key_Down *ev = va_arg(*list, void *);
    Eina_Bool *ret = va_arg(*list, Eina_Bool *);
+
    if (ret) *ret = EINA_FALSE;
+   (void) src;
 
    double zoom;
    Evas_Coord x = 0;
@@ -982,10 +983,8 @@ _elm_photocam_smart_event(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
    Evas_Coord step_y = 0;
    Evas_Coord page_x = 0;
    Evas_Coord page_y = 0;
-   Evas_Event_Key_Down *ev = event_info;
 
    if (elm_widget_disabled_get(obj)) return;
-
    if (type != EVAS_CALLBACK_KEY_DOWN) return;
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
 

diff --git a/src/lib/elm_radio.c b/src/lib/elm_radio.c
index f03ebf7..ad30388 100644 (file)
--- a/src/lib/elm_radio.c
+++ b/src/lib/elm_radio.c
@@ -148,20 +148,17 @@ _elm_radio_smart_content_set(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
 static void
 _elm_radio_smart_event(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
 {
-   Evas_Event_Key_Down *ev;
 
    Evas_Object *src = va_arg(*list, Evas_Object *);
-   (void) src;
    Evas_Callback_Type type = va_arg(*list, Evas_Callback_Type);
-   void *event_info = va_arg(*list, void *);
+   Evas_Event_Key_Down *ev = va_arg(*list, void *);
    Eina_Bool *ret = va_arg(*list, Eina_Bool *);
+
    if (ret) *ret = EINA_FALSE;
+   (void) src;
 
    if (elm_widget_disabled_get(obj)) return;
-
    if (type != EVAS_CALLBACK_KEY_DOWN) return;
-   ev = event_info;
-
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
 
    if ((strcmp(ev->key, "Return")) &&

diff --git a/src/lib/elm_scroller.c b/src/lib/elm_scroller.c
index a9fdf20..94ac723 100644 (file)
--- a/src/lib/elm_scroller.c
+++ b/src/lib/elm_scroller.c
@@ -51,11 +51,13 @@ static void
 _elm_scroller_smart_event(Eo *obj, void *_pd, va_list *list)
 {
    Evas_Object *src = va_arg(*list, Evas_Object *);
-   (void) src;
    Evas_Callback_Type type = va_arg(*list, Evas_Callback_Type);
-   void *event_info = va_arg(*list, void *);
+   Evas_Event_Key_Down *ev = va_arg(*list, void *);
    Eina_Bool *ret = va_arg(*list, Eina_Bool *);
+   Elm_Scroller_Smart_Data *sd = _pd;
+
    if (ret) *ret = EINA_FALSE;
+   (void) src;
 
    Evas_Coord x = 0;
    Evas_Coord y = 0;
@@ -69,9 +71,6 @@ _elm_scroller_smart_event(Eo *obj, void *_pd, va_list *list)
    Evas_Coord page_y = 0;
    Evas_Coord step_x = 0;
    Evas_Coord step_y = 0;
-   Evas_Event_Key_Down *ev = event_info;
-
-   Elm_Scroller_Smart_Data *sd = _pd;
 
    if (elm_widget_disabled_get(obj)) return;
    if (type != EVAS_CALLBACK_KEY_DOWN) return;

diff --git a/src/lib/elm_slider.c b/src/lib/elm_slider.c
index 79b09dd..22a81af 100755 (executable)
--- a/src/lib/elm_slider.c
+++ b/src/lib/elm_slider.c
@@ -355,17 +355,16 @@ _popup_emit(void *data,
 static void
 _elm_slider_smart_event(Eo *obj, void *_pd, va_list *list)
 {
-   Evas_Event_Mouse_Wheel *mev;
-   Evas_Event_Key_Down *ev;
-
-   Elm_Slider_Smart_Data *sd = _pd;
-
    Evas_Object *src = va_arg(*list, Evas_Object *);
-   (void) src;
    Evas_Callback_Type type = va_arg(*list, Evas_Callback_Type);
    void *event_info = va_arg(*list, void *);
    Eina_Bool *ret = va_arg(*list, Eina_Bool *);
+   Elm_Slider_Smart_Data *sd = _pd;
+   Evas_Event_Mouse_Wheel *mev;
+   Evas_Event_Key_Down *ev;
+
    if (ret) *ret = EINA_FALSE;
+   (void) src;
 
    if (elm_widget_disabled_get(obj)) return;
 

diff --git a/src/lib/elm_slideshow.c b/src/lib/elm_slideshow.c
index cae0094..7a35494 100644 (file)
--- a/src/lib/elm_slideshow.c
+++ b/src/lib/elm_slideshow.c
@@ -28,15 +28,14 @@ static void
 _elm_slideshow_smart_event(Eo *obj, void *_pd, va_list *list)
 {
    Evas_Object *src = va_arg(*list, Evas_Object *);
-   (void) src;
    Evas_Callback_Type type = va_arg(*list, Evas_Callback_Type);
-   void *event_info = va_arg(*list, void *);
+   Evas_Event_Key_Down *ev = va_arg(*list, void *);
    Eina_Bool *ret = va_arg(*list, Eina_Bool *);
+
    if (ret) *ret = EINA_FALSE;
-   Evas_Event_Key_Down *ev = event_info;
+   (void) src;
 
    if (elm_widget_disabled_get(obj)) return;
-
    if (type != EVAS_CALLBACK_KEY_DOWN) return;
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
 

diff --git a/src/lib/elm_spinner.c b/src/lib/elm_spinner.c
index 5040e20..fad85fa 100644 (file)
--- a/src/lib/elm_spinner.c
+++ b/src/lib/elm_spinner.c
@@ -438,21 +438,21 @@ _elm_spinner_smart_event(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
 {
 
    Evas_Object *src = va_arg(*list, Evas_Object *);
-   (void) src;
    Evas_Callback_Type type = va_arg(*list, Evas_Callback_Type);
-   void *event_info = va_arg(*list, void *);
+   Evas_Event_Key_Down *ev = va_arg(*list, void *);
    Eina_Bool *ret = va_arg(*list, Eina_Bool *);
+
    if (ret) *ret = EINA_FALSE;
+   (void) src;
+
    Eina_Bool horz = !!strncmp(elm_widget_style_get(obj), "vertical", 8);
 
    if (elm_widget_disabled_get(obj)) return;
+   if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
+
    if (type == EVAS_CALLBACK_KEY_DOWN)
      {
-        Evas_Event_Key_Down *ev = event_info;
-
-        if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
-        else if (
-           ( (!strcmp(ev->key, "Left") ||
+        if (( (!strcmp(ev->key, "Left") ||
               ((!strcmp(ev->key, "KP_Left")) && (!ev->string)))
              && horz )
            ||
@@ -486,9 +486,6 @@ _elm_spinner_smart_event(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
      }
    else if (type == EVAS_CALLBACK_KEY_UP)
      {
-        Evas_Event_Key_Down *ev = event_info;
-
-        if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
         if (!strcmp(ev->key, "Right") ||
             ((!strcmp(ev->key, "KP_Right")) && (!ev->string)) ||
             !strcmp(ev->key, "Up") ||

diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index 1672a4c..22528e8 100644 (file)
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -644,26 +644,25 @@ _highlight_next_item_get(Evas_Object *obj, Evas_Object *box, Eina_Bool reverse)
 
 
 static void
-_elm_toolbar_smart_event(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
+_elm_toolbar_smart_event(Eo *obj, void *_pd, va_list *list)
 {
    Evas_Object *src = va_arg(*list, Evas_Object *);
-   (void) src;
    Evas_Callback_Type type = va_arg(*list, Evas_Callback_Type);
-   (void) type;
-   void *event_info = va_arg(*list, void *);
+   Evas_Event_Key_Down *ev = va_arg(*list, void *);
    Eina_Bool *ret = va_arg(*list, Eina_Bool *);
+   Elm_Toolbar_Smart_Data *sd = _pd;
+
    if (ret) *ret = EINA_FALSE;
+   (void) src;
+   (void) type;
+
    Elm_Toolbar_Item *it = NULL;
    Evas_Coord x, y, w, h;
 
-   ELM_TOOLBAR_DATA_GET(obj, sd);
-
-   Evas_Event_Key_Down *ev = event_info;
-
    if (elm_widget_disabled_get(obj)) return;
    if (type != EVAS_CALLBACK_KEY_DOWN) return;
-   if (!sd->items) return;
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
+   if (!sd->items) return;
 
    if ((!strcmp(ev->key, "Return")) ||
             ((!strcmp(ev->key, "KP_Enter")) && !ev->string))

diff --git a/src/lib/elm_video.c b/src/lib/elm_video.c
index 2fd5eb7..cf91aed 100644 (file)
--- a/src/lib/elm_video.c
+++ b/src/lib/elm_video.c
@@ -31,18 +31,17 @@ static void
 _elm_video_smart_event(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
 {
    Evas_Object *src = va_arg(*list, Evas_Object *);
-   (void) src;
    Evas_Callback_Type type = va_arg(*list, Evas_Callback_Type);
-   void *event_info = va_arg(*list, void *);
+   Evas_Event_Key_Down *ev = va_arg(*list, void *);
    Eina_Bool *ret = va_arg(*list, Eina_Bool *);
+
    if (ret) *ret = EINA_FALSE;
+   (void) src;
 
 #ifdef HAVE_EMOTION
-   Evas_Event_Key_Down *ev = event_info;
-
+   if (elm_widget_disabled_get(obj)) return;
    if (type != EVAS_CALLBACK_KEY_DOWN) return;
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
-   if (elm_widget_disabled_get(obj)) return;
 
    if ((!strcmp(ev->key, "Left")) ||
        ((!strcmp(ev->key, "KP_Left")) && (!ev->string)))
@@ -100,10 +99,9 @@ _elm_video_smart_event(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
    INF("keyname: '%s' not handled", ev->key);
 
 #else
-
    (void) obj;
    (void) type;
-   (void) event_info;
+   (void) ev;
 #endif
 }
 

diff --git a/src/lib/elm_web.c b/src/lib/elm_web.c
index c1cfe62..8974c2e 100644 (file)
--- a/src/lib/elm_web.c
+++ b/src/lib/elm_web.c
@@ -185,15 +185,14 @@ static void
 _elm_web_smart_event(Eo *obj, void *_pd, va_list *list)
 {
    Evas_Object *src = va_arg(*list, Evas_Object *);
-   (void) src;
    Evas_Callback_Type type = va_arg(*list, Evas_Callback_Type);
-   void *event_info = va_arg(*list, void *);
+   Evas_Event_Key_Down *ev = va_arg(*list, void *);
    Eina_Bool *ret = va_arg(*list, Eina_Bool *);
+
    if (ret) *ret = EINA_FALSE;
+   (void) src;
 
 #ifdef HAVE_ELEMENTARY_WEB
-   Evas_Event_Key_Down *ev = event_info;
-
    Elm_Web_Smart_Data *sd = _pd;
 
    if (type != EVAS_CALLBACK_KEY_DOWN) return;
@@ -209,7 +208,7 @@ _elm_web_smart_event(Eo *obj, void *_pd, va_list *list)
    (void)obj;
    (void)_pd;
    (void)type;
-   (void)event_info;
+   (void)ev;
 #endif
 }
 

diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index d1cc852..5bfc452 100644 (file)
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -1152,19 +1152,16 @@ _elm_win_smart_on_focus(Eo *obj, void *_pd, va_list *list)
 static void
 _elm_win_smart_event(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
 {
-   Evas_Object *source = va_arg(*list, Evas_Object *);
-   (void) source;
+   Evas_Object *src = va_arg(*list, Evas_Object *);
    Evas_Callback_Type type = va_arg(*list, Evas_Callback_Type);
-   void *event_info = va_arg(*list, void *);
+   Evas_Event_Key_Down *ev = va_arg(*list, void *);
    Eina_Bool *ret = va_arg(*list, Eina_Bool *);
-   if (ret) *ret = EINA_FALSE;
 
-   Evas_Event_Key_Down *ev = event_info;
+   if (ret) *ret = EINA_FALSE;
+   (void) src;
 
    if (elm_widget_disabled_get(obj)) return;
-
-   if (type != EVAS_CALLBACK_KEY_DOWN)
-     return;
+   if (type != EVAS_CALLBACK_KEY_DOWN) return;
 
    if ((!strcmp(ev->key, "Tab")) ||
        (!strcmp(ev->key, "ISO_Left_Tab")))