* AT-SPI - Assistive Technology Service Provider Interface
* (Gnome Accessibility Project; http://developer.gnome.org/projects/gap)
*
+ * Copyright 2008, 2009 Codethink Ltd.
* Copyright 2001, 2002, 2003 Sun Microsystems Inc.,
* Copyright 2001, 2002, 2003 Ximian, Inc.
*
#include <X11/Xlib.h>
#include <X11/Xatom.h>
-#include <string.h>
-#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
+#include <stdio.h>
#include <stdarg.h>
+#include <string.h>
#include <atk/atk.h>
-#include <atk/atkobject.h>
-#include <atk/atknoopobject.h>
-#include "accessible.h"
+
+#include <droute/droute.h>
+
#include "bridge.h"
-#include "atk-dbus.h"
-
-#undef SPI_BRIDGE_DEBUG
-
-#define DBG(a,b) if(_dbg>=(a))b
-
-int _dbg = 0;
-static const char *registry = NULL;
-SpiAppData *this_app = NULL;
-static gboolean registry_died = FALSE;
-static gint toplevels = 0;
-static gboolean exiting = FALSE;
-static AtkMisc *misc = NULL;
-static gboolean during_init_shutdown = TRUE;
-
-static const char *spi_atk_bridge_get_registry (void);
-static char *device_event_controller = NULL;
-static void spi_atk_bridge_register_application (const char *registry);
-static gchar *spi_atk_bridge_get_registry_ior (void);
-static gboolean spi_atk_bridge_do_registration (void);
-static void spi_atk_bridge_toplevel_added (AtkObject *object,
- guint index,
- AtkObject *child);
-static void spi_atk_bridge_toplevel_removed (AtkObject *object,
- guint index,
- AtkObject *child);
-
-static void spi_atk_bridge_exit_func (void);
-static void spi_atk_tidy_windows (void);
-static void deregister_application (SpiAppData *app);
-static void reinit_register_vars (void);
-
-/* For automatic libgnome init */
-extern void gnome_accessibility_module_init (void);
-extern void gnome_accessibility_module_shutdown (void);
-
-static int atk_bridge_initialized = FALSE;
-static pid_t atk_bridge_pid = 0;
+#include "event.h"
+#include "adaptors.h"
+#include "object.h"
-/*
- * These exported symbols are hooked by gnome-program
- * to provide automatic module initialization and shutdown.
- */
-extern void gnome_accessibility_module_init (void);
-extern void gnome_accessibility_module_shutdown (void);
+#include "accessible-register.h"
+#include "accessible-leasing.h"
+#include "accessible-cache.h"
-void
-spi_atk_register_event_listeners(void);
+#include "common/spi-dbus.h"
-void
-spi_atk_deregister_event_listeners (void);
+/*---------------------------------------------------------------------------*/
-static gboolean
-post_init (gpointer data)
-{
- during_init_shutdown = FALSE;
- return FALSE;
-}
+SpiBridge *spi_global_app_data = NULL;
-static DBusObjectPathVTable droute_vtable =
-{
- NULL,
- &droute_message,
- NULL, NULL, NULL, NULL
-};
+static const AtkMisc *atk_misc = NULL;
-static gchar* atspi_dbus_name;
-static gboolean atspi_no_register;
+/*static Display *bridge_display = NULL;*/
-static GOptionEntry atspi_option_entries[] =
-{
- {"atspi-dbus-name", 0, 0, G_OPTION_ARG_STRING, &atspi_dbus_name, "D-Bus bus name to register as", NULL},
- {"atspi-no-register", 0, 0, G_OPTION_ARG_NONE, &atspi_no_register, "Do not register with Registry Daemon", NULL},
- {NULL}
-};
+/*---------------------------------------------------------------------------*/
-static SpiAppData *
-spi_app_init (AtkObject *root, gint *argc, gchar **argv[])
+/*
+ * Returns a 'canonicalized' value for DISPLAY,
+ * with the screen number stripped off if present.
+ *
+ */
+static const gchar *
+spi_display_name (void)
{
- GOptionContext *opt;
- SpiAppData *ad = g_new0(SpiAppData, 1);
- GError *err = NULL;
- DBusError error;
- int i;
-
- 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("Option parsing failed: %s\n", err->message);
-
- dbus_error_init(&error);
- ad->root = root;
- ad->droute.bus = dbus_bus_get(DBUS_BUS_SESSION, &error);
- g_print("D-Bus unique name is : %s\n", dbus_bus_get_unique_name(ad->droute.bus));
-
- if (!ad->droute.bus)
- {
- g_warning("Couldn't connect to dbus: %s\n", error.message);
- free(ad);
- return NULL;
- }
- if (atspi_dbus_name != NULL && dbus_bus_request_name(ad->droute.bus,
- atspi_dbus_name,
- 0,
- &error))
- {
- g_print("\nRecieved D-Bus name - %s\n", atspi_dbus_name);
- }
- spi_register_tree_object(ad->droute.bus, &ad->droute, "/org/freedesktop/atspi/tree");
- if (!dbus_connection_try_register_fallback (ad->droute.bus,
- "/org/freedesktop/atspi/accessible",
- &droute_vtable,
- &ad->droute,
- &error))
- {
- g_warning("Couldn't register droute.\n");
- free(ad);
- return NULL;
- }
-
- dbus_connection_setup_with_g_main(ad->droute.bus, g_main_context_default());
-
- atk_dbus_initialize (&ad->droute);
- return ad;
+ static const char *canonical_display_name = NULL;
+ if (!canonical_display_name)
+ {
+ 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;
+ }
+ }
+ return canonical_display_name;
}
-static int
-atk_bridge_init (gint *argc, gchar **argv[])
-{
- const char *debug_env_string = g_getenv ("AT_SPI_DEBUG");
- gchar *fname;
- gboolean success = FALSE;
+/*---------------------------------------------------------------------------*/
- if (atk_bridge_initialized)
- {
- return 0;
- }
- atk_bridge_initialized = TRUE;
- atk_bridge_pid = getpid ();
+/*
+ * 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.
+ */
- misc = atk_misc_get_instance();
+static DBusConnection *
+spi_atk_bridge_get_bus (void)
+{
+ 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;
- if (g_getenv ("ATK_BRIDGE_REDIRECT_LOG"))
- {
- fname = g_strconcat ("/tmp/", g_get_prgname (), ".at-spi-log", NULL);
- /* make sure we're not being redirected - security issue */
- if (!g_file_test (fname, G_FILE_TEST_IS_SYMLINK))
- freopen (fname, "w", stderr);
- g_free (fname);
- }
+ bridge_display = XOpenDisplay (spi_display_name ());
+ if (!bridge_display)
+ g_error ("AT_SPI: Could not get the display\n");
- if (debug_env_string)
- _dbg = (int) g_ascii_strtod (debug_env_string, 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);
- /* Connect to dbus */
- this_app = spi_app_init (atk_get_root (), argc, argv);
+ dbus_error_init (&error);
- /*
- * We only want to enable the bridge for top level
- * applications, we detect bonobo components by seeing
- * if they were activated with the intention of extracting
- * an impl. by IID - very solid.
- */
-#ifdef WITH_BONOBO
- // TODO: Figure out if this is still needed
- if (bonobo_activation_iid_get ())
-#else
- if (0)
-#endif
+ if (data == NULL)
{
- DBG (1, g_message ("Found Bonobo component\n"));
- g_signal_connect (atk_get_root (),
- "children-changed::add",
- (GCallback) spi_atk_bridge_toplevel_added,
- NULL);
- g_signal_connect (atk_get_root (),
- "children-changed::remove",
- (GCallback) spi_atk_bridge_toplevel_removed,
- NULL);
- /* in this case we redefine 'success' to mean 'registry is present' */
- success = (spi_atk_bridge_get_registry () != NULL);
+ 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);
}
else
{
- success = spi_atk_bridge_do_registration ();
+ bus = dbus_connection_open (data, &error);
+ if (!bus)
+ {
+ g_error ("AT-SPI: Couldn't connect to bus: %s\n", error.message);
+ }
+ else
+ {
+ if (!dbus_bus_register (bus, &error))
+ g_error ("AT-SPI: Couldn't register with bus: %s\n", error.message);
+ }
}
- /*
- * we must emit events even if we are not registered as a
- * full-fledged app; See bugzilla #400709.
- */
- if (success)
+
+ return bus;
+}
+
+static void
+set_reply (DBusPendingCall *pending, void *user_data)
+{
+ void **replyptr = (void **)user_data;
+
+ *replyptr = dbus_pending_call_steal_reply (pending);
+}
+
+static DBusMessage *
+send_and_allow_reentry (DBusConnection *bus, DBusMessage *message, DBusError *error)
+{
+ DBusPendingCall *pending;
+ DBusMessage *reply = NULL;
+
+ if (!dbus_connection_send_with_reply (bus, message, &pending, -1))
{
- spi_atk_register_event_listeners ();
+ return NULL;
}
- else
+ dbus_pending_call_set_notify (pending, set_reply, (void *)&reply, NULL);
+ while (!reply)
{
- atk_bridge_initialized = FALSE;
+ if (!dbus_connection_read_write_dispatch (bus, -1)) return NULL;
}
- g_idle_add (post_init, NULL);
-
- return 0;
+ return reply;
}
+/*---------------------------------------------------------------------------*/
static gboolean
-spi_atk_bridge_do_registration (void)
+register_application (SpiBridge * app)
{
- if (spi_atk_bridge_get_registry () == NULL)
- {
- g_warning ("Could not locate registry");
- return FALSE;
- }
+ DBusMessage *message, *reply;
+ DBusMessageIter iter;
+ DBusError error;
- /* Create the accessible application server object */
- if (this_app == NULL)
- this_app = spi_app_init (atk_get_root (), 0, NULL);
+ dbus_error_init (&error);
- DBG (1, g_message ("About to register application\n"));
+ message = dbus_message_new_method_call (SPI_DBUS_NAME_REGISTRY,
+ SPI_DBUS_PATH_ROOT,
+ SPI_DBUS_INTERFACE_SOCKET,
+ "Embed");
- spi_atk_bridge_register_application (spi_atk_bridge_get_registry ());
+ dbus_message_iter_init_append (message, &iter);
+ spi_object_append_reference (&iter, app->root);
- g_atexit (spi_atk_bridge_exit_func);
+ reply = send_and_allow_reentry (app->bus, message, &error);
- DBG (1, g_message ("Application registered & listening\n"));
- return TRUE;
-}
-
-static void
-spi_atk_bridge_toplevel_added (AtkObject *object,
- guint index,
- AtkObject *child)
-{
- if (toplevels == 0)
- {
- spi_atk_bridge_do_registration ();
- }
- toplevels++;
-}
+ if (message)
+ dbus_message_unref (message);
-static void
-spi_atk_bridge_toplevel_removed (AtkObject *object,
- guint index,
- AtkObject *child)
-{
- toplevels--;
- if (toplevels == 0)
+ if (reply)
{
- deregister_application (this_app);
- reinit_register_vars ();
+ DBusMessageIter iter, iter_struct;
+ 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");
+ return FALSE;
+ }
+
+ 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);
}
- if (toplevels < 0)
+ else
{
- g_warning ("More toplevels removed than added\n");
- toplevels = 0;
+ g_warning ("AT-SPI: Could not embed inside desktop: %s\n", error.message);
+ return FALSE;
}
+ return TRUE;
}
+/*---------------------------------------------------------------------------*/
+
static void
-spi_atk_bridge_register_application (const char *registry)
+deregister_application (SpiBridge * app)
{
- DBusMessage *message, *reply;
+ DBusMessage *message;
+ DBusMessageIter iter;
DBusError error;
+ const char *uname;
- message = dbus_message_new_signal (SPI_DBUS_PATH_REGISTRY, SPI_DBUS_INTERFACE_TREE, "registerApplication");
dbus_error_init (&error);
- dbus_connection_send (this_app->droute.bus, message, NULL);
- if (error.message) g_print (error.message);
- if (message) dbus_message_unref (message);
-}
-/*
- * Returns a 'canonicalized' value for DISPLAY,
- * with the screen number stripped off if present.
- */
-static const gchar*
-spi_display_name (void)
-{
- static const char *canonical_display_name = NULL;
- if (!canonical_display_name)
- {
- 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;
- }
- }
- return canonical_display_name;
-}
+ message = dbus_message_new_method_call (SPI_DBUS_NAME_REGISTRY,
+ SPI_DBUS_PATH_REGISTRY,
+ SPI_DBUS_INTERFACE_REGISTRY,
+ "DeregisterApplication");
+ dbus_message_set_no_reply (message, TRUE);
-static Display *bridge_display = NULL;
+ uname = dbus_bus_get_unique_name (app->bus);
-static gchar *
-spi_atk_bridge_get_registry_ior (void)
-{
-
- Atom AT_SPI_IOR;
- Atom actual_type;
- int actual_format;
- unsigned char *data = NULL;
- unsigned long nitems;
- unsigned long leftover;
- if (!bridge_display)
- bridge_display = XOpenDisplay (spi_display_name ());
-
- AT_SPI_IOR = XInternAtom (bridge_display, "AT_SPI_IOR", False);
- XGetWindowProperty(bridge_display,
- XDefaultRootWindow (bridge_display),
- AT_SPI_IOR, 0L,
- (long)BUFSIZ, False,
- (Atom) 31, &actual_type, &actual_format,
- &nitems, &leftover, &data);
- if (data == NULL)
- g_warning (_("AT_SPI_REGISTRY was not started at session startup."));
-
- return (gchar *) data;
-
+ dbus_message_iter_init_append (message, &iter);
+ dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &uname);
+ dbus_connection_send (app->bus, message, NULL);
+ if (message)
+ dbus_message_unref (message);
}
-static const char *
-spi_atk_bridge_get_registry (void)
+/*---------------------------------------------------------------------------*/
+
+static void
+exit_func (void)
{
- // TODO: check for registry dying, as the old code attempted to do
- return "org.freedesktop.atspi.registry";
+ 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 const char *
-spi_atk_bridge_get_dec (void)
+/*---------------------------------------------------------------------------*/
+
+static AtkPlugClass *plug_class;
+static AtkSocketClass *socket_class;
+
+static gchar *
+get_plug_id (AtkPlug * plug)
{
- return "/dec";
+ const char *uname = dbus_bus_get_unique_name (spi_global_app_data->bus);
+ gchar *path;
+ GString *str = g_string_new (NULL);
+
+ 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);
}
-int
-gtk_module_init (gint *argc, gchar **argv[])
+static void
+socket_embed_hook (AtkSocket * socket, gchar * plug_id)
{
- //printf("Pointer to argc %x %x\n", (short) ((argc && 0xffff0000) >> 16), (short) (argc && 0xffff));
- return atk_bridge_init (argc, argv);
+ AtkObject *accessible = ATK_OBJECT(socket);
+ gchar *plug_name, *plug_path;
+
+ /* Force registration */
+ 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)
+ {
+ g_free (path);
+ return;
+ }
+ plug_path = g_utf8_strchr (plug_name + 1, -1, ':');
+ if (plug_path)
+ {
+ DBusMessage *message;
+ *(plug_path++) = '\0';
+ 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);
}
static void
-deregister_application (SpiAppData *app)
+install_plug_hooks ()
{
- const char *registry = spi_atk_bridge_get_registry ();
- // todo: deregister
+ gpointer data;
+
+ data = g_type_class_ref (ATK_TYPE_PLUG);
+ plug_class = ATK_PLUG_CLASS (data);
+ data = g_type_class_ref (ATK_TYPE_SOCKET);
+ socket_class = ATK_SOCKET_CLASS (data);
+ plug_class->get_object_id = get_plug_id;
+ socket_class->embed = socket_embed_hook;
}
-static void
-spi_atk_bridge_exit_func (void)
+gchar *atspi_dbus_name = NULL;
+static gboolean atspi_no_register = FALSE;
+
+static GOptionEntry atspi_option_entries[] = {
+ {"atspi-dbus-name", 0, 0, G_OPTION_ARG_STRING, &atspi_dbus_name,
+ "D-Bus bus name to register as", NULL},
+ {"atspi-no-register", 0, 0, G_OPTION_ARG_NONE, &atspi_no_register,
+ "Do not register with Registry Daemon", NULL},
+ {NULL}
+};
+
+/*
+ * spi_app_init
+ *
+ * The following needs to be initialized.
+ *
+ * - DRoute for routing message to their accessible objects.
+ * - Event handlers for emmitting signals on specific ATK events.
+ * - Application registration with the AT-SPI registry.
+ *
+ */
+static int
+adaptor_init (gint * argc, gchar ** argv[])
{
- SpiAppData *app = (SpiAppData *) this_app;
+ GOptionContext *opt;
+ GError *err = NULL;
+ DBusError error;
+ DBusConnection *bus;
+ AtkObject *root;
+ gchar *introspection_directory;
+ static gboolean inited = FALSE;
- DBG (1, g_message ("exiting bridge\n"));
+ if (inited)
+ return 0;
- if (!app)
+ inited = TRUE;
+
+ DRoutePath *treepath, *accpath;
+
+ root = atk_get_root ();
+ g_return_val_if_fail (root, 0);
+
+ /* 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);
+
+ /* 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 ();
+ if (!spi_global_app_data->bus)
{
- return;
+ g_free (spi_global_app_data);
+ spi_global_app_data = NULL;
+ return 0;
}
- if (atk_bridge_pid != getpid ())
+
+ if (atspi_dbus_name != NULL)
{
- _exit (0);
+ if (dbus_bus_request_name
+ (spi_global_app_data->bus, atspi_dbus_name, 0, &error))
+ {
+ g_print ("AT-SPI Recieved D-Bus name - %s\n", atspi_dbus_name);
+ }
+ else
+ {
+ g_print
+ ("AT-SPI D-Bus name requested but could not be allocated - %s\n",
+ atspi_dbus_name);
+ }
}
- during_init_shutdown = TRUE;
- exiting = TRUE;
- /*
- * Check whether we still have windows which have not been deleted.
- */
- spi_atk_tidy_windows ();
- /*
- * FIXME: this may be incorrect for apps that do their own bonobo
- * shutdown, until we can explicitly shutdown to get the ordering
- * right.
+ dbus_connection_setup_with_g_main (spi_global_app_data->bus,
+ g_main_context_default ());
+
+ /* Hook our plug-and socket functions */
+ install_plug_hooks ();
+
+ /*
+ * Create the leasing, register and cache objects.
+ * The order is important here, the cache depends on the
+ * register object.
*/
- if (!registry_died)
- deregister_application (this_app);
- this_app = NULL;
- DBG (1, g_message ("bridge exit func complete.\n"));
+ 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 (spi_global_app_data->bus);
+
+ treepath = droute_add_one (spi_global_app_data->droute,
+ "/org/a11y/atspi/cache", spi_global_cache);
- if (g_getenv ("AT_BRIDGE_SHUTDOWN"))
+ if (!treepath)
{
+ g_warning ("atk-bridge: Error in droute_add_one(). Already running?");
+ return 0;
}
- if (bridge_display)
- XCloseDisplay (bridge_display);
+
+ accpath = droute_add_many (spi_global_app_data->droute,
+ "/org/a11y/atspi/accessible",
+ 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);
+ spi_initialize_collection (accpath);
+ spi_initialize_component (accpath);
+ spi_initialize_document (accpath);
+ spi_initialize_editabletext (accpath);
+ spi_initialize_hyperlink (accpath);
+ 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);
+
+ /* Register methods to send D-Bus signals on certain ATK events */
+ spi_atk_register_event_listeners ();
+
+ /* Register this app by sending a signal out to AT-SPI registry daemon */
+ if (!atspi_no_register && (!root || !ATK_IS_PLUG (root)))
+ register_application (spi_global_app_data);
+
+ g_atexit (exit_func);
+
+ return 0;
}
-void
-gnome_accessibility_module_init (void)
+/*---------------------------------------------------------------------------*/
+
+int
+gtk_module_init (gint * argc, gchar ** argv[])
{
- atk_bridge_init (0, NULL);
+ const gchar *load_bridge = g_getenv ("NO_AT_BRIDGE");
- if (g_getenv ("AT_BRIDGE_SHUTDOWN"))
+ if (!load_bridge || g_ascii_strtod (load_bridge, NULL) == 0)
{
- g_print("Atk Accessibility bridge initialized\n");
+ return adaptor_init (argc, argv);
}
+ return 0;
}
void
-gnome_accessibility_module_shutdown (void)
+gnome_accessibility_module_init (void)
{
- int i;
-
- if (!atk_bridge_initialized)
- {
- return;
- }
- during_init_shutdown = TRUE;
- atk_bridge_initialized = FALSE;
+ const gchar *load_bridge = g_getenv ("NO_AT_BRIDGE");
- if (g_getenv ("AT_BRIDGE_SHUTDOWN"))
+ if (!load_bridge || g_ascii_strtod (load_bridge, NULL) == 0)
{
- g_print("Atk Accessibility bridge shutdown\n");
- }
-
- spi_atk_deregister_event_listeners();
-
- deregister_application (this_app);
- this_app = NULL;
+ adaptor_init (NULL, NULL);
- misc = NULL;
+ if (g_getenv ("AT_SPI_DEBUG"))
+ {
+ g_print ("Atk Accessibility bridge initialized\n");
+ }
+ }
}
-static void
-reinit_register_vars (void)
+void
+gnome_accessibility_module_shutdown (void)
{
- registry = NULL;
- device_event_controller = NULL;
- this_app = NULL;
+ spi_atk_deregister_event_listeners ();
+ exit_func ();
}
+
+/*END------------------------------------------------------------------------*/
projects / platform / core / uifw / at-spi2-atk.git / blobdiff