summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-03-02 11:57:19 +0000
committerTom Hacohen <tom@stosb.com>2016-03-03 10:05:00 +0000
commitb805c84bbc72d07bbaff487c35bd0ea7420cdda2 (patch)
tree366ad9ff03e6d2a7d3cda5f924eee9712a77005e
parent306f50bf5c53d4f09a8c72b15921cd666adef923 (diff)
App client/server and entry: Mix of automatic migration and manual adjustments.
The script couldn't handle everything correctly on its own.
-rw-r--r--src/lib/elm_app_client_view.c39
-rw-r--r--src/lib/elm_app_server_view.c32
-rw-r--r--src/lib/elm_entry.c291
3 files changed, 176 insertions, 186 deletions
diff --git a/src/lib/elm_app_client_view.c b/src/lib/elm_app_client_view.c
index 62fa1fd46..7ea6d8a29 100644
--- a/src/lib/elm_app_client_view.c
+++ b/src/lib/elm_app_client_view.c
@@ -58,34 +58,26 @@ _prop_changed(void *user_data, Eldbus_Proxy *proxy EINA_UNUSED, void *event_info
58 Elm_App_Client_View_Data *cdata = eo_data_scope_get(eo, MY_CLASS); 58 Elm_App_Client_View_Data *cdata = eo_data_scope_get(eo, MY_CLASS);
59 59
60 if (!strcmp(prop_event->name, "Title")) 60 if (!strcmp(prop_event->name, "Title"))
61 eo_do(eo, eo_event_callback_call(ELM_APP_CLIENT_VIEW_EVENT_TITLE_CHANGED, 61 eo_event_callback_call(eo, ELM_APP_CLIENT_VIEW_EVENT_TITLE_CHANGED, (void *) _string_prop_get(v));
62 (void *) _string_prop_get(v)));
63 else if (!strcmp(prop_event->name, "IconName")) 62 else if (!strcmp(prop_event->name, "IconName"))
64 eo_do(eo, eo_event_callback_call(ELM_APP_CLIENT_VIEW_EVENT_ICON_CHANGED, 63 eo_event_callback_call(eo, ELM_APP_CLIENT_VIEW_EVENT_ICON_CHANGED, (void *) _string_prop_get(v));
65 (void *) _string_prop_get(v)));
66 else if (!strcmp(prop_event->name, "IconPixels")) 64 else if (!strcmp(prop_event->name, "IconPixels"))
67 eo_do(eo, eo_event_callback_call(ELM_APP_CLIENT_VIEW_EVENT_ICON_PIXELS_CHANGED, 65 eo_event_callback_call(eo, ELM_APP_CLIENT_VIEW_EVENT_ICON_PIXELS_CHANGED, NULL);
68 NULL));
69 else if (!strcmp(prop_event->name, "NewEvents")) 66 else if (!strcmp(prop_event->name, "NewEvents"))
70 eo_do(eo, eo_event_callback_call(ELM_APP_CLIENT_VIEW_EVENT_NEW_EVENTS_CHANGED, 67 eo_event_callback_call(eo, ELM_APP_CLIENT_VIEW_EVENT_NEW_EVENTS_CHANGED, (void *)(uintptr_t)_int_prop_get(v));
71 (void *)(uintptr_t)_int_prop_get(v)));
72 else if (!strcmp(prop_event->name, "Progress")) 68 else if (!strcmp(prop_event->name, "Progress"))
73 eo_do(eo, eo_event_callback_call(ELM_APP_CLIENT_VIEW_EVENT_PROGRESS_CHANGED, 69 eo_event_callback_call(eo, ELM_APP_CLIENT_VIEW_EVENT_PROGRESS_CHANGED, (void *)(uintptr_t)_short_prop_get(v));
74 (void *)(uintptr_t)_short_prop_get(v)));
75 else if (!strcmp(prop_event->name, "State")) 70 else if (!strcmp(prop_event->name, "State"))
76 { 71 {
77 cdata->state = _string_state_to_id(_string_prop_get(v)); 72 cdata->state = _string_state_to_id(_string_prop_get(v));
78 eo_do(eo, eo_event_callback_call(ELM_APP_CLIENT_VIEW_EVENT_STATE_CHANGED, 73 eo_event_callback_call(eo, ELM_APP_CLIENT_VIEW_EVENT_STATE_CHANGED, (void *)(uintptr_t)cdata->state);
79 (void *)(uintptr_t)cdata->state));
80 } 74 }
81 else if (!strcmp(prop_event->name, "WindowId")) 75 else if (!strcmp(prop_event->name, "WindowId"))
82 eo_do(eo, eo_event_callback_call(ELM_APP_CLIENT_VIEW_EVENT_WINDOW_CHANGED, 76 eo_event_callback_call(eo, ELM_APP_CLIENT_VIEW_EVENT_WINDOW_CHANGED, (void *)(uintptr_t)_int_prop_get(v));
83 (void *)(uintptr_t)_int_prop_get(v)));
84 else 77 else
85 return; 78 return;
86 79
87 eo_do(eo, eo_event_callback_call(ELM_APP_CLIENT_VIEW_EVENT_PROPERTY_CHANGED, 80 eo_event_callback_call(eo, ELM_APP_CLIENT_VIEW_EVENT_PROPERTY_CHANGED, (void *) prop_event->name);
88 (void *) prop_event->name));
89} 81}
90 82
91static void 83static void
@@ -123,8 +115,7 @@ elm_app_client_view_internal_state_set(Eo *eo, Elm_App_View_State state)
123 cdata->state = state; 115 cdata->state = state;
124 if (!changed) 116 if (!changed)
125 return; 117 return;
126 eo_do(eo, eo_event_callback_call(ELM_APP_CLIENT_VIEW_EVENT_STATE_CHANGED, 118 eo_event_callback_call(eo, ELM_APP_CLIENT_VIEW_EVENT_STATE_CHANGED, (void *)(uintptr_t)cdata->state);
127 (void *)(uintptr_t)cdata->state));
128} 119}
129 120
130EOLIAN static Eo * 121EOLIAN static Eo *
@@ -135,13 +126,13 @@ _elm_app_client_view_eo_base_finalize(Eo *eo, Elm_App_Client_View_Data *data)
135 Eldbus_Connection *conn; 126 Eldbus_Connection *conn;
136 Eldbus_Object *obj; 127 Eldbus_Object *obj;
137 128
138 eo_do(eo, parent = eo_parent_get()); 129 parent = eo_parent_get(eo);
139 EINA_SAFETY_ON_TRUE_RETURN_VAL((!parent) || 130 EINA_SAFETY_ON_TRUE_RETURN_VAL((!parent) ||
140 (!eo_isa(parent, ELM_APP_CLIENT_CLASS)), NULL); 131 (!eo_isa(parent, ELM_APP_CLIENT_CLASS)), NULL);
141 132
142 EINA_SAFETY_ON_NULL_RETURN_VAL(data->path, NULL); 133 EINA_SAFETY_ON_NULL_RETURN_VAL(data->path, NULL);
143 134
144 eo_do(parent, package = elm_app_client_package_get()); 135 package = elm_app_client_package_get(parent);
145 136
146 eldbus_init(); 137 eldbus_init();
147 conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SESSION); 138 conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SESSION);
@@ -156,7 +147,7 @@ _elm_app_client_view_eo_base_finalize(Eo *eo, Elm_App_Client_View_Data *data)
156 ELDBUS_PROXY_EVENT_PROPERTY_LOADED, 147 ELDBUS_PROXY_EVENT_PROPERTY_LOADED,
157 _props_loaded, eo); 148 _props_loaded, eo);
158 149
159 return eo_do_super_ret(eo, MY_CLASS, eo, eo_finalize()); 150 return eo_finalize(eo_super(eo, MY_CLASS));
160} 151}
161 152
162static void 153static void
@@ -272,9 +263,9 @@ _elm_app_client_view_window_get(Eo *eo EINA_UNUSED, Elm_App_Client_View_Data *da
272} 263}
273 264
274EOLIAN static void 265EOLIAN static void
275_elm_app_client_view_path_set(Eo *eo EINA_UNUSED, Elm_App_Client_View_Data *data, const char *path) 266_elm_app_client_view_path_set(Eo *eo, Elm_App_Client_View_Data *data, const char *path)
276{ 267{
277 if (eo_finalized_get()) 268 if (eo_finalized_get(eo))
278 { 269 {
279 ERR("Can't set id after object has been created."); 270 ERR("Can't set id after object has been created.");
280 return; 271 return;
@@ -318,7 +309,7 @@ _elm_app_client_view_eo_base_destructor(Eo *eo, Elm_App_Client_View_Data *data)
318 309
319 eina_stringshare_del(data->path); 310 eina_stringshare_del(data->path);
320 311
321 eo_do_super(eo, MY_CLASS, eo_destructor()); 312 eo_destructor(eo_super(eo, MY_CLASS));
322} 313}
323 314
324#include "elm_app_client_view.eo.c" 315#include "elm_app_client_view.eo.c"
diff --git a/src/lib/elm_app_server_view.c b/src/lib/elm_app_server_view.c
index df735e929..c13a8abba 100644
--- a/src/lib/elm_app_server_view.c
+++ b/src/lib/elm_app_server_view.c
@@ -43,7 +43,7 @@ _method_close(const Eldbus_Service_Interface *iface, const Eldbus_Message *messa
43 Elm_App_Server_View_Data *data = eo_data_scope_get(eo, MY_CLASS); 43 Elm_App_Server_View_Data *data = eo_data_scope_get(eo, MY_CLASS);
44 44
45 _state_set(data, ELM_APP_VIEW_STATE_CLOSED); 45 _state_set(data, ELM_APP_VIEW_STATE_CLOSED);
46 eo_do(eo, eo_event_callback_call(ELM_APP_SERVER_VIEW_EVENT_CLOSED, NULL)); 46 eo_event_callback_call(eo, ELM_APP_SERVER_VIEW_EVENT_CLOSED, NULL);
47 47
48 return eldbus_message_method_return_new(message); 48 return eldbus_message_method_return_new(message);
49} 49}
@@ -55,7 +55,7 @@ _method_pause(const Eldbus_Service_Interface *iface, const Eldbus_Message *messa
55 Elm_App_Server_View_Data *data = eo_data_scope_get(eo, MY_CLASS); 55 Elm_App_Server_View_Data *data = eo_data_scope_get(eo, MY_CLASS);
56 56
57 _state_set(data, ELM_APP_VIEW_STATE_PAUSED); 57 _state_set(data, ELM_APP_VIEW_STATE_PAUSED);
58 eo_do(eo, eo_event_callback_call(ELM_APP_SERVER_VIEW_EVENT_PAUSED, NULL)); 58 eo_event_callback_call(eo, ELM_APP_SERVER_VIEW_EVENT_PAUSED, NULL);
59 59
60 return eldbus_message_method_return_new(message); 60 return eldbus_message_method_return_new(message);
61} 61}
@@ -67,7 +67,7 @@ _method_resume(const Eldbus_Service_Interface *iface, const Eldbus_Message *mess
67 Elm_App_Server_View_Data *data = eo_data_scope_get(eo, MY_CLASS); 67 Elm_App_Server_View_Data *data = eo_data_scope_get(eo, MY_CLASS);
68 68
69 _state_set(data, ELM_APP_VIEW_STATE_LIVE); 69 _state_set(data, ELM_APP_VIEW_STATE_LIVE);
70 eo_do(eo, eo_event_callback_call(ELM_APP_SERVER_VIEW_EVENT_RESUMED, NULL)); 70 eo_event_callback_call(eo, ELM_APP_SERVER_VIEW_EVENT_RESUMED, NULL);
71 71
72 return eldbus_message_method_return_new(message); 72 return eldbus_message_method_return_new(message);
73} 73}
@@ -170,28 +170,28 @@ EOLIAN static void
170_elm_app_server_view_resume(Eo *obj, Elm_App_Server_View_Data *data) 170_elm_app_server_view_resume(Eo *obj, Elm_App_Server_View_Data *data)
171{ 171{
172 _state_set(data, ELM_APP_VIEW_STATE_LIVE); 172 _state_set(data, ELM_APP_VIEW_STATE_LIVE);
173 eo_do(obj, eo_event_callback_call(ELM_APP_SERVER_VIEW_EVENT_RESUMED, NULL)); 173 eo_event_callback_call(obj, ELM_APP_SERVER_VIEW_EVENT_RESUMED, NULL);
174} 174}
175 175
176EOLIAN static void 176EOLIAN static void
177_elm_app_server_view_pause(Eo *obj, Elm_App_Server_View_Data *data) 177_elm_app_server_view_pause(Eo *obj, Elm_App_Server_View_Data *data)
178{ 178{
179 _state_set(data, ELM_APP_VIEW_STATE_PAUSED); 179 _state_set(data, ELM_APP_VIEW_STATE_PAUSED);
180 eo_do(obj, eo_event_callback_call(ELM_APP_SERVER_VIEW_EVENT_PAUSED, NULL)); 180 eo_event_callback_call(obj, ELM_APP_SERVER_VIEW_EVENT_PAUSED, NULL);
181} 181}
182 182
183EOLIAN static void 183EOLIAN static void
184_elm_app_server_view_close(Eo *obj, Elm_App_Server_View_Data *data) 184_elm_app_server_view_close(Eo *obj, Elm_App_Server_View_Data *data)
185{ 185{
186 _state_set(data, ELM_APP_VIEW_STATE_CLOSED); 186 _state_set(data, ELM_APP_VIEW_STATE_CLOSED);
187 eo_do(obj, eo_event_callback_call(ELM_APP_SERVER_VIEW_EVENT_CLOSED, NULL)); 187 eo_event_callback_call(obj, ELM_APP_SERVER_VIEW_EVENT_CLOSED, NULL);
188} 188}
189 189
190EOLIAN static void 190EOLIAN static void
191_elm_app_server_view_shallow(Eo *obj, Elm_App_Server_View_Data *data) 191_elm_app_server_view_shallow(Eo *obj, Elm_App_Server_View_Data *data)
192{ 192{
193 _state_set(data, ELM_APP_VIEW_STATE_SHALLOW); 193 _state_set(data, ELM_APP_VIEW_STATE_SHALLOW);
194 eo_do(obj, eo_event_callback_call(ELM_APP_SERVER_VIEW_EVENT_SHALLOW, NULL)); 194 eo_event_callback_call(obj, ELM_APP_SERVER_VIEW_EVENT_SHALLOW, NULL);
195} 195}
196 196
197EOLIAN static Elm_App_View_State 197EOLIAN static Elm_App_View_State
@@ -299,17 +299,17 @@ _elm_app_server_view_path_get(Eo *obj EINA_UNUSED, Elm_App_Server_View_Data *dat
299} 299}
300 300
301EOLIAN static void 301EOLIAN static void
302_elm_app_server_view_id_set(Eo *obj EINA_UNUSED, Elm_App_Server_View_Data *data, const char *id) 302_elm_app_server_view_id_set(Eo *obj, Elm_App_Server_View_Data *data, const char *id)
303{ 303{
304 Elm_App_Server *server = NULL; 304 Elm_App_Server *server = NULL;
305 305
306 if (eo_finalized_get()) 306 if (eo_finalized_get(obj))
307 { 307 {
308 ERR("Can't set id after object has been created."); 308 ERR("Can't set id after object has been created.");
309 return; 309 return;
310 } 310 }
311 311
312 eo_do(obj, server = eo_parent_get()); 312 server = eo_parent_get(obj);
313 EINA_SAFETY_ON_TRUE_RETURN(!server || !eo_isa(server, ELM_APP_SERVER_CLASS)); 313 EINA_SAFETY_ON_TRUE_RETURN(!server || !eo_isa(server, ELM_APP_SERVER_CLASS));
314 314
315 if (!id) 315 if (!id)
@@ -321,7 +321,7 @@ _elm_app_server_view_id_set(Eo *obj EINA_UNUSED, Elm_App_Server_View_Data *data,
321 Eina_Bool valid = EINA_FALSE; 321 Eina_Bool valid = EINA_FALSE;
322 322
323 snprintf(buf, sizeof(buf), "view_%d", i); 323 snprintf(buf, sizeof(buf), "view_%d", i);
324 eo_do(server, valid = elm_app_server_view_check(buf)); 324 valid = elm_app_server_view_check(server, buf);
325 if (valid) 325 if (valid)
326 { 326 {
327 data->id = eina_stringshare_add(buf); 327 data->id = eina_stringshare_add(buf);
@@ -332,7 +332,7 @@ _elm_app_server_view_id_set(Eo *obj EINA_UNUSED, Elm_App_Server_View_Data *data,
332 else 332 else
333 { 333 {
334 Eina_Bool valid = EINA_FALSE; 334 Eina_Bool valid = EINA_FALSE;
335 eo_do(server, valid = elm_app_server_view_check(id)); 335 valid = elm_app_server_view_check(server, id);
336 if (valid) 336 if (valid)
337 data->id = eina_stringshare_add(id); 337 data->id = eina_stringshare_add(id);
338 } 338 }
@@ -345,7 +345,7 @@ _elm_app_server_view_eo_base_finalize(Eo *obj, Elm_App_Server_View_Data *data)
345 char view_path[PATH_MAX]; 345 char view_path[PATH_MAX];
346 Elm_App_Server *server = NULL; 346 Elm_App_Server *server = NULL;
347 347
348 eo_do(obj, server = eo_parent_get()); 348 server = eo_parent_get(obj);
349 EINA_SAFETY_ON_TRUE_RETURN_VAL(!server || !eo_isa(server, ELM_APP_SERVER_CLASS), NULL); 349 EINA_SAFETY_ON_TRUE_RETURN_VAL(!server || !eo_isa(server, ELM_APP_SERVER_CLASS), NULL);
350 350
351 351
@@ -355,7 +355,7 @@ _elm_app_server_view_eo_base_finalize(Eo *obj, Elm_App_Server_View_Data *data)
355 return NULL; 355 return NULL;
356 } 356 }
357 357
358 eo_do(server, server_path = elm_app_server_path_get()); 358 server_path = elm_app_server_path_get(server);
359 snprintf(view_path, sizeof(view_path), "%s/%s", server_path, data->id); 359 snprintf(view_path, sizeof(view_path), "%s/%s", server_path, data->id);
360 360
361 eldbus_init(); 361 eldbus_init();
@@ -368,7 +368,7 @@ _elm_app_server_view_eo_base_finalize(Eo *obj, Elm_App_Server_View_Data *data)
368 data->title = eina_stringshare_add(""); 368 data->title = eina_stringshare_add("");
369 data->icon_name = eina_stringshare_add(""); 369 data->icon_name = eina_stringshare_add("");
370 370
371 return eo_do_super_ret(obj, MY_CLASS, obj, eo_finalize()); 371 return eo_finalize(eo_super(obj, MY_CLASS));
372} 372}
373 373
374EOLIAN static void 374EOLIAN static void
@@ -382,7 +382,7 @@ _elm_app_server_view_eo_base_destructor(Eo *obj, Elm_App_Server_View_Data *data)
382 eldbus_connection_unref(data->conn); 382 eldbus_connection_unref(data->conn);
383 eldbus_shutdown(); 383 eldbus_shutdown();
384 384
385 eo_do_super(obj, MY_CLASS, eo_destructor()); 385 eo_destructor(eo_super(obj, MY_CLASS));
386} 386}
387 387
388#include "elm_app_server_view.eo.c" 388#include "elm_app_server_view.eo.c"
diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index 95b313693..75042abb6 100644
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -296,7 +296,7 @@ _validate(Evas_Object *obj)
296 if (sd->validators == 0) return; 296 if (sd->validators == 0) return;
297 297
298 vc.text = edje_object_part_text_get(sd->entry_edje, "elm.text"); 298 vc.text = edje_object_part_text_get(sd->entry_edje, "elm.text");
299 eo_do(obj, res = eo_event_callback_call(ELM_ENTRY_EVENT_VALIDATE, (void *)&vc)); 299 res = eo_event_callback_call(obj, ELM_ENTRY_EVENT_VALIDATE, (void *)&vc);
300 buf = eina_strbuf_new(); 300 buf = eina_strbuf_new();
301 eina_strbuf_append_printf(buf, "validation,%s,%s", vc.signal, res == EO_CALLBACK_STOP ? "fail" : "pass"); 301 eina_strbuf_append_printf(buf, "validation,%s,%s", vc.signal, res == EO_CALLBACK_STOP ? "fail" : "pass");
302 edje_object_signal_emit(sd->scr_edje, eina_strbuf_string_get(buf), "elm"); 302 edje_object_signal_emit(sd->scr_edje, eina_strbuf_string_get(buf), "elm");
@@ -431,8 +431,8 @@ _viewport_region_get(Evas_Object *obj)
431 431
432 if (!rect) return NULL; 432 if (!rect) return NULL;
433 if (sd->scroll) 433 if (sd->scroll)
434 eo_do(obj, elm_interface_scrollable_content_viewport_geometry_get 434 elm_interface_scrollable_content_viewport_geometry_get
435 (&rect->x, &rect->y, &rect->w, &rect->h)); 435 (obj, &rect->x, &rect->y, &rect->w, &rect->h);
436 else 436 else
437 evas_object_geometry_get(sd->entry_edje, &rect->x, &rect->y, &rect->w, &rect->h); 437 evas_object_geometry_get(sd->entry_edje, &rect->x, &rect->y, &rect->w, &rect->h);
438 438
@@ -741,7 +741,7 @@ _elm_entry_elm_widget_disable(Eo *obj, Elm_Entry_Data *sd)
741 if (sd->scroll) 741 if (sd->scroll)
742 { 742 {
743 edje_object_signal_emit(sd->scr_edje, "elm,state,disabled", "elm"); 743 edje_object_signal_emit(sd->scr_edje, "elm,state,disabled", "elm");
744 eo_do(obj, elm_interface_scrollable_freeze_set(EINA_TRUE)); 744 elm_interface_scrollable_freeze_set(obj, EINA_TRUE);
745 } 745 }
746 sd->disabled = EINA_TRUE; 746 sd->disabled = EINA_TRUE;
747 } 747 }
@@ -751,7 +751,7 @@ _elm_entry_elm_widget_disable(Eo *obj, Elm_Entry_Data *sd)
751 if (sd->scroll) 751 if (sd->scroll)
752 { 752 {
753 edje_object_signal_emit(sd->scr_edje, "elm,state,enabled", "elm"); 753 edje_object_signal_emit(sd->scr_edje, "elm,state,enabled", "elm");
754 eo_do(obj, elm_interface_scrollable_freeze_set(EINA_FALSE)); 754 elm_interface_scrollable_freeze_set(obj, EINA_FALSE);
755 } 755 }
756 sd->disabled = EINA_FALSE; 756 sd->disabled = EINA_FALSE;
757 sd->drop_format = _get_drop_format(obj); 757 sd->drop_format = _get_drop_format(obj);
@@ -802,7 +802,7 @@ _elm_entry_elm_widget_theme_apply(Eo *obj, Elm_Entry_Data *sd)
802 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); 802 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
803 803
804 Eina_Bool int_ret = EINA_FALSE; 804 Eina_Bool int_ret = EINA_FALSE;
805 eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply()); 805 int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
806 if (!int_ret) return EINA_FALSE; 806 if (!int_ret) return EINA_FALSE;
807 807
808 evas_event_freeze(evas_object_evas_get(obj)); 808 evas_event_freeze(evas_object_evas_get(obj));
@@ -873,7 +873,7 @@ _elm_entry_elm_widget_theme_apply(Eo *obj, Elm_Entry_Data *sd)
873 { 873 {
874 Eina_Bool ok = EINA_FALSE; 874 Eina_Bool ok = EINA_FALSE;
875 875
876 eo_do(obj, elm_interface_scrollable_mirrored_set(elm_widget_mirrored_get(obj))); 876 elm_interface_scrollable_mirrored_set(obj, elm_widget_mirrored_get(obj));
877 877
878 if (sd->single_line) 878 if (sd->single_line)
879 ok = elm_widget_theme_object_set 879 ok = elm_widget_theme_object_set
@@ -914,7 +914,7 @@ _elm_entry_elm_widget_theme_apply(Eo *obj, Elm_Entry_Data *sd)
914 evas_event_thaw(evas_object_evas_get(obj)); 914 evas_event_thaw(evas_object_evas_get(obj));
915 evas_event_thaw_eval(evas_object_evas_get(obj)); 915 evas_event_thaw_eval(evas_object_evas_get(obj));
916 916
917 eo_do(obj, eo_event_callback_call(ELM_LAYOUT_EVENT_THEME_CHANGED, NULL)); 917 eo_event_callback_call(obj, ELM_LAYOUT_EVENT_THEME_CHANGED, NULL);
918 918
919 evas_object_unref(obj); 919 evas_object_unref(obj);
920 920
@@ -926,7 +926,7 @@ _cursor_geometry_recalc(Evas_Object *obj)
926{ 926{
927 ELM_ENTRY_DATA_GET(obj, sd); 927 ELM_ENTRY_DATA_GET(obj, sd);
928 928
929 eo_do(obj, eo_event_callback_call(ELM_ENTRY_EVENT_CURSOR_CHANGED, NULL)); 929 eo_event_callback_call(obj, ELM_ENTRY_EVENT_CURSOR_CHANGED, NULL);
930 930
931 if (!sd->deferred_recalc_job) 931 if (!sd->deferred_recalc_job)
932 { 932 {
@@ -1032,8 +1032,8 @@ _elm_entry_elm_layout_sizing_eval(Eo *obj, Elm_Entry_Data *sd)
1032 { 1032 {
1033 Evas_Coord vw = 0, vh = 0, w = 0, h = 0; 1033 Evas_Coord vw = 0, vh = 0, w = 0, h = 0;
1034 1034
1035 eo_do(obj, elm_interface_scrollable_content_viewport_geometry_get 1035 elm_interface_scrollable_content_viewport_geometry_get
1036 (NULL, NULL, &vw, &vh)); 1036 (obj, NULL, NULL, &vw, &vh);
1037 1037
1038 w = sd->ent_mw; 1038 w = sd->ent_mw;
1039 h = sd->ent_mh; 1039 h = sd->ent_mh;
@@ -1056,8 +1056,8 @@ _elm_entry_elm_layout_sizing_eval(Eo *obj, Elm_Entry_Data *sd)
1056 1056
1057 evas_object_resize(sd->scr_edje, resw, resh); 1057 evas_object_resize(sd->scr_edje, resw, resh);
1058 edje_object_size_min_calc(sd->scr_edje, &vmw, &vmh); 1058 edje_object_size_min_calc(sd->scr_edje, &vmw, &vmh);
1059 eo_do(obj, elm_interface_scrollable_content_viewport_geometry_get 1059 elm_interface_scrollable_content_viewport_geometry_get
1060 (NULL, NULL, &vw, &vh)); 1060 (obj, NULL, NULL, &vw, &vh);
1061 edje_object_size_min_restricted_calc 1061 edje_object_size_min_restricted_calc
1062 (sd->entry_edje, &minw, &minh, vw, 0); 1062 (sd->entry_edje, &minw, &minh, vw, 0);
1063 elm_coords_finger_size_adjust(1, &minw, 1, &minh); 1063 elm_coords_finger_size_adjust(1, &minw, 1, &minh);
@@ -1115,8 +1115,8 @@ _elm_entry_elm_layout_sizing_eval(Eo *obj, Elm_Entry_Data *sd)
1115 sd->ent_mh = minh; 1115 sd->ent_mh = minh;
1116 elm_coords_finger_size_adjust(1, &minw, 1, &minh); 1116 elm_coords_finger_size_adjust(1, &minw, 1, &minh);
1117 1117
1118 eo_do(obj, elm_interface_scrollable_content_viewport_geometry_get 1118 elm_interface_scrollable_content_viewport_geometry_get
1119 (NULL, NULL, &vw, &vh)); 1119 (obj, NULL, NULL, &vw, &vh);
1120 1120
1121 if (minw > vw) vw = minw; 1121 if (minw > vw) vw = minw;
1122 if (minh > vh) vh = minh; 1122 if (minh > vh) vh = minh;
@@ -1189,7 +1189,7 @@ _elm_entry_elm_widget_on_focus(Eo *obj, Elm_Entry_Data *sd, Elm_Object_Item *ite
1189 if (top && top_is_win && sd->input_panel_enable && !sd->input_panel_show_on_demand && 1189 if (top && top_is_win && sd->input_panel_enable && !sd->input_panel_show_on_demand &&
1190 !edje_object_part_text_imf_context_get(sd->entry_edje, "elm.text")) 1190 !edje_object_part_text_imf_context_get(sd->entry_edje, "elm.text"))
1191 elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_ON); 1191 elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_ON);
1192 eo_do(obj, eo_event_callback_call(ELM_WIDGET_EVENT_FOCUSED, NULL)); 1192 eo_event_callback_call(obj, ELM_WIDGET_EVENT_FOCUSED, NULL);
1193 if (_elm_config->atspi_mode) 1193 if (_elm_config->atspi_mode)
1194 elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE); 1194 elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE);
1195 _return_key_enabled_check(obj); 1195 _return_key_enabled_check(obj);
@@ -1204,7 +1204,7 @@ _elm_entry_elm_widget_on_focus(Eo *obj, Elm_Entry_Data *sd, Elm_Object_Item *ite
1204 if (top && top_is_win && sd->input_panel_enable && 1204 if (top && top_is_win && sd->input_panel_enable &&
1205 !edje_object_part_text_imf_context_get(sd->entry_edje, "elm.text")) 1205 !edje_object_part_text_imf_context_get(sd->entry_edje, "elm.text"))
1206 elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_OFF); 1206 elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_OFF);
1207 eo_do(obj, eo_event_callback_call(ELM_WIDGET_EVENT_UNFOCUSED, NULL)); 1207 eo_event_callback_call(obj, ELM_WIDGET_EVENT_UNFOCUSED, NULL);
1208 if (_elm_config->atspi_mode) 1208 if (_elm_config->atspi_mode)
1209 elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_FOCUSED, EINA_FALSE); 1209 elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_FOCUSED, EINA_FALSE);
1210 1210
@@ -1248,7 +1248,7 @@ _show_region_hook(void *data EINA_UNUSED,
1248 1248
1249 elm_widget_show_region_get(obj, &x, &y, &w, &h); 1249 elm_widget_show_region_get(obj, &x, &y, &w, &h);
1250 1250
1251 eo_do(obj, elm_interface_scrollable_content_region_show(x, y, w, h)); 1251 elm_interface_scrollable_content_region_show(obj, x, y, w, h);
1252} 1252}
1253 1253
1254EOLIAN static Eina_Bool 1254EOLIAN static Eina_Bool
@@ -1267,7 +1267,7 @@ _elm_entry_elm_widget_sub_object_del(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, E
1267 elm_layout_signal_emit(obj, "elm,action,hide,end", "elm"); 1267 elm_layout_signal_emit(obj, "elm,action,hide,end", "elm");
1268 } 1268 }
1269 1269
1270 eo_do_super(obj, MY_CLASS, ret = elm_obj_widget_sub_object_del(sobj)); 1270 ret = elm_obj_widget_sub_object_del(eo_super(obj, MY_CLASS), sobj);
1271 if (!ret) return EINA_FALSE; 1271 if (!ret) return EINA_FALSE;
1272 1272
1273 return EINA_TRUE; 1273 return EINA_TRUE;
@@ -1440,8 +1440,8 @@ _paste_cb(void *data,
1440 1440
1441 ELM_ENTRY_DATA_GET(data, sd); 1441 ELM_ENTRY_DATA_GET(data, sd);
1442 1442
1443 eo_do(data, eo_event_callback_call 1443 eo_event_callback_call
1444 (EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_PASTE, NULL)); 1444 (data, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_PASTE, NULL);
1445 1445
1446 sd->selection_asked = EINA_TRUE; 1446 sd->selection_asked = EINA_TRUE;
1447 1447
@@ -1492,8 +1492,8 @@ _cut_cb(void *data,
1492{ 1492{
1493 ELM_ENTRY_DATA_GET(data, sd); 1493 ELM_ENTRY_DATA_GET(data, sd);
1494 1494
1495 eo_do(data, eo_event_callback_call 1495 eo_event_callback_call
1496 (EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_CUT, NULL)); 1496 (data, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_CUT, NULL);
1497 /* Store it */ 1497 /* Store it */
1498 sd->sel_mode = EINA_FALSE; 1498 sd->sel_mode = EINA_FALSE;
1499 if (!_elm_config->desktop_entry) 1499 if (!_elm_config->desktop_entry)
@@ -1515,8 +1515,8 @@ _copy_cb(void *data,
1515{ 1515{
1516 ELM_ENTRY_DATA_GET(data, sd); 1516 ELM_ENTRY_DATA_GET(data, sd);
1517 1517
1518 eo_do(data, eo_event_callback_call 1518 eo_event_callback_call
1519 (EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_COPY, NULL)); 1519 (data, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_COPY, NULL);
1520 sd->sel_mode = EINA_FALSE; 1520 sd->sel_mode = EINA_FALSE;
1521 if (!_elm_config->desktop_entry) 1521 if (!_elm_config->desktop_entry)
1522 { 1522 {
@@ -1567,7 +1567,7 @@ _menu_call(Evas_Object *obj)
1567 1567
1568 if (sd->anchor_hover.hover) return; 1568 if (sd->anchor_hover.hover) return;
1569 1569
1570 eo_do(obj, eo_event_callback_call(ELM_ENTRY_EVENT_CONTEXT_OPEN, NULL)); 1570 eo_event_callback_call(obj, ELM_ENTRY_EVENT_CONTEXT_OPEN, NULL);
1571 1571
1572 if ((sd->api) && (sd->api->obj_longpress)) 1572 if ((sd->api) && (sd->api->obj_longpress))
1573 { 1573 {
@@ -1604,8 +1604,8 @@ _menu_call(Evas_Object *obj)
1604 1604
1605 if (top) elm_hoversel_hover_parent_set(sd->hoversel, top); 1605 if (top) elm_hoversel_hover_parent_set(sd->hoversel, top);
1606 1606
1607 eo_do(sd->hoversel, eo_event_callback_add 1607 eo_event_callback_add
1608 (ELM_HOVERSEL_EVENT_DISMISSED, _hover_dismissed_cb, obj)); 1608 (sd->hoversel, ELM_HOVERSEL_EVENT_DISMISSED, _hover_dismissed_cb, obj);
1609 if (sd->have_selection) 1609 if (sd->have_selection)
1610 { 1610 {
1611 if (!sd->password) 1611 if (!sd->password)
@@ -1746,7 +1746,7 @@ _magnifier_move(void *data)
1746 { 1746 {
1747 Evas_Coord ox, oy; 1747 Evas_Coord ox, oy;
1748 evas_object_geometry_get(sd->scr_edje, &ex, &ey, NULL, NULL); 1748 evas_object_geometry_get(sd->scr_edje, &ex, &ey, NULL, NULL);
1749 eo_do(data, elm_interface_scrollable_content_pos_get(&ox, &oy)); 1749 elm_interface_scrollable_content_pos_get(data, &ox, &oy);
1750 ex -= ox; 1750 ex -= ox;
1751 ey -= oy; 1751 ey -= oy;
1752 } 1752 }
@@ -1850,8 +1850,8 @@ _long_press_cb(void *data)
1850 sd->long_pressed = EINA_TRUE; 1850 sd->long_pressed = EINA_TRUE;
1851 1851
1852 sd->longpress_timer = NULL; 1852 sd->longpress_timer = NULL;
1853 eo_do(data, eo_event_callback_call 1853 eo_event_callback_call
1854 (EVAS_CLICKABLE_INTERFACE_EVENT_LONGPRESSED, NULL)); 1854 (data, EVAS_CLICKABLE_INTERFACE_EVENT_LONGPRESSED, NULL);
1855 1855
1856 return ECORE_CALLBACK_CANCEL; 1856 return ECORE_CALLBACK_CANCEL;
1857} 1857}
@@ -2066,7 +2066,7 @@ _entry_changed_handle(void *data,
2066 /* callback - this could call callbacks that delete the 2066 /* callback - this could call callbacks that delete the
2067 * entry... thus... any access to sd after this could be 2067 * entry... thus... any access to sd after this could be
2068 * invalid */ 2068 * invalid */
2069 eo_do(data, eo_event_callback_call(event, NULL)); 2069 eo_event_callback_call(data, event, NULL);
2070} 2070}
2071 2071
2072static void 2072static void
@@ -2091,11 +2091,11 @@ _entry_changed_user_signal_cb(void *data,
2091 if (edje_info) 2091 if (edje_info)
2092 { 2092 {
2093 memcpy(&info, edje_info, sizeof(info)); 2093 memcpy(&info, edje_info, sizeof(info));
2094 eo_do(data, eo_event_callback_call(ELM_ENTRY_EVENT_CHANGED_USER, &info)); 2094 eo_event_callback_call(data, ELM_ENTRY_EVENT_CHANGED_USER, &info);
2095 } 2095 }
2096 else 2096 else
2097 { 2097 {
2098 eo_do(data, eo_event_callback_call(ELM_ENTRY_EVENT_CHANGED_USER, NULL)); 2098 eo_event_callback_call(data, ELM_ENTRY_EVENT_CHANGED_USER, NULL);
2099 } 2099 }
2100 if (_elm_config->atspi_mode) 2100 if (_elm_config->atspi_mode)
2101 { 2101 {
@@ -2105,14 +2105,14 @@ _entry_changed_user_signal_cb(void *data,
2105 atspi_info.content = edje_info->change.insert.content; 2105 atspi_info.content = edje_info->change.insert.content;
2106 atspi_info.pos = edje_info->change.insert.pos; 2106 atspi_info.pos = edje_info->change.insert.pos;
2107 atspi_info.len = edje_info->change.insert.plain_length; 2107 atspi_info.len = edje_info->change.insert.plain_length;
2108 eo_do(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, elm_interface_atspi_accessible_event_emit(data, ELM_INTERFACE_ATSPI_TEXT_EVENT_ACCESS_TEXT_INSERTED, &atspi_info)); 2108 elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, ELM_INTERFACE_ATSPI_TEXT_EVENT_ACCESS_TEXT_INSERTED, &atspi_info);
2109 } 2109 }
2110 else if (edje_info && !edje_info->insert) 2110 else if (edje_info && !edje_info->insert)
2111 { 2111 {
2112 atspi_info.content = edje_info->change.del.content; 2112 atspi_info.content = edje_info->change.del.content;
2113 atspi_info.pos = MIN(edje_info->change.del.start, edje_info->change.del.end); 2113 atspi_info.pos = MIN(edje_info->change.del.start, edje_info->change.del.end);
2114 atspi_info.len = MAX(edje_info->change.del.start, edje_info->change.del.end) - atspi_info.pos; 2114 atspi_info.len = MAX(edje_info->change.del.start, edje_info->change.del.end) - atspi_info.pos;
2115 eo_do(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, elm_interface_atspi_accessible_event_emit(data, ELM_INTERFACE_ATSPI_TEXT_EVENT_ACCESS_TEXT_REMOVED, &atspi_info)); 2115 elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, ELM_INTERFACE_ATSPI_TEXT_EVENT_ACCESS_TEXT_REMOVED, &atspi_info);
2116 } 2116 }
2117 } 2117 }
2118} 2118}
@@ -2132,7 +2132,7 @@ _entry_undo_request_signal_cb(void *data,
2132 const char *emission EINA_UNUSED, 2132 const char *emission EINA_UNUSED,
2133 const char *source EINA_UNUSED) 2133 const char *source EINA_UNUSED)
2134{ 2134{
2135 eo_do(data, eo_event_callback_call(ELM_ENTRY_EVENT_UNDO_REQUEST, NULL)); 2135 eo_event_callback_call(data, ELM_ENTRY_EVENT_UNDO_REQUEST, NULL);
2136} 2136}
2137 2137
2138static void 2138static void
@@ -2141,7 +2141,7 @@ _entry_redo_request_signal_cb(void *data,
2141 const char *emission EINA_UNUSED, 2141 const char *emission EINA_UNUSED,
2142 const char *source EINA_UNUSED) 2142 const char *source EINA_UNUSED)
2143{ 2143{
2144 eo_do(data, eo_event_callback_call(ELM_ENTRY_EVENT_REDO_REQUEST, NULL)); 2144 eo_event_callback_call(data, ELM_ENTRY_EVENT_REDO_REQUEST, NULL);
2145} 2145}
2146 2146
2147static void 2147static void
@@ -2159,8 +2159,8 @@ _entry_selection_start_signal_cb(void *data,
2159 { 2159 {
2160 if (entry != data) elm_entry_select_none(entry); 2160 if (entry != data) elm_entry_select_none(entry);
2161 } 2161 }
2162 eo_do(data, eo_event_callback_call 2162 eo_event_callback_call
2163 (EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_START, NULL)); 2163 (data, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_START, NULL);
2164 2164
2165 top = elm_widget_top_get(data); 2165 top = elm_widget_top_get(data);
2166 if (txt && top && (elm_win_window_id_get(top))) 2166 if (txt && top && (elm_win_window_id_get(top)))
@@ -2199,12 +2199,12 @@ _entry_selection_changed_signal_cb(void *data,
2199 ELM_ENTRY_DATA_GET(data, sd); 2199 ELM_ENTRY_DATA_GET(data, sd);
2200 2200
2201 sd->have_selection = EINA_TRUE; 2201 sd->have_selection = EINA_TRUE;
2202 eo_do(data, eo_event_callback_call 2202 eo_event_callback_call
2203 (EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_CHANGED, NULL)); 2203 (data, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_CHANGED, NULL);
2204 _selection_store(ELM_SEL_TYPE_PRIMARY, data); 2204 _selection_store(ELM_SEL_TYPE_PRIMARY, data);
2205 _update_selection_handler(data); 2205 _update_selection_handler(data);
2206 if (_elm_config->atspi_mode) 2206 if (_elm_config->atspi_mode)
2207 eo_do(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, elm_interface_atspi_accessible_event_emit(data, ELM_INTERFACE_ATSPI_TEXT_EVENT_ACCESS_TEXT_SELECTION_CHANGED, NULL)); 2207 elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, ELM_INTERFACE_ATSPI_TEXT_EVENT_ACCESS_TEXT_SELECTION_CHANGED, NULL);
2208} 2208}
2209 2209
2210static void 2210static void
@@ -2218,8 +2218,8 @@ _entry_selection_cleared_signal_cb(void *data,
2218 if (!sd->have_selection) return; 2218 if (!sd->have_selection) return;
2219 2219
2220 sd->have_selection = EINA_FALSE; 2220 sd->have_selection = EINA_FALSE;
2221 eo_do(data, eo_event_callback_call 2221 eo_event_callback_call
2222 (EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_CLEARED, NULL)); 2222 (data, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_CLEARED, NULL);
2223 if (sd->cut_sel) 2223 if (sd->cut_sel)
2224 { 2224 {
2225 elm_cnp_selection_set 2225 elm_cnp_selection_set
@@ -2250,8 +2250,8 @@ _entry_paste_request_signal_cb(void *data,
2250 ELM_SEL_TYPE_PRIMARY : ELM_SEL_TYPE_CLIPBOARD; 2250 ELM_SEL_TYPE_PRIMARY : ELM_SEL_TYPE_CLIPBOARD;
2251 2251
2252 if (!sd->editable) return; 2252 if (!sd->editable) return;
2253 eo_do(data, eo_event_callback_call 2253 eo_event_callback_call
2254 (EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_PASTE, NULL)); 2254 (data, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_PASTE, NULL);
2255 2255
2256 top = elm_widget_top_get(data); 2256 top = elm_widget_top_get(data);
2257 if ((top) && (elm_win_window_id_get(top))) 2257 if ((top) && (elm_win_window_id_get(top)))
@@ -2301,7 +2301,7 @@ _entry_cursor_changed_signal_cb(void *data,
2301 edje_object_signal_emit(sd->entry_edje, "elm,action,show,cursor", "elm"); 2301 edje_object_signal_emit(sd->entry_edje, "elm,action,show,cursor", "elm");
2302 _cursor_geometry_recalc(data); 2302 _cursor_geometry_recalc(data);
2303 if (_elm_config->atspi_mode) 2303 if (_elm_config->atspi_mode)
2304 eo_do(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, elm_interface_atspi_accessible_event_emit(data, ELM_INTERFACE_ATSPI_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL)); 2304 elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, ELM_INTERFACE_ATSPI_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL);
2305} 2305}
2306 2306
2307static void 2307static void
@@ -2310,10 +2310,10 @@ _entry_cursor_changed_manual_signal_cb(void *data,
2310 const char *emission EINA_UNUSED, 2310 const char *emission EINA_UNUSED,
2311 const char *source EINA_UNUSED) 2311 const char *source EINA_UNUSED)
2312{ 2312{
2313 eo_do(data, eo_event_callback_call 2313 eo_event_callback_call
2314 (ELM_ENTRY_EVENT_CURSOR_CHANGED_MANUAL, NULL)); 2314 (data, ELM_ENTRY_EVENT_CURSOR_CHANGED_MANUAL, NULL);
2315 if (_elm_config->atspi_mode) 2315 if (_elm_config->atspi_mode)
2316 eo_do(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, elm_interface_atspi_accessible_event_emit(data, ELM_INTERFACE_ATSPI_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL)); 2316 elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, ELM_INTERFACE_ATSPI_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL);
2317} 2317}
2318 2318
2319static void 2319static void
@@ -2369,7 +2369,7 @@ _entry_anchor_down_signal_cb(void *data,
2369 _signal_anchor_geoms_do_things_with_lol(sd, &ei); 2369 _signal_anchor_geoms_do_things_with_lol(sd, &ei);
2370 2370
2371 if (!sd->disabled) 2371 if (!sd->disabled)
2372 eo_do(data, eo_event_callback_call(ELM_ENTRY_EVENT_ANCHOR_DOWN, &ei)); 2372 eo_event_callback_call(data, ELM_ENTRY_EVENT_ANCHOR_DOWN, &ei);
2373} 2373}
2374 2374
2375static void 2375static void
@@ -2392,7 +2392,7 @@ _entry_anchor_up_signal_cb(void *data,
2392 _signal_anchor_geoms_do_things_with_lol(sd, &ei); 2392 _signal_anchor_geoms_do_things_with_lol(sd, &ei);
2393 2393
2394 if (!sd->disabled) 2394 if (!sd->disabled)
2395 eo_do(data, eo_event_callback_call(ELM_ENTRY_EVENT_ANCHOR_UP, &ei)); 2395 eo_event_callback_call(data, ELM_ENTRY_EVENT_ANCHOR_UP, &ei);
2396} 2396}
2397 2397
2398static void 2398static void
@@ -2474,9 +2474,9 @@ _entry_hover_anchor_clicked_do(Evas_Object *obj,
2474 ei.hover_right = tmp; 2474 ei.hover_right = tmp;
2475 } 2475 }
2476 2476
2477 eo_do(obj, eo_event_callback_call(ELM_ENTRY_EVENT_ANCHOR_HOVER_OPENED, &ei)); 2477 eo_event_callback_call(obj, ELM_ENTRY_EVENT_ANCHOR_HOVER_OPENED, &ei);
2478 eo_do(sd->anchor_hover.hover, eo_event_callback_add 2478 eo_event_callback_add
2479 (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _anchor_hover_clicked_cb, obj)); 2479 (sd->anchor_hover.hover, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _anchor_hover_clicked_cb, obj);
2480 2480
2481 /* FIXME: Should just check if there's any callback registered to 2481 /* FIXME: Should just check if there's any callback registered to
2482 * the smart events instead. This is used to determine if anyone 2482 * the smart events instead. This is used to determine if anyone
@@ -2514,7 +2514,7 @@ _entry_anchor_clicked_signal_cb(void *data,
2514 2514
2515 if (!sd->disabled) 2515 if (!sd->disabled)
2516 { 2516 {
2517 eo_do(data, eo_event_callback_call(ELM_ENTRY_EVENT_ANCHOR_CLICKED, &ei)); 2517 eo_event_callback_call(data, ELM_ENTRY_EVENT_ANCHOR_CLICKED, &ei);
2518 _entry_hover_anchor_clicked_do(data, &ei); 2518 _entry_hover_anchor_clicked_do(data, &ei);
2519 } 2519 }
2520} 2520}
@@ -2544,7 +2544,7 @@ _entry_anchor_in_signal_cb(void *data,
2544 _signal_anchor_geoms_do_things_with_lol(sd, &ei); 2544 _signal_anchor_geoms_do_things_with_lol(sd, &ei);
2545 2545
2546 if (!sd->disabled) 2546 if (!sd->disabled)
2547 eo_do(data, eo_event_callback_call(ELM_ENTRY_EVENT_ANCHOR_IN, &ei)); 2547 eo_event_callback_call(data, ELM_ENTRY_EVENT_ANCHOR_IN, &ei);
2548} 2548}
2549 2549
2550static void 2550static void
@@ -2564,7 +2564,7 @@ _entry_anchor_out_signal_cb(void *data,
2564 _signal_anchor_geoms_do_things_with_lol(sd, &ei); 2564 _signal_anchor_geoms_do_things_with_lol(sd, &ei);
2565 2565
2566 if (!sd->disabled) 2566 if (!sd->disabled)
2567 eo_do(data, eo_event_callback_call(ELM_ENTRY_EVENT_ANCHOR_OUT, &ei)); 2567 eo_event_callback_call(data, ELM_ENTRY_EVENT_ANCHOR_OUT, &ei);
2568} 2568}
2569 2569
2570static void 2570static void
@@ -2573,7 +2573,7 @@ _entry_key_enter_signal_cb(void *data,
2573 const char *emission EINA_UNUSED, 2573 const char *emission EINA_UNUSED,
2574 const char *source EINA_UNUSED) 2574 const char *source EINA_UNUSED)
2575{ 2575{
2576 eo_do(data, eo_event_callback_call(ELM_ENTRY_EVENT_ACTIVATED, NULL)); 2576 eo_event_callback_call(data, ELM_ENTRY_EVENT_ACTIVATED, NULL);
2577} 2577}
2578 2578
2579static void 2579static void
@@ -2582,7 +2582,7 @@ _entry_key_escape_signal_cb(void *data,
2582 const char *emission EINA_UNUSED, 2582 const char *emission EINA_UNUSED,
2583 const char *source EINA_UNUSED) 2583 const char *source EINA_UNUSED)
2584{ 2584{
2585 eo_do(data, eo_event_callback_call(ELM_ENTRY_EVENT_ABORTED, NULL)); 2585 eo_event_callback_call(data, ELM_ENTRY_EVENT_ABORTED, NULL);
2586} 2586}
2587 2587
2588static void 2588static void
@@ -2591,7 +2591,7 @@ _entry_mouse_down_signal_cb(void *data,
2591 const char *emission EINA_UNUSED, 2591 const char *emission EINA_UNUSED,
2592 const char *source EINA_UNUSED) 2592 const char *source EINA_UNUSED)
2593{ 2593{
2594 eo_do(data, eo_event_callback_call(ELM_ENTRY_EVENT_PRESS, NULL)); 2594 eo_event_callback_call(data, ELM_ENTRY_EVENT_PRESS, NULL);
2595} 2595}
2596 2596
2597static void 2597static void
@@ -2600,8 +2600,8 @@ _entry_mouse_clicked_signal_cb(void *data,
2600 const char *emission EINA_UNUSED, 2600 const char *emission EINA_UNUSED,
2601 const char *source EINA_UNUSED) 2601 const char *source EINA_UNUSED)
2602{ 2602{
2603 eo_do(data, eo_event_callback_call 2603 eo_event_callback_call
2604 (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL)); 2604 (data, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL);
2605} 2605}
2606 2606
2607static void 2607static void
@@ -2610,8 +2610,8 @@ _entry_mouse_double_signal_cb(void *data,
2610 const char *emission EINA_UNUSED, 2610 const char *emission EINA_UNUSED,
2611 const char *source EINA_UNUSED) 2611 const char *source EINA_UNUSED)
2612{ 2612{
2613 eo_do(data, eo_event_callback_call 2613 eo_event_callback_call
2614 (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_DOUBLE, NULL)); 2614 (data, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_DOUBLE, NULL);
2615} 2615}
2616 2616
2617static void 2617static void
@@ -2620,8 +2620,8 @@ _entry_mouse_triple_signal_cb(void *data,
2620 const char *emission EINA_UNUSED, 2620 const char *emission EINA_UNUSED,
2621 const char *source EINA_UNUSED) 2621 const char *source EINA_UNUSED)
2622{ 2622{
2623 eo_do(data, eo_event_callback_call 2623 eo_event_callback_call
2624 (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_TRIPLE, NULL)); 2624 (data, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_TRIPLE, NULL);
2625} 2625}
2626 2626
2627static Evas_Object * 2627static Evas_Object *
@@ -2850,8 +2850,8 @@ _text_append_idler(void *data)
2850 free(sd->append_text_left); 2850 free(sd->append_text_left);
2851 sd->append_text_left = NULL; 2851 sd->append_text_left = NULL;
2852 sd->append_text_idler = NULL; 2852 sd->append_text_idler = NULL;
2853 eo_do(obj, eo_event_callback_call 2853 eo_event_callback_call
2854 (ELM_ENTRY_EVENT_TEXT_SET_DONE, NULL)); 2854 (obj, ELM_ENTRY_EVENT_TEXT_SET_DONE, NULL);
2855 return ECORE_CALLBACK_CANCEL; 2855 return ECORE_CALLBACK_CANCEL;
2856 } 2856 }
2857} 2857}
@@ -2913,8 +2913,8 @@ _chars_add_till_limit(Evas_Object *obj,
2913 { 2913 {
2914 if (!i) 2914 if (!i)
2915 { 2915 {
2916 eo_do(obj, eo_event_callback_call 2916 eo_event_callback_call
2917 (ELM_ENTRY_EVENT_MAXLENGTH_REACHED, NULL)); 2917 (obj, ELM_ENTRY_EVENT_MAXLENGTH_REACHED, NULL);
2918 ELM_SAFE_FREE(*text, free); 2918 ELM_SAFE_FREE(*text, free);
2919 return; 2919 return;
2920 } 2920 }
@@ -2932,7 +2932,7 @@ _chars_add_till_limit(Evas_Object *obj,
2932 i++; 2932 i++;
2933 } 2933 }
2934 2934
2935 eo_do(obj, eo_event_callback_call(ELM_ENTRY_EVENT_MAXLENGTH_REACHED, NULL)); 2935 eo_event_callback_call(obj, ELM_ENTRY_EVENT_MAXLENGTH_REACHED, NULL);
2936} 2936}
2937 2937
2938EOLIAN static void 2938EOLIAN static void
@@ -2960,15 +2960,15 @@ _elm_entry_elm_layout_signal_callback_add (Eo *obj, Elm_Entry_Data *sd, const ch
2960 2960
2961 wd->resize_obj = sd->entry_edje; 2961 wd->resize_obj = sd->entry_edje;
2962 2962
2963 eo_do_super(obj, MY_CLASS, elm_obj_layout_signal_callback_add 2963 elm_obj_layout_signal_callback_add
2964 (emission, source, func_cb, data)); 2964 (eo_super(obj, MY_CLASS), emission, source, func_cb, data);
2965 2965
2966 if (sd->scr_edje) 2966 if (sd->scr_edje)
2967 { 2967 {
2968 wd->resize_obj = sd->scr_edje; 2968 wd->resize_obj = sd->scr_edje;
2969 2969
2970 eo_do_super(obj, MY_CLASS, elm_obj_layout_signal_callback_add 2970 elm_obj_layout_signal_callback_add
2971 (emission, source, func_cb, data)); 2971 (eo_super(obj, MY_CLASS), emission, source, func_cb, data);
2972 } 2972 }
2973 2973
2974 wd->resize_obj = ro; 2974 wd->resize_obj = ro;
@@ -2986,15 +2986,15 @@ _elm_entry_elm_layout_signal_callback_del(Eo *obj, Elm_Entry_Data *sd, const cha
2986 2986
2987 wd->resize_obj = sd->entry_edje; 2987 wd->resize_obj = sd->entry_edje;
2988 2988
2989 eo_do_super(obj, MY_CLASS, data = elm_obj_layout_signal_callback_del 2989 data = elm_obj_layout_signal_callback_del
2990 (emission, source, func_cb)); 2990 (eo_super(obj, MY_CLASS), emission, source, func_cb);
2991 2991
2992 if (sd->scr_edje) 2992 if (sd->scr_edje)
2993 { 2993 {
2994 wd->resize_obj = sd->scr_edje; 2994 wd->resize_obj = sd->scr_edje;
2995 2995
2996 eo_do_super(obj, MY_CLASS, data = elm_obj_layout_signal_callback_del 2996 data = elm_obj_layout_signal_callback_del
2997 (emission, source, func_cb)); 2997 (eo_super(obj, MY_CLASS), emission, source, func_cb);
2998 } 2998 }
2999 2999
3000 wd->resize_obj = ro; 3000 wd->resize_obj = ro;
@@ -3005,7 +3005,7 @@ EOLIAN static Eina_Bool
3005_elm_entry_elm_container_content_set(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, const char *part, Evas_Object *content) 3005_elm_entry_elm_container_content_set(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, const char *part, Evas_Object *content)
3006{ 3006{
3007 Eina_Bool int_ret = EINA_FALSE; 3007 Eina_Bool int_ret = EINA_FALSE;
3008 eo_do_super(obj, MY_CLASS, int_ret = elm_obj_container_content_set(part, content)); 3008 int_ret = elm_obj_container_content_set(eo_super(obj, MY_CLASS), part, content);
3009 if (!int_ret) return EINA_FALSE; 3009 if (!int_ret) return EINA_FALSE;
3010 3010
3011 /* too bad entry does not follow the pattern 3011 /* too bad entry does not follow the pattern
@@ -3023,7 +3023,7 @@ EOLIAN static Evas_Object*
3023_elm_entry_elm_container_content_unset(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, const char *part) 3023_elm_entry_elm_container_content_unset(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, const char *part)
3024{ 3024{
3025 Evas_Object *ret = NULL; 3025 Evas_Object *ret = NULL;
3026 eo_do_super(obj, MY_CLASS, ret = elm_obj_container_content_unset(part)); 3026 ret = elm_obj_container_content_unset(eo_super(obj, MY_CLASS), part);
3027 if (!ret) return NULL; 3027 if (!ret) return NULL;
3028 3028
3029 /* too bad entry does not follow the pattern 3029 /* too bad entry does not follow the pattern
@@ -3086,7 +3086,7 @@ _entry_text_append(Evas_Object* obj, const char* entry, Eina_Bool set)
3086 } 3086 }
3087 edje_object_part_text_cursor_pos_set(sd->entry_edje, "elm.text", 3087 edje_object_part_text_cursor_pos_set(sd->entry_edje, "elm.text",
3088 EDJE_CURSOR_MAIN, sd->cursor_pos); 3088 EDJE_CURSOR_MAIN, sd->cursor_pos);
3089 eo_do(obj, eo_event_callback_call(ELM_ENTRY_EVENT_TEXT_SET_DONE, NULL)); 3089 eo_event_callback_call(obj, ELM_ENTRY_EVENT_TEXT_SET_DONE, NULL);
3090 } 3090 }
3091 } 3091 }
3092} 3092}
@@ -3328,8 +3328,8 @@ _elm_entry_resize_internal(Evas_Object *obj)
3328 { 3328 {
3329 Evas_Coord vw = 0, vh = 0; 3329 Evas_Coord vw = 0, vh = 0;
3330 3330
3331 eo_do(obj, elm_interface_scrollable_content_viewport_geometry_get 3331 elm_interface_scrollable_content_viewport_geometry_get
3332 (NULL, NULL, &vw, &vh)); 3332 (obj, NULL, NULL, &vw, &vh);
3333 if (vw < sd->ent_mw) vw = sd->ent_mw; 3333 if (vw < sd->ent_mw) vw = sd->ent_mw;
3334 if (vh < sd->ent_mh) vh = sd->ent_mh; 3334 if (vh < sd->ent_mh) vh = sd->ent_mh;
3335 evas_object_resize(sd->entry_edje, vw, vh); 3335 evas_object_resize(sd->entry_edje, vw, vh);
@@ -3548,7 +3548,7 @@ _elm_entry_evas_object_smart_add(Eo *obj, Elm_Entry_Data *priv)
3548{ 3548{
3549 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 3549 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
3550 3550
3551 eo_do_super(obj, MY_CLASS, evas_obj_smart_add()); 3551 evas_obj_smart_add(eo_super(obj, MY_CLASS));
3552 elm_widget_sub_object_parent_add(obj); 3552 elm_widget_sub_object_parent_add(obj);
3553 3553
3554 priv->entry_edje = wd->resize_obj; 3554 priv->entry_edje = wd->resize_obj;
@@ -3583,7 +3583,7 @@ _elm_entry_evas_object_smart_add(Eo *obj, Elm_Entry_Data *priv)
3583 evas_object_show(priv->hit_rect); 3583 evas_object_show(priv->hit_rect);
3584 evas_object_repeat_events_set(priv->hit_rect, EINA_TRUE); 3584 evas_object_repeat_events_set(priv->hit_rect, EINA_TRUE);
3585 3585
3586 eo_do(obj, elm_interface_scrollable_objects_set(priv->entry_edje, priv->hit_rect)); 3586 elm_interface_scrollable_objects_set(obj, priv->entry_edje, priv->hit_rect);
3587 3587
3588 edje_object_item_provider_set(priv->entry_edje, _item_get, obj); 3588 edje_object_item_provider_set(priv->entry_edje, _item_get, obj);
3589 3589
@@ -3747,7 +3747,7 @@ _elm_entry_evas_object_smart_del(Eo *obj, Elm_Entry_Data *sd)
3747 } 3747 }
3748 3748
3749 if (sd->scroll) 3749 if (sd->scroll)
3750 eo_do(obj, elm_interface_scrollable_content_viewport_resize_cb_set(NULL)); 3750 elm_interface_scrollable_content_viewport_resize_cb_set(obj, NULL);
3751 3751
3752 elm_entry_anchor_hover_end(obj); 3752 elm_entry_anchor_hover_end(obj);
3753 elm_entry_anchor_hover_parent_set(obj, NULL); 3753 elm_entry_anchor_hover_parent_set(obj, NULL);
@@ -3803,13 +3803,13 @@ _elm_entry_evas_object_smart_del(Eo *obj, Elm_Entry_Data *sd)
3803 evas_object_del(sd->end_handler); 3803 evas_object_del(sd->end_handler);
3804 } 3804 }
3805 3805
3806 eo_do_super(obj, MY_CLASS, evas_obj_smart_del()); 3806 evas_obj_smart_del(eo_super(obj, MY_CLASS));
3807} 3807}
3808 3808
3809EOLIAN static void 3809EOLIAN static void
3810_elm_entry_evas_object_smart_move(Eo *obj, Elm_Entry_Data *sd, Evas_Coord x, Evas_Coord y) 3810_elm_entry_evas_object_smart_move(Eo *obj, Elm_Entry_Data *sd, Evas_Coord x, Evas_Coord y)
3811{ 3811{
3812 eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y)); 3812 evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y);
3813 3813
3814 evas_object_move(sd->hit_rect, x, y); 3814 evas_object_move(sd->hit_rect, x, y);
3815 3815
@@ -3822,7 +3822,7 @@ _elm_entry_evas_object_smart_move(Eo *obj, Elm_Entry_Data *sd, Evas_Coord x, Eva
3822EOLIAN static void 3822EOLIAN static void
3823_elm_entry_evas_object_smart_resize(Eo *obj, Elm_Entry_Data *sd, Evas_Coord w, Evas_Coord h) 3823_elm_entry_evas_object_smart_resize(Eo *obj, Elm_Entry_Data *sd, Evas_Coord w, Evas_Coord h)
3824{ 3824{
3825 eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h)); 3825 evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h);
3826 3826
3827 evas_object_resize(sd->hit_rect, w, h); 3827 evas_object_resize(sd->hit_rect, w, h);
3828 if (sd->have_selection) 3828 if (sd->have_selection)
@@ -3832,7 +3832,7 @@ _elm_entry_evas_object_smart_resize(Eo *obj, Elm_Entry_Data *sd, Evas_Coord w, E
3832EOLIAN static void 3832EOLIAN static void
3833_elm_entry_evas_object_smart_show(Eo *obj, Elm_Entry_Data *sd) 3833_elm_entry_evas_object_smart_show(Eo *obj, Elm_Entry_Data *sd)
3834{ 3834{
3835 eo_do_super(obj, MY_CLASS, evas_obj_smart_show()); 3835 evas_obj_smart_show(eo_super(obj, MY_CLASS));
3836 3836
3837 if (sd->have_selection) 3837 if (sd->have_selection)
3838 _update_selection_handler(obj); 3838 _update_selection_handler(obj);
@@ -3841,7 +3841,7 @@ _elm_entry_evas_object_smart_show(Eo *obj, Elm_Entry_Data *sd)
3841EOLIAN static void 3841EOLIAN static void
3842_elm_entry_evas_object_smart_hide(Eo *obj, Elm_Entry_Data *sd) 3842_elm_entry_evas_object_smart_hide(Eo *obj, Elm_Entry_Data *sd)
3843{ 3843{
3844 eo_do_super(obj, MY_CLASS, evas_obj_smart_hide()); 3844 evas_obj_smart_hide(eo_super(obj, MY_CLASS));
3845 3845
3846 if (sd->have_selection) 3846 if (sd->have_selection)
3847 _hide_selection_handler(obj); 3847 _hide_selection_handler(obj);
@@ -3850,7 +3850,7 @@ _elm_entry_evas_object_smart_hide(Eo *obj, Elm_Entry_Data *sd)
3850EOLIAN static void 3850EOLIAN static void
3851_elm_entry_evas_object_smart_member_add(Eo *obj, Elm_Entry_Data *sd, Evas_Object *member) 3851_elm_entry_evas_object_smart_member_add(Eo *obj, Elm_Entry_Data *sd, Evas_Object *member)
3852{ 3852{
3853 eo_do_super(obj, MY_CLASS, evas_obj_smart_member_add(member)); 3853 evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member);
3854 3854
3855 if (sd->hit_rect) 3855 if (sd->hit_rect)
3856 evas_object_raise(sd->hit_rect); 3856 evas_object_raise(sd->hit_rect);
@@ -3902,13 +3902,12 @@ _cb_deleted(void *data EINA_UNUSED, const Eo_Event *ev)
3902EOLIAN static Eo * 3902EOLIAN static Eo *
3903_elm_entry_eo_base_constructor(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED) 3903_elm_entry_eo_base_constructor(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED)
3904{ 3904{
3905 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); 3905 obj = eo_constructor(eo_super(obj, MY_CLASS));
3906 eo_do(obj, 3906 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
3907 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 3907 evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
3908 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 3908 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ENTRY);
3909 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_ENTRY), 3909 eo_event_callback_add(obj, EO_BASE_EVENT_CALLBACK_ADD, _cb_added, NULL);
3910 eo_event_callback_add(EO_BASE_EVENT_CALLBACK_ADD, _cb_added, NULL), 3910 eo_event_callback_add(obj, EO_BASE_EVENT_CALLBACK_DEL, _cb_deleted, NULL);
3911 eo_event_callback_add(EO_BASE_EVENT_CALLBACK_DEL, _cb_deleted, NULL));
3912 3911
3913 return obj; 3912 return obj;
3914} 3913}
@@ -3917,7 +3916,7 @@ EOLIAN static void
3917_elm_entry_text_style_user_push(Eo *obj, Elm_Entry_Data *sd, const char *style) 3916_elm_entry_text_style_user_push(Eo *obj, Elm_Entry_Data *sd, const char *style)
3918{ 3917{
3919 edje_object_part_text_style_user_push(sd->entry_edje, "elm.text", style); 3918 edje_object_part_text_style_user_push(sd->entry_edje, "elm.text", style);
3920 eo_do(obj, elm_obj_widget_theme_apply()); 3919 elm_obj_widget_theme_apply(obj);
3921} 3920}
3922 3921
3923EOLIAN static void 3922EOLIAN static void
@@ -3925,7 +3924,7 @@ _elm_entry_text_style_user_pop(Eo *obj, Elm_Entry_Data *sd)
3925{ 3924{
3926 edje_object_part_text_style_user_pop(sd->entry_edje, "elm.text"); 3925 edje_object_part_text_style_user_pop(sd->entry_edje, "elm.text");
3927 3926
3928 eo_do(obj, elm_obj_widget_theme_apply()); 3927 elm_obj_widget_theme_apply(obj);
3929} 3928}
3930 3929
3931EOLIAN static const char* 3930EOLIAN static const char*
@@ -3952,15 +3951,15 @@ _elm_entry_single_line_set(Eo *obj, Elm_Entry_Data *sd, Eina_Bool single_line)
3952 { 3951 {
3953 elm_entry_markup_filter_remove(obj, _entry_new_line_filter_cb, NULL); 3952 elm_entry_markup_filter_remove(obj, _entry_new_line_filter_cb, NULL);
3954 } 3953 }
3955 eo_do(obj, elm_obj_widget_theme_apply()); 3954 elm_obj_widget_theme_apply(obj);
3956 3955
3957 if (sd->scroll) 3956 if (sd->scroll)
3958 { 3957 {
3959 if (sd->single_line) 3958 if (sd->single_line)
3960 eo_do(obj, elm_interface_scrollable_policy_set(ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF)); 3959 elm_interface_scrollable_policy_set(obj, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
3961 else 3960 else
3962 { 3961 {
3963 eo_do(obj, elm_interface_scrollable_policy_set(sd->policy_h, sd->policy_v)); 3962 elm_interface_scrollable_policy_set(obj, sd->policy_h, sd->policy_v);
3964 } 3963 }
3965 elm_layout_sizing_eval(obj); 3964 elm_layout_sizing_eval(obj);
3966 } 3965 }
@@ -3991,7 +3990,7 @@ _elm_entry_password_set(Eo *obj, Elm_Entry_Data *sd, Eina_Bool password)
3991 sd->line_wrap = ELM_WRAP_NONE; 3990 sd->line_wrap = ELM_WRAP_NONE;
3992 elm_entry_input_hint_set(obj, ((sd->input_hints & ~ELM_INPUT_HINT_AUTO_COMPLETE) | ELM_INPUT_HINT_SENSITIVE_DATA)); 3991 elm_entry_input_hint_set(obj, ((sd->input_hints & ~ELM_INPUT_HINT_AUTO_COMPLETE) | ELM_INPUT_HINT_SENSITIVE_DATA));
3993 _entry_selection_callbacks_unregister(obj); 3992 _entry_selection_callbacks_unregister(obj);
3994 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_PASSWORD_TEXT); 3993 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PASSWORD_TEXT);
3995 } 3994 }
3996 else 3995 else
3997 { 3996 {
@@ -4004,10 +4003,10 @@ _elm_entry_password_set(Eo *obj, Elm_Entry_Data *sd, Eina_Bool password)
4004 4003
4005 elm_entry_input_hint_set(obj, ((sd->input_hints | ELM_INPUT_HINT_AUTO_COMPLETE) & ~ELM_INPUT_HINT_SENSITIVE_DATA)); 4004 elm_entry_input_hint_set(obj, ((sd->input_hints | ELM_INPUT_HINT_AUTO_COMPLETE) & ~ELM_INPUT_HINT_SENSITIVE_DATA));
4006 _entry_selection_callbacks_register(obj); 4005 _entry_selection_callbacks_register(obj);
4007 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_ENTRY); 4006 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ENTRY);
4008 } 4007 }
4009 4008
4010 eo_do(obj, elm_obj_widget_theme_apply()); 4009 elm_obj_widget_theme_apply(obj);
4011} 4010}
4012 4011
4013EOLIAN static Eina_Bool 4012EOLIAN static Eina_Bool
@@ -4021,7 +4020,7 @@ elm_entry_entry_set(Evas_Object *obj,
4021 const char *entry) 4020 const char *entry)
4022{ 4021{
4023 ELM_ENTRY_CHECK(obj); 4022 ELM_ENTRY_CHECK(obj);
4024 eo_do(obj, elm_obj_layout_text_set(NULL, entry)); 4023 elm_obj_layout_text_set(obj, NULL, entry);
4025} 4024}
4026 4025
4027EAPI const char * 4026EAPI const char *
@@ -4029,7 +4028,7 @@ elm_entry_entry_get(const Evas_Object *obj)
4029{ 4028{
4030 ELM_ENTRY_CHECK(obj) NULL; 4029 ELM_ENTRY_CHECK(obj) NULL;
4031 const char *text = NULL; 4030 const char *text = NULL;
4032 eo_do((Eo *)obj, text = elm_obj_layout_text_get(NULL)); 4031 text = elm_obj_layout_text_get((Eo *)obj, NULL);
4033 return text; 4032 return text;
4034} 4033}
4035 4034
@@ -4107,7 +4106,7 @@ _elm_entry_line_wrap_set(Eo *obj, Elm_Entry_Data *sd, Elm_Wrap_Type wrap)
4107 sd->line_wrap = wrap; 4106 sd->line_wrap = wrap;
4108 if (wrap == ELM_WRAP_NONE) 4107 if (wrap == ELM_WRAP_NONE)
4109 ELM_SAFE_FREE(sd->deferred_recalc_job, ecore_job_del); 4108 ELM_SAFE_FREE(sd->deferred_recalc_job, ecore_job_del);
4110 eo_do(obj, elm_obj_widget_theme_apply()); 4109 elm_obj_widget_theme_apply(obj);
4111} 4110}
4112 4111
4113EOLIAN static Elm_Wrap_Type 4112EOLIAN static Elm_Wrap_Type
@@ -4121,7 +4120,7 @@ _elm_entry_editable_set(Eo *obj, Elm_Entry_Data *sd, Eina_Bool editable)
4121{ 4120{
4122 if (sd->editable == editable) return; 4121 if (sd->editable == editable) return;
4123 sd->editable = editable; 4122 sd->editable = editable;
4124 eo_do(obj, elm_obj_widget_theme_apply()); 4123 elm_obj_widget_theme_apply(obj);
4125 4124
4126 elm_drop_target_del(obj, sd->drop_format, 4125 elm_drop_target_del(obj, sd->drop_format,
4127 NULL, NULL, 4126 NULL, NULL,
@@ -4158,8 +4157,8 @@ _elm_entry_select_none(Eo *obj EINA_UNUSED, Elm_Entry_Data *sd)
4158 edje_object_signal_emit(sd->entry_edje, "elm,state,select,off", "elm"); 4157 edje_object_signal_emit(sd->entry_edje, "elm,state,select,off", "elm");
4159 } 4158 }
4160 if (sd->have_selection) 4159 if (sd->have_selection)
4161 eo_do(obj, eo_event_callback_call 4160 eo_event_callback_call
4162 (EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_CLEARED, NULL)); 4161 (obj, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_CLEARED, NULL);
4163 4162
4164 sd->have_selection = EINA_FALSE; 4163 sd->have_selection = EINA_FALSE;
4165 edje_object_part_text_select_none(sd->entry_edje, "elm.text"); 4164 edje_object_part_text_select_none(sd->entry_edje, "elm.text");
@@ -4561,8 +4560,8 @@ elm_entry_filter_limit_size(void *data,
4561 newlen = evas_string_char_len_get(utfstr); 4560 newlen = evas_string_char_len_get(utfstr);
4562 if ((len >= lim->max_char_count) && (newlen > 0)) 4561 if ((len >= lim->max_char_count) && (newlen > 0))
4563 { 4562 {
4564 eo_do(entry, eo_event_callback_call 4563 eo_event_callback_call
4565 (ELM_ENTRY_EVENT_MAXLENGTH_REACHED, NULL)); 4564 (entry, ELM_ENTRY_EVENT_MAXLENGTH_REACHED, NULL);
4566 ELM_SAFE_FREE(*text, free); 4565 ELM_SAFE_FREE(*text, free);
4567 free(current); 4566 free(current);
4568 free(utfstr); 4567 free(utfstr);
@@ -4578,8 +4577,8 @@ elm_entry_filter_limit_size(void *data,
4578 newlen = strlen(utfstr); 4577 newlen = strlen(utfstr);
4579 if ((len >= lim->max_byte_count) && (newlen > 0)) 4578 if ((len >= lim->max_byte_count) && (newlen > 0))
4580 { 4579 {
4581 eo_do(entry, eo_event_callback_call 4580 eo_event_callback_call
4582 (ELM_ENTRY_EVENT_MAXLENGTH_REACHED, NULL)); 4581 (entry, ELM_ENTRY_EVENT_MAXLENGTH_REACHED, NULL);
4583 ELM_SAFE_FREE(*text, free); 4582 ELM_SAFE_FREE(*text, free);
4584 free(current); 4583 free(current);
4585 free(utfstr); 4584 free(utfstr);
@@ -4713,7 +4712,7 @@ inserting:
4713 } 4712 }
4714 *insert = 0; 4713 *insert = 0;
4715 if (rejected) 4714 if (rejected)
4716 eo_do(entry, eo_event_callback_call(ELM_ENTRY_EVENT_REJECTED, NULL)); 4715 eo_event_callback_call(entry, ELM_ENTRY_EVENT_REJECTED, NULL);
4717} 4716}
4718 4717
4719EOLIAN static void 4718EOLIAN static void
@@ -4726,8 +4725,8 @@ EAPI Eina_Bool
4726elm_entry_file_set(Evas_Object *obj, const char *file, Elm_Text_Format format) 4725elm_entry_file_set(Evas_Object *obj, const char *file, Elm_Text_Format format)
4727{ 4726{
4728 Eina_Bool ret; 4727 Eina_Bool ret;
4729 eo_do(obj, elm_obj_entry_file_text_format_set(format), 4728 elm_obj_entry_file_text_format_set(obj, format);
4730 ret = efl_file_set(file, NULL)); 4729 ret = efl_file_set(obj, file, NULL);
4731 return ret; 4730 return ret;
4732} 4731}
4733 4732
@@ -4744,7 +4743,7 @@ _elm_entry_efl_file_file_set(Eo *obj, Elm_Entry_Data *sd, const char *file, cons
4744EAPI void 4743EAPI void
4745elm_entry_file_get(const Evas_Object *obj, const char **file, Elm_Text_Format *format) 4744elm_entry_file_get(const Evas_Object *obj, const char **file, Elm_Text_Format *format)
4746{ 4745{
4747 eo_do(obj, efl_file_get(file, NULL)); 4746 efl_file_get(obj, file, NULL);
4748 if (format) 4747 if (format)
4749 { 4748 {
4750 ELM_ENTRY_DATA_GET(obj, sd); 4749 ELM_ENTRY_DATA_GET(obj, sd);
@@ -4846,8 +4845,8 @@ _scroll_cb(Evas_Object *obj, void *data EINA_UNUSED)
4846{ 4845{
4847 ELM_ENTRY_DATA_GET(obj, sd); 4846 ELM_ENTRY_DATA_GET(obj, sd);
4848 /* here we need to emit the signal that the elm_scroller would have done */ 4847 /* here we need to emit the signal that the elm_scroller would have done */
4849 eo_do(obj, eo_event_callback_call 4848 eo_event_callback_call
4850 (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL, NULL)); 4849 (obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL, NULL);
4851 4850
4852 if (sd->have_selection) 4851 if (sd->have_selection)
4853 _update_selection_handler(obj); 4852 _update_selection_handler(obj);
@@ -4886,24 +4885,24 @@ _elm_entry_scrollable_set(Eo *obj, Elm_Entry_Data *sd, Eina_Bool scroll)
4886 4885
4887 elm_widget_resize_object_set(obj, sd->scr_edje, EINA_TRUE); 4886 elm_widget_resize_object_set(obj, sd->scr_edje, EINA_TRUE);
4888 4887
4889 eo_do(obj, elm_interface_scrollable_objects_set(sd->scr_edje, sd->hit_rect)); 4888 elm_interface_scrollable_objects_set(obj, sd->scr_edje, sd->hit_rect);
4890 4889
4891 eo_do(obj, elm_interface_scrollable_scroll_cb_set(_scroll_cb)); 4890 elm_interface_scrollable_scroll_cb_set(obj, _scroll_cb);
4892 4891
4893 eo_do(obj, elm_interface_scrollable_bounce_allow_set(sd->h_bounce, sd->v_bounce)); 4892 elm_interface_scrollable_bounce_allow_set(obj, sd->h_bounce, sd->v_bounce);
4894 if (sd->single_line) 4893 if (sd->single_line)
4895 eo_do(obj, elm_interface_scrollable_policy_set(ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF)); 4894 elm_interface_scrollable_policy_set(obj, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
4896 else 4895 else
4897 eo_do(obj, elm_interface_scrollable_policy_set(sd->policy_h, sd->policy_v)); 4896 elm_interface_scrollable_policy_set(obj, sd->policy_h, sd->policy_v);
4898 eo_do(obj, elm_interface_scrollable_content_set(sd->entry_edje)); 4897 elm_interface_scrollable_content_set(obj, sd->entry_edje);
4899 eo_do(obj, elm_interface_scrollable_content_viewport_resize_cb_set(_elm_entry_content_viewport_resize_cb)); 4898 elm_interface_scrollable_content_viewport_resize_cb_set(obj, _elm_entry_content_viewport_resize_cb);
4900 elm_widget_on_show_region_hook_set(obj, _show_region_hook, NULL); 4899 elm_widget_on_show_region_hook_set(obj, _show_region_hook, NULL);
4901 } 4900 }
4902 else 4901 else
4903 { 4902 {
4904 if (sd->scr_edje) 4903 if (sd->scr_edje)
4905 { 4904 {
4906 eo_do(obj, elm_interface_scrollable_content_set(NULL)); 4905 elm_interface_scrollable_content_set(obj, NULL);
4907 evas_object_hide(sd->scr_edje); 4906 evas_object_hide(sd->scr_edje);
4908 } 4907 }
4909 elm_widget_resize_object_set(obj, sd->entry_edje, EINA_TRUE); 4908 elm_widget_resize_object_set(obj, sd->entry_edje, EINA_TRUE);
@@ -4911,12 +4910,12 @@ _elm_entry_scrollable_set(Eo *obj, Elm_Entry_Data *sd, Eina_Bool scroll)
4911 if (sd->scr_edje) 4910 if (sd->scr_edje)
4912 elm_widget_sub_object_add(obj, sd->scr_edje); 4911 elm_widget_sub_object_add(obj, sd->scr_edje);
4913 4912
4914 eo_do(obj, elm_interface_scrollable_objects_set(sd->entry_edje, sd->hit_rect)); 4913 elm_interface_scrollable_objects_set(obj, sd->entry_edje, sd->hit_rect);
4915 4914
4916 elm_widget_on_show_region_hook_set(obj, NULL, NULL); 4915 elm_widget_on_show_region_hook_set(obj, NULL, NULL);
4917 } 4916 }
4918 sd->last_w = -1; 4917 sd->last_w = -1;
4919 eo_do(obj, elm_obj_widget_theme_apply()); 4918 elm_obj_widget_theme_apply(obj);
4920} 4919}
4921 4920
4922EOLIAN static Eina_Bool 4921EOLIAN static Eina_Bool
@@ -4957,7 +4956,7 @@ elm_entry_scrollbar_policy_set(Evas_Object *obj,
4957 Elm_Scroller_Policy v) 4956 Elm_Scroller_Policy v)
4958{ 4957{
4959 ELM_ENTRY_CHECK(obj); 4958 ELM_ENTRY_CHECK(obj);
4960 eo_do(obj, elm_interface_scrollable_policy_set(h, v)); 4959 elm_interface_scrollable_policy_set(obj, h, v);
4961} 4960}
4962 4961
4963EOLIAN static void 4962EOLIAN static void
@@ -4965,7 +4964,7 @@ _elm_entry_elm_interface_scrollable_policy_set(Eo *obj, Elm_Entry_Data *sd, Elm_
4965{ 4964{
4966 sd->policy_h = h; 4965 sd->policy_h = h;
4967 sd->policy_v = v; 4966 sd->policy_v = v;
4968 eo_do_super(obj, MY_CLASS, elm_interface_scrollable_policy_set(sd->policy_h, sd->policy_v)); 4967 elm_interface_scrollable_policy_set(eo_super(obj, MY_CLASS), sd->policy_h, sd->policy_v);
4969} 4968}
4970 4969
4971EAPI void 4970EAPI void
@@ -4974,7 +4973,7 @@ elm_entry_bounce_set(Evas_Object *obj,
4974 Eina_Bool v_bounce) 4973 Eina_Bool v_bounce)
4975{ 4974{
4976 ELM_ENTRY_CHECK(obj); 4975 ELM_ENTRY_CHECK(obj);
4977 eo_do(obj, elm_interface_scrollable_bounce_allow_set(h_bounce, v_bounce)); 4976 elm_interface_scrollable_bounce_allow_set(obj, h_bounce, v_bounce);
4978} 4977}
4979 4978
4980EOLIAN static void 4979EOLIAN static void
@@ -4982,7 +4981,7 @@ _elm_entry_elm_interface_scrollable_bounce_allow_set(Eo *obj, Elm_Entry_Data *sd
4982{ 4981{
4983 sd->h_bounce = h_bounce; 4982 sd->h_bounce = h_bounce;
4984 sd->v_bounce = v_bounce; 4983 sd->v_bounce = v_bounce;
4985 eo_do_super(obj, MY_CLASS, elm_interface_scrollable_bounce_allow_set(h_bounce, v_bounce)); 4984 elm_interface_scrollable_bounce_allow_set(eo_super(obj, MY_CLASS), h_bounce, v_bounce);
4986} 4985}
4987 4986
4988EAPI void 4987EAPI void
@@ -4991,7 +4990,7 @@ elm_entry_bounce_get(const Evas_Object *obj,
4991 Eina_Bool *v_bounce) 4990 Eina_Bool *v_bounce)
4992{ 4991{
4993 ELM_ENTRY_CHECK(obj); 4992 ELM_ENTRY_CHECK(obj);
4994 eo_do((Eo *) obj, elm_interface_scrollable_bounce_allow_get(h_bounce, v_bounce)); 4993 elm_interface_scrollable_bounce_allow_get((Eo *) obj, h_bounce, v_bounce);
4995} 4994}
4996 4995
4997EOLIAN static void 4996EOLIAN static void
@@ -5262,8 +5261,8 @@ _elm_entry_elm_widget_activate(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, Elm_Act
5262 if (!elm_widget_disabled_get(obj) && 5261 if (!elm_widget_disabled_get(obj) &&
5263 !evas_object_freeze_events_get(obj)) 5262 !evas_object_freeze_events_get(obj))
5264 { 5263 {
5265 eo_do(obj, eo_event_callback_call 5264 eo_event_callback_call
5266 (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL)); 5265 (obj, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL);
5267 if (sd->editable && sd->input_panel_enable) 5266 if (sd->editable && sd->input_panel_enable)
5268 edje_object_part_text_input_panel_show(sd->entry_edje, "elm.text"); 5267 edje_object_part_text_input_panel_show(sd->entry_edje, "elm.text");
5269 } 5268 }
@@ -5476,7 +5475,7 @@ _elm_entry_elm_interface_atspi_text_selection_get(Eo *obj, Elm_Entry_Data *_pd E
5476{ 5475{
5477 if (selection_number != 0) return; 5476 if (selection_number != 0) return;
5478 5477
5479 eo_do(obj, elm_obj_entry_select_region_get(start_offset, end_offset)); 5478 elm_obj_entry_select_region_get(obj, start_offset, end_offset);
5480} 5479}
5481 5480
5482EOLIAN static Eina_Bool 5481EOLIAN static Eina_Bool
@@ -5847,7 +5846,7 @@ EOLIAN static Elm_Atspi_State_Set
5847_elm_entry_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED) 5846_elm_entry_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED)
5848{ 5847{
5849 Elm_Atspi_State_Set ret; 5848 Elm_Atspi_State_Set ret;
5850 eo_do_super(obj, ELM_ENTRY_CLASS, ret = elm_interface_atspi_accessible_state_set_get()); 5849 ret = elm_interface_atspi_accessible_state_set_get(eo_super(obj, ELM_ENTRY_CLASS));
5851 5850
5852 if (elm_entry_editable_get(obj)) 5851 if (elm_entry_editable_get(obj))
5853 STATE_TYPE_SET(ret, ELM_ATSPI_STATE_EDITABLE); 5852 STATE_TYPE_SET(ret, ELM_ATSPI_STATE_EDITABLE);
@@ -5859,7 +5858,7 @@ EOLIAN static char*
5859_elm_entry_elm_interface_atspi_accessible_name_get(Eo *obj, Elm_Entry_Data *sd) 5858_elm_entry_elm_interface_atspi_accessible_name_get(Eo *obj, Elm_Entry_Data *sd)
5860{ 5859{
5861 char *name; 5860 char *name;
5862 eo_do_super(obj, ELM_ENTRY_CLASS, name = elm_interface_atspi_accessible_name_get()); 5861 name = elm_interface_atspi_accessible_name_get(eo_super(obj, ELM_ENTRY_CLASS));
5863 if (name && strncmp("", name, 1)) return name; 5862 if (name && strncmp("", name, 1)) return name;
5864 const char *ret = edje_object_part_text_get(sd->entry_edje, "elm.guide"); 5863 const char *ret = edje_object_part_text_get(sd->entry_edje, "elm.guide");
5865 return ret ? strdup(ret) : NULL; 5864 return ret ? strdup(ret) : NULL;