X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=atk-adaptor%2Fadaptors%2Fcollection-adaptor.c;h=f274239090a30aec31375b0870049c43fed29f08;hb=105a835d32fcf5e2fae1c5e169df5031a190d150;hp=1702ee753d3c7c3f99504d2d106c140821d9323e;hpb=5713a8e46559b6de9fbf5fc3e073d0d482d8c7e1;p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git

diff --git a/atk-adaptor/adaptors/collection-adaptor.c b/atk-adaptor/adaptors/collection-adaptor.c
index 1702ee7..f274239 100644
--- a/atk-adaptor/adaptors/collection-adaptor.c
+++ b/atk-adaptor/adaptors/collection-adaptor.c
@@ -33,6 +33,7 @@
 
 #include "accessible-register.h"
 #include "object.h"
+#include "introspection.h"
 
 typedef struct _MatchRulePrivate MatchRulePrivate;
 struct _MatchRulePrivate
@@ -52,27 +53,27 @@ static gboolean
 child_interface_p (AtkObject * child, gchar * repo_id)
 {
   if (!strcasecmp (repo_id, "action"))
-    return atk_is_action (child);
+    return ATK_IS_ACTION (child);
   if (!strcasecmp (repo_id, "component"))
-    return atk_is_component (child);
+    return ATK_IS_COMPONENT (child);
   if (!strcasecmp (repo_id, "editabletext"))
-    return atk_is_editable_text (child);
+    return ATK_IS_EDITABLE_TEXT (child);
   if (!strcasecmp (repo_id, "text"))
-    return atk_is_text (child);
+    return ATK_IS_TEXT (child);
   if (!strcasecmp (repo_id, "hypertext"))
-    return atk_is_hypertext (child);
+    return ATK_IS_HYPERTEXT (child);
   if (!strcasecmp (repo_id, "image"))
-    return atk_is_image (child);
+    return ATK_IS_IMAGE (child);
   if (!strcasecmp (repo_id, "selection"))
-    return atk_is_selection (child);
+    return ATK_IS_SELECTION (child);
   if (!strcasecmp (repo_id, "table"))
-    return atk_is_table (child);
+    return ATK_IS_TABLE (child);
   if (!strcasecmp (repo_id, "value"))
-    return atk_is_value (child);
+    return ATK_IS_VALUE (child);
   if (!strcasecmp (repo_id, "streamablecontent"))
-    return atk_is_streamable_content (child);
+    return ATK_IS_STREAMABLE_CONTENT (child);
   if (!strcasecmp (repo_id, "document"))
-    return atk_is_document (child);
+    return ATK_IS_DOCUMENT (child);
   return FALSE;
 }
 
@@ -85,7 +86,7 @@ match_states_all_p (AtkObject * child, gint * set)
   gint i;
   gboolean ret = TRUE;
 
-  if (set == NULL)
+  if (set == NULL || set[0] == BITARRAY_SEQ_TERM)
     return TRUE;
 
   chs = atk_object_ref_state_set (child);
@@ -111,7 +112,7 @@ match_states_any_p (AtkObject * child, gint * set)
   gint i;
   gboolean ret = FALSE;
 
-  if (set == NULL)
+  if (set == NULL || set[0] == BITARRAY_SEQ_TERM)
     return TRUE;
 
   chs = atk_object_ref_state_set (child);
@@ -136,7 +137,7 @@ match_states_none_p (AtkObject * child, gint * set)
   gint i;
   gboolean ret = TRUE;
 
-  if (set == NULL)
+  if (set == NULL || set[0] == BITARRAY_SEQ_TERM)
     return TRUE;
 
   chs = atk_object_ref_state_set (child);
@@ -396,7 +397,7 @@ match_attributes_any_p (AtkObject * child, AtkAttributeSet * attributes)
       AtkAttribute *attr = g_slist_nth_data (attributes, i);
       for (k = 0; k < oa_length; k++)
         {
-          AtkAttribute *oa_attr = g_slist_nth_data (attributes, i);
+          AtkAttribute *oa_attr = g_slist_nth_data (oa, k);
           if (!g_ascii_strcasecmp (oa_attr->name, attr->name) &&
               !g_ascii_strcasecmp (oa_attr->value, attr->value))
             {
@@ -537,7 +538,8 @@ sort_order_rev_canonical (MatchRulePrivate * mrp, GList * ls,
   /* Add to the list if it matches */
   if (flag && match_interfaces_lookup (obj, mrp)
       && match_states_lookup (obj, mrp)
-      && match_roles_lookup (obj, mrp) && match_attributes_lookup (obj, mrp))
+      && match_roles_lookup (obj, mrp) && match_attributes_lookup (obj, mrp)
+      && (max == 0 || kount < max))
     {
       ls = g_list_append (ls, obj);
       kount++;
@@ -550,7 +552,7 @@ sort_order_rev_canonical (MatchRulePrivate * mrp, GList * ls,
   indexinparent = atk_object_get_index_in_parent (obj);
   parent = atk_object_get_parent (obj);
 
-  if (indexinparent > 0)
+  if (indexinparent > 0 && (max == 0 || kount < max))
     {
       /* there are still some siblings to visit so get the previous sibling
          and get it's last descendant.
@@ -570,7 +572,7 @@ sort_order_rev_canonical (MatchRulePrivate * mrp, GList * ls,
       kount = sort_order_rev_canonical (mrp, ls, kount, max,
                                         nextobj, TRUE, pobj);
     }
-  else
+  else if (max == 0 || kount < max)
     {
       /* no more siblings so next node must be the parent */
       kount = sort_order_rev_canonical (mrp, ls, kount, max,
@@ -642,7 +644,7 @@ bitarray_to_seq (int *array, int array_count, int **ret)
 static dbus_bool_t
 read_mr (DBusMessageIter * iter, MatchRulePrivate * mrp)
 {
-  DBusMessageIter mrc, arrayc;
+  DBusMessageIter iter_struct, iter_array, iter_dict, iter_dict_entry;
   dbus_uint32_t *array;
   dbus_int32_t matchType;
   int array_count;
@@ -651,97 +653,69 @@ read_mr (DBusMessageIter * iter, MatchRulePrivate * mrp)
   const char *str;
   char *interfaces = NULL;
 
-  dbus_message_iter_recurse (iter, &mrc);
-  dbus_message_iter_recurse (&mrc, &arrayc);
-  dbus_message_iter_get_fixed_array (&arrayc, &array, &array_count);
+  dbus_message_iter_recurse (iter, &iter_struct);
+
+  /* states */
+  dbus_message_iter_recurse (&iter_struct, &iter_array);
+  dbus_message_iter_get_fixed_array (&iter_array, &array, &array_count);
   bitarray_to_seq (array, array_count, &mrp->states);
   for (i = 0; mrp->states[i] != BITARRAY_SEQ_TERM; i++)
     {
       mrp->states[i] = spi_atk_state_from_spi_state (mrp->states[i]);
     }
-  dbus_message_iter_next (&mrc);
-  dbus_message_iter_get_basic (&mrc, &matchType);
-  dbus_message_iter_next (&mrc);
+  dbus_message_iter_next (&iter_struct);
+  dbus_message_iter_get_basic (&iter_struct, &matchType);
+  dbus_message_iter_next (&iter_struct);
   mrp->statematchtype = matchType;;
+
   /* attributes */
   mrp->attributes = NULL;
-  if (dbus_message_iter_get_arg_type (&mrc) == DBUS_TYPE_STRING)
+  dbus_message_iter_recurse (&iter_struct, &iter_dict);
+  while (dbus_message_iter_get_arg_type (&iter_dict) != DBUS_TYPE_INVALID)
     {
-      char *str;
-      gchar **attributes;
-      gchar **pp;
-      dbus_message_iter_get_basic (&mrc, &str);
-      attributes = g_strsplit (str, "\n", -1);
-      for (pp = attributes; *pp; pp++)
-        {
-          str = *pp;
-          attr = g_new (AtkAttribute, 1);
-          if (attr)
-            {
-              int len = strcspn (str, ":");
-              attr->name = g_strndup (str, len);
-              if (str[len] == ':')
-                {
-                  len++;
-                  if (str[len] == ' ')
-                    len++;
-                  attr->value = g_strdup (str + len);
-                }
-              else
-                attr->value = NULL;
-              mrp->attributes = g_slist_prepend (mrp->attributes, attr);
-            }
-        }
-      g_strfreev (attributes);
+      const char *key, *val;
+      dbus_message_iter_recurse (&iter_dict, &iter_dict_entry);
+      dbus_message_iter_get_basic (&iter_dict_entry, &key);
+      dbus_message_iter_next (&iter_dict_entry);
+      dbus_message_iter_get_basic (&iter_dict_entry, &val);
+      attr = g_new (AtkAttribute, 1);
+      attr->name = g_strdup (key);
+      attr->value = g_strdup (val);
+      mrp->attributes = g_slist_prepend (mrp->attributes, attr);
+      dbus_message_iter_next (&iter_dict);
     }
-  else
-    {
-      dbus_message_iter_recurse (&mrc, &arrayc);
-      while (dbus_message_iter_get_arg_type (&arrayc) != DBUS_TYPE_INVALID)
-        {
-          dbus_message_iter_get_basic (&arrayc, &str);
-          // TODO: remove this print
-          g_print ("Got attribute: %s\n", str);
-          attr = g_new (AtkAttribute, 1);
-          if (attr)
-            {
-              int len = strcspn (str, ":");
-              attr->name = g_strndup (str, len);
-              if (str[len] == ':')
-                {
-                  len++;
-                  if (str[len] == ' ')
-                    len++;
-                  attr->value = g_strdup (str + len);
-                }
-              else
-                attr->value = NULL;
-              mrp->attributes = g_slist_prepend (mrp->attributes, attr);
-            }
-          dbus_message_iter_next (&arrayc);
-        }
-    }
-  dbus_message_iter_next (&mrc);
-  dbus_message_iter_get_basic (&mrc, &matchType);
+  dbus_message_iter_next (&iter_struct);
+  dbus_message_iter_get_basic (&iter_struct, &matchType);
   mrp->attributematchtype = matchType;;
-  dbus_message_iter_next (&mrc);
+  dbus_message_iter_next (&iter_struct);
+
   /* Get roles and role match */
-  dbus_message_iter_recurse (&mrc, &arrayc);
-  dbus_message_iter_get_fixed_array (&arrayc, &array, &array_count);
+  dbus_message_iter_recurse (&iter_struct, &iter_array);
+  dbus_message_iter_get_fixed_array (&iter_array, &array, &array_count);
   bitarray_to_seq (array, array_count, &mrp->roles);
-  dbus_message_iter_next (&mrc);
-  dbus_message_iter_get_basic (&mrc, &matchType);
+  dbus_message_iter_next (&iter_struct);
+  dbus_message_iter_get_basic (&iter_struct, &matchType);
   mrp->rolematchtype = matchType;;
-  dbus_message_iter_next (&mrc);
+  dbus_message_iter_next (&iter_struct);
+
   /* Get interfaces and interface match */
-  dbus_message_iter_get_basic (&mrc, &interfaces);
-  dbus_message_iter_next (&mrc);
-  mrp->ifaces = g_strsplit (interfaces, ";", 0);
-  dbus_message_iter_get_basic (&mrc, &matchType);
+  dbus_message_iter_recurse (&iter_struct, &iter_array);
+  mrp->ifaces = g_new0 (gchar *, 16);
+  i = 0;
+  while (i < 15 && dbus_message_iter_get_arg_type (&iter_array) != DBUS_TYPE_INVALID)
+  {
+    char *iface;
+    dbus_message_iter_get_basic (&iter_array, &iface);
+    mrp->ifaces [i] = g_strdup (iface);
+    i++;
+    dbus_message_iter_next (&iter_array);
+  }
+  dbus_message_iter_next (&iter_struct);
+  dbus_message_iter_get_basic (&iter_struct, &matchType);
   mrp->interfacematchtype = matchType;;
-  dbus_message_iter_next (&mrc);
+  dbus_message_iter_next (&iter_struct);
   /* get invert */
-  dbus_message_iter_get_basic (&mrc, &mrp->invert);
+  dbus_message_iter_get_basic (&iter_struct, &mrp->invert);
   dbus_message_iter_next (iter);
   return TRUE;
 }
@@ -843,7 +817,7 @@ inorder (AtkObject * collection, MatchRulePrivate * mrp,
       obj = parent;
     }
 
-  if (kount < max)
+  if (max == 0 || kount < max)
     {
       kount = sort_order_canonical (mrp, ls, kount, max,
                                     obj, i + 1, TRUE, FALSE, TRUE, TRUE);
@@ -969,8 +943,7 @@ impl_GetMatchesFrom (DBusConnection * bus, DBusMessage * message,
   const char *signature;
 
   signature = dbus_message_get_signature (message);
-  if (strcmp (signature, "o(aiisiaiisib)uuib") != 0 &&
-      strcmp (signature, "o(aii(as)iaiisib)uuib") != 0)
+  if (strcmp (signature, "o(aiia{ss}iaiiasib)uuib") != 0)
     {
       return droute_invalid_arguments_error (message);
     }
@@ -1033,8 +1006,7 @@ impl_GetMatchesTo (DBusConnection * bus, DBusMessage * message,
   const char *signature;
 
   signature = dbus_message_get_signature (message);
-  if (strcmp (signature, "o(aiisiaiisib)uubib") != 0 &&
-      strcmp (signature, "o(aii(as)iaiisib)uubib") != 0)
+  if (strcmp (signature, "o(aiia{ss}iaiiasib)uubib") != 0)
     {
       return droute_invalid_arguments_error (message);
     }
@@ -1095,8 +1067,7 @@ impl_GetMatches (DBusConnection * bus, DBusMessage * message, void *user_data)
   const char *signature;
 
   signature = dbus_message_get_signature (message);
-  if (strcmp (signature, "(aiisiaiisib)uib") != 0 &&
-      strcmp (signature, "(aii(as)iaiisib)uib") != 0)
+  if (strcmp (signature, "(aiia{ss}iaiiasib)uib") != 0)
     {
       return droute_invalid_arguments_error (message);
     }
@@ -1134,5 +1105,5 @@ void
 spi_initialize_collection (DRoutePath * path)
 {
   droute_path_add_interface (path,
-                             SPI_DBUS_INTERFACE_COLLECTION, methods, NULL);
+                             SPI_DBUS_INTERFACE_COLLECTION, spi_org_a11y_atspi_Collection, methods, NULL);
 };