#include "accessible-register.h"
#include "accessible-marshaller.h"
+#include "bridge.h"
#include "adaptors.h"
/*---------------------------------------------------------------------------*/
+void
+spi_dbus_append_name_and_path_inner (DBusMessageIter *iter, const char *bus_name, const char *path)
+{
+ DBusMessageIter iter_struct;
+
+ if (!bus_name)
+ bus_name = "";
+
+ dbus_message_iter_open_container (iter, DBUS_TYPE_STRUCT, NULL, &iter_struct);
+ dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_STRING, &bus_name);
+ dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_OBJECT_PATH, &path);
+ dbus_message_iter_close_container (iter, &iter_struct);
+}
+
+extern gchar *atspi_dbus_name;
+
+void
+spi_dbus_append_name_and_path (DBusMessage *message, DBusMessageIter *iter, AtkObject *obj, gboolean do_register, gboolean unref)
+{
+ gchar *path;
+ DBusMessageIter iter_struct;
+
+ path = atk_dbus_object_to_path (obj, do_register);
+
+ if (!path)
+ path = g_strdup (SPI_DBUS_PATH_NULL);
+
+ spi_dbus_append_name_and_path_inner (iter, atspi_dbus_name, path);
+
+ g_free (path);
+ if (obj && unref)
+ g_object_unref (obj);
+}
+
/*
* Marshals the D-Bus path of an AtkObject into a D-Bus message.
*
spi_dbus_return_object (DBusMessage *message, AtkObject *obj, gboolean do_register, gboolean unref)
{
DBusMessage *reply;
- gchar *path;
-
- path = atk_dbus_object_to_path (obj, do_register);
-
- if (obj && unref)
- g_object_unref (obj);
-
- if (!path)
- path = g_strdup (SPI_DBUS_PATH_NULL);
-
reply = dbus_message_new_method_return (message);
if (reply)
{
- dbus_message_append_args (reply, DBUS_TYPE_OBJECT_PATH, &path,
- DBUS_TYPE_INVALID);
+ DBusMessageIter iter;
+ dbus_message_iter_init_append (reply, &iter);
+ spi_dbus_append_name_and_path (message, &iter, obj, do_register, unref);
}
- g_free (path);
-
return reply;
}
dbus_bool_t
spi_dbus_return_v_object (DBusMessageIter *iter, AtkObject *obj, int unref)
{
+ DBusMessageIter iter_variant;
char *path;
path = atk_dbus_object_to_path (obj, FALSE);
if (unref)
g_object_unref (obj);
- return droute_return_v_object (iter, path);
+ dbus_message_iter_open_container (iter, DBUS_TYPE_VARIANT, "(so)", &iter_variant);
+ spi_dbus_append_name_and_path_inner (&iter_variant, NULL, path);
+ dbus_message_iter_close_container (iter, &iter_variant);
+ return TRUE;
}
/*---------------------------------------------------------------------------*/
* Marshals the given AtkObject into the provided D-Bus iterator.
*
* The object is marshalled including all its client side cache data.
- * The format of the structure is (ooaoassusau).
+ * The format of the structure is (o(so)a(so)assusau).
* This is used in the updateTree signal and the GetTree method
* of the org.freedesktop.atspi.Tree interface.
*
* be registered with D-Bus and have been given a D-Bus object path.
*/
void
-spi_atk_append_accessible(AtkObject *obj, gpointer iter)
+spi_atk_append_accessible(AtkObject *obj, gpointer data)
{
- DBusMessageIter *iter_array;
DBusMessageIter iter_struct, iter_sub_array;
dbus_uint32_t states [2];
int count;
AtkStateSet *set;
+ DBusMessageIter *iter_array = (DBusMessageIter *)data;
const char *name, *desc;
dbus_uint32_t role;
- iter_array = (DBusMessageIter *) iter;
-
set = atk_object_ref_state_set (obj);
- dbus_message_iter_open_container (iter_array, DBUS_TYPE_STRUCT, NULL, &iter_struct);
{
AtkObject *parent;
- gchar *path, *path_parent;
+ gchar *path;
+ gchar *bus_parent = NULL, *path_parent;
/* Marshall object path */
path = atk_dbus_object_to_path (obj, FALSE);
- dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_OBJECT_PATH, &path);
+
+ role = spi_accessible_role_from_atk_role (atk_object_get_role (obj));
/* Marshall parent */
parent = atk_object_get_parent(obj);
if (parent == NULL)
{
- path_parent = atk_dbus_desktop_object_path ();
+ /* TODO: Support getting parent of an AtkPlug */
+#ifdef __ATK_PLUG_H__
+ if (role != Accessibility_ROLE_APPLICATION && !ATK_IS_PLUG (obj))
+#else
+ if (role != Accessibility_ROLE_APPLICATION)
+#endif
+ path_parent = g_strdup (SPI_DBUS_PATH_NULL);
+ else
+ path_parent = atk_dbus_desktop_object_path ();
}
else
{
path_parent = atk_dbus_desktop_object_path ();
}
}
- dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_OBJECT_PATH, &path_parent);
+
+ dbus_message_iter_open_container (iter_array, DBUS_TYPE_STRUCT, NULL, &iter_struct);
+ dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_OBJECT_PATH, &path);
+ spi_dbus_append_name_and_path_inner (&iter_struct, bus_parent, path_parent);
g_free(path_parent);
+ g_free (bus_parent);
/* Marshall children */
- dbus_message_iter_open_container (&iter_struct, DBUS_TYPE_ARRAY, "o", &iter_sub_array);
+ dbus_message_iter_open_container (&iter_struct, DBUS_TYPE_ARRAY, "(so)", &iter_sub_array);
if (!atk_state_set_contains_state (set, ATK_STATE_MANAGES_DESCENDANTS))
{
gint childcount, i;
child_path = atk_dbus_object_to_path (child, FALSE);
if (child_path)
{
- dbus_message_iter_append_basic (&iter_sub_array, DBUS_TYPE_OBJECT_PATH, &child_path);
+ spi_dbus_append_name_and_path_inner (&iter_sub_array, NULL, child_path);
g_free (child_path);
}
g_object_unref(G_OBJECT(child));
}
}
+#ifdef __ATK_PLUG_H__
+ if (ATK_IS_SOCKET (obj) && atk_socket_is_occupied (ATK_SOCKET(obj)))
+ {
+ AtkSocket *socket = ATK_SOCKET(obj);
+ gchar *child_name, *child_path;
+ child_name = g_strdup (socket->embedded_plug_id);
+ child_path = g_utf8_strchr (child_name + 1, -1, ':');
+ if (child_path)
+ {
+ *(child_path++) = '\0';
+ spi_dbus_append_name_and_path_inner (&iter_sub_array, child_name, child_path);
+ }
+ g_free (child_name);
+ }
+#endif
+
dbus_message_iter_close_container (&iter_struct, &iter_sub_array);
/* Marshall interfaces */
dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_STRING, &name);
/* Marshall role */
- role = spi_accessible_role_from_atk_role (atk_object_get_role (obj));
dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_UINT32, &role);
/* Marshall description */
projects / platform / core / uifw / at-spi2-atk.git / blobdiff