summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2019-02-09 18:45:27 +0100
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-02-13 16:59:58 +0100
commit37d2d378ec2e2d1f9a3941372ef4d818996291c7 (patch)
treee100879fbdc9ce0d2ce810be81977be97125603b /src/lib
parent3b2a5a429be16e5b8e5d322b7a077a2c849586b8 (diff)
eolian: drop class function overriding
Until this commit eo did class functions as part of the vtable, which enabled those functions to be overwritten in classes inheriting another class. However in task T7675 we decided that this is not really good for bindings, as most OOP languages do not support this sort of feature. After this commit eolian realizes class function completly outside of the vtable, the c-symbol that is the class funciton is now just directly redirecting to a implementation, without the involvement of the vtable. This also means a change to the syntax created by eo: Calling before: class_function(CLASS_A); Calling after: class_function(); Implementation before: class_function(const Eo *obj, void *pd) { ... } Implementation after: class_function(void) { ... } This fixes T7675. Co-authored-by: lauromauro <lauromoura@expertisesolutions.com.br> Reviewed-by: Daniel Kolesa <daniel@octaforge.org> Differential Revision: https://phab.enlightenment.org/D7901
Diffstat (limited to '')
-rw-r--r--src/lib/ecore/ecore_event_message_handler.c2
-rw-r--r--src/lib/ecore/ecore_events.c3
-rw-r--r--src/lib/ecore/efl_app.c2
-rw-r--r--src/lib/ecore/efl_core_proc_env.c2
-rw-r--r--src/lib/ecore/efl_loop.c8
-rw-r--r--src/lib/ecore_con/ecore_con_url.c2
-rw-r--r--src/lib/ecore_con/efl_net_dialer_http.c4
-rw-r--r--src/lib/ecore_con/efl_net_dialer_ssl.c2
-rw-r--r--src/lib/ecore_con/efl_net_dialer_udp.c2
-rw-r--r--src/lib/ecore_con/efl_net_ip_address.c16
-rw-r--r--src/lib/ecore_con/efl_net_ssl_context.c4
-rw-r--r--src/lib/edje/edje_util.c1
-rw-r--r--src/lib/efl/interfaces/efl_text_markup_util.c6
-rw-r--r--src/lib/elementary/efl_access_object.c8
-rw-r--r--src/lib/elementary/efl_access_object.h26
-rw-r--r--src/lib/elementary/efl_access_window.h14
-rw-r--r--src/lib/elementary/efl_ui_dnd.c4
-rw-r--r--src/lib/elementary/efl_ui_focus_layer.c2
-rw-r--r--src/lib/elementary/efl_ui_focus_manager_calc.c6
-rw-r--r--src/lib/elementary/efl_ui_focus_util.c8
-rw-r--r--src/lib/elementary/efl_ui_widget.c2
-rw-r--r--src/lib/elementary/efl_ui_win.c12
-rw-r--r--src/lib/elementary/elm_access.c2
-rw-r--r--src/lib/elementary/elm_atspi_bridge.c20
-rw-r--r--src/lib/elementary/elm_entry.c12
-rw-r--r--src/lib/elementary/elm_focus_legacy.c10
-rw-r--r--src/lib/elementary/elm_menu.c4
-rw-r--r--src/lib/elementary/elm_sys_notify.c7
-rw-r--r--src/lib/elementary/elm_theme.c2
-rw-r--r--src/lib/eo/eo_base_class.c6
-rw-r--r--src/lib/eolian_cxx/grammar/function_definition.hpp19
-rw-r--r--src/lib/evas/canvas/efl_input_event.c4
32 files changed, 108 insertions, 114 deletions
diff --git a/src/lib/ecore/ecore_event_message_handler.c b/src/lib/ecore/ecore_event_message_handler.c
index 60ab2c9395..52a63b9677 100644
--- a/src/lib/ecore/ecore_event_message_handler.c
+++ b/src/lib/ecore/ecore_event_message_handler.c
@@ -87,7 +87,7 @@ _ecore_event_filters_call(Eo *obj, Efl_Loop_Data *pd)
87 Filter *f; 87 Filter *f;
88 Ecore_Event_Message_Handler_Data *eemhd; 88 Ecore_Event_Message_Handler_Data *eemhd;
89 Eo *ecore_event_handler = efl_loop_message_handler_get 89 Eo *ecore_event_handler = efl_loop_message_handler_get
90 (EFL_LOOP_CLASS, obj, ECORE_EVENT_MESSAGE_HANDLER_CLASS); 90 (obj, ECORE_EVENT_MESSAGE_HANDLER_CLASS);
91 91
92 if (!ecore_event_handler) return; 92 if (!ecore_event_handler) return;
93 eemhd = efl_data_scope_get(ecore_event_handler, MY_CLASS); 93 eemhd = efl_data_scope_get(ecore_event_handler, MY_CLASS);
diff --git a/src/lib/ecore/ecore_events.c b/src/lib/ecore/ecore_events.c
index 258e10e663..59c04f127c 100644
--- a/src/lib/ecore/ecore_events.c
+++ b/src/lib/ecore/ecore_events.c
@@ -246,8 +246,7 @@ _ecore_event_init(void)
246 if ((!choice) || (!choice[0])) choice = "chained_mempool"; 246 if ((!choice) || (!choice[0])) choice = "chained_mempool";
247 247
248 _event_msg_handler = 248 _event_msg_handler =
249 efl_loop_message_handler_get(EFL_LOOP_CLASS, 249 efl_loop_message_handler_get(_mainloop_singleton,
250 _mainloop_singleton,
251 ECORE_EVENT_MESSAGE_HANDLER_CLASS); 250 ECORE_EVENT_MESSAGE_HANDLER_CLASS);
252 if (!_event_msg_handler) 251 if (!_event_msg_handler)
253 { 252 {
diff --git a/src/lib/ecore/efl_app.c b/src/lib/ecore/efl_app.c
index 3d090ca4d6..6bfa80088b 100644
--- a/src/lib/ecore/efl_app.c
+++ b/src/lib/ecore/efl_app.c
@@ -15,7 +15,7 @@
15Efl_Version _app_efl_version = { 0, 0, 0, 0, NULL, NULL }; 15Efl_Version _app_efl_version = { 0, 0, 0, 0, NULL, NULL };
16 16
17EOLIAN static Efl_App* 17EOLIAN static Efl_App*
18_efl_app_app_main_get(const Eo *obj EINA_UNUSED, void *pd EINA_UNUSED) 18_efl_app_app_main_get(void)
19{ 19{
20 if (_mainloop_singleton) return _mainloop_singleton; 20 if (_mainloop_singleton) return _mainloop_singleton;
21 _mainloop_singleton = efl_add_ref(EFL_APP_CLASS, NULL); 21 _mainloop_singleton = efl_add_ref(EFL_APP_CLASS, NULL);
diff --git a/src/lib/ecore/efl_core_proc_env.c b/src/lib/ecore/efl_core_proc_env.c
index 846b69a350..74519461ae 100644
--- a/src/lib/ecore/efl_core_proc_env.c
+++ b/src/lib/ecore/efl_core_proc_env.c
@@ -131,7 +131,7 @@ _efl_core_proc_env_efl_object_constructor(Eo *obj, Efl_Core_Proc_Env_Data *pd EI
131} 131}
132 132
133EOLIAN static Efl_Core_Env* 133EOLIAN static Efl_Core_Env*
134_efl_core_proc_env_self(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED) 134_efl_core_proc_env_self(void)
135{ 135{
136 if (!env) 136 if (!env)
137 { 137 {
diff --git a/src/lib/ecore/efl_loop.c b/src/lib/ecore/efl_loop.c
index cf8600c998..342a6f7725 100644
--- a/src/lib/ecore/efl_loop.c
+++ b/src/lib/ecore/efl_loop.c
@@ -29,7 +29,7 @@ struct _Efl_Loop_Promise_Simple_Data
29GENERIC_ALLOC_SIZE_DECLARE(Efl_Loop_Promise_Simple_Data); 29GENERIC_ALLOC_SIZE_DECLARE(Efl_Loop_Promise_Simple_Data);
30 30
31EOLIAN static Efl_Loop_Message_Handler * 31EOLIAN static Efl_Loop_Message_Handler *
32_efl_loop_message_handler_get(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, Efl_Loop *loop, const Efl_Class *klass) 32_efl_loop_message_handler_get(Efl_Loop *loop, const Efl_Class *klass)
33{ 33{
34 Message_Handler mh = { 0 }, *mh2; 34 Message_Handler mh = { 0 }, *mh2;
35 Efl_Loop_Data *ld = efl_data_scope_get(loop, EFL_LOOP_CLASS); 35 Efl_Loop_Data *ld = efl_data_scope_get(loop, EFL_LOOP_CLASS);
@@ -54,7 +54,7 @@ Efl_Loop_Data *_mainloop_singleton_data = NULL;
54EAPI Eo * 54EAPI Eo *
55efl_main_loop_get(void) 55efl_main_loop_get(void)
56{ 56{
57 return efl_app_main_get(EFL_APP_CLASS); 57 return efl_app_main_get();
58} 58}
59 59
60EOLIAN static void 60EOLIAN static void
@@ -309,7 +309,7 @@ _efl_loop_efl_object_constructor(Eo *obj, Efl_Loop_Data *pd)
309 pd->epoll_fd = -1; 309 pd->epoll_fd = -1;
310 pd->timer_fd = -1; 310 pd->timer_fd = -1;
311 pd->future_message_handler = efl_loop_message_handler_get 311 pd->future_message_handler = efl_loop_message_handler_get
312 (EFL_LOOP_CLASS, obj, EFL_LOOP_MESSAGE_FUTURE_HANDLER_CLASS); 312 (obj, EFL_LOOP_MESSAGE_FUTURE_HANDLER_CLASS);
313 return obj; 313 return obj;
314} 314}
315 315
@@ -395,7 +395,7 @@ ecore_loop_arguments_send(int argc, const char **argv)
395 eina_array_push(cml, arg); 395 eina_array_push(cml, arg);
396 } 396 }
397 397
398 efl_core_command_line_command_array_set(efl_app_main_get(EFL_APP_CLASS), cml); 398 efl_core_command_line_command_array_set(efl_app_main_get(), cml);
399 efl_future_then(efl_main_loop_get(), efl_loop_job(efl_main_loop_get()), 399 efl_future_then(efl_main_loop_get(), efl_loop_job(efl_main_loop_get()),
400 .success = _efl_loop_arguments_send, 400 .success = _efl_loop_arguments_send,
401 .free = _efl_loop_arguments_cleanup, 401 .free = _efl_loop_arguments_cleanup,
diff --git a/src/lib/ecore_con/ecore_con_url.c b/src/lib/ecore_con/ecore_con_url.c
index 3c9faea28c..dd8d249304 100644
--- a/src/lib/ecore_con/ecore_con_url.c
+++ b/src/lib/ecore_con/ecore_con_url.c
@@ -734,7 +734,7 @@ _ecore_con_url_request_prepare(Ecore_Con_Url *url_con, const char *method)
734 734
735 if (url_con->time.condition != ECORE_CON_URL_TIME_NONE) 735 if (url_con->time.condition != ECORE_CON_URL_TIME_NONE)
736 { 736 {
737 char *ts = efl_net_dialer_http_date_serialize(EFL_NET_DIALER_HTTP_CLASS, url_con->time.stamp); 737 char *ts = efl_net_dialer_http_date_serialize(url_con->time.stamp);
738 if (ts) 738 if (ts)
739 { 739 {
740 efl_net_dialer_http_request_header_add(url_con->dialer, 740 efl_net_dialer_http_request_header_add(url_con->dialer,
diff --git a/src/lib/ecore_con/efl_net_dialer_http.c b/src/lib/ecore_con/efl_net_dialer_http.c
index 8bfe967c32..53788514e1 100644
--- a/src/lib/ecore_con/efl_net_dialer_http.c
+++ b/src/lib/ecore_con/efl_net_dialer_http.c
@@ -2375,14 +2375,14 @@ _efl_net_dialer_http_ssl_certificate_revocation_list_get(const Eo *o EINA_UNUSED
2375} 2375}
2376 2376
2377EOLIAN static int64_t 2377EOLIAN static int64_t
2378_efl_net_dialer_http_date_parse(Efl_Class *cls EINA_UNUSED, void *cd EINA_UNUSED, const char *str) 2378_efl_net_dialer_http_date_parse(const char *str)
2379{ 2379{
2380 EINA_SAFETY_ON_NULL_RETURN_VAL(str, 0); 2380 EINA_SAFETY_ON_NULL_RETURN_VAL(str, 0);
2381 return curl_getdate(str, NULL); 2381 return curl_getdate(str, NULL);
2382} 2382}
2383 2383
2384EOLIAN static char * 2384EOLIAN static char *
2385_efl_net_dialer_http_date_serialize(Efl_Class *cls EINA_UNUSED, void *cd EINA_UNUSED, int64_t ts) 2385_efl_net_dialer_http_date_serialize(int64_t ts)
2386{ 2386{
2387 static const char *const wkday[] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" }; 2387 static const char *const wkday[] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" };
2388 static const char * const month[] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" }; 2388 static const char * const month[] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
diff --git a/src/lib/ecore_con/efl_net_dialer_ssl.c b/src/lib/ecore_con/efl_net_dialer_ssl.c
index 78b587973a..33d314f2f4 100644
--- a/src/lib/ecore_con/efl_net_dialer_ssl.c
+++ b/src/lib/ecore_con/efl_net_dialer_ssl.c
@@ -84,7 +84,7 @@ _efl_net_dialer_ssl_efl_object_finalize(Eo *o, Efl_Net_Dialer_Ssl_Data *pd)
84 else 84 else
85 { 85 {
86 if (!pd->ssl_ctx) 86 if (!pd->ssl_ctx)
87 pd->ssl_ctx = efl_ref(efl_net_ssl_context_default_dialer_get(EFL_NET_SSL_CONTEXT_CLASS)); 87 pd->ssl_ctx = efl_ref(efl_net_ssl_context_default_dialer_get());
88 88
89 efl_net_socket_ssl_adopt(o, pd->sock, pd->ssl_ctx); 89 efl_net_socket_ssl_adopt(o, pd->sock, pd->ssl_ctx);
90 } 90 }
diff --git a/src/lib/ecore_con/efl_net_dialer_udp.c b/src/lib/ecore_con/efl_net_dialer_udp.c
index 953ae7dd2f..b42e9d414e 100644
--- a/src/lib/ecore_con/efl_net_dialer_udp.c
+++ b/src/lib/ecore_con/efl_net_dialer_udp.c
@@ -180,7 +180,7 @@ _efl_net_dialer_udp_resolved_bind(Eo *o, Efl_Net_Dialer_Udp_Data *pd EINA_UNUSED
180 } 180 }
181 } 181 }
182 182
183 remote_address = efl_net_ip_address_create_sockaddr(EFL_NET_IP_ADDRESS_CLASS, addr->ai_addr); 183 remote_address = efl_net_ip_address_create_sockaddr(addr->ai_addr);
184 if (remote_address) 184 if (remote_address)
185 { 185 {
186 efl_net_socket_udp_init(o, remote_address); 186 efl_net_socket_udp_init(o, remote_address);
diff --git a/src/lib/ecore_con/efl_net_ip_address.c b/src/lib/ecore_con/efl_net_ip_address.c
index 9a79c07b3e..cc29aba680 100644
--- a/src/lib/ecore_con/efl_net_ip_address.c
+++ b/src/lib/ecore_con/efl_net_ip_address.c
@@ -300,7 +300,7 @@ _efl_net_ip_address_any_check(const Eo *o EINA_UNUSED, Efl_Net_Ip_Address_Data *
300} 300}
301 301
302EOLIAN static Efl_Net_Ip_Address * 302EOLIAN static Efl_Net_Ip_Address *
303_efl_net_ip_address_create(Eo *cls, void *pd EINA_UNUSED, uint16_t port, const Eina_Slice address) 303_efl_net_ip_address_create(uint16_t port, const Eina_Slice address)
304{ 304{
305 int family; 305 int family;
306 306
@@ -311,26 +311,26 @@ _efl_net_ip_address_create(Eo *cls, void *pd EINA_UNUSED, uint16_t port, const E
311 else 311 else
312 family = AF_INET; 312 family = AF_INET;
313 313
314 return efl_add_ref(cls, efl_main_loop_get(), 314 return efl_add_ref(EFL_NET_IP_ADDRESS_CLASS, efl_main_loop_get(),
315 efl_net_ip_address_family_set(efl_added, family), 315 efl_net_ip_address_family_set(efl_added, family),
316 efl_net_ip_address_port_set(efl_added, port), 316 efl_net_ip_address_port_set(efl_added, port),
317 efl_net_ip_address_set(efl_added, address)); 317 efl_net_ip_address_set(efl_added, address));
318} 318}
319 319
320EOLIAN static Efl_Net_Ip_Address * 320EOLIAN static Efl_Net_Ip_Address *
321_efl_net_ip_address_create_sockaddr(Eo *cls, void *pd EINA_UNUSED, const void *ptr) 321_efl_net_ip_address_create_sockaddr(const void *ptr)
322{ 322{
323 const struct sockaddr *sockaddr = ptr; 323 const struct sockaddr *sockaddr = ptr;
324 324
325 EINA_SAFETY_ON_NULL_RETURN_VAL(sockaddr, NULL); 325 EINA_SAFETY_ON_NULL_RETURN_VAL(sockaddr, NULL);
326 EINA_SAFETY_ON_TRUE_RETURN_VAL((sockaddr->sa_family != AF_INET) && (sockaddr->sa_family != AF_INET6), NULL); 326 EINA_SAFETY_ON_TRUE_RETURN_VAL((sockaddr->sa_family != AF_INET) && (sockaddr->sa_family != AF_INET6), NULL);
327 327
328 return efl_add_ref(cls, efl_main_loop_get(), 328 return efl_add_ref(EFL_NET_IP_ADDRESS_CLASS, efl_main_loop_get(),
329 efl_net_ip_address_sockaddr_set(efl_added, sockaddr)); 329 efl_net_ip_address_sockaddr_set(efl_added, sockaddr));
330} 330}
331 331
332EOLIAN static Efl_Net_Ip_Address * 332EOLIAN static Efl_Net_Ip_Address *
333_efl_net_ip_address_parse(Eo *cls, void *pd EINA_UNUSED, const char *numeric_address) 333_efl_net_ip_address_parse(const char *numeric_address)
334{ 334{
335 struct sockaddr_storage ss; 335 struct sockaddr_storage ss;
336 Eina_Bool r; 336 Eina_Bool r;
@@ -368,7 +368,7 @@ _efl_net_ip_address_parse(Eo *cls, void *pd EINA_UNUSED, const char *numeric_add
368 return NULL; 368 return NULL;
369 } 369 }
370 370
371 return efl_add_ref(cls, efl_main_loop_get(), 371 return efl_add_ref(EFL_NET_IP_ADDRESS_CLASS, efl_main_loop_get(),
372 efl_net_ip_address_sockaddr_set(efl_added, &ss)); 372 efl_net_ip_address_sockaddr_set(efl_added, &ss));
373} 373}
374 374
@@ -509,7 +509,7 @@ _efl_net_ip_address_resolve_done(void *data,
509 if (EINA_UNLIKELY(_efl_net_ip_address_find(&r, a->ai_addr) >= 0)) 509 if (EINA_UNLIKELY(_efl_net_ip_address_find(&r, a->ai_addr) >= 0))
510 continue; 510 continue;
511 511
512 o = efl_net_ip_address_create_sockaddr(EFL_NET_IP_ADDRESS_CLASS, a->ai_addr); 512 o = efl_net_ip_address_create_sockaddr(a->ai_addr);
513 if (!o) continue ; 513 if (!o) continue ;
514 514
515 eina_value_array_append(&r, o); 515 eina_value_array_append(&r, o);
@@ -536,7 +536,7 @@ _efl_net_ip_address_resolve_done(void *data,
536} 536}
537 537
538EOLIAN static Eina_Future * 538EOLIAN static Eina_Future *
539_efl_net_ip_address_resolve(Eo *cls EINA_UNUSED, void *pd EINA_UNUSED, const char *address, int family, int flags) 539_efl_net_ip_address_resolve(const char *address, int family, int flags)
540{ 540{
541 Efl_Net_Ip_Address_Resolve_Context *ctx; 541 Efl_Net_Ip_Address_Resolve_Context *ctx;
542 struct addrinfo hints = { }; 542 struct addrinfo hints = { };
diff --git a/src/lib/ecore_con/efl_net_ssl_context.c b/src/lib/ecore_con/efl_net_ssl_context.c
index 271cd8afc2..a625fe81ee 100644
--- a/src/lib/ecore_con/efl_net_ssl_context.c
+++ b/src/lib/ecore_con/efl_net_ssl_context.c
@@ -357,11 +357,11 @@ _efl_net_ssl_context_default_dialer_del(void *data EINA_UNUSED, const Efl_Event
357} 357}
358 358
359EOLIAN static Efl_Net_Ssl_Context * 359EOLIAN static Efl_Net_Ssl_Context *
360_efl_net_ssl_context_default_dialer_get(const Efl_Class *klass, void *pd EINA_UNUSED) 360_efl_net_ssl_context_default_dialer_get(void)
361{ 361{
362 if (!_efl_net_ssl_context_default_dialer) 362 if (!_efl_net_ssl_context_default_dialer)
363 { 363 {
364 _efl_net_ssl_context_default_dialer = efl_add(klass, efl_main_loop_get(), 364 _efl_net_ssl_context_default_dialer = efl_add(EFL_NET_SSL_CONTEXT_CLASS, efl_main_loop_get(),
365 efl_net_ssl_context_verify_mode_set(efl_added, EFL_NET_SSL_VERIFY_MODE_REQUIRED), 365 efl_net_ssl_context_verify_mode_set(efl_added, EFL_NET_SSL_VERIFY_MODE_REQUIRED),
366 efl_net_ssl_context_hostname_verify_set(efl_added, EINA_TRUE), 366 efl_net_ssl_context_hostname_verify_set(efl_added, EINA_TRUE),
367 efl_net_ssl_context_default_paths_load_set(efl_added, EINA_TRUE), 367 efl_net_ssl_context_default_paths_load_set(efl_added, EINA_TRUE),
diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index f5e80ce151..ba7da81abc 100644
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -1979,7 +1979,6 @@ _edje_object_part_text_raw_generic_set(Edje *ed, Evas_Object *obj, Edje_Real_Par
1979 { 1979 {
1980 char *mkup; 1980 char *mkup;
1981 mkup = efl_text_markup_util_text_to_markup( 1981 mkup = efl_text_markup_util_text_to_markup(
1982 EFL_TEXT_MARKUP_UTIL_CLASS,
1983 text); 1982 text);
1984 rp->typedata.text->text = eina_stringshare_add(mkup); 1983 rp->typedata.text->text = eina_stringshare_add(mkup);
1985 free(mkup); 1984 free(mkup);
diff --git a/src/lib/efl/interfaces/efl_text_markup_util.c b/src/lib/efl/interfaces/efl_text_markup_util.c
index bf296c11fb..239915b4ac 100644
--- a/src/lib/efl/interfaces/efl_text_markup_util.c
+++ b/src/lib/efl/interfaces/efl_text_markup_util.c
@@ -68,8 +68,7 @@ _markup_get_text_utf8_append(Eina_Strbuf *sbuf, const char *text)
68} 68}
69 69
70EOLIAN static char* 70EOLIAN static char*
71_efl_text_markup_util_text_to_markup(Eo *class EINA_UNUSED, 71_efl_text_markup_util_text_to_markup(const char *text)
72 void *_pd EINA_UNUSED, const char *text)
73{ 72{
74 Eina_Strbuf *sbuf; 73 Eina_Strbuf *sbuf;
75 char *str = NULL; 74 char *str = NULL;
@@ -491,8 +490,7 @@ _text_util_markup_to_text(const char *text)
491} 490}
492 491
493static EOLIAN char* 492static EOLIAN char*
494_efl_text_markup_util_markup_to_text(Eo *class EINA_UNUSED, 493_efl_text_markup_util_markup_to_text(const char *text)
495 void *_pd EINA_UNUSED, const char *text)
496{ 494{
497 return _text_util_markup_to_text(text); 495 return _text_util_markup_to_text(text);
498} 496}
diff --git a/src/lib/elementary/efl_access_object.c b/src/lib/elementary/efl_access_object.c
index 3c56eae6a5..84ae798cc0 100644
--- a/src/lib/elementary/efl_access_object.c
+++ b/src/lib/elementary/efl_access_object.c
@@ -401,7 +401,7 @@ EAPI void efl_access_attributes_list_free(Eina_List *list)
401} 401}
402 402
403EOLIAN void 403EOLIAN void
404_efl_access_object_event_emit(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Eo *accessible, const Efl_Event_Description *event, void *event_info) 404_efl_access_object_event_emit(Eo *accessible, const Efl_Event_Description *event, void *event_info)
405{ 405{
406 Eina_List *l; 406 Eina_List *l;
407 Efl_Access_Event_Handler *hdl; 407 Efl_Access_Event_Handler *hdl;
@@ -437,7 +437,7 @@ _efl_access_object_event_emit(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Eo *a
437} 437}
438 438
439EOLIAN Efl_Access_Event_Handler * 439EOLIAN Efl_Access_Event_Handler *
440_efl_access_object_event_handler_add(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Efl_Event_Cb cb, void *data) 440_efl_access_object_event_handler_add(Efl_Event_Cb cb, void *data)
441{ 441{
442 Efl_Access_Event_Handler *ret = calloc(1, sizeof(Efl_Access_Event_Handler)); 442 Efl_Access_Event_Handler *ret = calloc(1, sizeof(Efl_Access_Event_Handler));
443 if (!ret) return NULL; 443 if (!ret) return NULL;
@@ -451,7 +451,7 @@ _efl_access_object_event_handler_add(Eo *class EINA_UNUSED, void *pd EINA_UNUSED
451} 451}
452 452
453EOLIAN void 453EOLIAN void
454_efl_access_object_event_handler_del(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Efl_Access_Event_Handler *handler) 454_efl_access_object_event_handler_del(Efl_Access_Event_Handler *handler)
455{ 455{
456 Eina_List *l, *l2; 456 Eina_List *l, *l2;
457 Efl_Access_Event_Handler *hdl; 457 Efl_Access_Event_Handler *hdl;
@@ -596,7 +596,7 @@ _efl_access_object_relationships_clear(Eo *obj EINA_UNUSED, Efl_Access_Object_Da
596} 596}
597 597
598EOLIAN Eo* 598EOLIAN Eo*
599_efl_access_object_access_root_get(const Eo *class EINA_UNUSED, void *pd EINA_UNUSED) 599_efl_access_object_access_root_get(void)
600{ 600{
601 if (!root) 601 if (!root)
602 root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, efl_main_loop_get()); 602 root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, efl_main_loop_get());
diff --git a/src/lib/elementary/efl_access_object.h b/src/lib/elementary/efl_access_object.h
index 22dc4bf9ad..b42db31f7f 100644
--- a/src/lib/elementary/efl_access_object.h
+++ b/src/lib/elementary/efl_access_object.h
@@ -46,7 +46,7 @@ efl_access_attribute_free(Efl_Access_Attribute *attr);
46 Efl_Access_Event_State_Changed_Data evinfo; \ 46 Efl_Access_Event_State_Changed_Data evinfo; \
47 evinfo.type = (tp); \ 47 evinfo.type = (tp); \
48 evinfo.new_value = (nvl); \ 48 evinfo.new_value = (nvl); \
49 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_STATE_CHANGED, (void*)&evinfo); \ 49 efl_access_object_event_emit(obj, EFL_ACCESS_OBJECT_EVENT_STATE_CHANGED, (void*)&evinfo); \
50 } while(0); } 50 } while(0); }
51 51
52/** 52/**
@@ -55,38 +55,38 @@ efl_access_attribute_free(Efl_Access_Attribute *attr);
55#define efl_access_bounds_changed_signal_emit(obj, x, y, width, height) \ 55#define efl_access_bounds_changed_signal_emit(obj, x, y, width, height) \
56 do { \ 56 do { \
57 Efl_Access_Event_Geometry_Changed_Data evinfo = { x, y, width, height }; \ 57 Efl_Access_Event_Geometry_Changed_Data evinfo = { x, y, width, height }; \
58 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_BOUNDS_CHANGED, (void*)&evinfo); \ 58 efl_access_object_event_emit(obj, EFL_ACCESS_OBJECT_EVENT_BOUNDS_CHANGED, (void*)&evinfo); \
59 } while(0); 59 } while(0);
60 60
61/** 61/**
62 * Emits Accessible 'PropertyChanged' signal for 'Name' property. 62 * Emits Accessible 'PropertyChanged' signal for 'Name' property.
63 */ 63 */
64#define efl_access_i18n_name_changed_signal_emit(obj) \ 64#define efl_access_i18n_name_changed_signal_emit(obj) \
65 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "i18n_name"); 65 efl_access_object_event_emit(obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "i18n_name");
66 66
67/** 67/**
68 * Emits Accessible 'PropertyChanged' signal for 'Description' property. 68 * Emits Accessible 'PropertyChanged' signal for 'Description' property.
69 */ 69 */
70#define efl_access_description_changed_signal_emit(obj) \ 70#define efl_access_description_changed_signal_emit(obj) \
71 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "description"); 71 efl_access_object_event_emit(obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "description");
72 72
73/** 73/**
74 * Emits Accessible 'PropertyChanged' signal for 'Parent' property. 74 * Emits Accessible 'PropertyChanged' signal for 'Parent' property.
75 */ 75 */
76#define efl_access_parent_changed_signal_emit(obj) \ 76#define efl_access_parent_changed_signal_emit(obj) \
77 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "parent"); 77 efl_access_object_event_emit(obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "parent");
78 78
79/** 79/**
80 * Emits Accessible 'PropertyChanged' signal for 'Role' property. 80 * Emits Accessible 'PropertyChanged' signal for 'Role' property.
81 */ 81 */
82#define efl_access_role_changed_signal_emit(obj) \ 82#define efl_access_role_changed_signal_emit(obj) \
83 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "role"); 83 efl_access_object_event_emit(obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "role");
84 84
85/** 85/**
86 * Emits Accessible 'PropertyChanged' signal for 'Value' property. 86 * Emits Accessible 'PropertyChanged' signal for 'Value' property.
87 */ 87 */
88#define efl_access_value_changed_signal_emit(obj) \ 88#define efl_access_value_changed_signal_emit(obj) \
89 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "value"); 89 efl_access_object_event_emit(obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "value");
90 90
91/** 91/**
92 * Emits Accessible 'ChildrenChanged' signal with added child as argument. 92 * Emits Accessible 'ChildrenChanged' signal with added child as argument.
@@ -94,7 +94,7 @@ efl_access_attribute_free(Efl_Access_Attribute *attr);
94#define efl_access_children_changed_added_signal_emit(obj, child) \ 94#define efl_access_children_changed_added_signal_emit(obj, child) \
95 do { \ 95 do { \
96 Efl_Access_Event_Children_Changed_Data atspi_data = { EINA_TRUE, child }; \ 96 Efl_Access_Event_Children_Changed_Data atspi_data = { EINA_TRUE, child }; \
97 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_CHILDREN_CHANGED, &atspi_data); \ 97 efl_access_object_event_emit(obj, EFL_ACCESS_OBJECT_EVENT_CHILDREN_CHANGED, &atspi_data); \
98 } while(0); 98 } while(0);
99 99
100/** 100/**
@@ -103,32 +103,32 @@ efl_access_attribute_free(Efl_Access_Attribute *attr);
103#define efl_access_children_changed_del_signal_emit(obj, child) \ 103#define efl_access_children_changed_del_signal_emit(obj, child) \
104 do { \ 104 do { \
105 Efl_Access_Event_Children_Changed_Data atspi_data = { EINA_FALSE, child }; \ 105 Efl_Access_Event_Children_Changed_Data atspi_data = { EINA_FALSE, child }; \
106 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_CHILDREN_CHANGED, &atspi_data); \ 106 efl_access_object_event_emit(obj, EFL_ACCESS_OBJECT_EVENT_CHILDREN_CHANGED, &atspi_data); \
107 } while(0); 107 } while(0);
108 108
109/** 109/**
110 * Emits Accessible 'ActiveDescendantChanged' signal. 110 * Emits Accessible 'ActiveDescendantChanged' signal.
111 */ 111 */
112#define efl_access_active_descendant_changed_signal_emit(obj, child) \ 112#define efl_access_active_descendant_changed_signal_emit(obj, child) \
113 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_ACTIVE_DESCENDANT_CHANGED, child); 113 efl_access_object_event_emit(obj, EFL_ACCESS_OBJECT_EVENT_ACTIVE_DESCENDANT_CHANGED, child);
114 114
115/** 115/**
116 * Emits Accessible 'VisibleDataChanged' signal. 116 * Emits Accessible 'VisibleDataChanged' signal.
117 */ 117 */
118#define efl_access_visible_data_changed_signal_emit(obj) \ 118#define efl_access_visible_data_changed_signal_emit(obj) \
119 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_VISIBLE_DATA_CHANGED, NULL); 119 efl_access_object_event_emit(obj, EFL_ACCESS_OBJECT_EVENT_VISIBLE_DATA_CHANGED, NULL);
120 120
121/** 121/**
122 * Emits Accessible 'AddAccessible' signal. 122 * Emits Accessible 'AddAccessible' signal.
123 */ 123 */
124#define efl_access_added(obj) \ 124#define efl_access_added(obj) \
125 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_ADDED, NULL); 125 efl_access_object_event_emit(obj, EFL_ACCESS_OBJECT_EVENT_ADDED, NULL);
126 126
127/** 127/**
128 * Emits Accessible 'RemoveAccessible' signal. 128 * Emits Accessible 'RemoveAccessible' signal.
129 */ 129 */
130#define efl_access_removed(obj) \ 130#define efl_access_removed(obj) \
131 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_REMOVED, NULL); 131 efl_access_object_event_emit(obj, EFL_ACCESS_OBJECT_EVENT_REMOVED, NULL);
132 132
133#endif 133#endif
134 134
diff --git a/src/lib/elementary/efl_access_window.h b/src/lib/elementary/efl_access_window.h
index 38938d21ca..c4b3d3c398 100644
--- a/src/lib/elementary/efl_access_window.h
+++ b/src/lib/elementary/efl_access_window.h
@@ -14,43 +14,43 @@
14 * Emits 'Window:Activated' accessible signal. 14 * Emits 'Window:Activated' accessible signal.
15 */ 15 */
16#define efl_access_window_activated_signal_emit(obj) \ 16#define efl_access_window_activated_signal_emit(obj) \
17 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_ACTIVATED, NULL); 17 efl_access_object_event_emit(obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_ACTIVATED, NULL);
18 18
19/** 19/**
20 * Emits 'Window:Deactivated' accessible signal. 20 * Emits 'Window:Deactivated' accessible signal.
21 */ 21 */
22#define efl_access_window_deactivated_signal_emit(obj) \ 22#define efl_access_window_deactivated_signal_emit(obj) \
23 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_DEACTIVATED, NULL); 23 efl_access_object_event_emit(obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_DEACTIVATED, NULL);
24 24
25/** 25/**
26 * Emits 'Window:Created' accessible signal. 26 * Emits 'Window:Created' accessible signal.
27 */ 27 */
28#define efl_access_window_created_signal_emit(obj) \ 28#define efl_access_window_created_signal_emit(obj) \
29 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_CREATED, NULL); 29 efl_access_object_event_emit(obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_CREATED, NULL);
30 30
31/** 31/**
32 * Emits 'Window:Destroyed' accessible signal. 32 * Emits 'Window:Destroyed' accessible signal.
33 */ 33 */
34#define efl_access_window_destroyed_signal_emit(obj) \ 34#define efl_access_window_destroyed_signal_emit(obj) \
35 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_DESTROYED, NULL); 35 efl_access_object_event_emit(obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_DESTROYED, NULL);
36 36
37/** 37/**
38 * Emits 'Window:Maximized' accessible signal. 38 * Emits 'Window:Maximized' accessible signal.
39 */ 39 */
40#define efl_access_window_maximized_signal_emit(obj) \ 40#define efl_access_window_maximized_signal_emit(obj) \
41 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_MAXIMIZED, NULL); 41 efl_access_object_event_emit(obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_MAXIMIZED, NULL);
42 42
43/** 43/**
44 * Emits 'Window:Minimized' accessible signal. 44 * Emits 'Window:Minimized' accessible signal.
45 */ 45 */
46#define efl_access_window_minimized_signal_emit(obj) \ 46#define efl_access_window_minimized_signal_emit(obj) \
47 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_MINIMIZED, NULL); 47 efl_access_object_event_emit(obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_MINIMIZED, NULL);
48 48
49/** 49/**
50 * Emits 'Window:Restored' accessible signal. 50 * Emits 'Window:Restored' accessible signal.
51 */ 51 */
52#define efl_access_window_restored_signal_emit(obj) \ 52#define efl_access_window_restored_signal_emit(obj) \
53 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_RESTORED, NULL); 53 efl_access_object_event_emit(obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_RESTORED, NULL);
54 54
55#endif 55#endif
56#endif 56#endif
diff --git a/src/lib/elementary/efl_ui_dnd.c b/src/lib/elementary/efl_ui_dnd.c
index db13fbf242..4ed23e7d76 100644
--- a/src/lib/elementary/efl_ui_dnd.c
+++ b/src/lib/elementary/efl_ui_dnd.c
@@ -28,7 +28,7 @@ Eo*
28_efl_ui_selection_manager_get(Eo *obj) 28_efl_ui_selection_manager_get(Eo *obj)
29{ 29{
30 if (!efl_isa(obj, EFL_UI_WIDGET_CLASS)) return NULL; 30 if (!efl_isa(obj, EFL_UI_WIDGET_CLASS)) return NULL;
31 Eo *app = efl_app_main_get(EFL_APP_CLASS); 31 Eo *app = efl_app_main_get();
32 Eo *sel_man = efl_key_data_get(app, "__selection_manager"); 32 Eo *sel_man = efl_key_data_get(app, "__selection_manager");
33 if (!sel_man) 33 if (!sel_man)
34 { 34 {
@@ -41,7 +41,7 @@ _efl_ui_selection_manager_get(Eo *obj)
41void 41void
42_efl_ui_dnd_shutdown(void) 42_efl_ui_dnd_shutdown(void)
43{ 43{
44 Eo *app = efl_app_main_get(EFL_APP_CLASS); 44 Eo *app = efl_app_main_get();
45 Eo *sel_man = efl_key_data_get(app, "__selection_manager"); 45 Eo *sel_man = efl_key_data_get(app, "__selection_manager");
46 46
47 efl_del(sel_man); 47 efl_del(sel_man);
diff --git a/src/lib/elementary/efl_ui_focus_layer.c b/src/lib/elementary/efl_ui_focus_layer.c
index 1069956881..9cab1327b8 100644
--- a/src/lib/elementary/efl_ui_focus_layer.c
+++ b/src/lib/elementary/efl_ui_focus_layer.c
@@ -112,7 +112,7 @@ _efl_ui_focus_layer_enable_set(Eo *obj, Efl_Ui_Focus_Layer_Data *pd, Eina_Bool v
112 112
113 pd->registered_manager = elm_widget_top_get(obj); 113 pd->registered_manager = elm_widget_top_get(obj);
114 EINA_SAFETY_ON_FALSE_RETURN(efl_isa(pd->registered_manager, EFL_UI_WIN_CLASS)); 114 EINA_SAFETY_ON_FALSE_RETURN(efl_isa(pd->registered_manager, EFL_UI_WIN_CLASS));
115 manager = efl_ui_focus_util_active_manager(EFL_UI_FOCUS_UTIL_CLASS, pd->registered_manager); 115 manager = efl_ui_focus_util_active_manager(pd->registered_manager);
116 116
117 efl_ui_focus_manager_calc_register_logical(pd->registered_manager, obj, efl_ui_focus_manager_root_get(pd->registered_manager), obj); 117 efl_ui_focus_manager_calc_register_logical(pd->registered_manager, obj, efl_ui_focus_manager_root_get(pd->registered_manager), obj);
118 _publish_state_change(obj, NULL, NULL); 118 _publish_state_change(obj, NULL, NULL);
diff --git a/src/lib/elementary/efl_ui_focus_manager_calc.c b/src/lib/elementary/efl_ui_focus_manager_calc.c
index b2b8356cf4..308cdd861e 100644
--- a/src/lib/elementary/efl_ui_focus_manager_calc.c
+++ b/src/lib/elementary/efl_ui_focus_manager_calc.c
@@ -157,7 +157,7 @@ border_onedirection_set(Node *node, Efl_Ui_Focus_Direction direction, Eina_List
157 157
158 EINA_LIST_FREE(border->one_direction, partner) 158 EINA_LIST_FREE(border->one_direction, partner)
159 { 159 {
160 Border *b = &DIRECTION_ACCESS(partner, efl_ui_focus_util_direction_complement(EFL_UI_FOCUS_UTIL_CLASS,direction)); 160 Border *b = &DIRECTION_ACCESS(partner, efl_ui_focus_util_direction_complement(direction));
161 b->cleanup_nodes = eina_list_remove(b->cleanup_nodes, node); 161 b->cleanup_nodes = eina_list_remove(b->cleanup_nodes, node);
162 } 162 }
163 163
@@ -165,7 +165,7 @@ border_onedirection_set(Node *node, Efl_Ui_Focus_Direction direction, Eina_List
165 165
166 EINA_LIST_FOREACH(border->one_direction, lnode, partner) 166 EINA_LIST_FOREACH(border->one_direction, lnode, partner)
167 { 167 {
168 Border *comp_border = &DIRECTION_ACCESS(partner,efl_ui_focus_util_direction_complement(EFL_UI_FOCUS_UTIL_CLASS,direction)); 168 Border *comp_border = &DIRECTION_ACCESS(partner,efl_ui_focus_util_direction_complement(direction));
169 169
170 comp_border->cleanup_nodes = eina_list_append(comp_border->cleanup_nodes, node); 170 comp_border->cleanup_nodes = eina_list_append(comp_border->cleanup_nodes, node);
171 } 171 }
@@ -183,7 +183,7 @@ border_onedirection_cleanup(Node *node, Efl_Ui_Focus_Direction direction)
183 183
184 EINA_LIST_FREE(border->cleanup_nodes, partner) 184 EINA_LIST_FREE(border->cleanup_nodes, partner)
185 { 185 {
186 Border *b = &DIRECTION_ACCESS(partner, efl_ui_focus_util_direction_complement(EFL_UI_FOCUS_UTIL_CLASS,direction)); 186 Border *b = &DIRECTION_ACCESS(partner, efl_ui_focus_util_direction_complement(direction));
187 b->one_direction = eina_list_remove(b->one_direction, node); 187 b->one_direction = eina_list_remove(b->one_direction, node);
188 } 188 }
189} 189}
diff --git a/src/lib/elementary/efl_ui_focus_util.c b/src/lib/elementary/efl_ui_focus_util.c
index f422266101..3021c683eb 100644
--- a/src/lib/elementary/efl_ui_focus_util.c
+++ b/src/lib/elementary/efl_ui_focus_util.c
@@ -12,7 +12,7 @@ typedef struct {
12static void 12static void
13_manager_changed(void *data, const Efl_Event *event EINA_UNUSED) 13_manager_changed(void *data, const Efl_Event *event EINA_UNUSED)
14{ 14{
15 efl_ui_focus_util_focus(EFL_UI_FOCUS_UTIL_CLASS, data); 15 efl_ui_focus_util_focus(data);
16} 16}
17 17
18static Eina_Bool 18static Eina_Bool
@@ -25,7 +25,7 @@ _can_take_focus(Efl_Ui_Focus_Manager *m, Efl_Ui_Focus_Object *user)
25} 25}
26 26
27EOLIAN static void 27EOLIAN static void
28_efl_ui_focus_util_focus(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, Efl_Ui_Focus_Object *user) 28_efl_ui_focus_util_focus(Efl_Ui_Focus_Object *user)
29{ 29{
30 Efl_Ui_Focus_Object *entry; 30 Efl_Ui_Focus_Object *entry;
31 Efl_Ui_Widget *top, *o; 31 Efl_Ui_Widget *top, *o;
@@ -64,7 +64,7 @@ _efl_ui_focus_util_focus(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, Efl_Ui_Focus
64} 64}
65 65
66EOLIAN static Efl_Ui_Focus_Manager* 66EOLIAN static Efl_Ui_Focus_Manager*
67_efl_ui_focus_util_active_manager(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, Efl_Ui_Focus_Manager *manager) 67_efl_ui_focus_util_active_manager(Efl_Ui_Focus_Manager *manager)
68{ 68{
69 while (efl_ui_focus_manager_redirect_get(manager)) 69 while (efl_ui_focus_manager_redirect_get(manager))
70 manager = efl_ui_focus_manager_redirect_get(manager); 70 manager = efl_ui_focus_manager_redirect_get(manager);
@@ -73,7 +73,7 @@ _efl_ui_focus_util_active_manager(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, Efl
73} 73}
74 74
75EOLIAN static Efl_Ui_Focus_Direction 75EOLIAN static Efl_Ui_Focus_Direction
76_efl_ui_focus_util_direction_complement(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, Efl_Ui_Focus_Direction dir) 76_efl_ui_focus_util_direction_complement(Efl_Ui_Focus_Direction dir)
77{ 77{
78 #define COMP(a,b) \ 78 #define COMP(a,b) \
79 if (dir == a) return b; \ 79 if (dir == a) return b; \
diff --git a/src/lib/elementary/efl_ui_widget.c b/src/lib/elementary/efl_ui_widget.c
index 065bc3577f..67a2a01bba 100644
--- a/src/lib/elementary/efl_ui_widget.c
+++ b/src/lib/elementary/efl_ui_widget.c
@@ -3422,7 +3422,7 @@ elm_widget_focus_mouse_up_handle(Eo *obj)
3422 3422
3423 if (pd->focus.manager && !pd->focus.logical) 3423 if (pd->focus.manager && !pd->focus.logical)
3424 { 3424 {
3425 efl_ui_focus_util_focus(EFL_UI_FOCUS_UTIL_CLASS, obj); 3425 efl_ui_focus_util_focus(obj);
3426 } 3426 }
3427} 3427}
3428 3428
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 2e9e463205..74d741f4e2 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -2372,7 +2372,7 @@ _efl_ui_win_show(Eo *obj, Efl_Ui_Win_Data *sd)
2372 { 2372 {
2373 Eo *root; 2373 Eo *root;
2374 efl_access_window_created_signal_emit(obj); 2374 efl_access_window_created_signal_emit(obj);
2375 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); 2375 root = efl_access_object_access_root_get();
2376 if (root) 2376 if (root)
2377 efl_access_children_changed_added_signal_emit(root, obj); 2377 efl_access_children_changed_added_signal_emit(root, obj);
2378 } 2378 }
@@ -2441,7 +2441,7 @@ _efl_ui_win_hide(Eo *obj, Efl_Ui_Win_Data *sd)
2441 if (_elm_config->atspi_mode) 2441 if (_elm_config->atspi_mode)
2442 { 2442 {
2443 Eo *root; 2443 Eo *root;
2444 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); 2444 root = efl_access_object_access_root_get();
2445 efl_access_window_destroyed_signal_emit(obj); 2445 efl_access_window_destroyed_signal_emit(obj);
2446 if (root) 2446 if (root)
2447 efl_access_children_changed_del_signal_emit(root, obj); 2447 efl_access_children_changed_del_signal_emit(root, obj);
@@ -2996,7 +2996,7 @@ _efl_ui_win_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Win_Data *sd)
2996 } 2996 }
2997 if (!_elm_win_list) 2997 if (!_elm_win_list)
2998 { 2998 {
2999 efl_event_callback_call(efl_app_main_get(EFL_APP_CLASS), EFL_APP_EVENT_STANDBY, NULL); 2999 efl_event_callback_call(efl_app_main_get(), EFL_APP_EVENT_STANDBY, NULL);
3000 if (eina_value_type_get(&exit_on_all_windows_closed)) 3000 if (eina_value_type_get(&exit_on_all_windows_closed))
3001 efl_loop_quit(efl_loop_get(obj), exit_on_all_windows_closed); 3001 efl_loop_quit(efl_loop_get(obj), exit_on_all_windows_closed);
3002 } 3002 }
@@ -6266,13 +6266,13 @@ _dbus_menu_set(Eina_Bool dbus_connect, void *data)
6266} 6266}
6267 6267
6268EOLIAN static const Eina_Value * 6268EOLIAN static const Eina_Value *
6269_efl_ui_win_exit_on_all_windows_closed_get(const Eo *obj EINA_UNUSED, void *pd EINA_UNUSED) 6269_efl_ui_win_exit_on_all_windows_closed_get(void)
6270{ 6270{
6271 return &exit_on_all_windows_closed; 6271 return &exit_on_all_windows_closed;
6272} 6272}
6273 6273
6274EOLIAN static void 6274EOLIAN static void
6275_efl_ui_win_exit_on_all_windows_closed_set(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, const Eina_Value *exit_code) 6275_efl_ui_win_exit_on_all_windows_closed_set(const Eina_Value *exit_code)
6276{ 6276{
6277 const Eina_Value_Type *type = eina_value_type_get(exit_code); 6277 const Eina_Value_Type *type = eina_value_type_get(exit_code);
6278 6278
@@ -7385,7 +7385,7 @@ _efl_ui_win_efl_object_provider_find(const Eo *obj,
7385 return (Eo *)obj; 7385 return (Eo *)obj;
7386 7386
7387 // attach all kinds of windows directly to ATSPI application root object 7387 // attach all kinds of windows directly to ATSPI application root object
7388 if (klass == EFL_ACCESS_OBJECT_MIXIN) return efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); 7388 if (klass == EFL_ACCESS_OBJECT_MIXIN) return efl_access_object_access_root_get();
7389 7389
7390 if (klass == EFL_UI_FOCUS_PARENT_PROVIDER_INTERFACE) 7390 if (klass == EFL_UI_FOCUS_PARENT_PROVIDER_INTERFACE)
7391 return pd->provider; 7391 return pd->provider;
diff --git a/src/lib/elementary/elm_access.c b/src/lib/elementary/elm_access.c
index f5dcb242dd..588a0c6762 100644
--- a/src/lib/elementary/elm_access.c
+++ b/src/lib/elementary/elm_access.c
@@ -701,7 +701,7 @@ _elm_access_highlight_cycle(Evas_Object *obj, Elm_Focus_Direction dir)
701 } 701 }
702 else 702 else
703 { 703 {
704 efl_ui_focus_util_focus(EFL_UI_FOCUS_UTIL_CLASS, obj); 704 efl_ui_focus_util_focus(obj);
705 efl_ui_focus_manager_move(elm_widget_top_get(obj), dir); 705 efl_ui_focus_manager_move(elm_widget_top_get(obj), dir);
706 } 706 }
707 } 707 }
diff --git a/src/lib/elementary/elm_atspi_bridge.c b/src/lib/elementary/elm_atspi_bridge.c
index e75f935a71..91ad3dfc93 100644
--- a/src/lib/elementary/elm_atspi_bridge.c
+++ b/src/lib/elementary/elm_atspi_bridge.c
@@ -588,7 +588,7 @@ _accessible_get_application(const Eldbus_Service_Interface *iface, const Eldbus_
588 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 588 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
589 589
590 Eldbus_Message_Iter *iter = eldbus_message_iter_get(ret); 590 Eldbus_Message_Iter *iter = eldbus_message_iter_get(ret);
591 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); 591 root = efl_access_object_access_root_get();
592 _bridge_iter_object_reference_append(bridge, iter, root); 592 _bridge_iter_object_reference_append(bridge, iter, root);
593 593
594 return ret; 594 return ret;
@@ -2026,7 +2026,7 @@ _bridge_object_from_path(Eo *bridge, const char *path)
2026 tmp = path + len; /* Skip over the prefix */ 2026 tmp = path + len; /* Skip over the prefix */
2027 if (!strcmp(ELM_ACCESS_OBJECT_PATH_ROOT, tmp)) 2027 if (!strcmp(ELM_ACCESS_OBJECT_PATH_ROOT, tmp))
2028 { 2028 {
2029 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); 2029 root = efl_access_object_access_root_get();
2030 return root; 2030 return root;
2031 } 2031 }
2032 2032
@@ -2053,7 +2053,7 @@ _path_from_object(const Eo *eo)
2053 2053
2054 if (!eo) 2054 if (!eo)
2055 return ATSPI_DBUS_PATH_NULL; 2055 return ATSPI_DBUS_PATH_NULL;
2056 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); 2056 root = efl_access_object_access_root_get();
2057 2057
2058 if (eo == root) 2058 if (eo == root)
2059 snprintf(path, sizeof(path), "%s%s", ELM_ACCESS_OBJECT_PATH_PREFIX, ELM_ACCESS_OBJECT_PATH_ROOT); 2059 snprintf(path, sizeof(path), "%s%s", ELM_ACCESS_OBJECT_PATH_PREFIX, ELM_ACCESS_OBJECT_PATH_ROOT);
@@ -3201,7 +3201,7 @@ _cache_item_reference_append_cb(Eo *bridge, Eo *data, Eldbus_Message_Iter *iter_
3201 Efl_Access_State_Set states; 3201 Efl_Access_State_Set states;
3202 Efl_Access_Role role; 3202 Efl_Access_Role role;
3203 Eo *root; 3203 Eo *root;
3204 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); 3204 root = efl_access_object_access_root_get();
3205 3205
3206 role = efl_access_object_role_get(data); 3206 role = efl_access_object_role_get(data);
3207 3207
@@ -3298,7 +3298,7 @@ _cache_get_items(const Eldbus_Service_Interface *iface, const Eldbus_Message *ms
3298 iter_array = eldbus_message_iter_container_new(iter, 'a', CACHE_ITEM_SIGNATURE); 3298 iter_array = eldbus_message_iter_container_new(iter, 'a', CACHE_ITEM_SIGNATURE);
3299 EINA_SAFETY_ON_NULL_GOTO(iter_array, fail); 3299 EINA_SAFETY_ON_NULL_GOTO(iter_array, fail);
3300 3300
3301 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); 3301 root = efl_access_object_access_root_get();
3302 to_process = eina_list_append(NULL, root); 3302 to_process = eina_list_append(NULL, root);
3303 3303
3304 while (to_process) 3304 while (to_process)
@@ -3703,7 +3703,7 @@ _elm_atspi_bridge_app_register(Eo *bridge)
3703 "Embed"); 3703 "Embed");
3704 Eldbus_Message_Iter *iter = eldbus_message_iter_get(message); 3704 Eldbus_Message_Iter *iter = eldbus_message_iter_get(message);
3705 3705
3706 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); 3706 root = efl_access_object_access_root_get();
3707 _bridge_iter_object_reference_append(bridge, iter, root); 3707 _bridge_iter_object_reference_append(bridge, iter, root);
3708 eldbus_connection_send(pd->a11y_bus, message, _on_elm_atspi_bridge_app_register, NULL, -1); 3708 eldbus_connection_send(pd->a11y_bus, message, _on_elm_atspi_bridge_app_register, NULL, -1);
3709 3709
@@ -3716,7 +3716,7 @@ _elm_atspi_bridge_app_unregister(Eo *bridge)
3716 Eo *root; 3716 Eo *root;
3717 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(bridge, pd, EINA_FALSE); 3717 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(bridge, pd, EINA_FALSE);
3718 3718
3719 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); 3719 root = efl_access_object_access_root_get();
3720 3720
3721 Eldbus_Message *message = eldbus_message_method_call_new(ATSPI_DBUS_NAME_REGISTRY, 3721 Eldbus_Message *message = eldbus_message_method_call_new(ATSPI_DBUS_NAME_REGISTRY,
3722 ATSPI_DBUS_PATH_ROOT, 3722 ATSPI_DBUS_PATH_ROOT,
@@ -4116,7 +4116,7 @@ static void _bridge_signal_send(Eo *bridge, Eo *obj, const char *infc, const Eld
4116 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(bridge, pd); 4116 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(bridge, pd);
4117 4117
4118 path = _path_from_object(obj); 4118 path = _path_from_object(obj);
4119 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); 4119 root = efl_access_object_access_root_get();
4120 4120
4121 msg = eldbus_message_signal_new(path, infc, signal->name); 4121 msg = eldbus_message_signal_new(path, infc, signal->name);
4122 if (!msg) return; 4122 if (!msg) return;
@@ -4366,7 +4366,7 @@ _a11y_connection_shutdown(Eo *bridge)
4366 if (pd->event_hash) eina_hash_free(pd->event_hash); 4366 if (pd->event_hash) eina_hash_free(pd->event_hash);
4367 pd->event_hash = NULL; 4367 pd->event_hash = NULL;
4368 4368
4369 efl_access_object_event_handler_del(EFL_ACCESS_OBJECT_MIXIN, pd->event_hdlr); 4369 efl_access_object_event_handler_del(pd->event_hdlr);
4370 pd->event_hdlr = NULL; 4370 pd->event_hdlr = NULL;
4371 4371
4372 efl_event_callback_legacy_call(bridge, ELM_ATSPI_BRIDGE_EVENT_DISCONNECTED, NULL); 4372 efl_event_callback_legacy_call(bridge, ELM_ATSPI_BRIDGE_EVENT_DISCONNECTED, NULL);
@@ -4458,7 +4458,7 @@ _a11y_bus_initialize(Eo *obj, const char *socket_addr)
4458 _elm_atspi_bridge_app_register(obj); 4458 _elm_atspi_bridge_app_register(obj);
4459 4459
4460 // register accessible object event listener 4460 // register accessible object event listener
4461 pd->event_hdlr = efl_access_object_event_handler_add(EFL_ACCESS_OBJECT_MIXIN, _bridge_accessible_event_dispatch, obj); 4461 pd->event_hdlr = efl_access_object_event_handler_add(_bridge_accessible_event_dispatch, obj);
4462} 4462}
4463 4463
4464static void 4464static void
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index c811e16cb4..336b0f7ae8 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -2231,14 +2231,14 @@ _entry_changed_user_signal_cb(void *data,
2231 atspi_info.content = edje_info->change.insert.content; 2231 atspi_info.content = edje_info->change.insert.content;
2232 atspi_info.pos = edje_info->change.insert.pos; 2232 atspi_info.pos = edje_info->change.insert.pos;
2233 atspi_info.len = edje_info->change.insert.plain_length; 2233 atspi_info.len = edje_info->change.insert.plain_length;
2234 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_INSERTED, &atspi_info); 2234 efl_access_object_event_emit( data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_INSERTED, &atspi_info);
2235 } 2235 }
2236 else if (edje_info && !edje_info->insert) 2236 else if (edje_info && !edje_info->insert)
2237 { 2237 {
2238 atspi_info.content = edje_info->change.del.content; 2238 atspi_info.content = edje_info->change.del.content;
2239 atspi_info.pos = MIN(edje_info->change.del.start, edje_info->change.del.end); 2239 atspi_info.pos = MIN(edje_info->change.del.start, edje_info->change.del.end);
2240 atspi_info.len = MAX(edje_info->change.del.start, edje_info->change.del.end) - atspi_info.pos; 2240 atspi_info.len = MAX(edje_info->change.del.start, edje_info->change.del.end) - atspi_info.pos;
2241 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_REMOVED, &atspi_info); 2241 efl_access_object_event_emit( data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_REMOVED, &atspi_info);
2242 } 2242 }
2243 } 2243 }
2244} 2244}
@@ -2263,7 +2263,7 @@ _entry_preedit_changed_signal_cb(void *data,
2263 atspi_info.content = text; 2263 atspi_info.content = text;
2264 atspi_info.pos = edje_info->change.insert.pos; 2264 atspi_info.pos = edje_info->change.insert.pos;
2265 atspi_info.len = edje_info->change.insert.plain_length; 2265 atspi_info.len = edje_info->change.insert.plain_length;
2266 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, 2266 efl_access_object_event_emit(
2267 data, 2267 data,
2268 EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_INSERTED, 2268 EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_INSERTED,
2269 &atspi_info); 2269 &atspi_info);
@@ -2355,7 +2355,7 @@ _entry_selection_changed_signal_cb(void *data,
2355 _selection_store(ELM_SEL_TYPE_PRIMARY, data); 2355 _selection_store(ELM_SEL_TYPE_PRIMARY, data);
2356 _update_selection_handler(data); 2356 _update_selection_handler(data);
2357 if (_elm_config->atspi_mode) 2357 if (_elm_config->atspi_mode)
2358 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_SELECTION_CHANGED, NULL); 2358 efl_access_object_event_emit( data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_SELECTION_CHANGED, NULL);
2359} 2359}
2360 2360
2361static void 2361static void
@@ -2466,7 +2466,7 @@ _entry_cursor_changed_signal_cb(void *data,
2466 efl_event_callback_legacy_call(data, ELM_ENTRY_EVENT_CURSOR_CHANGED, NULL); 2466 efl_event_callback_legacy_call(data, ELM_ENTRY_EVENT_CURSOR_CHANGED, NULL);
2467 2467
2468 if (_elm_config->atspi_mode) 2468 if (_elm_config->atspi_mode)
2469 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL); 2469 efl_access_object_event_emit( data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL);
2470} 2470}
2471 2471
2472static void 2472static void
@@ -2478,7 +2478,7 @@ _entry_cursor_changed_manual_signal_cb(void *data,
2478 efl_event_callback_legacy_call 2478 efl_event_callback_legacy_call
2479 (data, ELM_ENTRY_EVENT_CURSOR_CHANGED_MANUAL, NULL); 2479 (data, ELM_ENTRY_EVENT_CURSOR_CHANGED_MANUAL, NULL);
2480 if (_elm_config->atspi_mode) 2480 if (_elm_config->atspi_mode)
2481 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL); 2481 efl_access_object_event_emit( data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL);
2482} 2482}
2483 2483
2484static void 2484static void
diff --git a/src/lib/elementary/elm_focus_legacy.c b/src/lib/elementary/elm_focus_legacy.c
index 31e1c32db1..5c9651fb15 100644
--- a/src/lib/elementary/elm_focus_legacy.c
+++ b/src/lib/elementary/elm_focus_legacy.c
@@ -110,7 +110,7 @@ elm_object_focus_next_object_set(Evas_Object *obj,
110 #define MAP(direction, field) if (dir == EFL_UI_FOCUS_DIRECTION_ ##direction) pd->legacy_focus.field = next; 110 #define MAP(direction, field) if (dir == EFL_UI_FOCUS_DIRECTION_ ##direction) pd->legacy_focus.field = next;
111 MAPPING() 111 MAPPING()
112 #undef MAP 112 #undef MAP
113 dir = efl_ui_focus_util_direction_complement(EFL_UI_FOCUS_UTIL_CLASS, dir); 113 dir = efl_ui_focus_util_direction_complement(dir);
114 #define MAP(direction, field) if (dir == EFL_UI_FOCUS_DIRECTION_ ##direction) next_pd->legacy_focus.field = obj; 114 #define MAP(direction, field) if (dir == EFL_UI_FOCUS_DIRECTION_ ##direction) next_pd->legacy_focus.field = obj;
115 MAPPING() 115 MAPPING()
116 #undef MAP 116 #undef MAP
@@ -218,7 +218,7 @@ elm_object_focus_next(Evas_Object *obj,
218 top = elm_object_top_widget_get(obj); 218 top = elm_object_top_widget_get(obj);
219 EINA_SAFETY_ON_FALSE_RETURN(efl_isa(top, EFL_UI_WIN_CLASS)); 219 EINA_SAFETY_ON_FALSE_RETURN(efl_isa(top, EFL_UI_WIN_CLASS));
220 220
221 manager_top = efl_ui_focus_util_active_manager(EFL_UI_FOCUS_UTIL_CLASS, obj); 221 manager_top = efl_ui_focus_util_active_manager(obj);
222 logical = efl_ui_focus_manager_focus_get(manager_top); 222 logical = efl_ui_focus_manager_focus_get(manager_top);
223 223
224 if (elm_widget_is(logical)) 224 if (elm_widget_is(logical))
@@ -255,7 +255,7 @@ elm_object_focus_next(Evas_Object *obj,
255 255
256 if (legacy_target) 256 if (legacy_target)
257 { 257 {
258 efl_ui_focus_util_focus(EFL_UI_FOCUS_UTIL_CLASS, legacy_target); 258 efl_ui_focus_util_focus(legacy_target);
259 if (elm_object_focused_object_get(top) == legacy_target) 259 if (elm_object_focused_object_get(top) == legacy_target)
260 { 260 {
261 legacy_focus_move = EINA_TRUE; 261 legacy_focus_move = EINA_TRUE;
@@ -289,7 +289,7 @@ elm_object_focus_next_object_get(const Evas_Object *obj,
289 MAPPING() 289 MAPPING()
290 #undef MAP 290 #undef MAP
291 291
292 return efl_ui_focus_manager_request_move(efl_ui_focus_util_active_manager(EFL_UI_FOCUS_UTIL_CLASS, top), dir, NULL, EINA_FALSE); 292 return efl_ui_focus_manager_request_move(efl_ui_focus_util_active_manager(top), dir, NULL, EINA_FALSE);
293} 293}
294 294
295EAPI Elm_Object_Item * 295EAPI Elm_Object_Item *
@@ -364,7 +364,7 @@ elm_object_focus_set(Evas_Object *obj,
364 else if (elm_widget_is(obj)) 364 else if (elm_widget_is(obj))
365 { 365 {
366 if (focus) 366 if (focus)
367 efl_ui_focus_util_focus(EFL_UI_FOCUS_UTIL_CLASS, obj); 367 efl_ui_focus_util_focus(obj);
368 else 368 else
369 { 369 {
370 if (efl_ui_focus_manager_focus_get(efl_ui_focus_object_focus_manager_get(obj)) == obj) 370 if (efl_ui_focus_manager_focus_get(efl_ui_focus_object_focus_manager_get(obj)) == obj)
diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c
index 53cc85f2c9..19225b7287 100644
--- a/src/lib/elementary/elm_menu.c
+++ b/src/lib/elementary/elm_menu.c
@@ -498,7 +498,7 @@ _menu_item_activate_cb(void *data,
498 if (eo_item2 != EO_OBJ(item)) 498 if (eo_item2 != EO_OBJ(item))
499 elm_menu_item_selected_set(eo_item2, 0); 499 elm_menu_item_selected_set(eo_item2, 0);
500 } 500 }
501 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, EO_OBJ(item->parent), EFL_ACCESS_SELECTION_EVENT_SELECTION_CHANGED, NULL); 501 efl_access_object_event_emit(EO_OBJ(item->parent), EFL_ACCESS_SELECTION_EVENT_SELECTION_CHANGED, NULL);
502 } 502 }
503 else 503 else
504 { 504 {
@@ -513,7 +513,7 @@ _menu_item_activate_cb(void *data,
513 elm_menu_item_selected_set(eo_item2, 0); 513 elm_menu_item_selected_set(eo_item2, 0);
514 } 514 }
515 } 515 }
516 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, WIDGET(item), EFL_ACCESS_SELECTION_EVENT_SELECTION_CHANGED, NULL); 516 efl_access_object_event_emit(WIDGET(item), EFL_ACCESS_SELECTION_EVENT_SELECTION_CHANGED, NULL);
517 if (sd->menu_bar && was_open) 517 if (sd->menu_bar && was_open)
518 _menu_item_select_cb(item, NULL, NULL, NULL); 518 _menu_item_select_cb(item, NULL, NULL, NULL);
519 } 519 }
diff --git a/src/lib/elementary/elm_sys_notify.c b/src/lib/elementary/elm_sys_notify.c
index a993a8cc3a..a4789cd12c 100644
--- a/src/lib/elementary/elm_sys_notify.c
+++ b/src/lib/elementary/elm_sys_notify.c
@@ -199,8 +199,7 @@ _elm_sys_notify_servers_get(const Eo *obj EINA_UNUSED,
199} 199}
200 200
201EOLIAN static Elm_Sys_Notify * 201EOLIAN static Elm_Sys_Notify *
202_elm_sys_notify_singleton_get(Eo *obj EINA_UNUSED, 202_elm_sys_notify_singleton_get(void)
203 void *sd EINA_UNUSED)
204{ 203{
205 if (!_singleton) 204 if (!_singleton)
206 _singleton = efl_add(MY_CLASS, efl_main_loop_get()); 205 _singleton = efl_add(MY_CLASS, efl_main_loop_get());
@@ -224,7 +223,7 @@ _elm_sys_notify_class_constructor(Efl_Class *klass EINA_UNUSED)
224void 223void
225_elm_unneed_sys_notify(void) 224_elm_unneed_sys_notify(void)
226{ 225{
227 Elm_Sys_Notify *manager = elm_sys_notify_singleton_get(); 226 Elm_Sys_Notify *manager = elm_obj_sys_notify_singleton_get();
228 if (manager) 227 if (manager)
229 { 228 {
230 elm_obj_sys_notify_servers_set(manager, ELM_SYS_NOTIFY_SERVER_NONE); 229 elm_obj_sys_notify_servers_set(manager, ELM_SYS_NOTIFY_SERVER_NONE);
@@ -242,7 +241,7 @@ elm_need_sys_notify(void)
242 /* In theory, there can be N notification managers, but 241 /* In theory, there can be N notification managers, but
243 * in the implementation there will be only one: the 242 * in the implementation there will be only one: the
244 * singleton which is initialized here. */ 243 * singleton which is initialized here. */
245 manager = elm_sys_notify_singleton_get(); 244 manager = elm_obj_sys_notify_singleton_get();
246 if (EINA_UNLIKELY(!manager)) 245 if (EINA_UNLIKELY(!manager))
247 { 246 {
248 CRI("Failed to get notification manager"); 247 CRI("Failed to get notification manager");
diff --git a/src/lib/elementary/elm_theme.c b/src/lib/elementary/elm_theme.c
index 6025a95930..13ebf233ca 100644
--- a/src/lib/elementary/elm_theme.c
+++ b/src/lib/elementary/elm_theme.c
@@ -1122,7 +1122,7 @@ _efl_ui_theme_efl_object_destructor(Eo *obj, Efl_Ui_Theme_Data *pd)
1122} 1122}
1123 1123
1124EOLIAN static Efl_Ui_Theme * 1124EOLIAN static Efl_Ui_Theme *
1125_efl_ui_theme_default_get(const Eo *obj EINA_UNUSED, void *pd EINA_UNUSED) 1125_efl_ui_theme_default_get(void)
1126{ 1126{
1127 if (theme_default) 1127 if (theme_default)
1128 return theme_default->eo_theme; 1128 return theme_default->eo_theme;
diff --git a/src/lib/eo/eo_base_class.c b/src/lib/eo/eo_base_class.c
index 63074cce17..9e33e6e3a0 100644
--- a/src/lib/eo/eo_base_class.c
+++ b/src/lib/eo/eo_base_class.c
@@ -1850,13 +1850,13 @@ _efl_object_event_freeze_count_get(const Eo *obj EINA_UNUSED, Efl_Object_Data *p
1850} 1850}
1851 1851
1852EOLIAN static void 1852EOLIAN static void
1853_efl_object_event_global_freeze(Eo *klass EINA_UNUSED, void *pd EINA_UNUSED) 1853_efl_object_event_global_freeze(void)
1854{ 1854{
1855 event_freeze_count++; 1855 event_freeze_count++;
1856} 1856}
1857 1857
1858EOLIAN static void 1858EOLIAN static void
1859_efl_object_event_global_thaw(Eo *klass EINA_UNUSED, void *pd EINA_UNUSED) 1859_efl_object_event_global_thaw(void)
1860{ 1860{
1861 if (event_freeze_count > 0) 1861 if (event_freeze_count > 0)
1862 { 1862 {
@@ -1869,7 +1869,7 @@ _efl_object_event_global_thaw(Eo *klass EINA_UNUSED, void *pd EINA_UNUSED)
1869} 1869}
1870 1870
1871EOLIAN static int 1871EOLIAN static int
1872_efl_object_event_global_freeze_count_get(const Eo *klass EINA_UNUSED, void *pd EINA_UNUSED) 1872_efl_object_event_global_freeze_count_get(void)
1873{ 1873{
1874 return event_freeze_count; 1874 return event_freeze_count;
1875} 1875}
diff --git a/src/lib/eolian_cxx/grammar/function_definition.hpp b/src/lib/eolian_cxx/grammar/function_definition.hpp
index b3080e4c67..893218155c 100644
--- a/src/lib/eolian_cxx/grammar/function_definition.hpp
+++ b/src/lib/eolian_cxx/grammar/function_definition.hpp
@@ -121,24 +121,27 @@ struct function_definition_generator
121 << " __return_value = " 121 << " __return_value = "
122 ).generate(sink, attributes::unused, ctx)) return false; 122 ).generate(sink, attributes::unused, ctx)) return false;
123 123
124 std::string object_flag; 124 std::tuple<std::string, std::string, std::vector<attributes::parameter_def> > params;
125 if (f.is_static) object_flag = "_eo_class()"; 125 if (f.is_static)
126 else object_flag = "_eo_ptr()"; 126 params = std::make_tuple(f.c_name, "", f.parameters);
127 else
128 params = std::make_tuple(f.c_name, "_eo_ptr()", f.parameters);
127 129
128 if(!as_generator 130 if(!as_generator
129 (" ::" << string << "(" << string << 131 (" ::" << string << "(" << string << ((!f.is_static && (f.parameters.size() > 0)) ? "," : "")
130 *( 132 <<
131 "\n" << scope_tab << scope_tab << ", " 133 (
134 ("\n" << scope_tab << scope_tab
132 << 135 <<
133 ( 136 (
134 attribute_conditional([] (attributes::parameter_def const& p) 137 attribute_conditional([] (attributes::parameter_def const& p)
135 { return p.direction == attributes::parameter_direction::in; }) 138 { return p.direction == attributes::parameter_direction::in; })
136 [converting_argument] 139 [converting_argument]
137 | ("& __out_param_" << attribute_reorder<2>(string)) 140 | ("& __out_param_" << attribute_reorder<2>(string))
138 ) 141 )) % ","
139 ) 142 )
140 << ");\n" 143 << ");\n"
141 ).generate(sink, std::make_tuple(f.c_name, object_flag, f.parameters), ctx)) 144 ).generate(sink, params, ctx))
142 return false; 145 return false;
143 146
144 auto out_assignments = 147 auto out_assignments =
diff --git a/src/lib/evas/canvas/efl_input_event.c b/src/lib/evas/canvas/efl_input_event.c
index 8b02713ad7..a617e504eb 100644
--- a/src/lib/evas/canvas/efl_input_event.c
+++ b/src/lib/evas/canvas/efl_input_event.c
@@ -136,14 +136,10 @@ efl_input_event_instance_clean(Eo *klass)
136/* Internal EO APIs */ 136/* Internal EO APIs */
137 137
138EOAPI EFL_FUNC_BODY_CONST(efl_input_legacy_info_get, void *, NULL) 138EOAPI EFL_FUNC_BODY_CONST(efl_input_legacy_info_get, void *, NULL)
139EOAPI EFL_FUNC_BODYV_CONST(efl_input_instance_get, Efl_Input_Event *, NULL, EFL_FUNC_CALL(owner, priv), Efl_Object *owner, void **priv)
140 139
141#define EFL_INPUT_EVENT_EXTRA_OPS \ 140#define EFL_INPUT_EVENT_EXTRA_OPS \
142 EFL_OBJECT_OP_FUNC(efl_input_legacy_info_get, NULL) 141 EFL_OBJECT_OP_FUNC(efl_input_legacy_info_get, NULL)
143 142
144#define EFL_INPUT_EVENT_EXTRA_CLASS_OPS \
145 EFL_OBJECT_OP_FUNC(efl_input_instance_get, NULL)
146
147#include "efl_input_event.eo.c" 143#include "efl_input_event.eo.c"
148#include "efl_input_state.eo.c" 144#include "efl_input_state.eo.c"
149#include "efl_input_interface.eo.c" 145#include "efl_input_interface.eo.c"