summaryrefslogtreecommitdiff
path: root/src/lib/elementary/efl_ui_win.c
diff options
context:
space:
mode:
authorLukasz Stanislawski <lukasz.stanislawski@gmail.com>2017-10-19 10:13:54 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-10-19 10:13:54 +0900
commit57aefc53c18c14ada19dcd09d3e5b5612b277b16 (patch)
tree897745eb7c2d9ccbbde1bc0cf4dd2971c2e625f4 /src/lib/elementary/efl_ui_win.c
parent98622623a0865c525ede12ef5759ab6f5b3af407 (diff)
elm: rename Elm_Interface_Atspi_Accessible interface
Subscribers: cedric, jpeg Differential Revision: https://phab.enlightenment.org/D5341
Diffstat (limited to '')
-rw-r--r--src/lib/elementary/efl_ui_win.c38
1 files changed, 19 insertions, 19 deletions
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 111032a73c..5d294fe3bf 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#define EFL_ACCESS_COMPONENT_PROTECTED 6#define EFL_ACCESS_COMPONENT_PROTECTED
7#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED 7#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
8#define EFL_INPUT_EVENT_PROTECTED 8#define EFL_INPUT_EVENT_PROTECTED
@@ -1243,7 +1243,7 @@ _elm_win_focus_in(Ecore_Evas *ee)
1243 if (_elm_config->atspi_mode) 1243 if (_elm_config->atspi_mode)
1244 { 1244 {
1245 efl_access_window_activated_signal_emit(obj); 1245 efl_access_window_activated_signal_emit(obj);
1246 elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_ACTIVE, EINA_TRUE); 1246 efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_ACTIVE, EINA_TRUE);
1247 } 1247 }
1248 1248
1249 /* do nothing */ 1249 /* do nothing */
@@ -1277,7 +1277,7 @@ _elm_win_focus_out(Ecore_Evas *ee)
1277 if (_elm_config->atspi_mode) 1277 if (_elm_config->atspi_mode)
1278 { 1278 {
1279 efl_access_window_deactivated_signal_emit(obj); 1279 efl_access_window_deactivated_signal_emit(obj);
1280 elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_ACTIVE, EINA_FALSE); 1280 efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_ACTIVE, EINA_FALSE);
1281 } 1281 }
1282 1282
1283 /* do nothing */ 1283 /* do nothing */
@@ -2273,9 +2273,9 @@ _efl_ui_win_show(Eo *obj, Efl_Ui_Win_Data *sd)
2273 { 2273 {
2274 Eo *root; 2274 Eo *root;
2275 efl_access_window_created_signal_emit(obj); 2275 efl_access_window_created_signal_emit(obj);
2276 root = elm_interface_atspi_accessible_root_get(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN); 2276 root = efl_access_root_get(EFL_ACCESS_MIXIN);
2277 if (root) 2277 if (root)
2278 elm_interface_atspi_accessible_children_changed_added_signal_emit(root, obj); 2278 efl_access_children_changed_added_signal_emit(root, obj);
2279 } 2279 }
2280 2280
2281 if (do_eval) 2281 if (do_eval)
@@ -2334,10 +2334,10 @@ _efl_ui_win_hide(Eo *obj, Efl_Ui_Win_Data *sd)
2334 if (_elm_config->atspi_mode) 2334 if (_elm_config->atspi_mode)
2335 { 2335 {
2336 Eo *root; 2336 Eo *root;
2337 root = elm_interface_atspi_accessible_root_get(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN); 2337 root = efl_access_root_get(EFL_ACCESS_MIXIN);
2338 efl_access_window_destroyed_signal_emit(obj); 2338 efl_access_window_destroyed_signal_emit(obj);
2339 if (root) 2339 if (root)
2340 elm_interface_atspi_accessible_children_changed_del_signal_emit(root, obj); 2340 efl_access_children_changed_del_signal_emit(root, obj);
2341 } 2341 }
2342 2342
2343 if (_elm_win_policy_quit_triggered(obj)) 2343 if (_elm_win_policy_quit_triggered(obj))
@@ -4319,7 +4319,7 @@ _elm_win_frame_add(Efl_Ui_Win_Data *sd, const char *element, const char *style)
4319 efreet_desktop_free(d); 4319 efreet_desktop_free(d);
4320 } 4320 }
4321 } 4321 }
4322 elm_interface_atspi_accessible_type_set(sd->icon, ELM_ATSPI_TYPE_DISABLED); 4322 efl_access_type_set(sd->icon, EFL_ACCESS_TYPE_DISABLED);
4323 } 4323 }
4324 4324
4325 edje_object_part_swallow(sd->frame_obj, "elm.swallow.icon", sd->icon); 4325 edje_object_part_swallow(sd->frame_obj, "elm.swallow.icon", sd->icon);
@@ -5282,7 +5282,7 @@ _elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Elm_W
5282 elm_win_focus_highlight_animate_set(obj, EINA_TRUE); 5282 elm_win_focus_highlight_animate_set(obj, EINA_TRUE);
5283 } 5283 }
5284 5284
5285 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_WINDOW); 5285 efl_access_role_set(obj, EFL_ACCESS_ROLE_WINDOW);
5286 if (_elm_config->atspi_mode) 5286 if (_elm_config->atspi_mode)
5287 efl_access_window_created_signal_emit(obj); 5287 efl_access_window_created_signal_emit(obj);
5288 5288
@@ -6648,7 +6648,7 @@ _on_atspi_bus_connected(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUS
6648 target = efl_ui_focus_manager_focus_get(m); 6648 target = efl_ui_focus_manager_focus_get(m);
6649 } 6649 }
6650 if (target) 6650 if (target)
6651 elm_interface_atspi_accessible_state_changed_signal_emit(target, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE); 6651 efl_access_state_changed_signal_emit(target, EFL_ACCESS_STATE_FOCUSED, EINA_TRUE);
6652 } 6652 }
6653 else 6653 else
6654 efl_access_window_deactivated_signal_emit(win); 6654 efl_access_window_deactivated_signal_emit(win);
@@ -6676,11 +6676,11 @@ _efl_ui_win_efl_object_debug_name_override(Eo *obj, Efl_Ui_Win_Data *pd, Eina_St
6676} 6676}
6677 6677
6678EOLIAN static Eo* 6678EOLIAN static Eo*
6679_efl_ui_win_elm_interface_atspi_accessible_parent_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd EINA_UNUSED) 6679_efl_ui_win_efl_access_parent_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd EINA_UNUSED)
6680{ 6680{
6681 // attach all kinds of windows directly to ATSPI application root object 6681 // attach all kinds of windows directly to ATSPI application root object
6682 Eo *root; 6682 Eo *root;
6683 root = elm_interface_atspi_accessible_root_get(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN); 6683 root = efl_access_root_get(EFL_ACCESS_MIXIN);
6684 return root; 6684 return root;
6685} 6685}
6686 6686
@@ -6699,23 +6699,23 @@ _efl_ui_win_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSE
6699 return &atspi_actions[0]; 6699 return &atspi_actions[0];
6700} 6700}
6701 6701
6702EOLIAN static Elm_Atspi_State_Set 6702EOLIAN static Efl_Access_State_Set
6703_efl_ui_win_elm_interface_atspi_accessible_state_set_get(Eo *obj, Efl_Ui_Win_Data *sd EINA_UNUSED) 6703_efl_ui_win_efl_access_state_set_get(Eo *obj, Efl_Ui_Win_Data *sd EINA_UNUSED)
6704{ 6704{
6705 Elm_Atspi_State_Set ret; 6705 Efl_Access_State_Set ret;
6706 ret = elm_interface_atspi_accessible_state_set_get(efl_super(obj, MY_CLASS)); 6706 ret = efl_access_state_set_get(efl_super(obj, MY_CLASS));
6707 6707
6708 if (elm_win_focus_get(obj)) 6708 if (elm_win_focus_get(obj))
6709 STATE_TYPE_SET(ret, ELM_ATSPI_STATE_ACTIVE); 6709 STATE_TYPE_SET(ret, EFL_ACCESS_STATE_ACTIVE);
6710 6710
6711 return ret; 6711 return ret;
6712} 6712}
6713 6713
6714EOLIAN static const char* 6714EOLIAN static const char*
6715_efl_ui_win_elm_interface_atspi_accessible_name_get(Eo *obj, Efl_Ui_Win_Data *sd EINA_UNUSED) 6715_efl_ui_win_efl_access_name_get(Eo *obj, Efl_Ui_Win_Data *sd EINA_UNUSED)
6716{ 6716{
6717 const char *ret; 6717 const char *ret;
6718 ret = elm_interface_atspi_accessible_name_get(efl_super(obj, EFL_UI_WIN_CLASS)); 6718 ret = efl_access_name_get(efl_super(obj, EFL_UI_WIN_CLASS));
6719 if (ret) return ret; 6719 if (ret) return ret;
6720 const char *name = elm_win_title_get(obj); 6720 const char *name = elm_win_title_get(obj);
6721 return name; 6721 return name;