#include <stdio.h>
#include <stdarg.h>
#include <string.h>
+#include<sys/stat.h>
#include <atk/atk.h>
#include <droute/droute.h>
+#include <gmodule.h>
#include "bridge.h"
#include "event.h"
#include "common/spi-dbus.h"
-/*
- * Provides the path for the introspection directory.
- */
-#if !defined ATSPI_INTROSPECTION_PATH
-#error "No introspection XML directory defined"
-#endif
-
/*---------------------------------------------------------------------------*/
SpiBridge *spi_global_app_data = NULL;
bridge_display = XOpenDisplay (spi_display_name ());
if (!bridge_display)
- g_error ("AT_SPI: Could not get the display\n");
+ {
+ 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,
("AT-SPI: Accessibility bus not found - Using session bus.\n");
bus = dbus_bus_get (DBUS_BUS_SESSION, &error);
if (!bus)
- g_error ("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
{
bus = dbus_connection_open (data, &error);
if (!bus)
{
- g_error ("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_error ("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;
+ }
}
}
return bus;
}
+static void
+set_reply (DBusPendingCall *pending, void *user_data)
+{
+ void **replyptr = (void **)user_data;
+
+ *replyptr = dbus_pending_call_steal_reply (pending);
+}
+
/*---------------------------------------------------------------------------*/
static void
+add_event (const char *bus_name, const char *event)
+{
+ event_data *evdata;
+ gchar **data;
+ GList *new_list;
+
+ evdata = (event_data *) g_malloc (sizeof (*evdata));
+ if (!evdata)
+ return;
+ data = g_strsplit (event, ":", 3);
+ if (!data)
+ {
+ g_free (evdata);
+ return;
+ }
+ evdata->bus_name = g_strdup (bus_name);
+ evdata->data = data;
+ new_list = g_list_append (spi_global_app_data->events, evdata);
+ if (new_list)
+ spi_global_app_data->events = new_list;
+}
+
+static void
+get_registered_event_listeners (SpiBridge *app)
+{
+ DBusMessage *message, *reply;
+ DBusMessageIter iter, iter_array, iter_struct;
+
+ message = dbus_message_new_method_call (SPI_DBUS_NAME_REGISTRY,
+ SPI_DBUS_PATH_REGISTRY,
+ SPI_DBUS_INTERFACE_REGISTRY,
+ "GetRegisteredEvents");
+ spi_global_app_data->events_initialized = TRUE;
+ if (!message)
+ return;
+
+ reply = dbus_connection_send_with_reply_and_block (app->bus, message, 5000, NULL);
+ dbus_message_unref (message);
+ if (!reply)
+ return;
+ if (strcmp (dbus_message_get_signature (reply), "a(ss)") != 0)
+ {
+ /* TODO: Add a warning when it's okay to add strings */
+ dbus_message_unref (reply);
+ return;
+ }
+ dbus_message_iter_init (reply, &iter);
+ dbus_message_iter_recurse (&iter, &iter_array);
+ /* TODO: This is bad. Need to determine that the array is non-empty,
+ so that we don't initially read a value rom it in that case, but using
+ a deprecated function. */
+ if (dbus_message_iter_get_array_len (&iter_array) > 0) do
+ {
+ char *bus_name, *event;
+ dbus_message_iter_recurse (&iter_array, &iter_struct);
+ dbus_message_iter_get_basic (&iter_struct, &bus_name);
+ dbus_message_iter_next (&iter_struct);
+ dbus_message_iter_get_basic (&iter_struct, &event);
+ add_event (bus_name, event);
+ }
+ while (dbus_message_iter_next (&iter_array));
+ dbus_message_unref (reply);
+}
+
+static void
+register_reply (DBusPendingCall *pending, void *user_data)
+{
+ DBusMessage *reply;
+ SpiBridge *app = user_data;
+ DBusMessage *message;
+
+ reply = dbus_pending_call_steal_reply (pending);
+ if (reply)
+ {
+ gchar *app_name, *obj_path;
+
+ if (strcmp (dbus_message_get_signature (reply), "(so)") != 0)
+ {
+ g_warning ("AT-SPI: Could not obtain desktop path or name\n");
+ }
+ else
+ {
+ DBusMessageIter iter, iter_struct;
+ dbus_message_iter_init (reply, &iter);
+ dbus_message_iter_recurse (&iter, &iter_struct);
+ dbus_message_iter_get_basic (&iter_struct, &app_name);
+ dbus_message_iter_next (&iter_struct);
+ dbus_message_iter_get_basic (&iter_struct, &obj_path);
+
+ app->desktop_name = g_strdup (app_name);
+ app->desktop_path = g_strdup (obj_path);
+ }
+ }
+ else
+ {
+ g_warning ("AT-SPI: Could not embed inside desktop");
+ return;
+ }
+ dbus_message_unref (reply);
+
+ get_registered_event_listeners (spi_global_app_data);
+}
+
+static gboolean
register_application (SpiBridge * app)
{
DBusMessage *message, *reply;
DBusMessageIter iter;
DBusError error;
+ DBusPendingCall *pending;
+ const int max_addr_length = 128; /* should be long enough */
dbus_error_init (&error);
+ /* These will be overridden when we get a reply, but in practice these
+ defaults should always be correct */
+ app->desktop_name = SPI_DBUS_NAME_REGISTRY;
+ app->desktop_path = SPI_DBUS_PATH_ROOT;
+
message = dbus_message_new_method_call (SPI_DBUS_NAME_REGISTRY,
SPI_DBUS_PATH_ROOT,
SPI_DBUS_INTERFACE_SOCKET,
dbus_message_iter_init_append (message, &iter);
spi_object_append_reference (&iter, app->root);
+
+ if (!dbus_connection_send_with_reply (app->bus, message, &pending, -1))
+ {
+ return FALSE;
+ }
- reply = dbus_connection_send_with_reply_and_block (app->bus, message, -1, &error);
+ dbus_pending_call_set_notify (pending, register_reply, app, NULL);
if (message)
dbus_message_unref (message);
- if (reply)
- {
- DBusMessageIter iter, iter_struct;
- gchar *app_name, *obj_path;
-
- dbus_message_iter_init (reply, &iter);
- dbus_message_iter_recurse (&iter, &iter_struct);
- if (!(dbus_message_iter_get_arg_type (&iter_struct) == DBUS_TYPE_STRING))
- g_error ("AT-SPI: Could not obtain desktop path or name\n");
- dbus_message_iter_get_basic (&iter_struct, &app_name);
- if (!dbus_message_iter_next (&iter_struct))
- g_error ("AT-SPI: Could not obtain desktop name");
- if (!(dbus_message_iter_get_arg_type (&iter_struct) == DBUS_TYPE_OBJECT_PATH))
- g_error ("AT-SPI: Could not obtain desktop path");
- dbus_message_iter_get_basic (&iter_struct, &obj_path);
-
- app->desktop_name = g_strdup (app_name);
- app->desktop_path = g_strdup (obj_path);
- }
- else
- {
- g_error ("AT-SPI: Could not embed inside desktop: %s\n", error.message);
- }
+/* could this be better, we accept some amount of race in getting the temp name*/
+/* make sure the directory exists */
+mkdir("/tmp/at-spi2/", S_IRWXU);
+app->app_bus_addr = g_malloc(max_addr_length * sizeof(char));
+#ifndef DISABLE_P2P
+sprintf(app->app_bus_addr, "unix:path=/tmp/at-spi2/socket-%d-%d", getpid(),
+rand());
+#endif
+ return TRUE;
}
/*---------------------------------------------------------------------------*/
/*---------------------------------------------------------------------------*/
-#ifdef SPI_ATK_PLUG_SOCKET
static AtkPlugClass *plug_class;
static AtkSocketClass *socket_class;
return g_string_free (str, FALSE);
}
+AtkStateSet *
+socket_ref_state_set (AtkObject *accessible)
+{
+ char *child_name, *child_path;
+ AtkSocket *socket = ATK_SOCKET (accessible);
+ int count = 0;
+ int j;
+ int v;
+ DBusMessage *message, *reply;
+ DBusMessageIter iter, iter_array;
+ AtkStateSet *set;
+
+ if (!socket->embedded_plug_id)
+ return NULL;
+
+ child_name = g_strdup (socket->embedded_plug_id);
+ if (!child_name)
+ return NULL;
+ child_path = g_utf8_strchr (child_name + 1, -1, ':');
+ if (!child_path)
+ {
+ g_free (child_name);
+ return NULL;
+ }
+ *(child_path++) = '\0';
+ message = dbus_message_new_method_call (child_name, child_path, SPI_DBUS_INTERFACE_ACCESSIBLE, "GetState");
+ g_free (child_name);
+ reply = dbus_connection_send_with_reply_and_block (spi_global_app_data->bus, message, 1, NULL);
+ dbus_message_unref (message);
+ if (reply == NULL)
+ return NULL;
+ if (strcmp (dbus_message_get_signature (reply), "au") != 0)
+ {
+ dbus_message_unref (reply);
+ return NULL;
+ }
+ set = atk_state_set_new ();
+ if (!set)
+ return NULL;
+ dbus_message_iter_init (reply, &iter);
+ dbus_message_iter_recurse (&iter, &iter_array);
+ do
+ {
+ dbus_message_iter_get_basic (&iter_array, &v);
+ for (j = 0; j < 32; j++)
+ {
+ if (v & (1 << j))
+ {
+ AtkState state = spi_atk_state_from_spi_state ((count << 5) + j);
+ atk_state_set_add_state (set, state);
+ }
+ }
+ count++;
+ }
+ while (dbus_message_iter_next (&iter_array));
+ dbus_message_unref (reply);
+ return set;
+}
+
static void
socket_embed_hook (AtkSocket * socket, gchar * plug_id)
{
AtkObject *accessible = ATK_OBJECT(socket);
gchar *plug_name, *plug_path;
+ AtkObjectClass *klass;
/* Force registration */
gchar *path = spi_register_object_to_path (spi_global_register, G_OBJECT (accessible));
{
DBusMessage *message;
*(plug_path++) = '\0';
- message = dbus_message_new_method_call (plug_name, plug_path, "org.freedesktop.atspi.Accessible", "Embedded");
+ message = dbus_message_new_method_call (plug_name, plug_path, SPI_DBUS_INTERFACE_SOCKET, "Embedded");
dbus_message_append_args (message, DBUS_TYPE_STRING, &path, DBUS_TYPE_INVALID);
dbus_connection_send (spi_global_app_data->bus, message, NULL);
}
g_free (plug_name);
g_free (path);
+
+ klass = ATK_OBJECT_GET_CLASS (accessible);
+ klass->ref_state_set = socket_ref_state_set;
}
static void
plug_class->get_object_id = get_plug_id;
socket_class->embed = socket_embed_hook;
}
+
+static void
+new_connection_cb (DBusServer *server, DBusConnection *con, void *data)
+{
+ GList *new_list;
+
+ dbus_connection_ref(con);
+ dbus_connection_setup_with_g_main(con, NULL);
+ droute_intercept_dbus (con);
+ droute_context_register (spi_global_app_data->droute, con);
+
+ new_list = g_list_append (spi_global_app_data->direct_connections, con);
+ if (new_list)
+ spi_global_app_data->direct_connections = new_list;
+}
+
+static int
+setup_bus (void)
+{
+#ifndef DISABLE_P2P
+ DBusServer *server;
+ DBusError err;
+
+ dbus_error_init(&err);
+ server = dbus_server_listen(spi_global_app_data->app_bus_addr, &err);
+
+ /* is there a better way to handle this */
+ if (server == NULL)
+ return -1;
+
+ dbus_server_setup_with_g_main(server, NULL);
+ dbus_server_set_new_connection_function(server, new_connection_cb, NULL, NULL);
+
+ spi_global_app_data->server = server;
#endif
+ return 0;
+}
+
+
gchar *atspi_dbus_name = NULL;
static gboolean atspi_no_register = FALSE;
{NULL}
};
+static gchar *
+introspect_children_cb (const char *path, void *data)
+{
+ if (!strcmp (path, "/org/a11y/atspi/accessible"))
+ {
+ return g_strdup ("<node name=\"root\"/>\n");
+ /* TODO: Should we place the whole hierarchy here? */
+ }
+ return NULL;
+}
+
+static void
+handle_event_listener_registered (DBusConnection *bus, DBusMessage *message,
+ void *user_data)
+{
+ const char *name;
+ char *sender;
+
+ if (!dbus_message_get_args (message, NULL, DBUS_TYPE_STRING, &sender,
+ DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID))
+ return;
+
+ add_event (sender, name);
+}
+
+static void
+remove_events (const char *bus_name, const char *event)
+{
+ event_data *evdata;
+ gchar **remove_data;
+ GList *list;
+
+ remove_data = g_strsplit (event, ":", 3);
+ if (!remove_data)
+ {
+ return;
+ }
+
+ for (list = spi_global_app_data->events; list;)
+ {
+ event_data *evdata = list->data;
+ if (!g_strcmp0 (evdata->bus_name, bus_name) &&
+ spi_event_is_subtype (evdata->data, remove_data))
+ {
+ GList *events = spi_global_app_data->events;
+ list = list->next;
+ g_strfreev (evdata->data);
+ g_free (evdata->bus_name);
+ g_free (evdata);
+ spi_global_app_data->events = g_list_remove (events, evdata);
+ }
+ else
+ {
+ list = list->next;
+ }
+ }
+}
+
+static void
+handle_event_listener_deregistered (DBusConnection *bus, DBusMessage *message,
+ void *user_data)
+{
+ const char *orig_name;
+ gchar *name;
+ char *sender;
+
+ if (!dbus_message_get_args (message, NULL, DBUS_TYPE_STRING, &sender,
+ DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID))
+ return;
+
+ remove_events (sender, name);
+}
+
+static DBusHandlerResult
+signal_filter (DBusConnection *bus, DBusMessage *message, void *user_data)
+{
+ const char *interface = dbus_message_get_interface (message);
+ const char *member = dbus_message_get_member (message);
+ DBusHandlerResult result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+
+ if (dbus_message_get_type (message) != DBUS_MESSAGE_TYPE_SIGNAL)
+ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+
+ if (!strcmp (interface, SPI_DBUS_INTERFACE_REGISTRY))
+ {
+ result = DBUS_HANDLER_RESULT_HANDLED;
+ if (!strcmp (member, "EventListenerRegistered"))
+ handle_event_listener_registered (bus, message, user_data);
+ else if (!strcmp (member, "EventListenerDeregistered"))
+ handle_event_listener_deregistered (bus, message, user_data);
+ else
+ result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+ }
+ return result;
+}
+
/*
* spi_app_init
*
*
* - DRoute for routing message to their accessible objects.
* - Event handlers for emmitting signals on specific ATK events.
+ * - setup the bus for p2p communication
* - Application registration with the AT-SPI registry.
*
*/
GOptionContext *opt;
GError *err = NULL;
DBusError error;
- DBusConnection *bus;
AtkObject *root;
gchar *introspection_directory;
static gboolean inited = FALSE;
DRoutePath *treepath, *accpath;
root = atk_get_root ();
- g_return_val_if_fail (root, 0);
+ g_warn_if_fail (root);
+ if (!root)
+ {
+ inited = FALSE;
+ return -1;
+ }
/* Parse command line options */
opt = g_option_context_new (NULL);
{
g_free (spi_global_app_data);
spi_global_app_data = NULL;
- return 0;
+ inited = FALSE;
+ return -1;
}
if (atspi_dbus_name != NULL)
}
}
- dbus_connection_setup_with_g_main (spi_global_app_data->bus,
- g_main_context_default ());
+ spi_global_app_data->main_context = g_main_context_new ();
+
+ dbus_connection_setup_with_g_main (spi_global_app_data->bus, NULL);
+
+ /* Hook our plug-and socket functions */
+ install_plug_hooks ();
/*
* Create the leasing, register and cache objects.
spi_global_leasing = g_object_new (SPI_LEASING_TYPE, NULL);
spi_global_cache = g_object_new (SPI_CACHE_TYPE, NULL);
- /* Get D-Bus introspection directory */
- introspection_directory = (char *) g_getenv ("ATSPI_INTROSPECTION_PATH");
- if (introspection_directory == NULL)
- introspection_directory = ATSPI_INTROSPECTION_PATH;
-
/* Register droute for routing AT-SPI messages */
spi_global_app_data->droute =
- droute_new (spi_global_app_data->bus, introspection_directory);
+ droute_new ();
treepath = droute_add_one (spi_global_app_data->droute,
- "/org/at_spi/cache", spi_global_cache);
+ "/org/a11y/atspi/cache", spi_global_cache);
+
+ if (!treepath)
+ {
+ g_warning ("atk-bridge: Error in droute_add_one(). Already running?");
+ return -1;
+ }
accpath = droute_add_many (spi_global_app_data->droute,
- "/org/freedesktop/atspi/accessible",
+ "/org/a11y/atspi/accessible",
+ NULL,
+ introspect_children_cb,
NULL,
(DRouteGetDatumFunction)
spi_global_register_path_to_object);
spi_initialize_hypertext (accpath);
spi_initialize_image (accpath);
spi_initialize_selection (accpath);
+ spi_initialize_socket (accpath);
spi_initialize_table (accpath);
spi_initialize_text (accpath);
spi_initialize_value (accpath);
+ droute_context_register (spi_global_app_data->droute,
+ spi_global_app_data->bus);
+
/* Register methods to send D-Bus signals on certain ATK events */
spi_atk_register_event_listeners ();
-#ifdef SPI_ATK_PLUG_SOCKET
- /* Hook our plug-and socket functions */
- install_plug_hooks ();
-#endif
+ /* Set up filter and match rules to catch signals */
+ dbus_bus_add_match (spi_global_app_data->bus, "type='signal', interface='org.a11y.atspi.Registry', sender='org.a11y.atspi.Registry'", NULL);
+ dbus_connection_add_filter (spi_global_app_data->bus, signal_filter, NULL,
+ NULL);
/* Register this app by sending a signal out to AT-SPI registry daemon */
- if (!atspi_no_register)
+ if (!atspi_no_register && (!root || !ATK_IS_PLUG (root)))
register_application (spi_global_app_data);
+ else
+ get_registered_event_listeners (spi_global_app_data);
+
+ setup_bus();
g_atexit (exit_func);
return 0;
}
+gchar*
+g_module_check_init (GModule *module)
+{
+ g_module_make_resident (module);
+
+ return NULL;
+}
+
void
gnome_accessibility_module_init (void)
{
projects / platform / core / uifw / at-spi2-atk.git / blobdiff