* Boston, MA 02111-1307, USA.
*/
+#define _GNU_SOURCE
#include "config.h"
-#include "dbus/dbus-glib-lowlevel.h"
-#include <X11/Xlib.h>
-#include <X11/Xatom.h>
#include <unistd.h>
#include <stdlib.h>
#include <stdio.h>
#include <atk/atk.h>
#include <droute/droute.h>
-#include <gmodule.h>
+#include <atspi/atspi.h>
+#include <atk-bridge.h>
#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"
+#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);
}
-/*---------------------------------------------------------------------------*/
-
-/*
- * 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 GSList *clients = NULL;
-static DBusConnection *
-spi_atk_bridge_get_bus (void)
+static void
+tally_event_reply ()
{
- 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;
- }
+ 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;
+ }
+}
- 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);
+static void
+get_events_reply (DBusPendingCall *pending, void *user_data)
+{
+ DBusMessage *reply = dbus_pending_call_steal_reply (pending);
+ DBusMessageIter iter, iter_array, iter_struct;
- dbus_error_init (&error);
+ if (!reply)
+ goto done;
- if (data == NULL)
+ if (strcmp (dbus_message_get_signature (reply), "a(ss)") != 0)
{
- 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;
- }
+ g_warning ("atk-bridge: GetRegisteredEvents returned message with 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)
{
- 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;
- }
- }
+ 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);
}
- return bus;
+done:
+ if (reply)
+ dbus_message_unref (reply);
+ if (pending)
+ dbus_pending_call_unref (pending);
+
+ tally_event_reply ();
}
static void
-set_reply (DBusPendingCall *pending, void *user_data)
+get_device_events_reply (DBusPendingCall *pending, void *user_data)
{
- void **replyptr = (void **)user_data;
-
- *replyptr = dbus_pending_call_steal_reply (pending);
-}
+ DBusMessage *reply = dbus_pending_call_steal_reply (pending);
+ DBusMessageIter iter, iter_array, iter_struct;
-/*---------------------------------------------------------------------------*/
+ if (!reply)
+ goto done;
-static void
-add_event (const char *bus_name, const char *event)
-{
- event_data *evdata;
- gchar **data;
- GList *new_list;
+ if (strncmp (dbus_message_get_signature (reply), "a(s", 3) != 0)
+ {
+ g_warning ("atk-bridge: get_device_events_reply: unknown signature");
+ goto done;
+ }
- evdata = (event_data *) g_malloc (sizeof (*evdata));
- if (!evdata)
- return;
- data = g_strsplit (event, ":", 3);
- if (!data)
+ 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)
{
- g_free (evdata);
- return;
+ 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);
}
- 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;
+
+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, *reply;
- DBusMessageIter iter, iter_array, iter_struct;
+ DBusMessage *message;
+ DBusPendingCall *pending = NULL;
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,
"GetRegisteredEvents");
if (!message)
return;
- reply = dbus_connection_send_with_reply_and_block (app->bus, message, 5000, NULL);
+ dbus_connection_send_with_reply (app->bus, message, &pending, -1);
dbus_message_unref (message);
- if (!reply)
+ 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;
- if (strcmp (dbus_message_get_signature (reply), "a(ss)") != 0)
+ pending = NULL;
+ dbus_connection_send_with_reply (app->bus, message, &pending, -1);
+ dbus_message_unref (message);
+ if (!pending)
{
- /* TODO: Add a warning when it's okay to add strings */
- dbus_message_unref (reply);
+ spi_global_app_data->events_initialized = TRUE;
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
+ 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)
{
- 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);
+ spi_global_app_data->events_initialized = TRUE;
+ return;
}
- while (dbus_message_iter_next (&iter_array));
- dbus_message_unref (reply);
+ dbus_pending_call_set_notify (pending, get_device_events_reply, NULL, NULL);
}
static void
{
DBusMessage *reply;
SpiBridge *app = user_data;
- DBusMessage *message;
- reply = dbus_pending_call_steal_reply (pending);
+ reply = dbus_pending_call_steal_reply (pending);
+ dbus_pending_call_unref (pending);
if (reply)
{
gchar *app_name, *obj_path;
static gboolean
register_application (SpiBridge * app)
{
- DBusMessage *message, *reply;
+ DBusMessage *message;
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;
+ app->desktop_name = ATSPI_DBUS_NAME_REGISTRY;
+ app->desktop_path = ATSPI_DBUS_PATH_ROOT;
message = dbus_message_new_method_call (SPI_DBUS_NAME_REGISTRY,
- SPI_DBUS_PATH_ROOT,
- SPI_DBUS_INTERFACE_SOCKET,
+ ATSPI_DBUS_PATH_ROOT,
+ ATSPI_DBUS_INTERFACE_SOCKET,
"Embed");
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))
+ if (!dbus_connection_send_with_reply (app->bus, message, &pending, -1)
+ || !pending)
{
return FALSE;
}
if (message)
dbus_message_unref (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));
-sprintf(app->app_bus_addr, "unix:path=/tmp/at-spi2/socket-%d-%d", getpid(),
-rand());
+#ifndef DISABLE_P2P
+ 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 ());
+#endif
return TRUE;
}
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);
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;
+ }
}
/*---------------------------------------------------------------------------*/
-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
-}
-
/*---------------------------------------------------------------------------*/
static AtkPlugClass *plug_class;
DBusMessageIter iter, iter_array;
AtkStateSet *set;
+ set = atk_state_set_new ();
+
if (!socket->embedded_plug_id)
- return NULL;
+ return set;
child_name = g_strdup (socket->embedded_plug_id);
if (!child_name)
- return NULL;
+ return set;
child_path = g_utf8_strchr (child_name + 1, -1, ':');
if (!child_path)
{
g_free (child_name);
- return NULL;
+ return set;
}
*(child_path++) = '\0';
- message = dbus_message_new_method_call (child_name, child_path, SPI_DBUS_INTERFACE_ACCESSIBLE, "GetState");
+ 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 NULL;
+ return set;
if (strcmp (dbus_message_get_signature (reply), "au") != 0)
{
dbus_message_unref (reply);
- return NULL;
+ return set;
}
- set = atk_state_set_new ();
- if (!set)
- return NULL;
+
dbus_message_iter_init (reply, &iter);
dbus_message_iter_recurse (&iter, &iter_array);
do
{
DBusMessage *message;
*(plug_path++) = '\0';
- message = dbus_message_new_method_call (plug_name, plug_path, SPI_DBUS_INTERFACE_SOCKET, "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 (spi_global_app_data->bus, message, NULL);
}
socket_class->embed = socket_embed_hook;
}
+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)
{
- GList *new_list;
-
+ dbus_connection_set_unix_user_function (con, user_check, NULL, NULL);
dbus_connection_ref(con);
- dbus_connection_setup_with_g_main(con, NULL);
+ atspi_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;
+ spi_global_app_data->direct_connections = g_list_append (spi_global_app_data->direct_connections, con);
}
static int
setup_bus (void)
{
+#ifndef DISABLE_P2P
DBusServer *server;
DBusError err;
+ 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);
-
- /* is there a better way to handle this */
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;
+ }
- dbus_server_setup_with_g_main(server, NULL);
+ 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;
}
static void
remove_events (const char *bus_name, const char *event)
{
- event_data *evdata;
gchar **remove_data;
GList *list;
list = list->next;
}
}
+
+ g_strfreev (remove_data);
}
static void
handle_event_listener_deregistered (DBusConnection *bus, DBusMessage *message,
void *user_data)
{
- const char *orig_name;
gchar *name;
char *sender;
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)
{
if (dbus_message_get_type (message) != DBUS_MESSAGE_TYPE_SIGNAL)
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
- if (!strcmp (interface, SPI_DBUS_INTERFACE_REGISTRY))
+ if (!strcmp (interface, ATSPI_DBUS_INTERFACE_REGISTRY))
{
result = DBUS_HANDLER_RESULT_HANDLED;
if (!strcmp (member, "EventListenerRegistered"))
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;
}
/*
+ * 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;
+}
+
+/*
* spi_app_init
*
* The following needs to be initialized.
* - 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;
AtkObject *root;
- gchar *introspection_directory;
- static gboolean inited = FALSE;
+ gboolean load_bridge;
+ DRoutePath *treepath, *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_warn_if_fail (root);
if (!root)
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_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 = 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->main_context = g_main_context_new ();
- dbus_connection_setup_with_g_main (spi_global_app_data->bus, NULL);
+ atspi_dbus_connection_setup_with_g_main (spi_global_app_data->bus, NULL);
/* Hook our plug-and socket functions */
install_plug_hooks ();
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_register_event_listeners ();
/* 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);
setup_bus();
- g_atexit (exit_func);
-
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 (!spi_global_app_data)
+ return;
+
+ spi_atk_tidy_windows ();
+ spi_atk_deregister_event_listeners ();
+
+ deregister_application (spi_global_app_data);
- if (!load_bridge || g_ascii_strtod (load_bridge, NULL) == 0)
+ 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_unref (spi_global_app_data->bus);
}
- 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);
+
+ for (ls = clients; ls; ls = ls->next)
+ g_free (l->data);
+ g_slist_free (clients);
+ clients = NULL;
+
+ g_object_unref (spi_global_cache);
+ g_object_unref (spi_global_leasing);
+ g_object_unref (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;
}
-gchar*
-g_module_check_init (GModule *module)
+/*---------------------------------------------------------------------------*/
+
+static gchar *name_match_tmpl =
+ "type='signal', interface='org.freedesktop.DBus', member='NameOwnerChanged', arg0='%s'";
+
+void
+spi_atk_add_client (const char *bus_name)
{
- g_module_make_resident (module);
+ GSList *l;
+ gchar *match;
- return NULL;
+ for (l = clients; l; l = l->next)
+ {
+ if (!g_strcmp0 (l->data, bus_name))
+ return;
+ }
+ if (!clients)
+ spi_atk_register_event_listeners ();
+ 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_init (void)
+spi_atk_remove_client (const char *bus_name)
{
- const gchar *load_bridge = g_getenv ("NO_AT_BRIDGE");
+ GSList *l;
+ GSList *next_node;
- if (!load_bridge || g_ascii_strtod (load_bridge, NULL) == 0)
- {
- adaptor_init (NULL, NULL);
+ l = clients;
+ while (l)
+ {
+ next_node = l->next;
- if (g_getenv ("AT_SPI_DEBUG"))
- {
- g_print ("Atk Accessibility bridge initialized\n");
- }
+ 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 ();
}
-}
-void
-gnome_accessibility_module_shutdown (void)
-{
- spi_atk_deregister_event_listeners ();
- exit_func ();
+ l = next_node;
+ }
}
/*END------------------------------------------------------------------------*/
projects / platform / core / uifw / at-spi2-atk.git / blobdiff