}
static void
-_item_wrap_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
+_item_wrap_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
{
Elm_Ctxpopup_Item_Data *item = data;
if (!item->wcb.org_func_cb) return;
item->wcb.org_func_cb((void *)item->wcb.org_data, item->wcb.cobj, EO_OBJ(item));
+//TIZEN ONLY(20150710)ctxpopup: Accessible methods for children_get, extents_get and item name_get
+ eo_do(obj, elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_MENU_ITEM));
+//
}
EOLIAN static Eo *
return ret;
}
+static Eina_Bool
+_item_action_activate(Evas_Object *obj, const char *params EINA_UNUSED)
+{
+ ELM_CTXPOPUP_ITEM_DATA_GET(obj, item);
+
+ if (item->wcb.org_func_cb)
+ item->wcb.org_func_cb((void*)item->wcb.org_data, WIDGET(item), EO_OBJ(item));
+ return EINA_TRUE;
+}
+
+EOLIAN static const Elm_Atspi_Action*
+_elm_ctxpopup_item_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Ctxpopup_Item_Data *sd EINA_UNUSED)
+{
+ static Elm_Atspi_Action atspi_actions[] = {
+ { "activate", "activate", NULL, _item_action_activate},
+ { NULL, NULL, NULL, NULL }
+ };
+ return &atspi_actions[0];
+}
+
#include "elm_ctxpopup_item.eo.c"
#include "elm_ctxpopup.eo.c"
eo_do(obj,
evas_obj_type_set(MY_CLASS_NAME_LEGACY),
evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
- elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_GLASS_PANE));
+ elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_COMBO_BOX));
return obj;
}
elm_layout_content_set(btn, CONTENT_PART, ico);
}
+ if(_elm_config->atspi_mode)
+ eo_do(btn, elm_interface_atspi_accessible_name_set(N_("Navigate back")));
+
return btn;
}
it->title_enabled = EINA_TRUE;
+ //TIZEN ONLY(20150707): expose title as at-spi object
+ if (_elm_config->atspi_mode)
+ {
+ Evas_Object *part = (Evas_Object*)edje_object_part_object_get(elm_layout_edje_get(VIEW(it)), TITLE_ACCESS_PART);
+ if (part)
+ {
+ Evas_Object *access = elm_access_object_register(part, VIEW(it));
+ _elm_access_callback_set(_elm_access_info_get(access),
+ ELM_ACCESS_INFO, _access_info_cb, it);
+ elm_atspi_accessible_role_set(access, ELM_ATSPI_ROLE_HEADING);
+ }
+ }
+ //
+
return EO_OBJ(it);
}
eo_do(obj,
evas_obj_type_set(MY_CLASS_NAME_LEGACY),
evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
- elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_NOTIFICATION));
-
+ elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_DIALOG));
return obj;
}
# include "elementary_config.h"
#endif
+#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define ELM_INTERFACE_ATSPI_COMPONENT_PROTECTED
+#define ELM_INTERFACE_ATSPI_ACTION_PROTECTED
+
#include <Elementary.h>
#include "elm_priv.h"
return ret;
}
+static Eina_Bool
+_access_action_callback_have(Evas_Object *obj, Elm_Access_Action_Type type)
+{
+ Action_Info *a;
+ a = evas_object_data_get(obj, "_elm_access_action_info");
+
+ if (!a) return EINA_FALSE;
+
+ return a->fn[type].cb ? EINA_TRUE : EINA_FALSE;
+}
+
EOLIAN static Eina_Bool
_elm_access_elm_widget_activate(Eo *obj, void *_pd EINA_UNUSED, Elm_Activate act)
{
evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
}
+EOLIAN static char*
+_elm_access_elm_interface_atspi_accessible_name_get(Eo *obj, void *pd EINA_UNUSED)
+{
+ return elm_access_info_get(obj, ELM_ACCESS_INFO);
+}
+
+EOLIAN static const char*
+_elm_access_elm_interface_atspi_accessible_description_get(Eo *obj, void *pd EINA_UNUSED)
+{
+ return elm_access_info_get(obj, ELM_ACCESS_CONTEXT_INFO);
+}
+
+EOLIAN static Eina_Bool
+_elm_access_elm_interface_atspi_component_highlight_grab(Eo *obj, void *pd EINA_UNUSED)
+{
+ if (!_access_action_callback_call(obj, ELM_ACCESS_ACTION_HIGHLIGHT, NULL))
+ eo_do_super(obj, ELM_ACCESS_CLASS, elm_interface_atspi_component_highlight_grab());
+
+ return EINA_TRUE;
+}
+
+EOLIAN static Eina_Bool
+_elm_access_elm_interface_atspi_component_highlight_clear(Eo *obj, void *pd EINA_UNUSED)
+{
+ if (!_access_action_callback_call(obj, ELM_ACCESS_ACTION_UNHIGHLIGHT, NULL))
+ eo_do_super(obj, ELM_ACCESS_CLASS, elm_interface_atspi_component_highlight_clear());
+
+ return EINA_TRUE;
+}
+
+EOLIAN static Eina_Bool
+_elm_access_elm_interface_atspi_action_action_do(Eo *obj, void *pd EINA_UNUSED, int id)
+{
+ if (id != 0)
+ return EINA_FALSE;
+
+ return _access_action_callback_call(obj, ELM_ACCESS_ACTION_ACTIVATE, NULL);
+}
+
+EOLIAN static const char *
+_elm_access_elm_interface_atspi_action_name_get(Eo *obj, void *pd EINA_UNUSED, int id)
+{
+ if ((id != 0) || !_access_action_callback_have(obj, ELM_ACCESS_ACTION_ACTIVATE))
+ return NULL;
+ return "activate";
+}
+
+EOLIAN static Eina_List*
+_elm_access_elm_interface_atspi_action_actions_get(Eo *obj, void *pd EINA_UNUSED)
+{
+ Eina_List *ret = NULL;
+
+ if (_access_action_callback_have(obj, ELM_ACCESS_ACTION_ACTIVATE))
+ ret = eina_list_append(ret, &("activate"));
+
+ return ret;
+}
+
#include "elm_access.eo.c"
-class Elm.Access (Elm.Widget)
+class Elm.Access (Elm.Widget, Elm_Interface_Atspi_Action)
{
eo_prefix: elm_obj_access;
data: null;
Evas.Object_Smart.add;
Elm.Widget.activate;
Elm.Widget.on_focus;
+ Elm_Interface_Atspi_Accessible.name.get;
+ Elm_Interface_Atspi_Accessible.description.get;
+ Elm_Interface_Atspi_Component.highlight_grab;
+ Elm_Interface_Atspi_Component.highlight_clear;
+ Elm_Interface_Atspi_Action.action_do;
+ Elm_Interface_Atspi_Action.name.get;
+ Elm_Interface_Atspi_Action.actions.get;
}
-
}
obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
eo_do(obj,
evas_obj_type_set(MY_CLASS_NAME_LEGACY),
- elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_IMAGE));
+ elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_REDUNDANT_OBJECT));
return obj;
}
-class Elm.Color_Item(Elm.Widget_Item)
+class Elm.Color_Item(Elm.Widget_Item, Elm_Interface_Atspi_Widget_Action)
{
eo_prefix: elm_obj_color_item;
methods {
Eo.Base.destructor;
Elm.Widget_Item.access_register;
Elm.Widget_Item.signal_emit;
+ //TIZEN_ONLY(20150707) : improve colorselctor atspi support
+ Elm_Interface_Atspi_Accessible.state_set.get;
+ Elm_Interface_Atspi_Component.highlight_grab;
+ Elm_Interface_Atspi_Component.highlight_clear;
+ Elm_Interface_Atspi_Widget_Action.elm_actions.get;
+ //
}
}
#endif
#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define ELM_INTERFACE_ATSPI_COMPONENT_PROTECTED
#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
#include <Elementary.h>
elm_object_signal_emit(VIEW(it), emission, source);
}
+// TIZEN ONLY : "elm,state,selected" signal is handled by _on_color_selected()
+static Eina_Bool
+_item_action_activate(Evas_Object *obj, const char *params EINA_UNUSED)
+{
+ Eina_List *l;
+ ELM_COLOR_ITEM_DATA_GET(obj, item);
+ ELM_COLORSELECTOR_DATA_GET(WIDGET(item), sd);
+
+ elm_object_signal_emit(VIEW(item), "elm,state,selected", "elm");
+ elm_colorselector_color_set(WIDGET(item), item->color->r, item->color->g,
+ item->color->b, item->color->a);
+ evas_object_smart_callback_call(WIDGET(item), SIG_COLOR_ITEM_SELECTED,
+ EO_OBJ(item));
+
+ Eo *eo_temp_item = eina_list_data_get(sd->selected);
+ if (eo_temp_item && (eo_temp_item != EO_OBJ(item)))
+ {
+ ELM_COLOR_ITEM_DATA_GET(eo_temp_item, temp_item);
+ elm_object_signal_emit(VIEW(temp_item), "elm,state,unselected", "elm");
+ }
+
+ EINA_LIST_FOREACH(sd->items, l, eo_temp_item)
+ {
+ ELM_COLOR_ITEM_DATA_GET(eo_temp_item, temp_item);
+ if (item == temp_item) sd->selected = l;
+ }
+ sd->focused = ELM_COLORSELECTOR_PALETTE;
+
+ return EINA_TRUE;
+}
+//
+
EOLIAN static Eo *
_elm_color_item_eo_base_constructor(Eo *eo_item, Elm_Color_Item_Data *item)
{
// ACCESS
if (_elm_config->access_mode == ELM_ACCESS_MODE_ON)
eo_do(eo_item, elm_wdg_item_access_register());
-
+ //TIZEN_ONLY(20150707) : improve colorselctor atspi support
+ eo_do(eo_item, elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_RADIO_BUTTON));
+ ///
return eo_item;
}
return &atspi_actions[0];
}
+//TIZEN_ONLY(20150707) : improve colorselctor atspi support
+EOLIAN static Eina_List*
+_elm_colorselector_elm_interface_atspi_accessible_children_get(Eo *obj EINA_UNUSED, Elm_Colorselector_Data *sd EINA_UNUSED)
+{
+ Eina_List *ret = NULL;
+
+ eo_do_super(obj, ELM_COLORSELECTOR_CLASS, ret = elm_interface_atspi_accessible_children_get());
+
+ // filter - out box contiainer
+ ret = eina_list_remove(ret, sd->palette_box);
+
+ // append items as colorselector children
+ ret = eina_list_merge(ret, eina_list_clone(sd->items));
+
+ return ret;
+}
+
+EOLIAN static Elm_Atspi_State_Set
+_elm_color_item_elm_interface_atspi_accessible_state_set_get(Eo *obj EINA_UNUSED, Elm_Color_Item_Data *sd EINA_UNUSED)
+{
+ Elm_Atspi_State_Set ret;
+
+ eo_do_super(obj, ELM_COLOR_ITEM_CLASS, ret = elm_interface_atspi_accessible_state_set_get());
+
+ Evas_Object *widget = WIDGET(sd);
+ if (!widget) return ret;
+
+ ELM_COLORSELECTOR_DATA_GET_OR_RETURN_VAL(widget, wd, ret);
+
+ if (eina_list_data_get(wd->selected) == obj)
+ STATE_TYPE_SET(ret, ELM_ATSPI_STATE_CHECKED);
+
+ return ret;
+}
+
+EOLIAN static Eina_Bool
+_elm_color_item_elm_interface_atspi_component_highlight_grab(Eo *eo_it, Elm_Color_Item_Data *it)
+{
+ elm_genlist_item_show(eo_it, ELM_GENLIST_ITEM_SCROLLTO_IN);
+
+ elm_object_accessibility_highlight_set(VIEW(it), EINA_TRUE);
+
+ return EINA_TRUE;
+}
+
+EOLIAN static Eina_Bool
+_elm_color_item_elm_interface_atspi_component_highlight_clear(Eo *eo_it EINA_UNUSED, Elm_Color_Item_Data *it)
+{
+ elm_object_accessibility_highlight_set(VIEW(it), EINA_FALSE);
+
+ return EINA_TRUE;
+}
+
+EOLIAN static const Elm_Atspi_Action*
+_elm_color_item_elm_interface_atspi_widget_action_elm_actions_get(Eo *eo_it EINA_UNUSED, Elm_Color_Item_Data *it EINA_UNUSED)
+{
+ static Elm_Atspi_Action atspi_actions[] = {
+ { "activate", "activate", NULL, _item_action_activate},
+ { NULL, NULL, NULL, NULL }
+ };
+ return &atspi_actions[0];
+}
+/////
+
#include "elm_colorselector.eo.c"
#include "elm_color_item.eo.c"
Elm.Widget.event;
Elm.Layout.sizing_eval;
Elm_Interface_Atspi_Widget_Action.elm_actions.get;
+ //TIZEN_ONLY(20150707) : improve colorselctor atspi support
+ Elm_Interface_Atspi_Accessible.children.get;
+ ///
}
events {
color,item,selected;
-class Elm.Ctxpopup_Item(Elm.Widget_Item)
+class Elm.Ctxpopup_Item(Elm.Widget_Item, Elm_Interface_Atspi_Widget_Action)
{
eo_prefix: elm_obj_ctxpopup_item;
methods {
Elm.Widget_Item.part_content.set;
Elm.Widget_Item.focus.set;
Elm.Widget_Item.focus.get;
+ Elm_Interface_Atspi_Widget_Action.elm_actions.get;
}
}
it_xpos = it_xpos - ((vw - sd->item_width) / 2);
it_ypos = it_ypos - ((vh - sd->item_height) / 2);
break;
+ // @tizen_feature
+ case ELM_GENGRID_ITEM_SCROLLTO_BOTTOM:
+ eo_do(WIDGET(it), elm_interface_scrollable_content_viewport_geometry_get
+ (NULL, NULL, &vw, &vh));
+ it_xpos = it_xpos - vw + sd->item_width;
+ it_ypos = it_ypos - vh + sd->item_height;
+ break;
+ ///
default:
vw = sd->item_width;
vh = sd->item_height;
}
EOLIAN char*
-_elm_gengrid_item_elm_interface_atspi_accessible_name_get(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it)
+_elm_gengrid_item_elm_interface_atspi_accessible_name_get(Eo *eo_it, Elm_Gen_Item *it)
{
char *ret;
Eina_Strbuf *buf;
+ eo_do_super(eo_it, ELM_GENGRID_ITEM_CLASS, ret = elm_interface_atspi_accessible_name_get());
+ if (ret) return ret;
+
buf = eina_strbuf_new();
if (it->itc->func.text_get)
Evas_Object *part;
part = edje_object_part_swallow_get(VIEW(it), key);
if (part && eo_isa(part, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN))
- ret = eina_list_append(ret, part);
+ {
+ ret = eina_list_append(ret, part);
+ eo_do(part, elm_interface_atspi_accessible_parent_set(eo_it));
+ }
}
}
return ret;
STATE_TYPE_SET(ret, ELM_ATSPI_STATE_MANAGES_DESCENDANTS);
+ if (elm_gengrid_multi_select_get(obj))
+ STATE_TYPE_SET(ret, ELM_ATSPI_STATE_MULTISELECTABLE);
+
return ret;
}
none = 0, [[No scrollto.]]
in = (1 << 0), [[To the nearest viewport.]]
top = (1 << 1), [[To the top of viewport.]]
- middle = (1 << 2) [[To the middle of viewport.]]
+ middle = (1 << 2), [[To the middle of viewport.]]
+ // @tizen_feature
+ bottom = (1 << 3) [[To the bottom of viewport.]]
+ //
}
enum Elm.Gengrid.Item.Field_Type
}
EOLIAN char*
-_elm_genlist_item_elm_interface_atspi_accessible_name_get(Eo *eo_it EINA_UNUSED,
+_elm_genlist_item_elm_interface_atspi_accessible_name_get(Eo *eo_it,
Elm_Gen_Item *it)
{
char *ret;
Eina_Strbuf *buf;
+ eo_do_super(eo_it, ELM_GENLIST_ITEM_CLASS, ret = elm_interface_atspi_accessible_name_get());
+ if (ret) return ret;
buf = eina_strbuf_new();
STATE_TYPE_SET(ret, ELM_ATSPI_STATE_MANAGES_DESCENDANTS);
+ if (elm_genlist_multi_select_get(obj))
+ STATE_TYPE_SET(ret, ELM_ATSPI_STATE_MULTISELECTABLE);
+
return ret;
}
#endif
#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
+#define ELM_INTERFACE_ATSPI_COMPONENT_PROTECTED
#include <Elementary.h>
eo_do(obj,
evas_obj_type_set(MY_CLASS_NAME_LEGACY),
evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
- elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_GLASS_PANE));
+ elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_POPUP_MENU));
return obj;
}
evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
}
+
+EOLIAN static Elm_Atspi_State_Set
+_elm_hover_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Hover_Data *pd EINA_UNUSED)
+{
+ Elm_Atspi_State_Set states;
+
+ eo_do_super(obj, MY_CLASS, states = elm_interface_atspi_accessible_state_set_get());
+
+ STATE_TYPE_SET(states, ELM_ATSPI_STATE_MODAL);
+
+ return states;
+}
+
+static Eina_Bool
+_action_dismiss(Evas_Object *obj, const char *params EINA_UNUSED)
+{
+ elm_hover_dismiss(obj);
+ return EINA_TRUE;
+}
+
+EOLIAN const Elm_Atspi_Action *
+_elm_hover_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Hover_Data *pd EINA_UNUSED)
+{
+ static Elm_Atspi_Action atspi_actions[] = {
+ { "dismiss", "dismiss", NULL, _action_dismiss },
+ { NULL, NULL, NULL, NULL}
+ };
+ return &atspi_actions[0];
+}
+
+EOLIAN static Eina_Bool
+_elm_hover_elm_interface_atspi_component_highlight_grab(Eo *obj, Elm_Hover_Data *sd)
+{
+ ELM_HOVER_PARTS_FOREACH
+ {
+ if (sd->subs[i].obj)
+ {
+ elm_object_accessibility_highlight_set(sd->subs[i].obj, EINA_TRUE);
+ elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_HIGHLIGHTED, EINA_TRUE);
+ break;
+ }
+ }
+ return EINA_TRUE;
+}
+
+EOLIAN static Eina_Bool
+_elm_hover_elm_interface_atspi_component_highlight_clear(Eo *obj, Elm_Hover_Data *sd)
+{
+ ELM_HOVER_PARTS_FOREACH
+ {
+ if (sd->subs[i].obj)
+ {
+ elm_object_accessibility_highlight_set(sd->subs[i].obj, EINA_FALSE);
+ elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_HIGHLIGHTED, EINA_FALSE);
+ break;
+ }
+ }
+ return EINA_TRUE;
+}
+
#include "elm_hover.eo.c"
both [[ELM_HOVER_AXIS_BOTH -- both.]]
}
-class Elm.Hover (Elm.Layout, Evas.Clickable_Interface)
+class Elm.Hover (Elm.Layout, Evas.Clickable_Interface,
+ Elm_Interface_Atspi_Widget_Action)
{
eo_prefix: elm_obj_hover;
methods {
Elm.Container.content_unset;
Elm.Layout.sizing_eval;
Elm.Layout.content_aliases.get;
+ Elm_Interface_Atspi_Accessible.state_set.get;
+ Elm_Interface_Atspi_Widget_Action.elm_actions.get;
+ Elm_Interface_Atspi_Component.highlight_grab;
+ Elm_Interface_Atspi_Component.highlight_clear;
}
events {
smart,changed;
eo_do(obj,
evas_obj_type_set(MY_CLASS_NAME_LEGACY),
evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
- elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_IMAGE));
+ elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_ICON));
return obj;
}
#endif
#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
#define ELM_WIDGET_ITEM_PROTECTED
#include <Elementary.h>
{
obj = eo_do_super_ret(obj, ELM_INDEX_ITEM_CLASS, obj, eo_constructor());
it->base = eo_data_scope_get(obj, ELM_WIDGET_ITEM_CLASS);
-
+ //TIZEN_ONLY(20150716) : improve atspi support
+ eo_do(obj, elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_PUSH_BUTTON));
+ ///
return obj;
}
eo_do(obj,
evas_obj_type_set(MY_CLASS_NAME_LEGACY),
evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
- elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_LIST));
+ elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_SCROLL_BAR));
return obj;
}
evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
}
+//TIZEN_ONLY(20150716) : improve atspi support
+static Eina_Bool
+_item_action_activate(Eo *obj, const char *params EINA_UNUSED EINA_UNUSED)
+{
+ elm_index_item_selected_set(obj, EINA_TRUE);
+ return EINA_FALSE;
+}
+
+EOLIAN static Eina_List*
+_elm_index_elm_interface_atspi_accessible_children_get(Eo *eo_it EINA_UNUSED, Elm_Index_Data *data)
+{
+ return eina_list_clone(data->items);
+}
+
+EOLIAN static char*
+_elm_index_item_elm_interface_atspi_accessible_name_get(Eo *eo_it EINA_UNUSED, Elm_Index_Item_Data *data)
+{
+ return data->letter ? strdup(data->letter) : NULL;
+}
+
+EOLIAN static const Elm_Atspi_Action*
+_elm_index_item_elm_interface_atspi_widget_action_elm_actions_get(Eo *eo_it EINA_UNUSED, Elm_Index_Item_Data *data EINA_UNUSED)
+{
+ static Elm_Atspi_Action atspi_actions[] = {
+ { "activate", "activate", NULL, _item_action_activate},
+ { NULL, NULL, NULL, NULL }
+ };
+ return &atspi_actions[0];
+}
+///
+
#include "elm_index_item.eo.c"
#include "elm_index.eo.c"
Elm.Widget.access;
Elm.Widget.focus_next;
Elm.Layout.sizing_eval;
+ //TIZEN_ONLY(20150716) : improve atspi support
+ Elm_Interface_Atspi_Accessible.children.get;
+ ///
}
events {
changed;
-class Elm.Index_Item(Elm.Widget_Item)
+class Elm.Index_Item(Elm.Widget_Item, Elm_Interface_Atspi_Widget_Action)
{
eo_prefix: elm_obj_index_item;
methods {
Eo.Base.constructor;
Eo.Base.destructor;
Elm.Widget_Item.access_register;
+ //TIZEN_ONLY(20150716) : improve atspi support
+ Elm_Interface_Atspi_Accessible.name.get;
+ Elm_Interface_Atspi_Widget_Action.elm_actions.get;
+ ///
}
}
added;
removed;
}
+ //TIZEN_ONLY(20150709) : atspi relations api
+ implements {
+ @virtual .relationship_append;
+ @virtual .relationship_remove;
+ }
+ //////////
}
/*
* Sets a particilar state type for given state set.
*/
-#define STATE_TYPE_SET(state_set, type) (state_set|= (1L << type))
+#define STATE_TYPE_SET(state_set, type) (state_set|= (1ULL << type))
/**
* Unsets a particilar state type for given state set.
*/
-#define STATE_TYPE_UNSET(state_set, type) (state_set &= ~(1L << type))
+#define STATE_TYPE_UNSET(state_set, type) (state_set &= ~(1ULL << type))
/**
* Gets value of a particilar state type for given state set.
*/
-#define STATE_TYPE_GET(state_set, type) (state_set & (1L << type))
+#define STATE_TYPE_GET(state_set, type) (state_set & (1ULL << type))
/**
eo_do(obj, children = elm_interface_atspi_accessible_children_get());
- EINA_LIST_FOREACH(children, l, child)
+ EINA_LIST_REVERSE_FOREACH(children, l, child)
{
Eina_Bool contains;
if (eo_isa(child, ELM_INTERFACE_ATSPI_COMPONENT_MIXIN))
{
+ //TIZEN_ONLY (20150709) imporove object at xy get function
+ Elm_Atspi_Role role;
+ eo_do(child, role = elm_interface_atspi_accessible_role_get());
+ if (role == ELM_ATSPI_ROLE_REDUNDANT_OBJECT)
+ continue;
+ //
eo_do(child, contains = elm_interface_atspi_component_contains(screen_coords, x, y));
if (contains)
{
VIEW(it) = edje_object_add(evas_object_evas_get(obj));
+ if (_elm_config->atspi_mode)
+ {
+ if (it->icon) eo_do(it->icon, elm_interface_atspi_accessible_parent_set(eo_it));
+ if (it->end) eo_do(it->end, elm_interface_atspi_accessible_parent_set(eo_it));
+ }
+
/* access */
if (_elm_config->access_mode == ELM_ACCESS_MODE_ON)
_access_widget_item_register(it, EINA_TRUE);
elm_language_set(const char *lang)
{
setlocale(LC_ALL, lang);
+ evas_language_reinit();
_elm_win_translate();
}
#endif
#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define ELM_INTERFACE_ATSPI_VALUE_PROTECTED
#include <Elementary.h>
return EINA_FALSE;
}
+/////////////////////////////////////////////////////////
+//TIZENONLY (20150825) Add atspi value interface to progressbar
+
+EOLIAN static void
+_elm_progressbar_elm_interface_atspi_value_value_and_text_get(Eo *obj, Elm_Progressbar_Data *_pd, double *value, const char **text)
+{
+ if (value) *value = _pd->val;
+}
+
+//
+
EOLIAN static void
_elm_progressbar_class_constructor(Eo_Class *klass)
{
-class Elm.Progressbar (Elm.Layout)
+class Elm.Progressbar (Elm.Layout, Elm_Interface_Atspi_Value)
{
eo_prefix: elm_obj_progressbar;
methods {
Elm.Layout.text_aliases.get;
Elm.Layout.content_aliases.get;
Elm.Layout.sizing_eval;
+ Elm_Interface_Atspi_Value.value_and_text.get;
}
events {
changed;
eo_do(obj,
evas_obj_type_set(MY_CLASS_NAME_LEGACY),
evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
- elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_SPIN_BUTTON));
+ elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_FILLER));
return obj;
}
_elm_spinner_smart_focus_next_enable = EINA_TRUE;
}
-EOLIAN static const Elm_Atspi_Action *
-_elm_spinner_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd EINA_UNUSED)
-{
- static Elm_Atspi_Action atspi_actions[] = {
- { "spin,left", "spin", "left", _key_action_spin},
- { "spin,right", "spin", "right", _key_action_spin},
- { "spin,up", "spin", "up", _key_action_spin},
- { "spin,down", "spin", "down", _key_action_spin},
- { "toggle", "toggle", NULL, _key_action_toggle},
- { NULL, NULL, NULL, NULL }
- };
- return &atspi_actions[0];
-}
-
// A11Y Accessibility
EOLIAN static void
Elm_Interface_Atspi_Value.value_and_text.set;
Elm_Interface_Atspi_Value.range.get;
Elm_Interface_Atspi_Value.increment.get;
- Elm_Interface_Atspi_Widget_Action.elm_actions.get;
}
events {
changed;
#endif
#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define ELM_INTERFACE_ATSPI_COMPONENT_PROTECTED
#define ELM_INTERFACE_ATSPI_SELECTION_PROTECTED
#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
#define ELM_WIDGET_ITEM_PROTECTED
VIEW(it) = elm_layout_add(obj);
evas_object_data_set(VIEW(it), "item", it);
+ if (_elm_config->atspi_mode)
+ if (icon_obj) eo_do(icon_obj, elm_interface_atspi_accessible_parent_set(eo_it));
+
if (_elm_config->access_mode == ELM_ACCESS_MODE_ON)
_access_widget_item_register(it);
}
EOLIAN static char*
-_elm_toolbar_item_elm_interface_atspi_accessible_name_get(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data *item)
+_elm_toolbar_item_elm_interface_atspi_accessible_name_get(Eo *eo_item, Elm_Toolbar_Item_Data *item)
{
+ char *ret;
+ eo_do_super(eo_item, ELM_TOOLBAR_ITEM_CLASS, ret = elm_interface_atspi_accessible_name_get());
+ if (ret) return ret;
return item->label ? strdup(item->label) : NULL;
}
return ret;
}
+// TIZEN_ONLY(20150701): Add accessibility highlight for toolbar items
+
+EOLIAN static Eina_Bool
+_elm_toolbar_item_elm_interface_atspi_component_highlight_grab(Eo *eo_it, Elm_Toolbar_Item_Data *it)
+{
+ elm_toolbar_item_show(eo_it, ELM_TOOLBAR_ITEM_SCROLLTO_IN);
+ elm_object_accessibility_highlight_set(VIEW(it), EINA_TRUE);
+ return EINA_TRUE;
+}
+
+EOLIAN static Eina_Bool
+_elm_toolbar_item_elm_interface_atspi_component_highlight_clear(Eo *eo_it, Elm_Toolbar_Item_Data *it)
+{
+ elm_object_accessibility_highlight_set(VIEW(it), EINA_FALSE);
+ return EINA_TRUE;
+}
+//
+
EOLIAN int
_elm_toolbar_elm_interface_atspi_selection_selected_children_count_get(Eo *obj EINA_UNUSED, Elm_Toolbar_Data *pd)
{
Elm.Widget_Item.part_content_unset;
Elm_Interface_Atspi_Accessible.name.get;
Elm_Interface_Atspi_Accessible.state_set.get;
+ Elm_Interface_Atspi_Component.highlight_grab;
+ Elm_Interface_Atspi_Component.highlight_clear;
}
}
elm_interface_atspi_accessible_removed(eo_item);
+ if (item->atspi_custom_relations)
+ elm_atspi_relation_set_free(&item->atspi_custom_relations);
+
EINA_MAGIC_SET(item, EINA_MAGIC_NONE);
eo_do_super(eo_item, ELM_WIDGET_ITEM_CLASS, eo_destructor());
elm_interface_atspi_accessible_translation_domain_set(NULL),
elm_interface_atspi_accessible_relationships_clear()
);
+ // TIZEN_ONLY(20150709) : atspi relations api
+ if (sd->atspi_custom_relations)
+ elm_atspi_relation_set_free(&sd->atspi_custom_relations);
+ //
eo_do_super(obj, ELM_WIDGET_CLASS, eo_destructor());
sd->on_destroy = EINA_FALSE;
return ret;
}
+// TIZEN_ONLY(20150709) : atspi relations api
+EOLIAN static Elm_Atspi_Relation_Set
+_elm_widget_elm_interface_atspi_accessible_relation_set_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
+{
+ return elm_atspi_relation_set_clone(&sd->atspi_custom_relations);
+}
+//////////////////////////////
+
EOLIAN static void
_elm_widget_item_elm_interface_atspi_component_extents_get(Eo *obj EINA_UNUSED, Elm_Widget_Item_Data *sd EINA_UNUSED, Eina_Bool screen_coords, int *x, int *y, int *w, int *h)
{
}
//
+//TIZEN_ONLY(20150709) add relations atpi
+EOLIAN static Eina_Bool
+_elm_widget_elm_interface_atspi_accessible_relationship_append(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Elm_Atspi_Relation_Type type, const Eo *relation_obj)
+{
+ return elm_atspi_relation_set_relation_append(&sd->atspi_custom_relations, type, relation_obj);
+}
+
+EOLIAN static void
+_elm_widget_elm_interface_atspi_accessible_relationship_remove(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Elm_Atspi_Relation_Type type, const Eo *relation_obj)
+{
+ elm_atspi_relation_set_relation_remove(&sd->atspi_custom_relations, type, relation_obj);
+}
+
+EOLIAN static Eina_Bool
+_elm_widget_item_elm_interface_atspi_accessible_relationship_append(Eo *obj EINA_UNUSED, Elm_Widget_Item_Data *sd, Elm_Atspi_Relation_Type type, const Eo *relation_obj)
+{
+ return elm_atspi_relation_set_relation_append(&sd->atspi_custom_relations, type, relation_obj);
+}
+
+EOLIAN static void
+_elm_widget_item_elm_interface_atspi_accessible_relationship_remove(Eo *obj EINA_UNUSED, Elm_Widget_Item_Data *sd, Elm_Atspi_Relation_Type type, const Eo *relation_obj)
+{
+ elm_atspi_relation_set_relation_remove(&sd->atspi_custom_relations, type, relation_obj);
+}
+///////////////////////////////////
+
#include "elm_widget_item.eo.c"
#include "elm_widget.eo.c"
Elm_Interface_Atspi_Accessible.children.get;
Elm_Interface_Atspi_Accessible.parent.get;
Elm_Interface_Atspi_Accessible.attributes.get;
+ //TIZEN_ONLY(20150709) : atspi relations api
+ Elm_Interface_Atspi_Accessible.relationship_append;
+ Elm_Interface_Atspi_Accessible.relationship_remove;
+ //
Elm_Interface_Atspi_Component.focus_grab;
//TIZEN_ONLY(20160329): atspi: implement HighlightGrab and HighlightClear methods (29e253e2f7ef3c632ac3a64c489bf569df407f30)
Elm_Interface_Atspi_Component.highlight_grab;
int role; /**< Accessibility role */
const char *description; /**< Accessibility description */
Eo *atspi_custom_parent; /**< Accessibility parent if different then parent_obj */
+ //TIZEN_ONLY(20150709) add relations atpi
+ Elm_Atspi_Relation_Set atspi_custom_relations; /**< Developer-defined accessiblity relations */
+ ///////////////////////////////////
/* this is a hook to be set on-the-fly on widgets. this is code
* handling the request of showing a specific region from an inner
/**< A11Y info */
const char *description;
int role;
+ //TIZEN_ONLY(20150709) add relations atpi
+ Elm_Atspi_Relation_Set atspi_custom_relations; /**< Developer-defined accessiblity relations */
+ ///////////////////////////////////
Eina_Bool disabled : 1;
Eina_Bool on_deletion : 1;
Eo.Base.destructor;
Elm_Interface_Atspi_Accessible.state_set.get;
Elm_Interface_Atspi_Accessible.parent.get;
+ //TIZEN_ONLY(20150709) : atspi relations api
+ Elm_Interface_Atspi_Accessible.relationship_append;
+ Elm_Interface_Atspi_Accessible.relationship_remove;
+ //
Elm_Interface_Atspi_Component.extents.get;
Elm_Interface_Atspi_Component.extents.set;
Elm_Interface_Atspi_Component.alpha.get;
Eina_Bool ch_aux_hint = EINA_FALSE;
Eina_List *aux_hints = NULL;
const char *profile;
+#ifdef HAVE_ELEMENTARY_WAYLAND
Conformant_Property property = CONFORMANT_DEFAULT; //TIZEN_ONLY(20160330): add processing properties of window
+#endif
if (!sd) return;
#include "elm_priv.h"
#include "elm_suite.h"
-static Evas_Object *g_win, *g_btn, *g_bg;
+static Evas_Object *g_win, *g_btn, *g_bg, *g_btn2, *g_btn3, *g_box, *g_lbl;
void generate_app(void)
{
evas_object_show(g_win);
}
+void generate_app2(void)
+{
+ g_win = elm_win_add(NULL, "Title", ELM_WIN_BASIC);
+ evas_object_geometry_set(g_win, 100, 100, 100, 100);
+
+ g_bg = elm_bg_add(g_win);
+
+ g_box = elm_box_add(g_win);
+
+ g_btn = elm_button_add(g_win);
+ g_btn2 = elm_button_add(g_win);
+ g_btn3 = elm_button_add(g_win);
+ g_lbl = elm_label_add(g_win);
+
+ elm_box_pack_end(g_box, g_btn);
+ elm_box_pack_end(g_box, g_btn2);
+ elm_box_pack_end(g_box, g_btn3);
+ elm_box_pack_end(g_box, g_lbl);
+
+ evas_object_show(g_btn);
+ evas_object_show(g_bg);
+ evas_object_show(g_win);
+ evas_object_show(g_box);
+ evas_object_show(g_btn2);
+ evas_object_show(g_btn3);
+ evas_object_show(g_lbl);
+}
+
START_TEST (elm_atspi_app_obj_name_get)
{
elm_init(0, NULL);
}
END_TEST
+<<<<<<< HEAD
/* Initial value of translation domain should be NULL */
START_TEST (elm_atspi_translation_domain_get)
{
elm_init(0, NULL);
generate_app();
+=======
+START_TEST (elm_atspi_elm_widget_custom_relations)
+{
+>>>>>>> 876f95b... atspi: add new APIs for setting atspi relationship.
Elm_Atspi_Relation_Set set;
Elm_Atspi_Relation *rel, *rel_to, *rel_from;
Eina_List *l;
+<<<<<<< HEAD
eo_do(g_btn, elm_interface_atspi_accessible_relationship_append(ELM_ATSPI_RELATION_FLOWS_TO, g_bg));
eo_do(g_btn, elm_interface_atspi_accessible_relationship_append(ELM_ATSPI_RELATION_FLOWS_FROM, g_win));
eo_do(g_btn, set = elm_interface_atspi_accessible_relation_set_get());
+=======
+ elm_init(0, NULL);
+ generate_app2();
+
+ eo_do(g_btn, set = elm_interface_atspi_accessible_relation_set_get());
+ ck_assert(set == NULL);
+
+ eo_do(g_btn, elm_interface_atspi_accessible_relationship_append(ELM_ATSPI_RELATION_FLOWS_TO, g_lbl));
+ eo_do(g_btn, elm_interface_atspi_accessible_relationship_append(ELM_ATSPI_RELATION_FLOWS_FROM, g_win));
+
+ eo_do(g_btn, set = elm_interface_atspi_accessible_relation_set_get());
+>>>>>>> 876f95b... atspi: add new APIs for setting atspi relationship.
ck_assert(set != NULL);
ck_assert(eina_list_count(set) >= 2);
rel_to = rel_from = NULL;
EINA_LIST_FOREACH(set, l, rel)
+<<<<<<< HEAD
{
if (rel->type == ELM_ATSPI_RELATION_FLOWS_TO)
rel_to = rel;
eo_do(g_btn, elm_interface_atspi_accessible_relationship_remove(ELM_ATSPI_RELATION_FLOWS_TO, g_bg));
eo_do(g_btn, set = elm_interface_atspi_accessible_relation_set_get());
+=======
+ {
+ if (rel->type == ELM_ATSPI_RELATION_FLOWS_TO)
+ rel_to = rel;
+ if (rel->type == ELM_ATSPI_RELATION_FLOWS_FROM)
+ rel_from = rel;
+ }
+
+ ck_assert(rel_to != NULL);
+ ck_assert(rel_from != NULL);
+ ck_assert(eina_list_data_find(rel_to->objects, g_lbl) != NULL);
+ ck_assert(eina_list_data_find(rel_from->objects, g_win) != NULL);
+
+ elm_atspi_relation_set_free(&set);
+
+ eo_do(g_btn, elm_interface_atspi_accessible_relationship_remove(ELM_ATSPI_RELATION_FLOWS_TO, g_lbl));
+ eo_do(g_btn, set = elm_interface_atspi_accessible_relation_set_get());
+>>>>>>> 876f95b... atspi: add new APIs for setting atspi relationship.
ck_assert(set != NULL);
ck_assert(eina_list_count(set) >= 1);
rel_to = rel_from = NULL;
EINA_LIST_FOREACH(set, l, rel)
+<<<<<<< HEAD
{
if (rel->type == ELM_ATSPI_RELATION_FLOWS_TO)
rel_to = rel;
}
elm_atspi_relation_set_free(set);
+=======
+ {
+ if (rel->type == ELM_ATSPI_RELATION_FLOWS_TO)
+ ck_assert(EINA_FALSE);
+ }
+
+ elm_atspi_relation_set_free(&set);
+
+>>>>>>> 876f95b... atspi: add new APIs for setting atspi relationship.
elm_shutdown();
}
END_TEST
tcase_add_test(tc, elm_atspi_description_get);
tcase_add_test(tc, elm_atspi_children_and_parent);
tcase_add_test(tc, elm_atspi_children_and_parent2);
+<<<<<<< HEAD
tcase_add_test(tc, elm_atspi_translation_domain_get);
tcase_add_test(tc, elm_atspi_translation_domain_set);
tcase_add_test(tc, elm_atspi_relationship_append);
tcase_add_test(tc, elm_atspi_relationship_remove);
tcase_add_test(tc, elm_atspi_relationships_clear);
+=======
+ tcase_add_test(tc, elm_atspi_elm_widget_custom_relations);
+>>>>>>> 876f95b... atspi: add new APIs for setting atspi relationship.
}
projects / platform / upstream / elementary.git / commitdiff