atspi: resolve conficts 38/50938/3
authorLukasz Stanislawski <l.stanislaws@samsung.com>
Tue, 3 Nov 2015 16:25:20 +0000 (17:25 +0100)
committerJaehwan Kim <jae.hwan.kim@samsung.com>
Wed, 4 Nov 2015 02:23:24 +0000 (11:23 +0900)
Change-Id: If00bcc0ef6dc3fedd5894857b09b9c04c13339dc

src/lib/elm_atspi_bridge.c
src/lib/elm_gengrid.eo
src/lib/elm_interface_atspi_accessible.c
src/lib/elm_interface_atspi_accessible.eo
src/lib/elm_interface_atspi_accessible.h
src/lib/elm_interfaces.h
src/lib/elm_widget.c
src/lib/elm_widget.eo
src/lib/elm_widget_item.eo
src/tests/elm_test_genlist.c

index e4d0fca6d7168bfc4ef2b9c0c8b84bb066577bb1..edd10fcd38aa1da620aa37e4408b7773ed9c8b72 100644 (file)
 #define SIZE(x) sizeof(x)/sizeof(x[0])
 #define ELM_ATSPI_BRIDGE_CLASS_NAME "__Elm_Atspi_Bridge"
 
-<<<<<<< HEAD
-typedef struct Key_Event_Info {
-     Ecore_Event_Key event;
-     int type;
-} Key_Event_Info;
-
-static int _init_count = 0;
-static Eldbus_Connection *_a11y_bus = NULL;
-static Eina_List *reemited_events;
-static Eo *_root;
-static Ecore_Idler *_cache_update_idler;
-static Eina_List *_pending_objects;
-static Eina_Hash *_cache;
-static Eldbus_Service_Interface *_cache_interface = NULL;
-static Eldbus_Signal_Handler *_register_hdl;
-static Eldbus_Signal_Handler *_unregister_hdl;
-static unsigned long _object_broadcast_mask;
-static unsigned long _object_property_broadcast_mask;
-static unsigned long _object_children_broadcast_mask;
-static unsigned long long _object_state_broadcast_mask;
-static unsigned long long _window_signal_broadcast_mask;
-static Ecore_Event_Filter *_key_flr;
-=======
 #define ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(obj, sd) \
    Elm_Atspi_Bridge_Data *sd = eo_data_scope_get(obj, ELM_ATSPI_BRIDGE_CLASS); \
    if (!sd) return;
@@ -137,7 +114,6 @@ struct collection_match_rule {
 
 static Eo *_instance;
 static int _init_count = 0;
->>>>>>> opensource/master
 
 // Object Event handlers
 static Eina_Bool _state_changed_signal_send(void *data, Eo *obj, const Eo_Event_Description *desc, void *event_info);
@@ -163,13 +139,9 @@ static void _bridge_iter_object_reference_append(Eo *bridge, Eldbus_Message_Iter
 // utility functions
 static void _iter_interfaces_append(Eldbus_Message_Iter *iter, const Eo *obj);
 static Eina_Bool _elm_atspi_bridge_key_filter(void *data, void *loop, int type, void *event);
-<<<<<<< HEAD
-static void _object_signal_send(Eldbus_Service_Interface *infc, int sig_id, const char *minor, unsigned int det1, unsigned int det2, const char *variant_sig, ...);
-=======
 static void _object_desktop_reference_append(Eldbus_Message_Iter *iter);
 static Eina_Bool _on_object_add(void *data, Eo *obj, const Eo_Event_Description *event EINA_UNUSED, void *event_info EINA_UNUSED);
 static Eina_Bool _on_object_del(void *data, Eo *obj, const Eo_Event_Description *event EINA_UNUSED, void *event_info EINA_UNUSED);
->>>>>>> opensource/master
 
 typedef struct {
      const Eo_Event_Description *desc;
@@ -3209,15 +3181,6 @@ _cache_item_reference_append_cb(Eo *bridge, Eo *data, Eldbus_Message_Iter *iter_
   if (!name)
     name = strdup("");
 
-<<<<<<< HEAD
-  /* Marshall name */
-  char *name = NULL;
-  eo_do(data, name = elm_interface_atspi_accessible_name_get());
-  if (!name)
-    name = strdup("");
-
-=======
->>>>>>> opensource/master
   eldbus_message_iter_basic_append(iter_struct, 's', name);
   free(name);
 
@@ -3825,15 +3788,9 @@ _registered_events_list_update(Eo *bridge)
 }
 
 static void
-<<<<<<< HEAD
-_handle_listener_change(void *data EINA_UNUSED, const Eldbus_Message *msg EINA_UNUSED)
-{
-   _registered_events_list_update();
-=======
 _handle_listener_change(void *data, const Eldbus_Message *msg EINA_UNUSED)
 {
    _registered_events_list_update(data);
->>>>>>> opensource/master
 }
 
 static Eina_Bool
@@ -3923,8 +3880,6 @@ _visible_data_changed_signal_send(void *data, Eo *obj, const Eo_Event_Descriptio
 }
 
 static Eina_Bool
-<<<<<<< HEAD
-=======
 _active_descendant_changed_signal_send(void *data, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info)
 {
    Eo *child = event_info;
@@ -3944,7 +3899,6 @@ _active_descendant_changed_signal_send(void *data, Eo *obj, const Eo_Event_Descr
 }
 
 static Eina_Bool
->>>>>>> opensource/master
 _children_changed_signal_send(void *data, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info)
 {
    const char *atspi_desc = NULL;
@@ -3954,15 +3908,7 @@ _children_changed_signal_send(void *data, Eo *obj, const Eo_Event_Description *d
 
    ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_FALSE);
 
-<<<<<<< HEAD
-   // update cached objects
-   if (ev_data->is_added)
-     {
-        _cache_build(obj);
-     }
-=======
    type = ev_data->is_added ? ATSPI_OBJECT_CHILD_ADDED : ATSPI_OBJECT_CHILD_REMOVED;
->>>>>>> opensource/master
 
    if (!STATE_TYPE_GET(pd->object_children_broadcast_mask, type))
      return EINA_FALSE;
@@ -4221,11 +4167,7 @@ _on_object_add(void *data, Eo *obj, const Eo_Event_Description *event EINA_UNUSE
 
    eldbus_service_signal_send(pd->cache_interface, sig);
 
-<<<<<<< HEAD
-   _key_flr = ecore_event_filter_add(NULL, _elm_atspi_bridge_key_filter, NULL, NULL);
-=======
    return EINA_TRUE;
->>>>>>> opensource/master
 }
 
 static Eina_Bool
@@ -4533,34 +4475,6 @@ _key_event_info_new(int event_type, const Ecore_Event_Key *data, Eo *bridge)
    ret->event.string = eina_stringshare_add(data->string);
    ret->event.compose = eina_stringshare_add(data->compose);
 
-<<<<<<< HEAD
-        if (_key_flr)
-          ecore_event_filter_del(_key_flr);
-        _key_flr = NULL;
-=======
-   // not sure why it is here, but explicite keep it NULLed.
-   ret->event.data = NULL;
->>>>>>> opensource/master
-
-   return ret;
-}
-
-static Key_Event_Info*
-_key_event_info_new(int event_type, const Ecore_Event_Key *data)
-{
-   Key_Event_Info *ret;
-   EINA_SAFETY_ON_NULL_RETURN_VAL(data, NULL);
-
-   ret = calloc(sizeof(Key_Event_Info), 1);
-
-   ret->type = event_type;
-   ret->event = *data;
-
-   ret->event.keyname = eina_stringshare_add(data->keyname);
-   ret->event.key = eina_stringshare_add(data->key);
-   ret->event.string = eina_stringshare_add(data->string);
-   ret->event.compose = eina_stringshare_add(data->compose);
-
    // not sure why it is here, but explicite keep it NULLed.
    ret->event.data = NULL;
 
@@ -4576,17 +4490,10 @@ _key_event_info_free(Key_Event_Info *data)
    eina_stringshare_del(data->event.key);
    eina_stringshare_del(data->event.string);
    eina_stringshare_del(data->event.compose);
-<<<<<<< HEAD
 
    free(data);
 }
 
-=======
-
-   free(data);
-}
-
->>>>>>> opensource/master
 static void
 _iter_marshall_key_event(Eldbus_Message_Iter *iter, Key_Event_Info *data)
 {
@@ -4621,11 +4528,8 @@ _on_listener_answer(void *data, const Eldbus_Message *msg, Eldbus_Pending *pendi
    const char *errname, *errmsg;
    Eina_Bool ret = EINA_TRUE;
 
-<<<<<<< HEAD
-=======
    ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(info->bridge, pd);
 
->>>>>>> opensource/master
    if (eldbus_message_error_get(msg, &errname, &errmsg))
      {
         ERR("%s %s", errname, errmsg);
@@ -4643,38 +4547,16 @@ _on_listener_answer(void *data, const Eldbus_Message *msg, Eldbus_Pending *pendi
      }
 reemit:
    ecore_event_add(info->type, &info->event, _on_event_del, info);
-<<<<<<< HEAD
-   reemited_events = eina_list_append(reemited_events, &info->event);
-}
-
-static Eina_Bool
-_elm_atspi_bridge_key_filter(void *data EINA_UNUSED, void *loop EINA_UNUSED, int type, void *event)
-=======
    pd->reemited_events = eina_list_append(pd->reemited_events, &info->event);
 }
 
 static Eina_Bool
 _elm_atspi_bridge_key_filter(void *data, void *loop EINA_UNUSED, int type, void *event)
->>>>>>> opensource/master
 {
    Eldbus_Message *msg;
    Eldbus_Message_Iter *iter;
    Ecore_Event_Key *key_event = event;
    Key_Event_Info *ke;
-<<<<<<< HEAD
-
-   if (!_init_count) return EINA_TRUE;
-   if ((type != ECORE_EVENT_KEY_DOWN) && (type != ECORE_EVENT_KEY_UP)) return EINA_TRUE;
-
-   // check if reemited
-   if (eina_list_data_find(reemited_events, event))
-     {
-        reemited_events = eina_list_remove(reemited_events, event);
-        return EINA_TRUE;
-     }
-
-   ke = _key_event_info_new(type, key_event);
-=======
    Eo *bridge = data;
 
    ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(bridge, pd, EINA_TRUE);
@@ -4689,20 +4571,12 @@ _elm_atspi_bridge_key_filter(void *data, void *loop EINA_UNUSED, int type, void
      }
 
    ke = _key_event_info_new(type, key_event, bridge);
->>>>>>> opensource/master
    if (!ke) return EINA_TRUE;
 
    msg = eldbus_message_method_call_new(ATSPI_DBUS_NAME_REGISTRY, ATSPI_DBUS_PATH_DEC,
                                         ATSPI_DBUS_INTERFACE_DEC, "NotifyListenersSync");
    iter = eldbus_message_iter_get(msg);
    _iter_marshall_key_event(iter, ke);
-<<<<<<< HEAD
-
-   // timeout should be kept reasonaby low to avoid
-   eldbus_connection_send(_a11y_bus, msg, _on_listener_answer, ke, 500);
-
-   return EINA_FALSE;
-=======
 
    // timeout should be kept reasonaby low to avoid delays
    if (!eldbus_connection_send(pd->a11y_bus, msg, _on_listener_answer, ke, 100))
@@ -4808,7 +4682,6 @@ _elm_atspi_bridge_eo_base_destructor(Eo *obj, Elm_Atspi_Bridge_Data *pd)
    if (pd->root) eo_del(pd->root);
 
    eo_do_super(obj, ELM_ATSPI_BRIDGE_CLASS, eo_destructor());
->>>>>>> opensource/master
 }
 
 #include "elm_atspi_bridge.eo.c"
index e141c8c8b2749d46d1e3627dd749c791d52266c2..d5ca4efffa823c7d2e964f99c6bf4caf92930fef 100644 (file)
@@ -561,8 +561,6 @@ class Elm.Gengrid (Elm.Layout, Elm_Interface_Scrollable,
       Elm_Interface_Atspi_Accessible.children.get;
       Elm_Interface_Atspi_Accessible.state_set.get;
       Elm_Interface_Atspi_Widget_Action.elm_actions.get;
-<<<<<<< HEAD
-=======
       Elm_Interface_Atspi_Selection.selected_children_count.get;
       Elm_Interface_Atspi_Selection.selected_child.get;
       Elm_Interface_Atspi_Selection.selected_child_deselect;
@@ -571,7 +569,6 @@ class Elm.Gengrid (Elm.Layout, Elm_Interface_Scrollable,
       Elm_Interface_Atspi_Selection.is_child_selected;
       Elm_Interface_Atspi_Selection.all_children_select;
       Elm_Interface_Atspi_Selection.clear;
->>>>>>> opensource/master
    }
    events {
       language,changed;
index 6981eb644ec170da99a54aba5e13c1c3a7dbcec8..0c0a213fcd0a97ea007441c701d0c671a80ff4c5 100644 (file)
@@ -215,11 +215,7 @@ _elm_interface_atspi_accessible_role_name_get(Eo *obj EINA_UNUSED, Elm_Interface
 }
 
 EOLIAN char *
-<<<<<<< HEAD
-_elm_interface_atspi_accessible_name_get(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED)
-=======
 _elm_interface_atspi_accessible_name_get(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *pd)
->>>>>>> opensource/master
 {
    if (pd->name)
      {
@@ -237,11 +233,7 @@ _elm_interface_atspi_accessible_name_get(Eo *obj EINA_UNUSED, Elm_Interface_Atsp
 }
 
 EOLIAN static void
-<<<<<<< HEAD
-_elm_interface_atspi_accessible_name_set(Eo *obj, void *pd EINA_UNUSED, char *val EINA_UNUSED)
-=======
 _elm_interface_atspi_accessible_name_set(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *pd, char *val)
->>>>>>> opensource/master
 {
    eina_stringshare_replace(&pd->name, val);
 }
index 9ff6682cb30aecf3f6652df0269cc9f297f4f3ea..65485cd4ca52d83e9e4954d206bb3908cfcd5256 100644 (file)
@@ -14,21 +14,12 @@ mixin Elm_Interface_Atspi_Accessible ()
       }
       @property name @protected {
          get {
-<<<<<<< HEAD
-            /*@ Gets an string describing ATSPI widget role name. 
-                Should be free by a user. */
-=======
             [[Gets an string describing ATSPI widget role name.  Should be free by a user.]]
->>>>>>> opensource/master
          }
          set {
          }
          values {
-<<<<<<< HEAD
-            char* name; /*@ obj name */
-=======
             name: char*; [[obj name]]
->>>>>>> opensource/master
          }
       }
       @property relation_set @protected {
index a7daaf69ec35a5f2eac0f242bf627ce3c989ba77..dd3112f7b3ee40723abbc543a01e4ea640e77b39 100644 (file)
@@ -348,11 +348,7 @@ EAPI Elm_Atspi_Relation_Set elm_atspi_relation_set_clone(const Elm_Atspi_Relatio
 #define elm_interface_atspi_accessible_children_changed_added_signal_emit(obj, child) \
    do { \
       Elm_Atspi_Event_Children_Changed_Data atspi_data = { EINA_TRUE, child }; \
-<<<<<<< HEAD
-      eo_do(obj, eo_event_callback_call(ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_CHILDREN_CHANGED, &atspi_data)); \
-=======
    eo_do(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, elm_interface_atspi_accessible_event_emit(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_CHILDREN_CHANGED, &atspi_data)); \
->>>>>>> opensource/master
    } while(0);
 
 /**
@@ -361,11 +357,7 @@ EAPI Elm_Atspi_Relation_Set elm_atspi_relation_set_clone(const Elm_Atspi_Relatio
 #define elm_interface_atspi_accessible_children_changed_del_signal_emit(obj, child) \
    do { \
       Elm_Atspi_Event_Children_Changed_Data atspi_data = { EINA_FALSE, child }; \
-<<<<<<< HEAD
-      eo_do(obj, eo_event_callback_call(ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_CHILDREN_CHANGED, &atspi_data)); \
-=======
       eo_do(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, elm_interface_atspi_accessible_event_emit(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_CHILDREN_CHANGED, &atspi_data)); \
->>>>>>> opensource/master
    } while(0);
 
 /**
index a4c2f9c9f7509a4416efc84100c49eb3e5dfa83b..78e262f09293f90673d9719cc8be47082404d052 100644 (file)
 #include "elm_interface_atspi_image.eo.h"
 #include "elm_interface_atspi_selection.eo.h"
 #include "elm_interface_atspi_value.eo.h"
-<<<<<<< HEAD
-#include "elm_interface_atspi_window.eo.h"
-=======
->>>>>>> opensource/master
 #endif
 #endif
 #ifndef EFL_NOLEGACY_API_SUPPORT
@@ -26,9 +22,5 @@
 #include "elm_interface_atspi_image.eo.legacy.h"
 #include "elm_interface_atspi_selection.eo.legacy.h"
 #include "elm_interface_atspi_value.eo.legacy.h"
-<<<<<<< HEAD
-#include "elm_interface_atspi_window.eo.legacy.h"
-=======
->>>>>>> opensource/master
 #endif
 #endif
index f632ea0d8687299775036d69c60e543b32a4fc9c..1a66683552f1e8b7861b64550609832d708c04f8 100644 (file)
@@ -4479,13 +4479,6 @@ _elm_widget_item_eo_base_destructor(Eo *eo_item, Elm_Widget_Item_Data *item)
      }
    eina_hash_free(item->labels);
 
-<<<<<<< HEAD
-   if (item->description)
-     eina_stringshare_del(item->description);
-
-   if (_elm_config->atspi_mode)
-        elm_interface_atspi_accessible_children_changed_del_signal_emit(item->widget, eo_item);
-=======
    eo_do(eo_item,
          elm_interface_atspi_accessible_description_set(NULL),
          elm_interface_atspi_accessible_name_set(NULL),
@@ -4497,7 +4490,6 @@ _elm_widget_item_eo_base_destructor(Eo *eo_item, Elm_Widget_Item_Data *item)
      elm_interface_atspi_accessible_children_changed_del_signal_emit(item->widget, eo_item);
 
    elm_interface_atspi_accessible_removed(eo_item);
->>>>>>> opensource/master
 
    EINA_MAGIC_SET(item, EINA_MAGIC_NONE);
 
@@ -4621,38 +4613,6 @@ _elm_widget_item_widget_get(const Eo *eo_item EINA_UNUSED, Elm_Widget_Item_Data
    return item->widget;
 }
 
-<<<<<<< HEAD
-EOLIAN static const char*
-_elm_widget_item_elm_interface_atspi_accessible_description_get(Eo *eo_item EINA_UNUSED,
-                                                                Elm_Widget_Item_Data *item)
-{
-   return item->description;
-}
-
-EOLIAN static void
-_elm_widget_item_elm_interface_atspi_accessible_description_set(Eo *eo_item EINA_UNUSED,
-                                                                Elm_Widget_Item_Data *item,
-                                                                const char *descr)
-{
-   eina_stringshare_replace(&item->description, descr);
-}
-
-EOLIAN static Elm_Atspi_Role
-_elm_widget_item_elm_interface_atspi_accessible_role_get(Eo *eo_item EINA_UNUSED, Elm_Widget_Item_Data *item)
-{
-   return item->role;
-}
-
-EOLIAN static void
-_elm_widget_item_elm_interface_atspi_accessible_role_set(Eo *eo_item EINA_UNUSED, Elm_Widget_Item_Data *item,
-                                                         Elm_Atspi_Role role)
-{
-   item->role = role;
-}
-
-EOLIAN static Elm_Atspi_State_Set
-_elm_widget_item_elm_interface_atspi_accessible_state_set_get(Eo *eo_item EINA_UNUSED,
-=======
 EAPI Eina_Bool
 _elm_widget_onscreen_is(Evas_Object *widget)
 {
@@ -4710,7 +4670,6 @@ _elm_widget_item_onscreen_is(Elm_Object_Item *item)
 
 EOLIAN static Elm_Atspi_State_Set
 _elm_widget_item_elm_interface_atspi_accessible_state_set_get(Eo *eo_item,
->>>>>>> opensource/master
                                                               Elm_Widget_Item_Data *item EINA_UNUSED)
 {
    Elm_Atspi_State_Set states = 0;
@@ -4721,19 +4680,12 @@ _elm_widget_item_elm_interface_atspi_accessible_state_set_get(Eo *eo_item,
      STATE_TYPE_SET(states, ELM_ATSPI_STATE_FOCUSED);
    if (!elm_object_item_disabled_get(eo_item))
      {
-<<<<<<< HEAD
-        STATE_TYPE_SET(states, ELM_ATSPI_STATE_ACTIVE);
-        STATE_TYPE_SET(states, ELM_ATSPI_STATE_ENABLED);
-        STATE_TYPE_SET(states, ELM_ATSPI_STATE_SENSITIVE);
-     }
-=======
         STATE_TYPE_SET(states, ELM_ATSPI_STATE_ENABLED);
         STATE_TYPE_SET(states, ELM_ATSPI_STATE_SENSITIVE);
         STATE_TYPE_SET(states, ELM_ATSPI_STATE_VISIBLE);
      }
    if (_elm_widget_item_onscreen_is(eo_item))
      STATE_TYPE_SET(states, ELM_ATSPI_STATE_SHOWING);
->>>>>>> opensource/master
 
    return states;
 }
@@ -5784,20 +5736,8 @@ elm_widget_tree_dot_dump(const Evas_Object *top,
 #endif
 }
 
-<<<<<<< HEAD
-static void
-_on_focus_change(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
-{
-   Eina_Bool val = data ? EINA_TRUE : EINA_FALSE;
-   elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_FOCUSED, val);
-}
-
-EOLIAN static void
-_elm_widget_eo_base_constructor(Eo *obj, Elm_Widget_Smart_Data *sd)
-=======
 EOLIAN static Eo *
 _elm_widget_eo_base_constructor(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED)
->>>>>>> opensource/master
 {
    Eo *parent = NULL;
 
@@ -5810,24 +5750,6 @@ _elm_widget_eo_base_constructor(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED)
    eo_do(obj, elm_obj_widget_parent_set(parent));
    sd->on_create = EINA_FALSE;
 
-<<<<<<< HEAD
-   sd->role = ELM_ATSPI_ROLE_UNKNOWN;
-   evas_object_smart_callback_add(obj, "focused", _on_focus_change, (void*)1);
-   evas_object_smart_callback_add(obj, "unfocused", _on_focus_change, NULL);
-}
-
-EOLIAN static void
-_elm_widget_eo_base_destructor(Eo *obj, Elm_Widget_Smart_Data *sd)
-{
-   Eo *parent;
-   if (sd->description) eina_stringshare_del(sd->description);
-
-   eo_do(obj, parent = elm_interface_atspi_accessible_parent_get());
-   if (parent && !eo_destructed_is(parent))
-     elm_interface_atspi_accessible_children_changed_del_signal_emit(parent, obj);
-
-   eo_do_super(obj, ELM_WIDGET_CLASS, eo_destructor());
-=======
    eo_do(obj, elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_UNKNOWN));
    return obj;
 }
@@ -5846,7 +5768,6 @@ _elm_widget_eo_base_destructor(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED)
    sd->on_destroy = EINA_FALSE;
 
    elm_interface_atspi_accessible_removed(obj);
->>>>>>> opensource/master
 }
 
 EOLIAN static Eina_Bool
@@ -5939,47 +5860,17 @@ EOLIAN static char*
 _elm_widget_elm_interface_atspi_accessible_name_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED)
 {
    const char *ret;
-<<<<<<< HEAD
-=======
    char *name;
    eo_do_super(obj, ELM_WIDGET_CLASS, name = elm_interface_atspi_accessible_name_get());
 
    if (name) return name;
 
->>>>>>> opensource/master
    ret = elm_object_text_get(obj);
    if (!ret) return NULL;
 
    return _elm_util_mkup_to_text(ret);
 }
 
-<<<<<<< HEAD
-EOLIAN static const char*
-_elm_widget_elm_interface_atspi_accessible_description_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd)
-{
-   return _pd->description;
-}
-
-EOLIAN static void
-_elm_widget_elm_interface_atspi_accessible_description_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd, const char *descr)
-{
-   eina_stringshare_replace(&_pd->description, descr);
-}
-
-EOLIAN static Elm_Atspi_Role
-_elm_widget_elm_interface_atspi_accessible_role_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd EINA_UNUSED)
-{
-   return pd->role;
-}
-
-EOLIAN static void
-_elm_widget_elm_interface_atspi_accessible_role_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd, Elm_Atspi_Role role)
-{
-   pd->role = role;
-}
-
-=======
->>>>>>> opensource/master
 EOLIAN static Eina_List*
 _elm_widget_elm_interface_atspi_accessible_children_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd EINA_UNUSED)
 {
@@ -6002,59 +5893,20 @@ _elm_widget_elm_interface_atspi_accessible_children_get(Eo *obj EINA_UNUSED, Elm
 EOLIAN static Eo*
 _elm_widget_elm_interface_atspi_accessible_parent_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd)
 {
-<<<<<<< HEAD
-   if (pd->atspi_custom_parent)
-     return pd->atspi_custom_parent;
-   else
-     return pd->parent_obj;
-}
-
-EOLIAN static void
-_elm_widget_elm_interface_atspi_accessible_parent_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd, Eo *parent)
-{
-   pd->atspi_custom_parent = parent;
-=======
    Eo *ret;
    eo_do_super(obj, ELM_WIDGET_CLASS, ret = elm_interface_atspi_accessible_parent_get());
 
    return ret ? ret : pd->parent_obj;
->>>>>>> opensource/master
 }
 
 EOLIAN static Elm_Atspi_State_Set
 _elm_widget_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED)
 {
    Elm_Atspi_State_Set states = 0;
-<<<<<<< HEAD
-   Evas *evas = NULL;
-=======
->>>>>>> opensource/master
 
    eo_do_super(obj, ELM_WIDGET_CLASS, states = elm_interface_atspi_accessible_state_set_get());
 
    if (evas_object_visible_get(obj))
-<<<<<<< HEAD
-     STATE_TYPE_SET(states, ELM_ATSPI_STATE_VISIBLE);
-   evas = evas_object_evas_get(obj);
-   if (evas)
-     {
-        Evas_Coord x, y, w, h, wx, wy, ww, wh;
-
-        evas_output_viewport_get(evas, &x, &y, &w, &h);
-        evas_object_geometry_get(obj, &wx, &wy, &ww, &wh);
-        if (!(((wx < x) && (wx + ww < x)) || ((wx > x + w) && (wx + ww > x + w)) ||
-              ((wy < y) && (wy + wh < y)) || ((wy > y+ h) && (wy + wh > y + h))))
-          STATE_TYPE_SET(states, ELM_ATSPI_STATE_SHOWING);
-     }
-   if (elm_object_focus_get(obj))
-     STATE_TYPE_SET(states, ELM_ATSPI_STATE_FOCUSED);
-   if (elm_object_focus_allow_get(obj))
-     STATE_TYPE_SET(states, ELM_ATSPI_STATE_FOCUSABLE);
-   if (!elm_object_disabled_get(obj))
-     {
-        STATE_TYPE_SET(states, ELM_ATSPI_STATE_ENABLED);
-        STATE_TYPE_SET(states, ELM_ATSPI_STATE_ACTIVE);
-=======
      {
         STATE_TYPE_SET(states, ELM_ATSPI_STATE_VISIBLE);
         if (_elm_widget_onscreen_is(obj))
@@ -6070,7 +5922,6 @@ _elm_widget_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Widget_Sma
    if (!elm_object_disabled_get(obj))
      {
         STATE_TYPE_SET(states, ELM_ATSPI_STATE_ENABLED);
->>>>>>> opensource/master
         STATE_TYPE_SET(states, ELM_ATSPI_STATE_SENSITIVE);
      }
 
@@ -6091,42 +5942,6 @@ _elm_widget_elm_interface_atspi_accessible_attributes_get(Eo *obj, Elm_Widget_Sm
    return ret;
 }
 
-<<<<<<< HEAD
-static Elm_Atspi_Relation*
-_relation_new(Elm_Atspi_Relation_Type type, Eo *obj)
-{
-   Elm_Atspi_Relation *rel = calloc(1, sizeof(Elm_Atspi_Relation));
-   if (!rel) return NULL;
-
-   rel->type = type;
-   rel->obj = obj;
-
-   return rel;
-}
-
-EOLIAN static Eina_List*
-_elm_widget_elm_interface_atspi_accessible_relation_set_get(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED)
-{
-   Eina_List *list = NULL;
-   Elm_Atspi_Relation *rel;
-   Evas_Object *rel_obj;
-
-   rel_obj = elm_object_focus_next_object_get(obj, ELM_FOCUS_NEXT);
-   if (eo_isa(rel_obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN))
-     {
-        rel = _relation_new(ELM_ATSPI_RELATION_FLOWS_TO, rel_obj);
-        list = eina_list_append(list, rel);
-     }
-
-   rel_obj = elm_object_focus_next_object_get(obj, ELM_FOCUS_PREVIOUS);
-   if (eo_isa(rel_obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN))
-     {
-        rel = _relation_new(ELM_ATSPI_RELATION_FLOWS_FROM, rel_obj);
-        list = eina_list_append(list, rel);
-     }
-
-   return list;
-=======
 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)
 {
@@ -6181,7 +5996,6 @@ _elm_widget_item_elm_interface_atspi_component_alpha_get(Eo *obj EINA_UNUSED, El
    if (!sd->view) return -1.0;
    evas_object_color_get(sd->view, NULL, NULL, NULL, &alpha);
    return (double)alpha / 255.0;
->>>>>>> opensource/master
 }
 
 #include "elm_widget_item.eo.c"
index 70c37cd023970617de30c3fb9d1d98fedf7be3d1..012370a8828fe3a6736b8c2ef40cef795e9cf16a 100644 (file)
@@ -781,19 +781,6 @@ abstract Elm.Widget (Evas.Object_Smart, Elm_Interface_Atspi_Accessible, Elm_Inte
       @virtual .focus_next;
       @virtual .parent_widget.get;
       Elm_Interface_Atspi_Accessible.name.get;
-<<<<<<< HEAD
-      Elm_Interface_Atspi_Accessible.description.get;
-      Elm_Interface_Atspi_Accessible.description.set;
-      Elm_Interface_Atspi_Accessible.role.get;
-      Elm_Interface_Atspi_Accessible.role.set;
-      Elm_Interface_Atspi_Accessible.state_set.get;
-      Elm_Interface_Atspi_Accessible.children.get;
-      Elm_Interface_Atspi_Accessible.parent.get;
-      Elm_Interface_Atspi_Accessible.parent.set;
-      Elm_Interface_Atspi_Accessible.attributes.get;
-      Elm_Interface_Atspi_Accessible.relation_set.get;
-      Elm_Interface_Atspi_Component.focus_grab;
-=======
       Elm_Interface_Atspi_Accessible.state_set.get;
       Elm_Interface_Atspi_Accessible.children.get;
       Elm_Interface_Atspi_Accessible.parent.get;
@@ -806,6 +793,5 @@ abstract Elm.Widget (Evas.Object_Smart, Elm_Interface_Atspi_Accessible, Elm_Inte
       unfocused;
       language,changed;
       access,changed;
->>>>>>> opensource/master
    }
 }
index 801f78761ec4725428dd0cdc09341f357cf1fb79..9953bc8d93852e9ec2c953c456a80f6ece755df7 100644 (file)
@@ -529,14 +529,6 @@ class Elm.Widget_Item(Eo.Base, Elm_Interface_Atspi_Accessible,
       implements {
            Eo.Base.constructor;
            Eo.Base.destructor;
-<<<<<<< HEAD
-           Elm_Interface_Atspi_Accessible.description.get;
-           Elm_Interface_Atspi_Accessible.description.set;
-           Elm_Interface_Atspi_Accessible.role.get;
-           Elm_Interface_Atspi_Accessible.role.set;
-           Elm_Interface_Atspi_Accessible.state_set.get;
-           Elm_Interface_Atspi_Accessible.parent.get;
-=======
            Elm_Interface_Atspi_Accessible.state_set.get;
            Elm_Interface_Atspi_Accessible.parent.get;
            Elm_Interface_Atspi_Component.extents.get;
@@ -544,6 +536,5 @@ class Elm.Widget_Item(Eo.Base, Elm_Interface_Atspi_Accessible,
            Elm_Interface_Atspi_Component.alpha.get;
            Elm_Interface_Atspi_Component.layer.get;
            Elm_Interface_Atspi_Component.focus_grab;
->>>>>>> opensource/master
       }
 }
index f8d2dbd3873d85e00644c45ebfdd6b7bbf3a1b83..593e04cab2dd0a6d29cb4e7fe10fcb6bbd8be8dc 100644 (file)
@@ -11,13 +11,9 @@ static Elm_Gen_Item_Class itc;
 static Eo *current;
 static int counter;
 static Elm_Atspi_Event_Children_Changed_Data ev_data;
-<<<<<<< HEAD
-
-=======
 Evas_Object *content;
 
 
->>>>>>> opensource/master
 void test_init(void)
 {
    elm_init(1, NULL);
@@ -86,16 +82,11 @@ END_TEST
 
 static Eina_Bool
 _children_changed_cb(void *data EINA_UNUSED, Eo *obj EINA_UNUSED,
-<<<<<<< HEAD
-                     const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
-{
-=======
                      const Eo_Event_Description *desc, void *event_info EINA_UNUSED)
 {
    if (desc != ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_CHILDREN_CHANGED)
      return EINA_TRUE;
 
->>>>>>> opensource/master
    ev_data = *(Elm_Atspi_Event_Children_Changed_Data*)event_info;
    current = obj;
    counter++;
@@ -112,11 +103,7 @@ START_TEST(elm_atspi_children_events_add)
 
    Elm_Object_Item *it[3];
 
-<<<<<<< HEAD
-   eo_do(genlist, eo_event_callback_add(ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_CHILDREN_CHANGED, _children_changed_cb, NULL));
-=======
    eo_do(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, elm_interface_atspi_accessible_event_handler_add(_children_changed_cb, NULL));
->>>>>>> opensource/master
 
    it[0] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
    ck_assert(genlist == current);
@@ -153,11 +140,7 @@ START_TEST(elm_atspi_children_events_del1)
    it[1] = elm_genlist_item_prepend(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
    it[2] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_TREE, NULL, NULL);
 
-<<<<<<< HEAD
-   eo_do(genlist, eo_event_callback_add(ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_CHILDREN_CHANGED, _children_changed_cb, NULL));
-=======
    eo_do(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, elm_interface_atspi_accessible_event_handler_add(_children_changed_cb, NULL));
->>>>>>> opensource/master
 
    elm_object_item_del(it[0]);
    ck_assert(genlist == current);
@@ -185,11 +168,7 @@ START_TEST(elm_atspi_children_events_del2)
 
    it = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
 
-<<<<<<< HEAD
-   eo_do(genlist, eo_event_callback_add(ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_CHILDREN_CHANGED, _children_changed_cb, NULL));
-=======
    eo_do(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, elm_interface_atspi_accessible_event_handler_add(_children_changed_cb, NULL));
->>>>>>> opensource/master
    elm_genlist_clear(genlist);
 
    ck_assert(genlist == current);
@@ -201,8 +180,6 @@ START_TEST(elm_atspi_children_events_del2)
 }
 END_TEST
 
-<<<<<<< HEAD
-=======
 static Evas_Object *
 gl_content_get(void *data EINA_UNUSED, Evas_Object *obj, const char *part EINA_UNUSED)
 {
@@ -238,7 +215,6 @@ START_TEST(elm_atspi_children_parent)
 }
 END_TEST
 
->>>>>>> opensource/master
 void elm_test_genlist(TCase *tc)
 {
    tcase_add_test(tc, elm_atspi_role_get);
@@ -247,8 +223,5 @@ void elm_test_genlist(TCase *tc)
    tcase_add_test(tc, elm_atspi_children_events_add);
    tcase_add_test(tc, elm_atspi_children_events_del1);
    tcase_add_test(tc, elm_atspi_children_events_del2);
-<<<<<<< HEAD
-=======
    tcase_add_test(tc, elm_atspi_children_parent);
->>>>>>> opensource/master
 }