summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvi Levin <avi.levin@samsung.com>2015-05-10 17:50:04 +0300
committerAvi Levin <avi.levin@samsung.com>2015-06-29 17:03:33 +0300
commitea22f23a476bd06478940d2a45854a090a38fe26 (patch)
tree0bcc9b5fa617994c9ba93830d5f53bd2f301403c
parentde1906e3b821dd02d783b6c9cfcc4b1ab8a00bec (diff)
elm_entry: porting evas smart callbacks to eo
-rw-r--r--src/lib/elm_colorselector.eo2
-rw-r--r--src/lib/elm_entry.c130
-rw-r--r--src/lib/elm_entry.eo17
3 files changed, 94 insertions, 55 deletions
diff --git a/src/lib/elm_colorselector.eo b/src/lib/elm_colorselector.eo
index c5f824a83..1ef429906 100644
--- a/src/lib/elm_colorselector.eo
+++ b/src/lib/elm_colorselector.eo
@@ -2,7 +2,7 @@ class Elm.Colorselector (Elm.Layout, Elm_Interface_Atspi_Widget_Action,
2 Evas.Clickable_Interface) 2 Evas.Clickable_Interface)
3{ 3{
4 eo_prefix: elm_obj_colorselector; 4 eo_prefix: elm_obj_colorselector;
5 methods { 5 methods {
6 @property color { 6 @property color {
7 set { 7 set {
8 /*@ 8 /*@
diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index f307dd571..150650cb9 100644
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -880,7 +880,7 @@ _elm_entry_elm_widget_theme_apply(Eo *obj, Elm_Entry_Data *sd)
880 evas_event_thaw(evas_object_evas_get(obj)); 880 evas_event_thaw(evas_object_evas_get(obj));
881 evas_event_thaw_eval(evas_object_evas_get(obj)); 881 evas_event_thaw_eval(evas_object_evas_get(obj));
882 882
883 evas_object_smart_callback_call(obj, SIG_THEME_CHANGED, NULL); 883 eo_do(obj, eo_event_callback_call(ELM_LAYOUT_EVENT_THEME_CHANGED, NULL));
884 884
885 evas_object_unref(obj); 885 evas_object_unref(obj);
886 886
@@ -892,7 +892,7 @@ _cursor_geometry_recalc(Evas_Object *obj)
892{ 892{
893 ELM_ENTRY_DATA_GET(obj, sd); 893 ELM_ENTRY_DATA_GET(obj, sd);
894 894
895 evas_object_smart_callback_call(obj, SIG_CURSOR_CHANGED, NULL); 895 eo_do(obj, eo_event_callback_call(ELM_ENTRY_EVENT_CURSOR_CHANGED, NULL));
896 896
897 if (!sd->deferred_recalc_job) 897 if (!sd->deferred_recalc_job)
898 { 898 {
@@ -1151,7 +1151,7 @@ _elm_entry_elm_widget_on_focus(Eo *obj, Elm_Entry_Data *sd)
1151 if (top && top_is_win && sd->input_panel_enable && !sd->input_panel_show_on_demand && 1151 if (top && top_is_win && sd->input_panel_enable && !sd->input_panel_show_on_demand &&
1152 !edje_object_part_text_imf_context_get(sd->entry_edje, "elm.text")) 1152 !edje_object_part_text_imf_context_get(sd->entry_edje, "elm.text"))
1153 elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_ON); 1153 elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_ON);
1154 evas_object_smart_callback_call(obj, SIG_FOCUSED, NULL); 1154 eo_do(obj, eo_event_callback_call(ELM_LAYOUT_EVENT_FOCUSED, NULL));
1155 if (_elm_config->atspi_mode) 1155 if (_elm_config->atspi_mode)
1156 elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE); 1156 elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE);
1157 _return_key_enabled_check(obj); 1157 _return_key_enabled_check(obj);
@@ -1164,7 +1164,7 @@ _elm_entry_elm_widget_on_focus(Eo *obj, Elm_Entry_Data *sd)
1164 if (top && top_is_win && sd->input_panel_enable && 1164 if (top && top_is_win && sd->input_panel_enable &&
1165 !edje_object_part_text_imf_context_get(sd->entry_edje, "elm.text")) 1165 !edje_object_part_text_imf_context_get(sd->entry_edje, "elm.text"))
1166 elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_OFF); 1166 elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_OFF);
1167 evas_object_smart_callback_call(obj, SIG_UNFOCUSED, NULL); 1167 eo_do(obj, eo_event_callback_call(ELM_LAYOUT_EVENT_UNFOCUSED, NULL));
1168 if (_elm_config->atspi_mode) 1168 if (_elm_config->atspi_mode)
1169 elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_FOCUSED, EINA_FALSE); 1169 elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_FOCUSED, EINA_FALSE);
1170 1170
@@ -1271,10 +1271,10 @@ _hover_del_job(void *data)
1271 sd->hov_deljob = NULL; 1271 sd->hov_deljob = NULL;
1272} 1272}
1273 1273
1274static void 1274static Eina_Bool
1275_hover_dismissed_cb(void *data, 1275_hover_dismissed_cb(void *data EINA_UNUSED,
1276 Evas_Object *obj EINA_UNUSED, 1276 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED,
1277 void *event_info EINA_UNUSED) 1277 void *event_info EINA_UNUSED)
1278{ 1278{
1279 ELM_ENTRY_DATA_GET(data, sd); 1279 ELM_ENTRY_DATA_GET(data, sd);
1280 1280
@@ -1292,6 +1292,8 @@ _hover_dismissed_cb(void *data,
1292 elm_widget_scroll_freeze_pop(data); 1292 elm_widget_scroll_freeze_pop(data);
1293 ecore_job_del(sd->hov_deljob); 1293 ecore_job_del(sd->hov_deljob);
1294 sd->hov_deljob = ecore_job_add(_hover_del_job, data); 1294 sd->hov_deljob = ecore_job_add(_hover_del_job, data);
1295
1296 return EINA_TRUE;
1295} 1297}
1296 1298
1297static void 1299static void
@@ -1397,7 +1399,8 @@ _paste_cb(void *data,
1397 1399
1398 ELM_ENTRY_DATA_GET(data, sd); 1400 ELM_ENTRY_DATA_GET(data, sd);
1399 1401
1400 evas_object_smart_callback_call(data, SIG_SELECTION_PASTE, NULL); 1402 eo_do(data, eo_event_callback_call
1403 (EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_PASTE, NULL));
1401 1404
1402 sd->selection_asked = EINA_TRUE; 1405 sd->selection_asked = EINA_TRUE;
1403 1406
@@ -1448,7 +1451,8 @@ _cut_cb(void *data,
1448{ 1451{
1449 ELM_ENTRY_DATA_GET(data, sd); 1452 ELM_ENTRY_DATA_GET(data, sd);
1450 1453
1451 evas_object_smart_callback_call(data, SIG_SELECTION_CUT, NULL); 1454 eo_do(data, eo_event_callback_call
1455 (EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_CUT, NULL));
1452 /* Store it */ 1456 /* Store it */
1453 sd->sel_mode = EINA_FALSE; 1457 sd->sel_mode = EINA_FALSE;
1454 if (!_elm_config->desktop_entry) 1458 if (!_elm_config->desktop_entry)
@@ -1470,7 +1474,8 @@ _copy_cb(void *data,
1470{ 1474{
1471 ELM_ENTRY_DATA_GET(data, sd); 1475 ELM_ENTRY_DATA_GET(data, sd);
1472 1476
1473 evas_object_smart_callback_call(data, SIG_SELECTION_COPY, NULL); 1477 eo_do(data, eo_event_callback_call
1478 (EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_COPY, NULL));
1474 sd->sel_mode = EINA_FALSE; 1479 sd->sel_mode = EINA_FALSE;
1475 if (!_elm_config->desktop_entry) 1480 if (!_elm_config->desktop_entry)
1476 { 1481 {
@@ -1558,8 +1563,8 @@ _menu_call(Evas_Object *obj)
1558 1563
1559 if (top) elm_hoversel_hover_parent_set(sd->hoversel, top); 1564 if (top) elm_hoversel_hover_parent_set(sd->hoversel, top);
1560 1565
1561 evas_object_smart_callback_add 1566 eo_do(sd->hoversel, eo_event_callback_add
1562 (sd->hoversel, "dismissed", _hover_dismissed_cb, obj); 1567 (ELM_HOVER_EVENT_DISMISSED, _hover_dismissed_cb, obj));
1563 if (sd->have_selection) 1568 if (sd->have_selection)
1564 { 1569 {
1565 if (!sd->password) 1570 if (!sd->password)
@@ -1769,7 +1774,8 @@ _long_press_cb(void *data)
1769 sd->long_pressed = EINA_TRUE; 1774 sd->long_pressed = EINA_TRUE;
1770 1775
1771 sd->longpress_timer = NULL; 1776 sd->longpress_timer = NULL;
1772 evas_object_smart_callback_call(data, SIG_LONGPRESSED, NULL); 1777 eo_do(data, eo_event_callback_call
1778 (EVAS_CLICKABLE_INTERFACE_EVENT_LONGPRESSED, NULL));
1773 1779
1774 return ECORE_CALLBACK_CANCEL; 1780 return ECORE_CALLBACK_CANCEL;
1775} 1781}
@@ -1934,7 +1940,7 @@ _mouse_move_cb(void *data,
1934 1940
1935static void 1941static void
1936_entry_changed_handle(void *data, 1942_entry_changed_handle(void *data,
1937 const char *event) 1943 const Eo_Event_Description* event)
1938{ 1944{
1939 Evas_Coord minh; 1945 Evas_Coord minh;
1940 const char *text; 1946 const char *text;
@@ -1972,7 +1978,7 @@ _entry_changed_handle(void *data,
1972 /* callback - this could call callbacks that delete the 1978 /* callback - this could call callbacks that delete the
1973 * entry... thus... any access to sd after this could be 1979 * entry... thus... any access to sd after this could be
1974 * invalid */ 1980 * invalid */
1975 evas_object_smart_callback_call(data, event, NULL); 1981 eo_do(data, eo_event_callback_call(event, NULL));
1976} 1982}
1977 1983
1978static void 1984static void
@@ -1981,7 +1987,7 @@ _entry_changed_signal_cb(void *data,
1981 const char *emission EINA_UNUSED, 1987 const char *emission EINA_UNUSED,
1982 const char *source EINA_UNUSED) 1988 const char *source EINA_UNUSED)
1983{ 1989{
1984 _entry_changed_handle(data, SIG_CHANGED); 1990 _entry_changed_handle(data, ELM_ENTRY_EVENT_CHANGED);
1985} 1991}
1986 1992
1987static void 1993static void
@@ -1997,11 +2003,11 @@ _entry_changed_user_signal_cb(void *data,
1997 if (edje_info) 2003 if (edje_info)
1998 { 2004 {
1999 memcpy(&info, edje_info, sizeof(info)); 2005 memcpy(&info, edje_info, sizeof(info));
2000 evas_object_smart_callback_call(data, SIG_CHANGED_USER, &info); 2006 eo_do(data, eo_event_callback_call(ELM_ENTRY_EVENT_CHANGED_USER, &info));
2001 } 2007 }
2002 else 2008 else
2003 { 2009 {
2004 evas_object_smart_callback_call(data, SIG_CHANGED_USER, NULL); 2010 eo_do(data, eo_event_callback_call(ELM_ENTRY_EVENT_CHANGED_USER, NULL));
2005 } 2011 }
2006 if (_elm_config->atspi_mode) 2012 if (_elm_config->atspi_mode)
2007 { 2013 {
@@ -2029,7 +2035,7 @@ _entry_preedit_changed_signal_cb(void *data,
2029 const char *emission EINA_UNUSED, 2035 const char *emission EINA_UNUSED,
2030 const char *source EINA_UNUSED) 2036 const char *source EINA_UNUSED)
2031{ 2037{
2032 _entry_changed_handle(data, SIG_PREEDIT_CHANGED); 2038 _entry_changed_handle(data, ELM_ENTRY_EVENT_PREEDIT_CHANGED);
2033} 2039}
2034 2040
2035static void 2041static void
@@ -2038,7 +2044,7 @@ _entry_undo_request_signal_cb(void *data,
2038 const char *emission EINA_UNUSED, 2044 const char *emission EINA_UNUSED,
2039 const char *source EINA_UNUSED) 2045 const char *source EINA_UNUSED)
2040{ 2046{
2041 evas_object_smart_callback_call(data, SIG_UNDO_REQUEST, NULL); 2047 eo_do(data, eo_event_callback_call(ELM_ENTRY_EVENT_UNDO_REQUEST, NULL));
2042} 2048}
2043 2049
2044static void 2050static void
@@ -2047,7 +2053,7 @@ _entry_redo_request_signal_cb(void *data,
2047 const char *emission EINA_UNUSED, 2053 const char *emission EINA_UNUSED,
2048 const char *source EINA_UNUSED) 2054 const char *source EINA_UNUSED)
2049{ 2055{
2050 evas_object_smart_callback_call(data, SIG_REDO_REQUEST, NULL); 2056 eo_do(data, eo_event_callback_call(ELM_ENTRY_EVENT_REDO_REQUEST, NULL));
2051} 2057}
2052 2058
2053static void 2059static void
@@ -2065,7 +2071,8 @@ _entry_selection_start_signal_cb(void *data,
2065 { 2071 {
2066 if (entry != data) elm_entry_select_none(entry); 2072 if (entry != data) elm_entry_select_none(entry);
2067 } 2073 }
2068 evas_object_smart_callback_call(data, SIG_SELECTION_START, NULL); 2074 eo_do(data, eo_event_callback_call
2075 (EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_START, NULL));
2069 2076
2070 top = elm_widget_top_get(data); 2077 top = elm_widget_top_get(data);
2071 if (txt && top && (elm_win_window_id_get(top))) 2078 if (txt && top && (elm_win_window_id_get(top)))
@@ -2104,7 +2111,8 @@ _entry_selection_changed_signal_cb(void *data,
2104 ELM_ENTRY_DATA_GET(data, sd); 2111 ELM_ENTRY_DATA_GET(data, sd);
2105 2112
2106 sd->have_selection = EINA_TRUE; 2113 sd->have_selection = EINA_TRUE;
2107 evas_object_smart_callback_call(data, SIG_SELECTION_CHANGED, NULL); 2114 eo_do(data, eo_event_callback_call
2115 (EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_CHANGED, NULL));
2108 _selection_store(ELM_SEL_TYPE_PRIMARY, data); 2116 _selection_store(ELM_SEL_TYPE_PRIMARY, data);
2109 _update_selection_handler(data); 2117 _update_selection_handler(data);
2110 if (_elm_config->atspi_mode) 2118 if (_elm_config->atspi_mode)
@@ -2122,7 +2130,8 @@ _entry_selection_cleared_signal_cb(void *data,
2122 if (!sd->have_selection) return; 2130 if (!sd->have_selection) return;
2123 2131
2124 sd->have_selection = EINA_FALSE; 2132 sd->have_selection = EINA_FALSE;
2125 evas_object_smart_callback_call(data, SIG_SELECTION_CLEARED, NULL); 2133 eo_do(data, eo_event_callback_call
2134 (EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_CLEARED, NULL));
2126 if (sd->cut_sel) 2135 if (sd->cut_sel)
2127 { 2136 {
2128 elm_cnp_selection_set 2137 elm_cnp_selection_set
@@ -2153,7 +2162,8 @@ _entry_paste_request_signal_cb(void *data,
2153 ELM_SEL_TYPE_PRIMARY : ELM_SEL_TYPE_CLIPBOARD; 2162 ELM_SEL_TYPE_PRIMARY : ELM_SEL_TYPE_CLIPBOARD;
2154 2163
2155 if (!sd->editable) return; 2164 if (!sd->editable) return;
2156 evas_object_smart_callback_call(data, SIG_SELECTION_PASTE, NULL); 2165 eo_do(data, eo_event_callback_call
2166 (EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_PASTE, NULL));
2157 2167
2158 top = elm_widget_top_get(data); 2168 top = elm_widget_top_get(data);
2159 if ((top) && (elm_win_window_id_get(top))) 2169 if ((top) && (elm_win_window_id_get(top)))
@@ -2212,7 +2222,8 @@ _entry_cursor_changed_manual_signal_cb(void *data,
2212 const char *emission EINA_UNUSED, 2222 const char *emission EINA_UNUSED,
2213 const char *source EINA_UNUSED) 2223 const char *source EINA_UNUSED)
2214{ 2224{
2215 evas_object_smart_callback_call(data, SIG_CURSOR_CHANGED_MANUAL, NULL); 2225 eo_do(data, eo_event_callback_call
2226 (ELM_ENTRY_EVENT_CURSOR_CHANGED_MANUAL, NULL));
2216 if (_elm_config->atspi_mode) 2227 if (_elm_config->atspi_mode)
2217 eo_do(data, eo_event_callback_call(ELM_INTERFACE_ATSPI_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL)); 2228 eo_do(data, eo_event_callback_call(ELM_INTERFACE_ATSPI_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL));
2218} 2229}
@@ -2270,7 +2281,7 @@ _entry_anchor_down_signal_cb(void *data,
2270 _signal_anchor_geoms_do_things_with_lol(sd, &ei); 2281 _signal_anchor_geoms_do_things_with_lol(sd, &ei);
2271 2282
2272 if (!sd->disabled) 2283 if (!sd->disabled)
2273 evas_object_smart_callback_call(data, SIG_ANCHOR_DOWN, &ei); 2284 eo_do(data, eo_event_callback_call(ELM_ENTRY_EVENT_ANCHOR_DOWN, &ei));
2274} 2285}
2275 2286
2276static void 2287static void
@@ -2293,7 +2304,7 @@ _entry_anchor_up_signal_cb(void *data,
2293 _signal_anchor_geoms_do_things_with_lol(sd, &ei); 2304 _signal_anchor_geoms_do_things_with_lol(sd, &ei);
2294 2305
2295 if (!sd->disabled) 2306 if (!sd->disabled)
2296 evas_object_smart_callback_call(data, SIG_ANCHOR_UP, &ei); 2307 eo_do(data, eo_event_callback_call(ELM_ENTRY_EVENT_ANCHOR_UP, &ei));
2297} 2308}
2298 2309
2299static void 2310static void
@@ -2309,12 +2320,13 @@ _anchor_hover_del_cb(void *data,
2309 (sd->anchor_hover.hover, EVAS_CALLBACK_DEL, _anchor_hover_del_cb, obj); 2320 (sd->anchor_hover.hover, EVAS_CALLBACK_DEL, _anchor_hover_del_cb, obj);
2310} 2321}
2311 2322
2312static void 2323static Eina_Bool
2313_anchor_hover_clicked_cb(void *data, 2324_anchor_hover_clicked_cb(void *data,
2314 Evas_Object *obj EINA_UNUSED, 2325 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
2315 void *event_info EINA_UNUSED)
2316{ 2326{
2317 elm_entry_anchor_hover_end(data); 2327 elm_entry_anchor_hover_end(data);
2328
2329 return EINA_TRUE;
2318} 2330}
2319 2331
2320static void 2332static void
@@ -2375,9 +2387,9 @@ _entry_hover_anchor_clicked_do(Evas_Object *obj,
2375 ei.hover_right = tmp; 2387 ei.hover_right = tmp;
2376 } 2388 }
2377 2389
2378 evas_object_smart_callback_call(obj, SIG_ANCHOR_HOVER_OPENED, &ei); 2390 eo_do(obj, eo_event_callback_call(ELM_ENTRY_EVENT_ANCHOR_HOVER_OPENED, &ei));
2379 evas_object_smart_callback_add 2391 eo_do(sd->anchor_hover.hover, eo_event_callback_add
2380 (sd->anchor_hover.hover, "clicked", _anchor_hover_clicked_cb, obj); 2392 (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _anchor_hover_clicked_cb, obj));
2381 2393
2382 /* FIXME: Should just check if there's any callback registered to 2394 /* FIXME: Should just check if there's any callback registered to
2383 * the smart events instead. This is used to determine if anyone 2395 * the smart events instead. This is used to determine if anyone
@@ -2415,7 +2427,7 @@ _entry_anchor_clicked_signal_cb(void *data,
2415 2427
2416 if (!sd->disabled) 2428 if (!sd->disabled)
2417 { 2429 {
2418 evas_object_smart_callback_call(data, SIG_ANCHOR_CLICKED, &ei); 2430 eo_do(data, eo_event_callback_call(ELM_ENTRY_EVENT_ANCHOR_CLICKED, &ei));
2419 _entry_hover_anchor_clicked_do(data, &ei); 2431 _entry_hover_anchor_clicked_do(data, &ei);
2420 } 2432 }
2421} 2433}
@@ -2445,7 +2457,7 @@ _entry_anchor_in_signal_cb(void *data,
2445 _signal_anchor_geoms_do_things_with_lol(sd, &ei); 2457 _signal_anchor_geoms_do_things_with_lol(sd, &ei);
2446 2458
2447 if (!sd->disabled) 2459 if (!sd->disabled)
2448 evas_object_smart_callback_call(data, SIG_ANCHOR_IN, &ei); 2460 eo_do(data, eo_event_callback_call(ELM_ENTRY_EVENT_ANCHOR_IN, &ei));
2449} 2461}
2450 2462
2451static void 2463static void
@@ -2465,7 +2477,7 @@ _entry_anchor_out_signal_cb(void *data,
2465 _signal_anchor_geoms_do_things_with_lol(sd, &ei); 2477 _signal_anchor_geoms_do_things_with_lol(sd, &ei);
2466 2478
2467 if (!sd->disabled) 2479 if (!sd->disabled)
2468 evas_object_smart_callback_call(data, SIG_ANCHOR_OUT, &ei); 2480 eo_do(data, eo_event_callback_call(ELM_ENTRY_EVENT_ANCHOR_OUT, &ei));
2469} 2481}
2470 2482
2471static void 2483static void
@@ -2474,7 +2486,7 @@ _entry_key_enter_signal_cb(void *data,
2474 const char *emission EINA_UNUSED, 2486 const char *emission EINA_UNUSED,
2475 const char *source EINA_UNUSED) 2487 const char *source EINA_UNUSED)
2476{ 2488{
2477 evas_object_smart_callback_call(data, SIG_ACTIVATED, NULL); 2489 eo_do(data, eo_event_callback_call(ELM_ENTRY_EVENT_ACTIVATED, NULL));
2478} 2490}
2479 2491
2480static void 2492static void
@@ -2483,7 +2495,7 @@ _entry_key_escape_signal_cb(void *data,
2483 const char *emission EINA_UNUSED, 2495 const char *emission EINA_UNUSED,
2484 const char *source EINA_UNUSED) 2496 const char *source EINA_UNUSED)
2485{ 2497{
2486 evas_object_smart_callback_call(data, SIG_ABORTED, NULL); 2498 eo_do(data, eo_event_callback_call(ELM_ENTRY_EVENT_ABORTED, NULL));
2487} 2499}
2488 2500
2489static void 2501static void
@@ -2492,7 +2504,7 @@ _entry_mouse_down_signal_cb(void *data,
2492 const char *emission EINA_UNUSED, 2504 const char *emission EINA_UNUSED,
2493 const char *source EINA_UNUSED) 2505 const char *source EINA_UNUSED)
2494{ 2506{
2495 evas_object_smart_callback_call(data, SIG_PRESS, NULL); 2507 eo_do(data, eo_event_callback_call(ELM_ENTRY_EVENT_PRESS, NULL));
2496} 2508}
2497 2509
2498static void 2510static void
@@ -2501,7 +2513,8 @@ _entry_mouse_clicked_signal_cb(void *data,
2501 const char *emission EINA_UNUSED, 2513 const char *emission EINA_UNUSED,
2502 const char *source EINA_UNUSED) 2514 const char *source EINA_UNUSED)
2503{ 2515{
2504 evas_object_smart_callback_call(data, SIG_CLICKED, NULL); 2516 eo_do(data, eo_event_callback_call
2517 (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL));
2505} 2518}
2506 2519
2507static void 2520static void
@@ -2510,7 +2523,8 @@ _entry_mouse_double_signal_cb(void *data,
2510 const char *emission EINA_UNUSED, 2523 const char *emission EINA_UNUSED,
2511 const char *source EINA_UNUSED) 2524 const char *source EINA_UNUSED)
2512{ 2525{
2513 evas_object_smart_callback_call(data, SIG_CLICKED_DOUBLE, NULL); 2526 eo_do(data, eo_event_callback_call
2527 (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_DOUBLE, NULL));
2514} 2528}
2515 2529
2516static void 2530static void
@@ -2519,7 +2533,8 @@ _entry_mouse_triple_signal_cb(void *data,
2519 const char *emission EINA_UNUSED, 2533 const char *emission EINA_UNUSED,
2520 const char *source EINA_UNUSED) 2534 const char *source EINA_UNUSED)
2521{ 2535{
2522 evas_object_smart_callback_call(data, SIG_CLICKED_TRIPLE, NULL); 2536 eo_do(data, eo_event_callback_call
2537 (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_TRIPLE, NULL));
2523} 2538}
2524 2539
2525static Evas_Object * 2540static Evas_Object *
@@ -2672,7 +2687,8 @@ _text_append_idler(void *data)
2672 free(sd->append_text_left); 2687 free(sd->append_text_left);
2673 sd->append_text_left = NULL; 2688 sd->append_text_left = NULL;
2674 sd->append_text_idler = NULL; 2689 sd->append_text_idler = NULL;
2675 evas_object_smart_callback_call(obj, SIG_TEXT_SET_DONE, NULL); 2690 eo_do(obj, eo_event_callback_call
2691 (ELM_ENTRY_EVENT_TEXT_SET_DONE, NULL));
2676 return ECORE_CALLBACK_CANCEL; 2692 return ECORE_CALLBACK_CANCEL;
2677 } 2693 }
2678} 2694}
@@ -2734,7 +2750,8 @@ _chars_add_till_limit(Evas_Object *obj,
2734 { 2750 {
2735 if (!i) 2751 if (!i)
2736 { 2752 {
2737 evas_object_smart_callback_call(obj, SIG_MAX_LENGTH, NULL); 2753 eo_do(obj, eo_event_callback_call
2754 (ELM_ENTRY_EVENT_MAXLENGTH_REACHED, NULL));
2738 ELM_SAFE_FREE(*text, free); 2755 ELM_SAFE_FREE(*text, free);
2739 return; 2756 return;
2740 } 2757 }
@@ -2752,7 +2769,7 @@ _chars_add_till_limit(Evas_Object *obj,
2752 i++; 2769 i++;
2753 } 2770 }
2754 2771
2755 evas_object_smart_callback_call(obj, SIG_MAX_LENGTH, NULL); 2772 eo_do(obj, eo_event_callback_call(ELM_ENTRY_EVENT_MAXLENGTH_REACHED, NULL));
2756} 2773}
2757 2774
2758EOLIAN static void 2775EOLIAN static void
@@ -2910,7 +2927,7 @@ _elm_entry_elm_layout_text_set(Eo *obj, Elm_Entry_Data *sd, const char *part, co
2910 else 2927 else
2911 { 2928 {
2912 edje_object_part_text_set(sd->entry_edje, "elm.text", entry); 2929 edje_object_part_text_set(sd->entry_edje, "elm.text", entry);
2913 evas_object_smart_callback_call(obj, SIG_TEXT_SET_DONE, NULL); 2930 eo_do(obj, eo_event_callback_call(ELM_ENTRY_EVENT_TEXT_SET_DONE, NULL));
2914 } 2931 }
2915 2932
2916 if (len > 0) 2933 if (len > 0)
@@ -3968,7 +3985,8 @@ _elm_entry_select_none(Eo *obj EINA_UNUSED, Elm_Entry_Data *sd)
3968 edje_object_signal_emit(sd->entry_edje, "elm,state,select,off", "elm"); 3985 edje_object_signal_emit(sd->entry_edje, "elm,state,select,off", "elm");
3969 } 3986 }
3970 if (sd->have_selection) 3987 if (sd->have_selection)
3971 evas_object_smart_callback_call(obj, SIG_SELECTION_CLEARED, NULL); 3988 eo_do(obj, eo_event_callback_call
3989 (EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_CLEARED, NULL));
3972 3990
3973 sd->have_selection = EINA_FALSE; 3991 sd->have_selection = EINA_FALSE;
3974 edje_object_part_text_select_none(sd->entry_edje, "elm.text"); 3992 edje_object_part_text_select_none(sd->entry_edje, "elm.text");
@@ -4354,7 +4372,8 @@ elm_entry_filter_limit_size(void *data,
4354 newlen = evas_string_char_len_get(utfstr); 4372 newlen = evas_string_char_len_get(utfstr);
4355 if ((len >= lim->max_char_count) && (newlen > 0)) 4373 if ((len >= lim->max_char_count) && (newlen > 0))
4356 { 4374 {
4357 evas_object_smart_callback_call(entry, SIG_MAX_LENGTH, NULL); 4375 eo_do(entry, eo_event_callback_call
4376 (ELM_ENTRY_EVENT_MAXLENGTH_REACHED, NULL));
4358 ELM_SAFE_FREE(*text, free); 4377 ELM_SAFE_FREE(*text, free);
4359 free(current); 4378 free(current);
4360 free(utfstr); 4379 free(utfstr);
@@ -4370,7 +4389,8 @@ elm_entry_filter_limit_size(void *data,
4370 newlen = strlen(utfstr); 4389 newlen = strlen(utfstr);
4371 if ((len >= lim->max_byte_count) && (newlen > 0)) 4390 if ((len >= lim->max_byte_count) && (newlen > 0))
4372 { 4391 {
4373 evas_object_smart_callback_call(entry, SIG_MAX_LENGTH, NULL); 4392 eo_do(entry, eo_event_callback_call
4393 (ELM_ENTRY_EVENT_MAXLENGTH_REACHED, NULL));
4374 ELM_SAFE_FREE(*text, free); 4394 ELM_SAFE_FREE(*text, free);
4375 free(current); 4395 free(current);
4376 free(utfstr); 4396 free(utfstr);
@@ -4504,7 +4524,7 @@ inserting:
4504 } 4524 }
4505 *insert = 0; 4525 *insert = 0;
4506 if (rejected) 4526 if (rejected)
4507 evas_object_smart_callback_call(entry, SIG_REJECTED, NULL); 4527 eo_do(entry, eo_event_callback_call(ELM_ENTRY_EVENT_REJECTED, NULL));
4508} 4528}
4509 4529
4510EOLIAN static Eina_Bool 4530EOLIAN static Eina_Bool
@@ -4611,7 +4631,8 @@ _scroll_cb(Evas_Object *obj, void *data EINA_UNUSED)
4611{ 4631{
4612 ELM_ENTRY_DATA_GET(obj, sd); 4632 ELM_ENTRY_DATA_GET(obj, sd);
4613 /* here we need to emit the signal that the elm_scroller would have done */ 4633 /* here we need to emit the signal that the elm_scroller would have done */
4614 evas_object_smart_callback_call(obj, "scroll", NULL); 4634 eo_do(obj, eo_event_callback_call
4635 (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL, NULL));
4615 4636
4616 if (sd->have_selection) 4637 if (sd->have_selection)
4617 _update_selection_handler(obj); 4638 _update_selection_handler(obj);
@@ -5026,7 +5047,8 @@ _elm_entry_elm_widget_activate(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, Elm_Act
5026 if (!elm_widget_disabled_get(obj) && 5047 if (!elm_widget_disabled_get(obj) &&
5027 !evas_object_freeze_events_get(obj)) 5048 !evas_object_freeze_events_get(obj))
5028 { 5049 {
5029 evas_object_smart_callback_call(obj, SIG_CLICKED, NULL); 5050 eo_do(obj, eo_event_callback_call
5051 (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL));
5030 if (sd->editable && sd->input_panel_enable) 5052 if (sd->editable && sd->input_panel_enable)
5031 edje_object_part_text_input_panel_show(sd->entry_edje, "elm.text"); 5053 edje_object_part_text_input_panel_show(sd->entry_edje, "elm.text");
5032 } 5054 }
diff --git a/src/lib/elm_entry.eo b/src/lib/elm_entry.eo
index 6da7b48da..094764620 100644
--- a/src/lib/elm_entry.eo
+++ b/src/lib/elm_entry.eo
@@ -1234,6 +1234,23 @@ class Elm.Entry (Elm.Layout, Elm_Interface_Scrollable, Evas.Clickable_Interface,
1234 changed,user; 1234 changed,user;
1235 validate; 1235 validate;
1236 context,open; 1236 context,open;
1237 anchor,clicked;
1238 rejected;
1239 maxlength,reached;
1240 preedit,changed;
1241 press;
1242 redo,request;
1243 undo,request;
1244 text,set,done;
1245 aborted;
1246 anchor,down;
1247 anchor,hover,opened;
1248 anchor,in;
1249 anchor,out;
1250 anchor,up;
1251 cursor,changed;
1252 cursor,changed,manual;
1253
1237 } 1254 }
1238 1255
1239} 1256}