*
* 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;
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)
{
if (!app) return NULL;
app->bus_name = bus_name_dup;
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 = atspi_accessible_new (app, path);
if (!a)
return NULL;
- g_hash_table_insert (app->hash, a->parent.path, a);
+ g_hash_table_insert (app->hash, g_strdup (a->parent.path), a);
g_object_ref (a); /* for the hash */
return a;
}
hyperlink = atspi_hyperlink_new (app, path);
if (!hyperlink)
return NULL;
- g_hash_table_insert (app->hash, hyperlink->parent.path, hyperlink);
+ 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;
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)
return DBUS_HANDLER_RESULT_HANDLED;
- 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);
+ 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;
}
}
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;
_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)
{
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;
}
{
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;
}
else
{
- g_warning ("Atspi: Called _atspi_dbus_return_hyperlink_from_message with strange signature %s", signature);
+ g_warning (_("AT-SPI: Called _atspi_dbus_return_hyperlink_from_message with strange signature %s"), signature);
}
dbus_message_unref (message);
return retval;
{
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);
{
int type = dbus_message_get_type (closure->message);
const char *interface = dbus_message_get_interface (closure->message);
- const char *member = dbus_message_get_member (closure->message);
- dbus_uint32_t v;
- char *bus_name;
if (type == DBUS_MESSAGE_TYPE_SIGNAL &&
!strncmp (interface, "org.a11y.atspi.Event.", 21))
static int in_process_deferred_messages = 0;
if (in_process_deferred_messages)
- return;
+ return TRUE;
in_process_deferred_messages = 1;
while (deferred_messages != NULL)
{
{
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))
bridge_display = XOpenDisplay (spi_display_name ());
if (!bridge_display)
{
- g_warning ("AT_SPI: Could not get the display\n");
+ g_warning (_("AT-SPI: Could not get the display\n"));
return NULL;
}
(long) BUFSIZ, False,
(Atom) 31, &actual_type, &actual_format,
&nitems, &leftover, &data);
+ XCloseDisplay (bridge_display);
dbus_error_init (&error);
if (data == NULL)
{
g_warning
- ("AT-SPI: Accessibility bus not found - Using session bus.\n");
+ (_("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);
+ g_warning (_("AT-SPI: Couldn't connect to bus: %s\n"), error.message);
return NULL;
}
}
bus = dbus_connection_open (data, &error);
if (!bus)
{
- g_warning ("AT-SPI: Couldn't connect to bus: %s\n", error.message);
+ 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);
+ g_warning (_("AT-SPI: Couldn't register with bus: %s\n"), error.message);
return NULL;
}
}
{
DBusError error;
char *match;
- int i;
if (atspi_inited)
{
bus = get_accessibility_bus ();
if (!bus)
{
- g_error ("Couldn't get session bus");
+ g_warning ("Couldn't get session bus");
return 2;
}
dbus_bus_register (bus, &error);
DBusError err;
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;
+ }
+
va_start (args, type);
dbus_error_init (&err);
- retval = dbind_method_call_reentrant_va (_atspi_bus(), aobj->app->bus_name, aobj->path, interface, method, &err, type, args);
+ 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))
va_list args)
{
AtspiObject *aobj = ATSPI_OBJECT (obj);
- dbus_bool_t retval;
DBusError err;
DBusMessage *msg = NULL, *reply = NULL;
DBusMessageIter iter;
dbus_error_init (&err);
+ 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))
{
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",
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 = dbind_send_and_allow_reentry (_atspi_bus(), message, &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;
}
if (!strcmp (type, "(so)"))
else
{
dbus_message_iter_get_basic (&iter_variant, data);
- dbus_message_unref (reply);
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);
- reply = dbind_send_and_allow_reentry (_atspi_bus(), message, &err);
+ reply = dbind_send_and_allow_reentry (bus, message, &err);
_atspi_process_deferred_messages ((gpointer)TRUE);
dbus_message_unref (message);
if (err.message)
- g_warning ("Atspi: Got error: %s\n", 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)
{
DBusMessageIter iter;
+ GHashTable *ret;
- _ATSPI_DBUS_CHECK_SIG (message, "a{ss}", NULL);
+ if (!message)
+ return NULL;
+
+ _ATSPI_DBUS_CHECK_SIG (message, "a{ss}", NULL, NULL);
dbus_message_iter_init (message, &iter);
- return _atspi_dbus_hash_from_iter (&iter);
+ ret = _atspi_dbus_hash_from_iter (&iter);
+ dbus_message_unref (message);
+ return ret;
}
GHashTable *
}
GArray *
-_atspi_dbus_attribute_array_from_message (DBusMessage *message)
+_atspi_dbus_return_attribute_array_from_message (DBusMessage *message)
{
DBusMessageIter iter;
+ GArray *ret;
+
+ if (!message)
+ return NULL;
- _ATSPI_DBUS_CHECK_SIG (message, "a{ss}", NULL);
+ _ATSPI_DBUS_CHECK_SIG (message, "a{ss}", NULL, NULL);
dbus_message_iter_init (message, &iter);
- return _atspi_dbus_attribute_array_from_iter (&iter);
+ ret = _atspi_dbus_attribute_array_from_iter (&iter);
+ dbus_message_unref (message);
+ return ret;
}
GArray *
{
DBusMessageIter iter_array, iter_dict;
GArray *array = g_array_new (TRUE, TRUE, sizeof (gchar *));
- gint count = 0;
dbus_message_iter_recurse (iter, &iter_array);
while (dbus_message_iter_get_arg_type (&iter_array) != DBUS_TYPE_INVALID)
n = _atspi_get_iface_num (iface);
if (n == -1)
{
- g_warning ("at-spi: Unknown interface %s", iface);
+ g_warning (_("AT-SPI: Unknown interface %s"), iface);
}
else
accessible->interfaces |= (1 << n);
dbus_message_iter_next (&iter_array);
}
- accessible->cached_properties |= ATSPI_CACHE_INTERFACES;
+ _atspi_accessible_add_cache (accessible, ATSPI_CACHE_INTERFACES);
}
void
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);
+ 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
accessible->states->states = val;
}
- accessible->cached_properties |= ATSPI_CACHE_STATES;
+ _atspi_accessible_add_cache (accessible, ATSPI_CACHE_STATES);
}
+
+GQuark
+atspi_error_quark (void)
+{
+ return g_quark_from_static_string ("atspi_error");
+}
+
projects / platform / upstream / at-spi2-core.git / blobdiff