2008-04-22 Mike Gorse <mgorse@novell.com>

	* atk-adaptor/accessible-adaptor.c atk-adaptor/accessible-marshaller.c,
	atk-adaptor/accessible-marshaller.h, atk-adaptor/text-adaptor.c,
	atk-adaptor/document-adaptor.c, xml/org.freedesktop.atspi.Text.xml:
	Make a text return value the first
	parameter returned.
	Modify attribute-related functions to return dictionaries.

diff --git a/atk-adaptor/accessible-adaptor.c b/atk-adaptor/accessible-adaptor.c
index 1536236..5029acc 100644 (file)
--- a/atk-adaptor/accessible-adaptor.c
+++ b/atk-adaptor/accessible-adaptor.c
@@ -518,34 +518,17 @@ impl_getAttributes (DBusConnection *bus,
   AtkObject *object = (AtkObject *) user_data;
   DBusMessage *reply;
 
-  GSList *attr;
   AtkAttributeSet *attributes;
-  DBusMessageIter iter, dictIter, dictEntryIter;
-  gint n_attributes = 0;
+  DBusMessageIter iter;
 
   g_return_val_if_fail (ATK_IS_OBJECT (user_data),
                         droute_not_yet_handled_error (message));
 
   attributes = atk_object_get_attributes (object);
 
-  if (attributes)
-    n_attributes = g_slist_length (attributes);
-
-  attr = attributes;
-
   reply = dbus_message_new_method_return (message);
   dbus_message_iter_init_append (reply, &iter);
-  dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, "{ss}", &dictIter);
-  while (attr)
-    {
-      AtkAttribute *attribute = (AtkAttribute *) attr->data;
-      dbus_message_iter_open_container (&dictIter, DBUS_TYPE_DICT_ENTRY, NULL, &dictEntryIter);
-      dbus_message_iter_append_basic (&dictEntryIter, DBUS_TYPE_STRING, &attribute->name);
-      dbus_message_iter_append_basic (&dictEntryIter, DBUS_TYPE_STRING, &attribute->value);
-      dbus_message_iter_close_container (&dictIter, &dictEntryIter);
-      attr = g_slist_next (attr);
-    }
-  dbus_message_iter_close_container (&iter, &dictIter);
+  spi_atk_append_attribute_set (&iter, attributes);
 
   if (attributes)
     atk_attribute_set_free (attributes);

diff --git a/atk-adaptor/accessible-marshaller.c b/atk-adaptor/accessible-marshaller.c
index 30d6b33..d8d069f 100644 (file)
--- a/atk-adaptor/accessible-marshaller.c
+++ b/atk-adaptor/accessible-marshaller.c
@@ -286,5 +286,31 @@ spi_atk_append_accessible(AtkObject *obj, gpointer iter)
   dbus_message_iter_close_container (iter_array, &iter_struct);
 }
 
+void
+spi_atk_append_attribute_set (DBusMessageIter *iter, AtkAttributeSet *attr)
+{
+  DBusMessageIter dictIter;
+
+  dbus_message_iter_open_container (iter, DBUS_TYPE_ARRAY, "{ss}", &dictIter);
+  spi_atk_append_attribute_set_inner (&dictIter, attr);
+  dbus_message_iter_close_container (iter, &dictIter);
+}
+
+void
+spi_atk_append_attribute_set_inner (DBusMessageIter *iter, AtkAttributeSet *attr)
+{
+  DBusMessageIter dictEntryIter;
+
+  while (attr)
+    {
+      AtkAttribute *attribute = (AtkAttribute *) attr->data;
+      dbus_message_iter_open_container (iter, DBUS_TYPE_DICT_ENTRY, NULL, &dictEntryIter);
+      dbus_message_iter_append_basic (&dictEntryIter, DBUS_TYPE_STRING, &attribute->name);
+      dbus_message_iter_append_basic (&dictEntryIter, DBUS_TYPE_STRING, &attribute->value);
+      dbus_message_iter_close_container (iter, &dictEntryIter);
+      attr = g_slist_next (attr);
+    }
+}
+
 /*END------------------------------------------------------------------------*/
 

diff --git a/atk-adaptor/accessible-marshaller.h b/atk-adaptor/accessible-marshaller.h
index afeeb1b..a150fe5 100644 (file)
--- a/atk-adaptor/accessible-marshaller.h
+++ b/atk-adaptor/accessible-marshaller.h
@@ -36,4 +36,9 @@ spi_dbus_return_v_object (DBusMessageIter *iter, AtkObject *obj, int unref);
 void
 spi_atk_append_accessible(AtkObject *obj, gpointer iter);
 
+void
+spi_atk_append_attribute_set (DBusMessageIter *iter, AtkAttributeSet *attr);
+
+void
+spi_atk_append_attribute_set_inner (DBusMessageIter *iter, AtkAttributeSet *attr);
 #endif /* ACCESSIBLE_MARSHALLER */

diff --git a/atk-adaptor/document-adaptor.c b/atk-adaptor/document-adaptor.c
index d99d0e9..449368f 100644 (file)
--- a/atk-adaptor/document-adaptor.c
+++ b/atk-adaptor/document-adaptor.c
@@ -87,36 +87,22 @@ impl_getAttributes (DBusConnection * bus, DBusMessage * message,
   AtkDocument *document = (AtkDocument *) user_data;
   DBusMessage *reply;
   AtkAttributeSet *attributes;
-  AtkAttribute *attr = NULL;
-  char **retval;
-  gint n_attributes = 0;
-  gint i;
+  DBusMessageIter iter;
 
   g_return_val_if_fail (ATK_IS_DOCUMENT (user_data),
                         droute_not_yet_handled_error (message));
 
   attributes = atk_document_get_attributes (document);
-  if (attributes)
-    n_attributes = g_slist_length (attributes);
-
-  retval = (char **) g_malloc (n_attributes * sizeof (char *));
 
-  for (i = 0; i < n_attributes; ++i)
-    {
-      attr = g_slist_nth_data (attributes, i);
-      retval[i] = g_strconcat (attr->name, ":", attr->value, NULL);
-    }
-  if (attributes)
-    atk_attribute_set_free (attributes);
   reply = dbus_message_new_method_return (message);
   if (reply)
     {
-      dbus_message_append_args (reply, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING,
-                                &retval, n_attributes, DBUS_TYPE_INVALID);
+      dbus_message_iter_init_append (reply, &iter);
+      spi_atk_append_attribute_set (&iter, attributes);
     }
-  for (i = 0; i < n_attributes; i++)
-    g_free (retval[i]);
-  g_free (retval);
+
+  if (attributes)
+    atk_attribute_set_free (attributes);
   return reply;
 }
 

diff --git a/atk-adaptor/text-adaptor.c b/atk-adaptor/text-adaptor.c
index 4a43542..323f687 100644 (file)
--- a/atk-adaptor/text-adaptor.c
+++ b/atk-adaptor/text-adaptor.c
@@ -138,9 +138,9 @@ impl_getTextBeforeOffset (DBusConnection * bus, DBusMessage * message,
   reply = dbus_message_new_method_return (message);
   if (reply)
     {
-      dbus_message_append_args (reply, DBUS_TYPE_INT32, &startOffset,
-                                DBUS_TYPE_INT32, &endOffset, DBUS_TYPE_STRING,
-                                &txt, DBUS_TYPE_INVALID);
+      dbus_message_append_args (reply, DBUS_TYPE_STRING, &txt, DBUS_TYPE_INT32,
+                                &startOffset, DBUS_TYPE_INT32, &endOffset,
+                                DBUS_TYPE_INVALID);
     }
   g_free (txt);
   return reply;
@@ -177,9 +177,9 @@ impl_getTextAtOffset (DBusConnection * bus, DBusMessage * message,
   reply = dbus_message_new_method_return (message);
   if (reply)
     {
-      dbus_message_append_args (reply, DBUS_TYPE_INT32, &startOffset,
-                                DBUS_TYPE_INT32, &endOffset, DBUS_TYPE_STRING,
-                                &txt, DBUS_TYPE_INVALID);
+      dbus_message_append_args (reply, DBUS_TYPE_STRING, &txt, DBUS_TYPE_INT32,
+                                &startOffset, DBUS_TYPE_INT32, &endOffset,
+                                DBUS_TYPE_INVALID);
     }
   g_free (txt);
   return reply;
@@ -217,9 +217,9 @@ impl_getTextAfterOffset (DBusConnection * bus, DBusMessage * message,
   reply = dbus_message_new_method_return (message);
   if (reply)
     {
-      dbus_message_append_args (reply, DBUS_TYPE_INT32, &startOffset,
-                                DBUS_TYPE_INT32, &endOffset, DBUS_TYPE_STRING,
-                                &txt, DBUS_TYPE_INVALID);
+      dbus_message_append_args (reply, DBUS_TYPE_STRING, &txt, DBUS_TYPE_INT32,
+                                &startOffset, DBUS_TYPE_INT32, &endOffset,
+                                DBUS_TYPE_INVALID);
     }
   g_free (txt);
   return reply;
@@ -301,10 +301,9 @@ impl_getAttributeValue (DBusConnection * bus, DBusMessage * message,
   reply = dbus_message_new_method_return (message);
   if (reply)
     {
-      dbus_message_append_args (reply, DBUS_TYPE_INT32, &startOffset,
-                                DBUS_TYPE_INT32, &endOffset,
-                                DBUS_TYPE_BOOLEAN, &defined, DBUS_TYPE_STRING,
-                                &rv, DBUS_TYPE_INVALID);
+      dbus_message_append_args (reply, DBUS_TYPE_STRING, &rv, DBUS_TYPE_INT32,
+                                &startOffset, DBUS_TYPE_INT32, &endOffset,
+                                DBUS_TYPE_BOOLEAN, &defined, DBUS_TYPE_INVALID);
     }
   atk_attribute_set_free (set);
   return reply;
@@ -343,10 +342,10 @@ impl_getAttributes (DBusConnection * bus, DBusMessage * message,
   dbus_int32_t offset;
   dbus_int32_t startOffset, endOffset;
   gint intstart_offset, intend_offset;
-  char *rv;
   DBusError error;
   DBusMessage *reply;
   AtkAttributeSet *set;
+  DBusMessageIter iter;
 
   g_return_val_if_fail (ATK_IS_TEXT (user_data),
                         droute_not_yet_handled_error (message));
@@ -360,18 +359,17 @@ impl_getAttributes (DBusConnection * bus, DBusMessage * message,
   set = atk_text_get_run_attributes (text, offset,
                                      &intstart_offset, &intend_offset);
 
-  rv = _string_from_attribute_set (set);
-
   startOffset = intstart_offset;
   endOffset = intend_offset;
   reply = dbus_message_new_method_return (message);
   if (reply)
     {
-      dbus_message_append_args (reply, DBUS_TYPE_STRING, &rv, DBUS_TYPE_INT32, &startOffset,
+      dbus_message_iter_init_append (reply, &iter);
+      spi_atk_append_attribute_set (&iter, set);
+      dbus_message_append_args (reply, DBUS_TYPE_INT32, &startOffset,
                                 DBUS_TYPE_INT32, &endOffset, DBUS_TYPE_INVALID);
     }
   atk_attribute_set_free (set);
-  g_free(rv);
   return reply;
 }
 
@@ -380,24 +378,22 @@ impl_getDefaultAttributes (DBusConnection * bus, DBusMessage * message,
                            void *user_data)
 {
   AtkText *text = (AtkText *) user_data;
-  char *rv;
   DBusError error;
   DBusMessage *reply;
   AtkAttributeSet *set;
+  DBusMessageIter iter;
 
   g_return_val_if_fail (ATK_IS_TEXT (user_data),
                         droute_not_yet_handled_error (message));
   dbus_error_init (&error);
 
   set = atk_text_get_default_attributes (text);
-  rv = _string_from_attribute_set (set);
   reply = dbus_message_new_method_return (message);
   if (reply)
     {
-      dbus_message_append_args (reply, DBUS_TYPE_STRING, &rv,
-                                DBUS_TYPE_INVALID);
+      dbus_message_iter_init_append (reply, &iter);
+      spi_atk_append_attribute_set (&iter, set);
     }
-  g_free (rv);
   atk_attribute_set_free (set);
   return reply;
 }
@@ -735,9 +731,7 @@ impl_getAttributeRun (DBusConnection * bus, DBusMessage * message,
   DBusMessage *reply;
   AtkAttributeSet *attributes, *default_attributes = NULL;
   AtkAttribute *attr = NULL;
-  char **retval;
-  gint n_attributes = 0, total_attributes = 0, n_default_attributes = 0;
-  gint i, j;
+  DBusMessageIter iter, iterArray;
 
   g_return_val_if_fail (ATK_IS_TEXT (user_data),
                         droute_not_yet_handled_error (message));
@@ -753,51 +747,29 @@ impl_getAttributeRun (DBusConnection * bus, DBusMessage * message,
     atk_text_get_run_attributes (text, offset, &intstart_offset,
                                  &intend_offset);
 
-  if (attributes)
-    total_attributes = n_attributes = g_slist_length (attributes);
+  reply = dbus_message_new_method_return (message);
+  if (!reply)
+    return NULL;
 
+  dbus_message_iter_init_append (reply, &iter);
+  dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, "{ss}", &iterArray);
+  spi_atk_append_attribute_set_inner (&iterArray, attributes);
   if (includeDefaults)
     {
       default_attributes = atk_text_get_default_attributes (text);
-      if (default_attributes)
-        n_default_attributes = g_slist_length (default_attributes);
-      total_attributes += n_default_attributes;
+      spi_atk_append_attribute_set_inner (&iterArray, default_attributes);
     }
+  dbus_message_iter_close_container (&iter, &iterArray);
 
   startOffset = intstart_offset;
   endOffset = intend_offset;
+  dbus_message_iter_append_basic (&iter, DBUS_TYPE_INT32, &startOffset);
+  dbus_message_iter_append_basic (&iter, DBUS_TYPE_INT32, &endOffset);
 
-  retval = (char **) g_malloc (total_attributes * sizeof (char *));
+  atk_attribute_set_free (attributes);
+  if (default_attributes)
+    atk_attribute_set_free (default_attributes);
 
-  if (total_attributes)
-    {
-      for (i = 0; i < n_attributes; ++i)
-        {
-          attr = g_slist_nth_data (attributes, i);
-          retval[i] = g_strconcat (attr->name, ":", attr->value, NULL);
-        }
-
-      for (j = 0; j < n_default_attributes; ++i, ++j)
-        {
-          attr = g_slist_nth_data (default_attributes, j);
-          retval[i] = g_strconcat (attr->name, ":", attr->value, NULL);
-        }
-
-      atk_attribute_set_free (attributes);
-      if (default_attributes)
-        atk_attribute_set_free (default_attributes);
-    }
-  reply = dbus_message_new_method_return (message);
-  if (reply)
-    {
-      dbus_message_append_args (reply, DBUS_TYPE_INT32, &startOffset,
-                                DBUS_TYPE_INT32, &endOffset, DBUS_TYPE_ARRAY,
-                                DBUS_TYPE_STRING, &retval, total_attributes,
-                                DBUS_TYPE_INVALID);
-    }
-  for (i = 0; i < total_attributes; i++)
-    g_free (retval[i]);
-  g_free (retval);
   return reply;
 }
 
@@ -807,37 +779,24 @@ impl_getDefaultAttributeSet (DBusConnection * bus, DBusMessage * message,
 {
   AtkText *text = (AtkText *) user_data;
   DBusMessage *reply;
+  DBusMessageIter iter;
   AtkAttributeSet *attributes;
-  AtkAttribute *attr = NULL;
-  char **retval;
-  gint n_attributes = 0;
-  gint i;
 
   g_return_val_if_fail (ATK_IS_TEXT (user_data),
                         droute_not_yet_handled_error (message));
 
   attributes = atk_text_get_default_attributes (text);
-  if (attributes)
-    n_attributes = g_slist_length (attributes);
-
-  retval = g_new (char *, n_attributes);
 
-  for (i = 0; i < n_attributes; ++i)
-    {
-      attr = g_slist_nth_data (attributes, i);
-      retval[i] = g_strconcat (attr->name, ":", attr->value, NULL);
-    }
-  if (attributes)
-    atk_attribute_set_free (attributes);
   reply = dbus_message_new_method_return (message);
   if (reply)
     {
-      dbus_message_append_args (reply, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING,
-                                &retval, n_attributes, DBUS_TYPE_INVALID);
+      dbus_message_iter_init_append (reply, &iter);
+      spi_atk_append_attribute_set (&iter, attributes);
     }
-  for (i = 0; i < n_attributes; i++)
-    g_free (retval[i]);
-  g_free (retval);
+
+  if (attributes)
+    atk_attribute_set_free (attributes);
+
   return reply;
 }
 

diff --git a/xml/org.freedesktop.atspi.Text.xml b/xml/org.freedesktop.atspi.Text.xml
index b2e2221..6d17692 100644 (file)
--- a/xml/org.freedesktop.atspi.Text.xml
+++ b/xml/org.freedesktop.atspi.Text.xml
@@ -206,6 +206,11 @@
         and whether the start or ending of such a substring forms the boundary condition.
            </tp:docstring>
     </arg>
+    <arg direction="out" type="s">
+    <tp:docstring>
+      A string which is a substring of the text content of the object, delimited by the specified boundary condition.
+    </tp:docstring>
+    </arg>
     <arg direction="out" name="startOffset" type="i">
            <tp:docstring>
         Back-filled with the starting offset of the resulting substring, if one exists.
@@ -217,11 +222,6 @@
         substring, if one exists.
            </tp:docstring>
     </arg>
-    <arg direction="out" type="s">
-    <tp:docstring>
-      A string which is a substring of the text content of the object, delimited by thespecified boundary condition.
-    </tp:docstring>
-    </arg>
   </method>
   <method name="getTextAtOffset">
     <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
@@ -243,6 +243,11 @@
         and whether the start or ending of such a substring forms the boundary condition.
            </tp:docstring>
     </arg>
+    <arg direction="out" type="s">
+    <tp:docstring>
+      A string which is a substring of the text content of the object, delimited by the specified boundary condition.
+    </tp:docstring>
+    </arg>
     <arg direction="out" name="startOffset" type="i">
            <tp:docstring>
         Back-filled with the starting offset of the resulting substring, if one exists.
@@ -254,11 +259,6 @@
         substring, if one exists.
            </tp:docstring>
     </arg>
-    <arg direction="out" type="s">
-    <tp:docstring>
-      A string which is a substring of the text content of the object, delimited by thespecified boundary condition.
-    </tp:docstring>
-    </arg>
   </method>
   <method name="getTextAfterOffset">
     <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
@@ -281,6 +281,11 @@
         and whether the start or ending of such a substring forms the boundary condition.
            </tp:docstring>
     </arg>
+    <arg direction="out" type="s">
+    <tp:docstring>
+      A string which is a substring of the text content of the object, delimited by the specified boundary condition.
+    </tp:docstring>
+    </arg>
     <arg direction="out" name="startOffset" type="i">
            <tp:docstring>
         Back-filled with the starting offset of the resulting substring, if one exists.
@@ -292,13 +297,8 @@
         substring, if one exists.
            </tp:docstring>
     </arg>
-    <arg direction="out" type="s">
-    <tp:docstring>
-      A string which is a substring of the text content of the object, delimited by thespecified boundary condition.
-    </tp:docstring>
-    </arg>
   </method>
-  <method name="getCharacterOffset">
+  <method name="getCharacterAtOffset">
     <arg name="offset" type="i" direction="in"/>
     <arg type="i" direction="out">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
@@ -322,6 +322,11 @@
         The name of the attribute for which the value is to be returned, if defined.
            </tp:docstring>
     </arg>
+    <arg direction="out" type="s">
+    <tp:docstring>
+      The value of attribute (name-value pair) corresponding to "name", if defined. 
+    </tp:docstring>
+    </arg>
     <arg direction="out" name="startOffset" type="i">
            <tp:docstring>
         Back-filled with the offset of the first character in the attribute run
@@ -340,24 +345,19 @@
         <code>False</code> otherwise.
            </tp:docstring>
     </arg>
-    <arg direction="out" type="s">
-    <tp:docstring>
-      The value of attribute (name-value pair) corresponding to "name", if defined. 
-    </tp:docstring>
-    </arg>
   </method>
   <method name="getAttributes">
     <tp:docstring>
       getAttributes is deprecated in favor of getAttributeRun.
     </tp:docstring>
     <arg direction="in" name="offset" type="i"/>
-    <arg direction="out" name="startOffset" type="i"/>
-    <arg direction="out" name="endOffset" type="i"/>
     <arg direction="out" type="{ss}">
     <tp:docstring>
       The attributes at offset, as a semicolon-delimited set of colon-delimited name-value pairs. @see getAttributeRun
     </tp:docstring>
     </arg>
+    <arg direction="out" name="startOffset" type="i"/>
+    <arg direction="out" name="endOffset" type="i"/>
   </method>
   <method name="getDefaultAttributes">
     <tp:docstring>