*
* Copyright 2001, 2002 Sun Microsystems Inc.,
* Copyright 2001, 2002 Ximian, Inc.
+ * Copyright 2010, 2011 Novell, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
#include "atspi-private.h"
#include "X11/Xlib.h"
+#include "dbus/dbus-glib.h"
#include <stdio.h>
+#include <string.h>
+
+static void handle_get_items (DBusPendingCall *pending, void *user_data);
static DBusConnection *bus = NULL;
-static GHashTable *apps = NULL;
static GHashTable *live_refs = NULL;
-static GQueue *exception_handlers = NULL;
-static DBusError exception;
const char *atspi_path_dec = ATSPI_DBUS_PATH_DEC;
const char *atspi_path_registry = ATSPI_DBUS_PATH_REGISTRY;
const char *atspi_interface_accessible = ATSPI_DBUS_INTERFACE_ACCESSIBLE;
const char *atspi_interface_action = ATSPI_DBUS_INTERFACE_ACTION;
const char *atspi_interface_application = ATSPI_DBUS_INTERFACE_APPLICATION;
+const char *atspi_interface_collection = ATSPI_DBUS_INTERFACE_COLLECTION;
const char *atspi_interface_component = ATSPI_DBUS_INTERFACE_COMPONENT;
const char *atspi_interface_dec = ATSPI_DBUS_INTERFACE_DEC;
const char *atspi_interface_device_event_listener = ATSPI_DBUS_INTERFACE_DEVICE_EVENT_LISTENER;
static GHashTable *app_hash = NULL;
+static void
+handle_get_bus_address (DBusPendingCall *pending, void *user_data)
+{
+ AtspiApplication *app = user_data;
+ DBusMessage *reply = dbus_pending_call_steal_reply (pending);
+ DBusMessage *message;
+ const char *address;
+ DBusPendingCall *new_pending;
+
+ if (dbus_message_get_type (reply) == DBUS_MESSAGE_TYPE_METHOD_RETURN)
+ {
+ if (dbus_message_get_args (reply, NULL, DBUS_TYPE_STRING, &address,
+ DBUS_TYPE_INVALID))
+ {
+ DBusError error;
+ dbus_error_init (&error);
+ DBusConnection *bus = dbus_connection_open (address, &error);
+ if (bus)
+ {
+ if (app->bus)
+ dbus_connection_unref (app->bus);
+ app->bus = bus;
+ }
+ }
+ }
+ dbus_message_unref (reply);
+ dbus_pending_call_unref (pending);
+
+ message = dbus_message_new_method_call (app->bus_name,
+ "/org/a11y/atspi/cache",
+ atspi_interface_cache, "GetItems");
+
+ dbus_connection_send_with_reply (app->bus, message, &new_pending, 2000);
+ dbus_pending_call_set_notify (new_pending, handle_get_items, app, NULL);
+ dbus_message_unref (message);
+}
+
static AtspiApplication *
get_application (const char *bus_name)
{
AtspiApplication *app = NULL;
char *bus_name_dup;
+ DBusMessage *message;
+ DBusError error;
+ DBusPendingCall *pending = NULL;
if (!app_hash)
{
- app_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify)g_hash_table_unref);
+ app_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify)g_object_unref);
if (!app_hash) return NULL;
}
app = g_hash_table_lookup (app_hash, bus_name);
// TODO: change below to something that will send state-change:defunct notification if necessary */
app = _atspi_application_new (bus_name);
if (!app) return NULL;
- app->bus_name = bus_name_dup;
- if (APP_IS_REGISTRY (app))
- {
- app->hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
- }
- else
- {
- app->hash = g_hash_table_new_full (g_int_hash, g_int_equal, g_free, g_object_unref);
- }
+ app->hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
+ app->bus = dbus_connection_ref (_atspi_bus ());
+ app->cache = ATSPI_CACHE_UNDEFINED;
g_hash_table_insert (app_hash, bus_name_dup, app);
+ dbus_error_init (&error);
+ message = dbus_message_new_method_call (bus_name, atspi_path_root,
+ atspi_interface_application, "GetApplicationBusAddress");
+
+ dbus_connection_send_with_reply (app->bus, message, &pending, 2000);
+ dbus_pending_call_set_notify (pending, handle_get_bus_address, app, NULL);
+ dbus_message_unref (message);
return app;
}
static AtspiAccessible *
ref_accessible (const char *app_name, const char *path)
{
- AtspiApplication *app = get_application (app_name);
+ AtspiApplication *app;
AtspiAccessible *a;
+ if (!strcmp (path, ATSPI_DBUS_PATH_NULL))
+ return NULL;
+
+ app = get_application (app_name);
+
if (!strcmp (path, "/org/a11y/atspi/accessible/root"))
{
if (!app->root)
a = g_hash_table_lookup (app->hash, path);
if (a)
{
- g_object_ref (a);
- return a;
+ return g_object_ref (a);
}
a = atspi_accessible_new (app, path);
if (!a)
return NULL;
- g_hash_table_insert (app->hash, a->path, a);
+ g_hash_table_insert (app->hash, g_strdup (a->parent.path), a);
g_object_ref (a); /* for the hash */
return a;
}
+static AtspiHyperlink *
+ref_hyperlink (const char *app_name, const char *path)
+{
+ AtspiApplication *app = get_application (app_name);
+ AtspiHyperlink *hyperlink;
+
+ if (!strcmp (path, ATSPI_DBUS_PATH_NULL))
+ return NULL;
+
+ hyperlink = g_hash_table_lookup (app->hash, path);
+ if (hyperlink)
+ {
+ return g_object_ref (hyperlink);
+ }
+ hyperlink = atspi_hyperlink_new (app, path);
+ if (!hyperlink)
+ return NULL;
+ g_hash_table_insert (app->hash, g_strdup (hyperlink->parent.path), hyperlink);
+ /* TODO: This should be a weak ref */
+ g_object_ref (hyperlink); /* for the hash */
+ return hyperlink;
+}
+
typedef struct
{
char *path;
DBusMessageIter iter, iter_struct;
const char *signature = dbus_message_get_signature (message);
AtspiAccessible *a;
- int id;
if (strcmp (signature, "(so)") != 0)
{
- g_warning ("at-spi: Unknown signature %s for RemoveAccessible", signature);
+ g_warning (_("AT-SPI: Unknown signature %s for RemoveAccessible"), signature);
return DBUS_HANDLER_RESULT_HANDLED;
}
dbus_message_iter_init (message, &iter);
dbus_message_iter_recurse (&iter, &iter_struct);
dbus_message_iter_get_basic (&iter_struct, &sender);
+ dbus_message_iter_next (&iter_struct);
dbus_message_iter_get_basic (&iter_struct, &path);
app = get_application (sender);
a = ref_accessible (sender, path);
- if (a->accessible_parent && g_list_find (a->accessible_parent->children, a))
- {
- a->accessible_parent->children = g_list_remove (a->accessible_parent->children, a);
- g_object_unref (a);
- }
- g_hash_table_remove (app->hash, app->bus_name);
+ if (!a)
+ return DBUS_HANDLER_RESULT_HANDLED;
+ g_object_run_dispose (G_OBJECT (a));
+ g_hash_table_remove (app->hash, a->parent.path);
g_object_unref (a); /* unref our own ref */
return DBUS_HANDLER_RESULT_HANDLED;
}
add_app_to_desktop (AtspiAccessible *a, const char *bus_name)
{
DBusError error;
- char *root_path;
dbus_error_init (&error);
AtspiAccessible *obj = ref_accessible (bus_name, atspi_path_root);
}
else
{
- g_warning ("Error calling getRoot for %s: %s", bus_name, error.message);
+ g_warning (_("AT-SPI: Error calling getRoot for %s: %s"), bus_name, error.message);
}
return FALSE;
}
{
AtspiEvent e;
+ memset (&e, 0, sizeof (e));
e.type = (add? "object:children-changed:add": "object:children-changed:remove");
e.source = parent;
e.detail1 = g_list_index (parent->children, child);
e.detail2 = 0;
- g_value_unset (&e.any);
_atspi_send_event (&e);
}
for (l = a->children; l; l = l->next)
{
child = l->data;
- if (!strcmp (bus_name, child->app->bus_name)) break;
+ if (!strcmp (bus_name, child->parent.app->bus_name)) break;
}
if (!l)
{
- g_warning ("Removing unregistered app %s; doing nothing\n", bus_name);
return FALSE;
}
send_children_changed (a, child, FALSE);
static void
add_accessible_from_iter (DBusMessageIter *iter)
{
- gint i;
GList *new_list;
DBusMessageIter iter_struct, iter_array;
const char *app_name, *path;
- AtspiApplication *app;
AtspiAccessible *accessible;
const char *name, *description;
dbus_uint32_t role;
- dbus_uint32_t *states;
- int count;
dbus_message_iter_recurse (iter, &iter_struct);
/* get accessible */
get_reference_from_iter (&iter_struct, &app_name, &path);
accessible = ref_accessible (app_name, path);
+ if (!accessible)
+ return;
/* Get application: TODO */
dbus_message_iter_next (&iter_struct);
/* get parent */
get_reference_from_iter (&iter_struct, &app_name, &path);
+ if (accessible->accessible_parent)
+ g_object_unref (accessible->accessible_parent);
accessible->accessible_parent = ref_accessible (app_name, path);
/* Get children */
+ while (accessible->children)
+ {
+ g_object_unref (accessible->children->data);
+ accessible->children = g_list_remove (accessible->children, accessible->children->data);
+ }
dbus_message_iter_recurse (&iter_struct, &iter_array);
while (dbus_message_iter_get_arg_type (&iter_array) != DBUS_TYPE_INVALID)
{
}
/* interfaces */
- accessible->interfaces = 0;
dbus_message_iter_next (&iter_struct);
- dbus_message_iter_recurse (&iter_struct, &iter_array);
- while (dbus_message_iter_get_arg_type (&iter_array) != DBUS_TYPE_INVALID)
- {
- const char *iface;
- gint n;
- dbus_message_iter_get_basic (&iter_array, &iface);
- if (!strcmp (iface, "org.freedesktop.DBus.Introspectable")) continue;
- n = _atspi_get_iface_num (iface);
- if (n == -1)
- {
- g_warning ("Unknown interface %s", iface);
- }
- else accessible->interfaces |= (1 << n);
- dbus_message_iter_next (&iter_array);
- }
+ _atspi_dbus_set_interfaces (accessible, &iter_struct);
dbus_message_iter_next (&iter_struct);
/* name */
+ if (accessible->name)
+ g_free (accessible->name);
dbus_message_iter_get_basic (&iter_struct, &name);
accessible->name = g_strdup (name);
dbus_message_iter_next (&iter_struct);
dbus_message_iter_next (&iter_struct);
/* description */
+ if (accessible->description)
+ g_free (accessible->description);
dbus_message_iter_get_basic (&iter_struct, &description);
accessible->description = g_strdup (description);
dbus_message_iter_next (&iter_struct);
- dbus_message_iter_recurse (&iter_struct, &iter_array);
- dbus_message_iter_get_fixed_array (&iter_array, &states, &count);
- if (count != 2)
- {
- g_warning ("at-spi: expected 2 values in states array; got %d\n", count);
- accessible->states = atspi_state_set_new (accessible, 0);
- }
- else
- {
- guint64 val = ((guint64)states [1]) << 32;
- val += states [0];
- accessible->states = atspi_state_set_new (accessible, val);
- }
+ _atspi_dbus_set_state (accessible, &iter_struct);
dbus_message_iter_next (&iter_struct);
+ _atspi_accessible_add_cache (accessible, ATSPI_CACHE_NAME | ATSPI_CACHE_ROLE |
+ ATSPI_CACHE_PARENT | ATSPI_CACHE_DESCRIPTION);
+ if (!atspi_state_set_contains (accessible->states,
+ ATSPI_STATE_MANAGES_DESCENDANTS))
+ _atspi_accessible_add_cache (accessible, ATSPI_CACHE_CHILDREN);
+
/* This is a bit of a hack since the cache holds a ref, so we don't need
* the one provided for us anymore */
g_object_unref (accessible);
}
static void
-add_accessibles (const char *app_name)
+handle_get_items (DBusPendingCall *pending, void *user_data)
{
- DBusError error;
- DBusMessage *message, *reply;
+ DBusMessage *reply = dbus_pending_call_steal_reply (pending);
DBusMessageIter iter, iter_array;
- AtspiApplication *app = get_application (app_name);
- /* TODO: Move this functionality into app initializer? */
- dbus_error_init (&error);
- message = dbus_message_new_method_call (app_name, "/org/a11y/atspi/cache", atspi_interface_cache, "GetItems");
- reply = _atspi_dbus_send_with_reply_and_block (message);
- if (!reply || strcmp (dbus_message_get_signature (reply), "a((so)(so)(so)a(so)assusau)") != 0)
+ if (dbus_message_get_type (reply) == DBUS_MESSAGE_TYPE_ERROR)
{
- g_warning ("at-spi: Error in GetItems");
+ const char *sender = dbus_message_get_sender (reply);
+ const char *error = NULL;
+ dbus_message_get_args (reply, NULL, DBUS_TYPE_STRING, &error,
+ DBUS_TYPE_INVALID);
+ g_warning (_("AT-SPI: Error in GetItems, sender=%s, error=%s"), sender, error);
+ dbus_message_unref (reply);
+ dbus_pending_call_unref (pending);
return;
- if (reply)
- dbus_message_unref (reply);
}
+
dbus_message_iter_init (reply, &iter);
dbus_message_iter_recurse (&iter, &iter_array);
while (dbus_message_iter_get_arg_type (&iter_array) != DBUS_TYPE_INVALID)
dbus_message_iter_next (&iter_array);
}
dbus_message_unref (reply);
+ dbus_pending_call_unref (pending);
}
/* TODO: Do we stil need this function? */
ref_accessible_desktop (AtspiApplication *app)
{
DBusError error;
- GArray *apps = NULL;
- GArray *additions;
- gint i;
DBusMessage *message, *reply;
DBusMessageIter iter, iter_array;
+ gchar *bus_name_dup;
if (desktop)
{
{
return NULL;
}
- g_hash_table_insert (app->hash, desktop->path, desktop);
+ g_hash_table_insert (app->hash, desktop->parent.path, desktop);
g_object_ref (desktop); /* for the hash */
desktop->name = g_strdup ("main");
dbus_error_init (&error);
atspi_interface_accessible,
"GetChildren");
if (!message)
- return;
- reply = _atspi_dbus_send_with_reply_and_block (message);
+ return NULL;
+ reply = _atspi_dbus_send_with_reply_and_block (message, NULL);
if (!reply || strcmp (dbus_message_get_signature (reply), "a(so)") != 0)
{
- g_error ("Couldn't get application list: %s", error.message);
+ g_warning ("Couldn't get application list: %s", error.message);
if (reply)
dbus_message_unref (reply);
- return;
+ return NULL;
}
dbus_message_iter_init (reply, &iter);
dbus_message_iter_recurse (&iter, &iter_array);
{
const char *app_name, *path;
get_reference_from_iter (&iter_array, &app_name, &path);
- add_accessibles (app_name);
add_app_to_desktop (desktop, app_name);
}
dbus_message_unref (reply);
+
+ /* Record the alternate name as an alias for org.a11y.atspi.Registry */
+ bus_name_dup = g_strdup (dbus_message_get_sender (reply));
+ if (bus_name_dup)
+ g_hash_table_insert (app_hash, bus_name_dup, app);
+
return desktop;
}
if (!a) return NULL;
if ( APP_IS_REGISTRY(a))
{
- return ref_accessible_desktop (a);
+ return a->root = ref_accessible_desktop (a);
}
return ref_accessible (app, path);
}
{
DBusMessageIter iter;
AtspiAccessible *retval = NULL;
- const char *signature = dbus_message_get_signature (message);
-
+ const char *signature;
+
+ if (!message)
+ return NULL;
+
+ signature = dbus_message_get_signature (message);
if (!strcmp (signature, "(so)"))
{
dbus_message_iter_init (message, &iter);
}
else
{
- g_warning ("Atspi: Called __atspi_dbus_return_accessible_from_message with strange signature %s", signature);
+ g_warning (_("AT-SPI: Called _atspi_dbus_return_accessible_from_message with strange signature %s"), signature);
}
dbus_message_unref (message);
return retval;
return ref_accessible (app_name, path);
}
-/* TODO: Remove this function. We should not need it anymore.
- * If we do, it's a bug.
- */
-AtspiAccessible *
-_atspi_ref_related_accessible (AtspiAccessible *obj, const AtspiReference *ref)
+AtspiHyperlink *
+_atspi_dbus_return_hyperlink_from_message (DBusMessage *message)
{
- const char *app = (ref->name && ref->name[0]? ref->name: obj->app->bus_name);
- return ref_accessible (app, obj->path);
+ DBusMessageIter iter;
+ AtspiHyperlink *retval = NULL;
+ const char *signature = dbus_message_get_signature (message);
+
+ if (!strcmp (signature, "(so)"))
+ {
+ dbus_message_iter_init (message, &iter);
+ retval = _atspi_dbus_return_hyperlink_from_iter (&iter);
+ }
+ else
+ {
+ g_warning (_("AT-SPI: Called _atspi_dbus_return_hyperlink_from_message with strange signature %s"), signature);
+ }
+ dbus_message_unref (message);
+ return retval;
+}
+
+AtspiHyperlink *
+_atspi_dbus_return_hyperlink_from_iter (DBusMessageIter *iter)
+{
+ const char *app_name, *path;
+
+ get_reference_from_iter (iter, &app_name, &path);
+ return ref_hyperlink (app_name, path);
}
const char *cache_signal_type = "((so)(so)(so)a(so)assusau)";
{
DBusMessageIter iter;
const char *sender = dbus_message_get_sender (message);
- AtspiApplication *app = get_application (sender);
- const char *type = cache_signal_type;
if (strcmp (dbus_message_get_signature (message), cache_signal_type) != 0)
{
- g_warning ("atspi: AddAccessible with unknown signature %s\n", dbus_message_get_signature (message));
- return;
+ g_warning (_("AT-SPI: AddAccessible with unknown signature %s\n"),
+ dbus_message_get_signature (message));
+ return DBUS_HANDLER_RESULT_HANDLED;
}
dbus_message_iter_init (message, &iter);
add_accessible_from_iter (&iter);
+ return DBUS_HANDLER_RESULT_HANDLED;
+}
+
+typedef struct
+{
+ DBusConnection *bus;
+ DBusMessage *message;
+ void *data;
+} BusDataClosure;
+
+static guint process_deferred_messages_id = -1;
+
+static void
+process_deferred_message (BusDataClosure *closure)
+{
+ int type = dbus_message_get_type (closure->message);
+ const char *interface = dbus_message_get_interface (closure->message);
+
+ if (type == DBUS_MESSAGE_TYPE_SIGNAL &&
+ !strncmp (interface, "org.a11y.atspi.Event.", 21))
+ {
+ atspi_dbus_handle_event (closure->bus, closure->message, closure->data);
+ }
+ if (dbus_message_is_method_call (closure->message, atspi_interface_device_event_listener, "NotifyEvent"))
+ {
+ atspi_dbus_handle_DeviceEvent (closure->bus,
+ closure->message, closure->data);
+ }
+ if (dbus_message_is_signal (closure->message, atspi_interface_cache, "AddAccessible"))
+ {
+ handle_add_accessible (closure->bus, closure->message, closure->data);
+ }
+ if (dbus_message_is_signal (closure->message, atspi_interface_cache, "RemoveAccessible"))
+ {
+ handle_remove_accessible (closure->bus, closure->message, closure->data);
+ }
+}
+
+static GList *deferred_messages = NULL;
+
+gboolean
+_atspi_process_deferred_messages (gpointer data)
+{
+ static int in_process_deferred_messages = 0;
+
+ if (in_process_deferred_messages)
+ return TRUE;
+ in_process_deferred_messages = 1;
+ while (deferred_messages != NULL)
+ {
+ BusDataClosure *closure = deferred_messages->data;
+ process_deferred_message (closure);
+ deferred_messages = g_list_remove (deferred_messages, closure);
+ dbus_message_unref (closure->message);
+ dbus_connection_unref (closure->bus);
+ g_free (closure);
+ }
+ /* If data is NULL, assume that we were called from GLib */
+ if (!data)
+ process_deferred_messages_id = -1;
+ in_process_deferred_messages = 0;
+ return FALSE;
+}
+
+static DBusHandlerResult
+defer_message (DBusConnection *connection, DBusMessage *message, void *user_data)
+{
+ BusDataClosure *closure = g_new (BusDataClosure, 1);
+ GList *new_list;
+
+ if (!closure)
+ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+ closure->bus = dbus_connection_ref (bus);
+ closure->message = dbus_message_ref (message);
+ closure->data = user_data;
+
+ new_list = g_list_append (deferred_messages, closure);
+ if (new_list)
+ deferred_messages = new_list;
+
+ if (process_deferred_messages_id == -1)
+ process_deferred_messages_id = g_idle_add (_atspi_process_deferred_messages, NULL);
+ return DBUS_HANDLER_RESULT_HANDLED;
}
static DBusHandlerResult
{
int type = dbus_message_get_type (message);
const char *interface = dbus_message_get_interface (message);
- const char *member = dbus_message_get_member (message);
- dbus_uint32_t v;
- char *bus_name;
if (type == DBUS_MESSAGE_TYPE_SIGNAL &&
!strncmp (interface, "org.a11y.atspi.Event.", 21))
{
- return atspi_dbus_handle_event (bus, message, data);
+ return defer_message (bus, message, data);
}
- if (dbus_message_is_method_call (message, atspi_interface_device_event_listener, "notifyEvent"))
+ if (dbus_message_is_method_call (message, atspi_interface_device_event_listener, "NotifyEvent"))
{
- g_warning ("atspi: TODO: DeviceEvent");
- //return handle_device_event (bus, message, data);
+ return defer_message (bus, message, data);
}
if (dbus_message_is_signal (message, atspi_interface_cache, "AddAccessible"))
{
- return handle_add_accessible (bus, message, data);
+ return defer_message (bus, message, data);
}
if (dbus_message_is_signal (message, atspi_interface_cache, "RemoveAccessible"))
{
- return handle_remove_accessible (bus, message, data);
+ return defer_message (bus, message, data);
}
- /* TODO: Handle ChildrenChanged, StateChanged, PropertyChanged */
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
}
return canonical_display_name;
}
-/* TODO: Avoid having duplicate functions for this here and in at-spi2-atk */
-static DBusConnection *
-get_accessibility_bus ()
-{
- Atom AT_SPI_BUS;
- Atom actual_type;
- Display *bridge_display;
- int actual_format;
- unsigned char *data = NULL;
- unsigned long nitems;
- unsigned long leftover;
-
- DBusConnection *bus = NULL;
- DBusError error;
-
- bridge_display = XOpenDisplay (spi_display_name ());
- if (!bridge_display)
- {
- g_warning ("AT_SPI: Could not get the display\n");
- return NULL;
- }
-
- AT_SPI_BUS = XInternAtom (bridge_display, "AT_SPI_BUS", False);
- XGetWindowProperty (bridge_display,
- XDefaultRootWindow (bridge_display),
- AT_SPI_BUS, 0L,
- (long) BUFSIZ, False,
- (Atom) 31, &actual_type, &actual_format,
- &nitems, &leftover, &data);
-
- dbus_error_init (&error);
-
- if (data == NULL)
- {
- g_warning
- ("AT-SPI: Accessibility bus not found - Using session bus.\n");
- bus = dbus_bus_get (DBUS_BUS_SESSION, &error);
- if (!bus)
- {
- g_warning ("AT-SPI: Couldn't connect to bus: %s\n", error.message);
- return NULL;
- }
- }
- else
- {
- bus = dbus_connection_open (data, &error);
- if (!bus)
- {
- g_warning ("AT-SPI: Couldn't connect to bus: %s\n", error.message);
- return NULL;
- }
- else
- {
- if (!dbus_bus_register (bus, &error))
- {
- g_warning ("AT-SPI: Couldn't register with bus: %s\n", error.message);
- return NULL;
- }
- }
- }
-
- return bus;
-}
-
/**
* atspi_init:
*
{
DBusError error;
char *match;
- int i;
if (atspi_inited)
{
get_live_refs();
dbus_error_init (&error);
- bus = get_accessibility_bus ();
+ bus = atspi_get_a11y_bus ();
if (!bus)
- {
- g_error ("Couldn't get session bus");
return 2;
- }
dbus_bus_register (bus, &error);
dbus_connection_setup_with_g_main(bus, g_main_context_default());
dbus_connection_add_filter (bus, atspi_dbus_filter, NULL, NULL);
+ dbind_set_timeout (1000);
match = g_strdup_printf ("type='signal',interface='%s',member='AddAccessible'", atspi_interface_cache);
dbus_error_init (&error);
dbus_bus_add_match (bus, match, &error);
va_list args;
dbus_bool_t retval;
DBusError err;
- AtspiAccessible *accessible = ATSPI_ACCESSIBLE (obj);
+ AtspiObject *aobj = ATSPI_OBJECT (obj);
+
+ if (!aobj->app || !aobj->app->bus)
+ {
+ g_set_error_literal (error, ATSPI_ERROR, ATSPI_ERROR_APPLICATION_GONE,
+ _("The application no longer exists"));
+ return FALSE;
+ }
- dbus_error_init (&err);
va_start (args, type);
- retval = dbind_method_call_reentrant_va (_atspi_bus(), accessible->app->bus_name, accessible->path, interface, method, &err, type, args);
+ dbus_error_init (&err);
+ retval = dbind_method_call_reentrant_va (aobj->app->bus, aobj->app->bus_name,
+ aobj->path, interface, method, &err,
+ type, args);
va_end (args);
+ _atspi_process_deferred_messages ((gpointer)TRUE);
if (dbus_error_is_set (&err))
{
/* TODO: Set gerror */
}
DBusMessage *
-_atspi_dbus_call_partial (gpointer obj, const char *interface, const char *method, GError **error, const char *type, ...)
+_atspi_dbus_call_partial (gpointer obj,
+ const char *interface,
+ const char *method,
+ GError **error,
+ const char *type, ...)
{
- AtspiAccessible *accessible = ATSPI_ACCESSIBLE (obj);
va_list args;
- dbus_bool_t retval;
+
+ va_start (args, type);
+ return _atspi_dbus_call_partial_va (obj, interface, method, error, type, args);
+}
+
+DBusMessage *
+_atspi_dbus_call_partial_va (gpointer obj,
+ const char *interface,
+ const char *method,
+ GError **error,
+ const char *type,
+ va_list args)
+{
+ AtspiObject *aobj = ATSPI_OBJECT (obj);
DBusError err;
DBusMessage *msg = NULL, *reply = NULL;
DBusMessageIter iter;
const char *p;
dbus_error_init (&err);
- va_start (args, type);
- msg = dbus_message_new_method_call (accessible->app->bus_name, accessible->path, interface, method);
+ if (!aobj->app || !aobj->app->bus)
+ {
+ g_set_error_literal (error, ATSPI_ERROR, ATSPI_ERROR_APPLICATION_GONE,
+ _("The application no longer exists"));
+ goto out;
+ }
+
+ msg = dbus_message_new_method_call (aobj->app->bus_name, aobj->path, interface, method);
if (!msg)
goto out;
dbus_message_iter_init_append (msg, &iter);
dbind_any_marshal_va (&iter, &p, args);
- reply = dbind_send_and_allow_reentry (_atspi_bus(), msg, &err);
+ reply = dbind_send_and_allow_reentry (aobj->app->bus, msg, &err);
out:
va_end (args);
+ if (msg)
+ dbus_message_unref (msg);
+ _atspi_process_deferred_messages ((gpointer)TRUE);
if (dbus_error_is_set (&err))
{
/* TODO: Set gerror */
}
dbus_bool_t
-_atspi_dbus_get_property (AtspiAccessible *obj, const char *interface, const char *name, GError **error, const char *type, void *data)
+_atspi_dbus_get_property (gpointer obj, const char *interface, const char *name, GError **error, const char *type, void *data)
{
DBusMessage *message, *reply;
DBusMessageIter iter, iter_variant;
DBusError err;
dbus_bool_t retval = FALSE;
+ AtspiObject *aobj = ATSPI_OBJECT (obj);
- message = dbus_message_new_method_call (obj->app->bus_name, obj->path, "org.freedesktop.DBus.Properties", "Get");
+ if (!aobj)
+ return FALSE;
+
+ if (!aobj->app || !aobj->app->bus)
+ {
+ g_set_error_literal (error, ATSPI_ERROR, ATSPI_ERROR_APPLICATION_GONE,
+ _("The application no longer exists"));
+ return FALSE;
+ }
+
+ message = dbus_message_new_method_call (aobj->app->bus_name,
+ aobj->path,
+ "org.freedesktop.DBus.Properties",
+ "Get");
if (!message)
{
// TODO: throw exception
- goto done;
+ return FALSE;
}
dbus_message_append_args (message, DBUS_TYPE_STRING, &interface, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID);
dbus_error_init (&err);
- reply = dbus_connection_send_with_reply_and_block (_atspi_bus(), message, 1000, &err);
+ reply = dbind_send_and_allow_reentry (aobj->app->bus, message, &err);
dbus_message_unref (message);
+ _atspi_process_deferred_messages ((gpointer)TRUE);
if (!reply)
{
// TODO: throw exception
goto done;
}
+
+ if (dbus_message_get_type (reply) == DBUS_MESSAGE_TYPE_ERROR)
+ {
+ const char *err;
+ dbus_message_get_args (message, NULL, DBUS_TYPE_STRING, &err, DBUS_TYPE_INVALID);
+ if (err)
+ g_set_error_literal (error, ATSPI_ERROR, ATSPI_ERROR_IPC, err);
+ goto done;
+ }
+
dbus_message_iter_init (reply, &iter);
+ if (dbus_message_iter_get_arg_type (&iter) != 'v')
+ {
+ g_warning (_("AT-SPI: expected a variant when fetching %s from interface %s; got %s\n"), name, interface, dbus_message_get_signature (reply));
+ goto done;
+ }
dbus_message_iter_recurse (&iter, &iter_variant);
if (dbus_message_iter_get_arg_type (&iter_variant) != type[0])
{
- g_warning ("atspi_dbus_get_property: Wrong type: expected %s, got %c\n", type, dbus_message_iter_get_arg_type (&iter_variant));
+ g_warning (_("atspi_dbus_get_property: Wrong type: expected %s, got %c\n"), type, dbus_message_iter_get_arg_type (&iter_variant));
goto done;
}
- dbus_message_iter_get_basic (&iter_variant, data);
- dbus_message_unref (reply);
- if (type[0] == 's') *(char **)data = g_strdup (*(char **)data);
+ if (!strcmp (type, "(so)"))
+ {
+ *((AtspiAccessible **)data) = _atspi_dbus_return_accessible_from_iter (&iter_variant);
+ }
+ else
+ {
+ dbus_message_iter_get_basic (&iter_variant, data);
+ if (type [0] == 's')
+ *(char **)data = g_strdup (*(char **)data);
+ }
retval = TRUE;
done:
+ if (reply)
+ dbus_message_unref (reply);
return retval;
}
DBusMessage *
-_atspi_dbus_send_with_reply_and_block (DBusMessage *message)
+_atspi_dbus_send_with_reply_and_block (DBusMessage *message, GError **error)
{
DBusMessage *reply;
DBusError err;
+ AtspiApplication *app;
+ DBusConnection *bus;
+ app = get_application (dbus_message_get_destination (message));
+
+ if (app && !app->bus)
+ return NULL; /* will fail anyway; app has been disposed */
+
+ bus = (app ? app->bus : _atspi_bus());
dbus_error_init (&err);
- /* TODO: Write this function; allow reentrancy */
- reply = dbus_connection_send_with_reply_and_block (_atspi_bus(), message, 1000, &err);
+ reply = dbind_send_and_allow_reentry (bus, message, &err);
+ _atspi_process_deferred_messages ((gpointer)TRUE);
dbus_message_unref (message);
+ if (err.message)
+ {
+ if (error)
+ g_set_error_literal (error, ATSPI_ERROR, ATSPI_ERROR_IPC, err.message);
+ dbus_error_free (&err);
+ }
return reply;
}
GHashTable *
-_atspi_dbus_hash_from_message (DBusMessage *message)
+_atspi_dbus_return_hash_from_message (DBusMessage *message)
{
- GHashTable *hash = g_hash_table_new (g_str_hash, g_str_equal);
- DBusMessageIter iter, iter_array, iter_dict;
- const char *signature;
+ DBusMessageIter iter;
+ GHashTable *ret;
- signature = dbus_message_get_signature (message);
+ if (!message)
+ return NULL;
- if (strcmp (signature, "a{ss}") != 0)
- {
- g_warning ("Trying to get hash from message of unexpected type %s\n", signature);
- return NULL;
- }
+ _ATSPI_DBUS_CHECK_SIG (message, "a{ss}", NULL, NULL);
dbus_message_iter_init (message, &iter);
- dbus_message_iter_recurse (&iter, &iter_array);
+ ret = _atspi_dbus_hash_from_iter (&iter);
+ dbus_message_unref (message);
+ return ret;
+}
+
+GHashTable *
+_atspi_dbus_hash_from_iter (DBusMessageIter *iter)
+{
+ GHashTable *hash = g_hash_table_new (g_str_hash, g_str_equal);
+ DBusMessageIter iter_array, iter_dict;
+
+ dbus_message_iter_recurse (iter, &iter_array);
while (dbus_message_iter_get_arg_type (&iter_array) != DBUS_TYPE_INVALID)
{
const char *name, *value;
dbus_message_iter_recurse (&iter_array, &iter_dict);
dbus_message_iter_get_basic (&iter_dict, &name);
+ dbus_message_iter_next (&iter_dict);
dbus_message_iter_get_basic (&iter_dict, &value);
g_hash_table_insert (hash, g_strdup (name), g_strdup (value));
dbus_message_iter_next (&iter_array);
}
GArray *
-_atspi_dbus_attribute_array_from_message (DBusMessage *message)
+_atspi_dbus_return_attribute_array_from_message (DBusMessage *message)
{
- GArray *array = g_array_new (TRUE, TRUE, sizeof (gchar *));
- DBusMessageIter iter, iter_array, iter_dict;
- const char *signature;
- gint count = 0;
+ DBusMessageIter iter;
+ GArray *ret;
- signature = dbus_message_get_signature (message);
+ if (!message)
+ return NULL;
- if (strcmp (signature, "a{ss}") != 0)
- {
- g_warning ("Trying to get hash from message of unexpected type %s\n", signature);
- return NULL;
- }
+ _ATSPI_DBUS_CHECK_SIG (message, "a{ss}", NULL, NULL);
dbus_message_iter_init (message, &iter);
- dbus_message_iter_recurse (&iter, &iter_array);
+ ret = _atspi_dbus_attribute_array_from_iter (&iter);
+ dbus_message_unref (message);
+ return ret;
+}
+
+GArray *
+_atspi_dbus_attribute_array_from_iter (DBusMessageIter *iter)
+{
+ DBusMessageIter iter_array, iter_dict;
+ GArray *array = g_array_new (TRUE, TRUE, sizeof (gchar *));
+
+ dbus_message_iter_recurse (iter, &iter_array);
while (dbus_message_iter_get_arg_type (&iter_array) != DBUS_TYPE_INVALID)
{
const char *name, *value;
GArray *new_array;
dbus_message_iter_recurse (&iter_array, &iter_dict);
dbus_message_iter_get_basic (&iter_dict, &name);
+ dbus_message_iter_next (&iter_dict);
dbus_message_iter_get_basic (&iter_dict, &value);
- str = g_strdup_printf ("%s:;%s", name, value);
+ str = g_strdup_printf ("%s:%s", name, value);
new_array = g_array_append_val (array, str);
if (new_array)
array = new_array;
- dbus_message_iter_next (&iter);;
+ dbus_message_iter_next (&iter_array);;
}
return array;
}
+void
+_atspi_dbus_set_interfaces (AtspiAccessible *accessible, DBusMessageIter *iter)
+{
+ DBusMessageIter iter_array;
+
+ accessible->interfaces = 0;
+ dbus_message_iter_recurse (iter, &iter_array);
+ while (dbus_message_iter_get_arg_type (&iter_array) != DBUS_TYPE_INVALID)
+ {
+ const char *iface;
+ gint n;
+ dbus_message_iter_get_basic (&iter_array, &iface);
+ if (!strcmp (iface, "org.freedesktop.DBus.Introspectable")) continue;
+ n = _atspi_get_iface_num (iface);
+ if (n == -1)
+ {
+ g_warning (_("AT-SPI: Unknown interface %s"), iface);
+ }
+ else
+ accessible->interfaces |= (1 << n);
+ dbus_message_iter_next (&iter_array);
+ }
+ _atspi_accessible_add_cache (accessible, ATSPI_CACHE_INTERFACES);
+}
+
+void
+_atspi_dbus_set_state (AtspiAccessible *accessible, DBusMessageIter *iter)
+{
+ DBusMessageIter iter_array;
+ gint count;
+ dbus_uint32_t *states;
+
+ dbus_message_iter_recurse (iter, &iter_array);
+ dbus_message_iter_get_fixed_array (&iter_array, &states, &count);
+ if (count != 2)
+ {
+ g_warning (_("AT-SPI: expected 2 values in states array; got %d\n"), count);
+ if (!accessible->states)
+ accessible->states = _atspi_state_set_new_internal (accessible, 0);
+ }
+ else
+ {
+ guint64 val = ((guint64)states [1]) << 32;
+ val += states [0];
+ if (!accessible->states)
+ accessible->states = _atspi_state_set_new_internal (accessible, val);
+ else
+ accessible->states->states = val;
+ }
+ _atspi_accessible_add_cache (accessible, ATSPI_CACHE_STATES);
+}
+
+GQuark
+atspi_error_quark (void)
+{
+ return g_quark_from_static_string ("atspi_error");
+}
+
+/*
+ * Gets the IOR from the XDisplay.
+ */
+static char *
+get_accessibility_bus_address_x11 (void)
+{
+ Atom AT_SPI_BUS;
+ Atom actual_type;
+ Display *bridge_display;
+ int actual_format;
+ unsigned char *data = NULL;
+ unsigned long nitems;
+ unsigned long leftover;
+
+ bridge_display = XOpenDisplay (spi_display_name ());
+ if (!bridge_display)
+ {
+ g_warning ("Could not open X display");
+ return NULL;
+ }
+
+ AT_SPI_BUS = XInternAtom (bridge_display, "AT_SPI_BUS", False);
+ XGetWindowProperty (bridge_display,
+ XDefaultRootWindow (bridge_display),
+ AT_SPI_BUS, 0L,
+ (long) BUFSIZ, False,
+ (Atom) 31, &actual_type, &actual_format,
+ &nitems, &leftover, &data);
+ XCloseDisplay (bridge_display);
+
+ return g_strdup (data);
+}
+
+static char *
+get_accessibility_bus_address_dbus (void)
+{
+ DBusConnection *session_bus = NULL;
+ DBusMessage *message;
+ DBusMessage *reply;
+ char *address = NULL;
+
+ session_bus = dbus_bus_get (DBUS_BUS_SESSION, NULL);
+ if (!session_bus)
+ return NULL;
+
+ message = dbus_message_new_method_call ("org.a11y.Bus",
+ "/org/a11y/bus",
+ "org.a11y.Bus",
+ "GetAddress");
+
+ reply = dbus_connection_send_with_reply_and_block (session_bus,
+ message,
+ -1,
+ NULL);
+ dbus_message_unref (message);
+
+ if (!reply)
+ return NULL;
+
+ {
+ const char *tmp_address;
+ if (!dbus_message_get_args (reply,
+ NULL,
+ DBUS_TYPE_STRING,
+ &tmp_address,
+ DBUS_TYPE_INVALID))
+ {
+ dbus_message_unref (reply);
+ return NULL;
+ }
+ address = g_strdup (tmp_address);
+ dbus_message_unref (reply);
+ }
+
+ return address;
+}
+
+DBusConnection *
+atspi_get_a11y_bus (void)
+{
+ DBusConnection *bus = NULL;
+ DBusError error;
+ char *address;
+
+ address = get_accessibility_bus_address_x11 ();
+ if (!address)
+ address = get_accessibility_bus_address_dbus ();
+ if (!address)
+ return NULL;
+
+ dbus_error_init (&error);
+ bus = dbus_connection_open (address, &error);
+ if (!bus)
+ {
+ g_warning ("Couldn't connect to accessibility bus: %s", error.message);
+ return NULL;
+ }
+ else
+ {
+ if (!dbus_bus_register (bus, &error))
+ {
+ g_warning ("Couldn't register with accessibility bus: %s", error.message);
+ return NULL;
+ }
+ }
+
+ return bus;
+}
projects / platform / upstream / at-spi2-core.git / blobdiff