X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git;a=blobdiff_plain;f=atk-adaptor%2Fbridge.c;h=a66f0e26fbc2de90025322a5c4fdf6272a35c0bf;hp=b283506c7f7fffddfe87c53bf6e45b5797f025fb;hb=5431ebbe7f471a01014236100ec803631dc3941b;hpb=5713a8e46559b6de9fbf5fc3e073d0d482d8c7e1 diff --git a/atk-adaptor/bridge.c b/atk-adaptor/bridge.c index b283506..a66f0e2 100644 --- a/atk-adaptor/bridge.c +++ b/atk-adaptor/bridge.c @@ -22,175 +22,285 @@ * Boston, MA 02111-1307, USA. */ +#define _GNU_SOURCE #include "config.h" -#include "dbus/dbus-glib-lowlevel.h" -#include -#include #include #include #include #include #include +#include #include #include +#include +#include #include "bridge.h" #include "event.h" #include "adaptors.h" +#include "object.h" +#include "accessible-stateset.h" #include "accessible-register.h" #include "accessible-leasing.h" #include "accessible-cache.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 +#include "spi-dbus.h" /*---------------------------------------------------------------------------*/ -SpiBridge *spi_global_app_data = NULL; +static DBusHandlerResult +signal_filter (DBusConnection *bus, DBusMessage *message, void *user_data); -static const AtkMisc *atk_misc = NULL; +SpiBridge *spi_global_app_data = NULL; -/*static Display *bridge_display = NULL;*/ +static gboolean inited = FALSE; /*---------------------------------------------------------------------------*/ -/* - * Returns a 'canonicalized' value for DISPLAY, - * with the screen number stripped off if present. - * - */ -static const gchar * -spi_display_name (void) +static void +add_event (const char *bus_name, const char *event) { - static const char *canonical_display_name = NULL; - if (!canonical_display_name) + event_data *evdata; + gchar **data; + + spi_atk_add_client (bus_name); + evdata = (event_data *) g_malloc (sizeof (*evdata)); + if (!evdata) + return; + data = g_strsplit (event, ":", 3); + if (!data) { - const gchar *display_env = g_getenv ("AT_SPI_DISPLAY"); - if (!display_env) - { - display_env = g_getenv ("DISPLAY"); - if (!display_env || !display_env[0]) - canonical_display_name = ":0"; - else - { - gchar *display_p, *screen_p; - canonical_display_name = g_strdup (display_env); - display_p = strrchr (canonical_display_name, ':'); - screen_p = strrchr (canonical_display_name, '.'); - if (screen_p && display_p && (screen_p > display_p)) - { - *screen_p = '\0'; - } - } - } - else - { - canonical_display_name = display_env; - } + g_free (evdata); + return; } - return canonical_display_name; + evdata->bus_name = g_strdup (bus_name); + evdata->data = data; + spi_global_app_data->events = g_list_append (spi_global_app_data->events, evdata); } -/*---------------------------------------------------------------------------*/ +static GSList *clients = NULL; -/* - * Gets the IOR from the XDisplay. - * Not currently used in D-Bus version, but something similar - * may be employed in the future for accessing the registry daemon - * bus name. - */ +static void +tally_event_reply () +{ + static int replies_received = 0; + + replies_received++; + if (replies_received == 3) + { + if (!clients) + spi_atk_deregister_event_listeners (); + spi_global_app_data->events_initialized = TRUE; + } +} -static DBusConnection * -spi_atk_bridge_get_bus (void) +static void +get_events_reply (DBusPendingCall *pending, void *user_data) { - 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; + DBusMessage *reply = dbus_pending_call_steal_reply (pending); + DBusMessageIter iter, iter_array, iter_struct; - bridge_display = XOpenDisplay (spi_display_name ()); - if (!bridge_display) - g_error ("AT_SPI: Could not get the display\n"); + if (!reply) + goto done; - 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); + if (strcmp (dbus_message_get_signature (reply), "a(ss)") != 0) + { + g_warning ("atk-bridge: GetRegisteredEvents returned message with unknown signature"); + goto done; + } - dbus_error_init (&error); + 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) + { + 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); + dbus_message_iter_next (&iter_array); + } + +done: + if (reply) + dbus_message_unref (reply); + if (pending) + dbus_pending_call_unref (pending); + + tally_event_reply (); +} + +static void +get_device_events_reply (DBusPendingCall *pending, void *user_data) +{ + DBusMessage *reply = dbus_pending_call_steal_reply (pending); + DBusMessageIter iter, iter_array, iter_struct; + + if (!reply) + goto done; - if (data == NULL) + if (strncmp (dbus_message_get_signature (reply), "a(s", 3) != 0) { - g_warning - ("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 ("atk-bridge: get_device_events_reply: unknown signature"); + goto done; } - else + + 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) + { + char *bus_name; + dbus_message_iter_recurse (&iter_array, &iter_struct); + dbus_message_iter_get_basic (&iter_struct, &bus_name); + spi_atk_add_client (bus_name); + dbus_message_iter_next (&iter_array); + } + +done: + if (reply) + dbus_message_unref (reply); + if (pending) + dbus_pending_call_unref (pending); + + tally_event_reply (); +} + +static void +get_registered_event_listeners (SpiBridge *app) +{ + DBusMessage *message; + DBusPendingCall *pending = NULL; + + message = dbus_message_new_method_call (SPI_DBUS_NAME_REGISTRY, + ATSPI_DBUS_PATH_REGISTRY, + ATSPI_DBUS_INTERFACE_REGISTRY, + "GetRegisteredEvents"); + if (!message) + return; + + dbus_connection_send_with_reply (app->bus, message, &pending, -1); + dbus_message_unref (message); + if (!pending) + { + spi_global_app_data->events_initialized = TRUE; + return; + } + dbus_pending_call_set_notify (pending, get_events_reply, NULL, NULL); + + message = dbus_message_new_method_call (SPI_DBUS_NAME_REGISTRY, + ATSPI_DBUS_PATH_DEC, + ATSPI_DBUS_INTERFACE_DEC, + "GetKeystrokeListeners"); + if (!message) + return; + pending = NULL; + dbus_connection_send_with_reply (app->bus, message, &pending, -1); + dbus_message_unref (message); + if (!pending) { - bus = dbus_connection_open (data, &error); - if (!bus) + spi_global_app_data->events_initialized = TRUE; + return; + } + dbus_pending_call_set_notify (pending, get_device_events_reply, NULL, NULL); + + message = dbus_message_new_method_call (SPI_DBUS_NAME_REGISTRY, + ATSPI_DBUS_PATH_DEC, + ATSPI_DBUS_INTERFACE_DEC, + "GetDeviceEventListeners"); + if (!message) + return; + pending = NULL; + dbus_connection_send_with_reply (app->bus, message, &pending, -1); + dbus_message_unref (message); + if (!pending) + { + spi_global_app_data->events_initialized = TRUE; + return; + } + dbus_pending_call_set_notify (pending, get_device_events_reply, NULL, NULL); +} + +static void +register_reply (DBusPendingCall *pending, void *user_data) +{ + DBusMessage *reply; + SpiBridge *app = user_data; + + reply = dbus_pending_call_steal_reply (pending); + dbus_pending_call_unref (pending); + if (reply) + { + gchar *app_name, *obj_path; + + if (strcmp (dbus_message_get_signature (reply), "(so)") != 0) { - g_error ("AT-SPI: Couldn't connect to bus: %s\n", error.message); + g_warning ("AT-SPI: Could not obtain desktop path or name\n"); } else { - if (!dbus_bus_register (bus, &error)) - g_error ("AT-SPI: Couldn't register with bus: %s\n", error.message); + 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); + + g_free (app->desktop_name); + app->desktop_name = g_strdup (app_name); + g_free (app->desktop_path); + app->desktop_path = g_strdup (obj_path); } } + else + { + g_warning ("AT-SPI: Could not embed inside desktop"); + return; + } + dbus_message_unref (reply); - return bus; + get_registered_event_listeners (spi_global_app_data); } -/*---------------------------------------------------------------------------*/ - -static void +static gboolean register_application (SpiBridge * app) { DBusMessage *message; DBusMessageIter iter; DBusError error; - const char *uname = NULL; + DBusPendingCall *pending; 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 = g_strdup (ATSPI_DBUS_NAME_REGISTRY); + app->desktop_path = g_strdup (ATSPI_DBUS_PATH_ROOT); + message = dbus_message_new_method_call (SPI_DBUS_NAME_REGISTRY, - SPI_DBUS_PATH_REGISTRY, - SPI_DBUS_INTERFACE_REGISTRY, - "RegisterApplication"); - dbus_message_set_no_reply (message, TRUE); + ATSPI_DBUS_PATH_ROOT, + ATSPI_DBUS_INTERFACE_SOCKET, + "Embed"); - uname = dbus_bus_get_unique_name (app->bus); - if (!uname) + 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) + || !pending) { - g_error ("AT-SPI: Couldn't get unique name for this connection"); + dbus_message_unref (message); + return FALSE; } - dbus_message_iter_init_append (message, &iter); - dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &uname); - dbus_connection_send (app->bus, message, NULL); + dbus_pending_call_set_notify (pending, register_reply, app, NULL); + if (message) dbus_message_unref (message); + + return TRUE; } /*---------------------------------------------------------------------------*/ @@ -206,8 +316,8 @@ deregister_application (SpiBridge * app) dbus_error_init (&error); message = dbus_message_new_method_call (SPI_DBUS_NAME_REGISTRY, - SPI_DBUS_PATH_REGISTRY, - SPI_DBUS_INTERFACE_REGISTRY, + ATSPI_DBUS_PATH_REGISTRY, + ATSPI_DBUS_INTERFACE_REGISTRY, "DeregisterApplication"); dbus_message_set_no_reply (message, TRUE); @@ -218,35 +328,31 @@ deregister_application (SpiBridge * app) dbus_connection_send (app->bus, message, NULL); if (message) dbus_message_unref (message); + + if (app->app_bus_addr) + { + unlink (app->app_bus_addr); + g_free (app->app_bus_addr); + app->app_bus_addr = NULL; + } + + if (app->app_tmp_dir) + { + rmdir (app->app_tmp_dir); + g_free (app->app_tmp_dir); + app->app_tmp_dir = NULL; + } + + g_free (app->desktop_name); + app->desktop_name = NULL; + g_free (app->desktop_path); + app->desktop_path = NULL; } /*---------------------------------------------------------------------------*/ -static void -exit_func (void) -{ - if (!spi_global_app_data) - { - return; - } - - spi_atk_tidy_windows (); - spi_atk_deregister_event_listeners (); - deregister_application (spi_global_app_data); - - g_free (spi_global_app_data); - spi_global_app_data = NULL; - - /* Not currently creating an XDisplay */ -#if 0 - if (bridge_display) - XCloseDisplay (bridge_display); -#endif -} - /*---------------------------------------------------------------------------*/ -#ifdef __ATK_PLUG_H__ static AtkPlugClass *plug_class; static AtkSocketClass *socket_class; @@ -257,21 +363,80 @@ get_plug_id (AtkPlug * plug) gchar *path; GString *str = g_string_new (NULL); - path = atk_dbus_object_to_path (ATK_OBJECT (plug), TRUE); + path = spi_register_object_to_path (spi_global_register, G_OBJECT (plug)); g_string_printf (str, "%s:%s", uname, path); g_free (path); 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; + + set = atk_state_set_new (); + + if (!socket->embedded_plug_id) + return set; + + child_name = g_strdup (socket->embedded_plug_id); + if (!child_name) + return set; + child_path = g_utf8_strchr (child_name + 1, -1, ':'); + if (!child_path) + { + g_free (child_name); + return set; + } + *(child_path++) = '\0'; + message = dbus_message_new_method_call (child_name, child_path, ATSPI_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 set; + if (strcmp (dbus_message_get_signature (reply), "au") != 0) + { + dbus_message_unref (reply); + return set; + } + + 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 = atk_dbus_object_to_path (accessible, TRUE); - spi_emit_cache_update (accessible, atk_adaptor_app_data->bus); + gchar *path = spi_register_object_to_path (spi_global_register, G_OBJECT (accessible)); /* Let the plug know that it has been embedded */ plug_name = g_strdup (plug_id); if (!plug_name) @@ -284,12 +449,15 @@ socket_embed_hook (AtkSocket * socket, gchar * plug_id) { 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, ATSPI_DBUS_INTERFACE_SOCKET, "Embedded"); dbus_message_append_args (message, DBUS_TYPE_STRING, &path, DBUS_TYPE_INVALID); - dbus_connection_send (atk_adaptor_app_data->bus, message, NULL); + 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 @@ -304,7 +472,61 @@ install_plug_hooks () plug_class->get_object_id = get_plug_id; socket_class->embed = socket_embed_hook; } -#endif + +static guint +get_ancestral_uid (guint pid) +{ + FILE *fp; + char buf [80]; + int ppid = 0; + int uid = 0; + gboolean got_ppid = 0; + gboolean got_uid = 0; + + sprintf (buf, "/proc/%d/status", pid); + fp = fopen (buf, "r"); + if (!fp) + return 0; + while ((!got_ppid || !got_uid) && fgets (buf, sizeof (buf), fp)) + { + if (sscanf (buf, "PPid:\t%d", &ppid) == 1) + got_ppid = TRUE; + else if (sscanf (buf, "Uid:\t%d", &uid) == 1) + got_uid = TRUE; + } + fclose (fp); + + if (!got_ppid || !got_uid) + return 0; + if (uid != 0) + return uid; + if (ppid == 0 || ppid == 1) + return 0; + return get_ancestral_uid (ppid); +} + +static dbus_bool_t +user_check (DBusConnection *bus, unsigned long uid, void *data) +{ + if (uid == getuid () || uid == geteuid ()) + return TRUE; + if (getuid () == 0) + return get_ancestral_uid (getpid ()) == uid; + return FALSE; +} + +static void +new_connection_cb (DBusServer *server, DBusConnection *con, void *data) +{ + dbus_connection_set_unix_user_function (con, user_check, NULL, NULL); + dbus_connection_ref(con); + atspi_dbus_connection_setup_with_g_main(con, NULL); + droute_intercept_dbus (con); + droute_context_register (spi_global_app_data->droute, con); + + spi_global_app_data->direct_connections = g_list_append (spi_global_app_data->direct_connections, con); +} + gchar *atspi_dbus_name = NULL; static gboolean atspi_no_register = FALSE; @@ -317,6 +539,248 @@ static GOptionEntry atspi_option_entries[] = { {NULL} }; +static gchar * +introspect_children_cb (const char *path, void *data) +{ + if (!strcmp (path, "/org/a11y/atspi/accessible")) + { + return g_strdup ("\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) +{ + 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; + g_strfreev (evdata->data); + g_free (evdata->bus_name); + g_free (evdata); + if (list->prev) + { + GList *next = list->next; + list->prev = g_list_remove (list->prev, evdata); + list = next; + } + else + { + spi_global_app_data->events = g_list_remove (events, evdata); + list = spi_global_app_data->events; + } + } + else + { + list = list->next; + } + } + + g_strfreev (remove_data); +} + +static void +handle_event_listener_deregistered (DBusConnection *bus, DBusMessage *message, + void *user_data) +{ + 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 void +handle_device_listener_registered (DBusConnection *bus, DBusMessage *message, + void *user_data) +{ + char *sender; + DBusMessageIter iter, iter_struct; + + if (strncmp (dbus_message_get_signature (message), "(s", 2) != 0) + { + g_warning ("atk-bridge: handle_device_listener_register: unknown signature"); + return; + } + + dbus_message_iter_init (message, &iter); + dbus_message_iter_recurse (&iter, &iter_struct); + dbus_message_iter_get_basic (&iter_struct, &sender); + spi_atk_add_client (sender); +} + +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, ATSPI_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; + } + else if (!strcmp (interface, ATSPI_DBUS_INTERFACE_DEVICE_EVENT_LISTENER)) + { + result = DBUS_HANDLER_RESULT_HANDLED; + if (!strcmp (member, "KeystrokeListenerRegistered")) + handle_device_listener_registered (bus, message, user_data); + else if (!strcmp (member, "DeviceListenerRegistered")) + handle_device_listener_registered (bus, message, user_data); + else + result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + } + + if (!g_strcmp0(interface, DBUS_INTERFACE_DBUS) && + !g_strcmp0(member, "NameOwnerChanged")) + { + char *name, *old, *new; + result = DBUS_HANDLER_RESULT_HANDLED; + if (dbus_message_get_args (message, NULL, + DBUS_TYPE_STRING, &name, + DBUS_TYPE_STRING, &old, + DBUS_TYPE_STRING, &new, + DBUS_TYPE_INVALID)) + { + if (*old != '\0' && *new == '\0') + spi_atk_remove_client (old); + } + } + + return result; +} + +int +spi_atk_create_socket (SpiBridge *app) +{ +#ifndef DISABLE_P2P + DBusServer *server; + DBusError err; + + if (getuid () != 0) + { + app->app_tmp_dir = g_build_filename (g_get_user_runtime_dir (), + "at-spi2-XXXXXX", NULL); + if (!g_mkdtemp (app->app_tmp_dir)) + { + g_free (app->app_tmp_dir); + app->app_tmp_dir = NULL; + return FALSE; + } + } + + if (app->app_tmp_dir) + app->app_bus_addr = g_strdup_printf ("unix:path=%s/socket", app->app_tmp_dir); + else + app->app_bus_addr = g_strdup_printf ("unix:path=%s/at-spi2-socket-%d", + g_get_user_runtime_dir (), getpid ()); + + if (!spi_global_app_data->app_bus_addr) + return -1; + + dbus_error_init(&err); + server = dbus_server_listen(spi_global_app_data->app_bus_addr, &err); + if (server == NULL) + { + g_warning ("atk-bridge: Couldn't listen on dbus server: %s", err.message); + dbus_error_init (&err); + spi_global_app_data->app_bus_addr [0] = '\0'; + g_main_context_unref (spi_global_app_data->main_context); + spi_global_app_data->main_context = NULL; + return -1; + } + + atspi_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; +} + +/* + * Checks the status of the environment variables + * + * At this moment it only checks NO_AT_BRIDGE + * + * Returns TRUE if there isn't anything on the environment preventing + * you to load the bridge, FALSE otherwise + */ +static gboolean +check_envvar (void) +{ + const gchar *envvar; + + envvar = g_getenv ("NO_AT_BRIDGE"); + + if (envvar && atoi (envvar) == 1) + return FALSE; + else + return TRUE; +} + +void +spi_atk_activate () +{ + DRoutePath *treepath; + + spi_atk_register_event_listeners (); + if (!spi_global_cache) + { + spi_global_cache = g_object_new (SPI_CACHE_TYPE, NULL); + treepath = droute_add_one (spi_global_app_data->droute, + "/org/a11y/atspi/cache", spi_global_cache); + + if (!treepath) + { + g_warning ("atk-bridge: Error in droute_add_one(). Already running?"); + return; + } + spi_initialize_cache (treepath); + } +} + /* * spi_app_init * @@ -324,50 +788,61 @@ static GOptionEntry atspi_option_entries[] = { * * - 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. * */ -static int -adaptor_init (gint * argc, gchar ** argv[]) +int +atk_bridge_adaptor_init (gint * argc, gchar ** argv[]) { GOptionContext *opt; GError *err = NULL; DBusError error; - DBusConnection *bus; AtkObject *root; - gchar *introspection_directory; - static gboolean inited = FALSE; + gboolean load_bridge; + DRoutePath *accpath; + + load_bridge = check_envvar (); + if (inited && !load_bridge) + g_warning ("ATK Bridge is disabled but a11y has already been enabled."); - if (inited) + if (inited || !load_bridge) return 0; inited = TRUE; - 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_option_context_add_main_entries (opt, atspi_option_entries, NULL); g_option_context_set_ignore_unknown_options (opt, TRUE); if (!g_option_context_parse (opt, argc, argv, &err)) - g_warning ("AT-SPI Option parsing failed: %s\n", err->message); + { + g_warning ("AT-SPI Option parsing failed: %s\n", err->message); + g_error_free (err); + } + g_option_context_free (opt); /* Allocate global data and do ATK initializations */ spi_global_app_data = g_new0 (SpiBridge, 1); - atk_misc = atk_misc_get_instance (); - spi_global_app_data->root = root; + spi_global_app_data->root = g_object_ref (root); /* Set up D-Bus connection and register bus name */ dbus_error_init (&error); - spi_global_app_data->bus = spi_atk_bridge_get_bus (); + spi_global_app_data->bus = atspi_get_a11y_bus (); if (!spi_global_app_data->bus) { g_free (spi_global_app_data); spi_global_app_data = NULL; - return 0; + inited = FALSE; + return -1; } if (atspi_dbus_name != NULL) @@ -385,26 +860,12 @@ adaptor_init (gint * argc, gchar ** argv[]) } } - dbus_connection_setup_with_g_main (spi_global_app_data->bus, - g_main_context_default ()); - - /* 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); + spi_global_app_data->main_context = g_main_context_new (); - treepath = droute_add_one (spi_global_app_data->droute, - "/org/at_spi/cache", NULL); + atspi_dbus_connection_setup_with_g_main (spi_global_app_data->bus, NULL); - accpath = droute_add_many (spi_global_app_data->droute, - "/org/at_spi/accessible", - NULL, - (DRouteGetDatumFunction) - spi_global_register_path_to_object); + /* Hook our plug-and socket functions */ + install_plug_hooks (); /* * Create the leasing, register and cache objects. @@ -413,10 +874,21 @@ adaptor_init (gint * argc, gchar ** argv[]) */ spi_global_register = g_object_new (SPI_REGISTER_TYPE, NULL); spi_global_leasing = g_object_new (SPI_LEASING_TYPE, NULL); - spi_global_cache = g_object_new (SPI_CACHE_TYPE, NULL); + + /* Register droute for routing AT-SPI messages */ + spi_global_app_data->droute = + droute_new (); + + accpath = droute_add_many (spi_global_app_data->droute, + "/org/a11y/atspi/accessible", + NULL, + introspect_children_cb, + NULL, + (DRouteGetDatumFunction) + spi_global_register_path_to_object); + /* Register all interfaces with droute and set up application accessible db */ - spi_initialize_cache (treepath); spi_initialize_accessible (accpath); spi_initialize_application (accpath); spi_initialize_action (accpath); @@ -428,62 +900,140 @@ adaptor_init (gint * argc, gchar ** argv[]) 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 (); + if (clients) + spi_atk_activate (); -#ifdef __ATK_PLUG_H__ - /* 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_bus_add_match (spi_global_app_data->bus, "type='signal', interface='org.a11y.atspi.DeviceEventListener', 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); - - g_atexit (exit_func); + else + get_registered_event_listeners (spi_global_app_data); return 0; } -/*---------------------------------------------------------------------------*/ - -int -gtk_module_init (gint * argc, gchar ** argv[]) +void +atk_bridge_adaptor_cleanup (void) { - const gchar *load_bridge = g_getenv ("NO_AT_BRIDGE"); + GList *l; + GSList *ls; + + g_return_if_fail (inited); - if (!load_bridge || g_ascii_strtod (load_bridge, NULL) == 0) + if (!spi_global_app_data) + return; + + spi_atk_tidy_windows (); + spi_atk_deregister_event_listeners (); + + deregister_application (spi_global_app_data); + + if (spi_global_app_data->bus) { - return adaptor_init (argc, argv); + dbus_connection_remove_filter (spi_global_app_data->bus, signal_filter, NULL); + droute_context_unregister (spi_global_app_data->droute, spi_global_app_data->bus); + dbus_connection_close (spi_global_app_data->bus); + dbus_connection_unref (spi_global_app_data->bus); + spi_global_app_data->bus = NULL; } - return 0; + + for (l = spi_global_app_data->direct_connections; l; l = l->next) + { + DBusConnection *connection; + + connection = l->data; + + droute_context_unregister (spi_global_app_data->droute, connection); + droute_unintercept_dbus (connection); + dbus_connection_unref (connection); + } + g_list_free (spi_global_app_data->direct_connections); + spi_global_app_data->direct_connections = NULL; + + for (ls = clients; ls; ls = ls->next) + g_free (l->data); + g_slist_free (clients); + clients = NULL; + + g_clear_object (&spi_global_cache); + g_clear_object (&spi_global_leasing); + g_clear_object (&spi_global_register); + + if (spi_global_app_data->main_context) + g_main_context_unref (spi_global_app_data->main_context); + + droute_free (spi_global_app_data->droute); + + g_free (spi_global_app_data); + spi_global_app_data = NULL; + + inited = FALSE; } +/*---------------------------------------------------------------------------*/ + +static gchar *name_match_tmpl = + "type='signal', interface='org.freedesktop.DBus', member='NameOwnerChanged', arg0='%s'"; + void -gnome_accessibility_module_init (void) +spi_atk_add_client (const char *bus_name) { - const gchar *load_bridge = g_getenv ("NO_AT_BRIDGE"); - - if (!load_bridge || g_ascii_strtod (load_bridge, NULL) == 0) - { - adaptor_init (NULL, NULL); + GSList *l; + gchar *match; - if (g_getenv ("AT_SPI_DEBUG")) - { - g_print ("Atk Accessibility bridge initialized\n"); - } - } + for (l = clients; l; l = l->next) + { + if (!g_strcmp0 (l->data, bus_name)) + return; + } + if (!clients) + spi_atk_activate (); + clients = g_slist_append (clients, g_strdup (bus_name)); + match = g_strdup_printf (name_match_tmpl, bus_name); + dbus_bus_add_match (spi_global_app_data->bus, match, NULL); + g_free (match); } void -gnome_accessibility_module_shutdown (void) +spi_atk_remove_client (const char *bus_name) { - spi_atk_deregister_event_listeners (); - exit_func (); + GSList *l; + GSList *next_node; + + l = clients; + while (l) + { + next_node = l->next; + + if (!g_strcmp0 (l->data, bus_name)) + { + gchar *match = g_strdup_printf (name_match_tmpl, l->data); + dbus_bus_remove_match (spi_global_app_data->bus, match, NULL); + g_free (match); + g_free (l->data); + clients = g_slist_delete_link (clients, l); + if (!clients) + spi_atk_deregister_event_listeners (); + return; + } + + l = next_node; + } } /*END------------------------------------------------------------------------*/