Merge branch 'master' of git+ssh://git.codethink.co.uk/git/atspi-dbus
[platform/core/uifw/at-spi2-atk.git] / atk-adaptor / bridge.c
index 755310b..9c37fe5 100644 (file)
 #include <atk/atkobject.h>
 #include <atk/atknoopobject.h>
 #include "accessible.h"
+#include "bridge.h"
+#include "atk-dbus.h"
 
 #undef SPI_BRIDGE_DEBUG
 
 #define DBG(a,b) if(_dbg>=(a))b
 
-#define bridge_threads_leave() \
-  if (!during_init_shutdown && !g_main_context_is_owner (NULL)) atk_misc_threads_leave(misc);
-#define bridge_threads_enter() \
-  if (!during_init_shutdown && !g_main_context_is_owner (NULL)) atk_misc_threads_enter(misc);
-
-typedef struct _SpiAppData SpiAppData;
-struct _SpiAppData
-{
-  AtkObject *root;
-  DRouteData droute;
-};
-
 int _dbg = 0;
 static const char *registry = NULL;
-static char *device_event_controller = NULL;
-static SpiAppData *this_app = NULL;
+SpiAppData *this_app = NULL;
 static gboolean registry_died = FALSE;
-static gboolean atk_listeners_registered = FALSE;
 static gint toplevels = 0;
 static gboolean exiting = FALSE;
 static AtkMisc *misc = NULL;
 static gboolean during_init_shutdown = TRUE;
 
-static guint atk_signal_text_changed;
-static guint atk_signal_children_changed;
-static guint atk_signal_active_descendant_changed;
-static guint atk_signal_text_selection_changed;
-
-/* NOT YET USED
-   static guint atk_signal_row_reordered;
-   static guint atk_signal_row_inserted;
-   static guint atk_signal_row_deleted;
-   static guint atk_signal_column_reordered;
-   static guint atk_signal_column_inserted;
-   static guint atk_signal_column_deleted;
-*/
-
-static guint atk_signal_link_selected;
-static guint atk_signal_bounds_changed;
-
 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,
@@ -90,36 +64,6 @@ static void     spi_atk_bridge_toplevel_removed        (AtkObject             *o
                                                         AtkObject             *child);
 
 static void     spi_atk_bridge_exit_func               (void);
-static void     spi_atk_register_event_listeners       (void);
-static void     spi_atk_bridge_focus_tracker           (AtkObject             *object);
-static gchar   *spi_atk_bridge_get_registry_ior        (void);
-static void     spi_atk_bridge_register_application    (const char *registry);
-static gboolean spi_atk_bridge_property_event_listener (GSignalInvocationHint *signal_hint,
-                                                       guint                  n_param_values,
-                                                       const GValue          *param_values,
-                                                       gpointer               data);
-
-static gboolean
-spi_atk_bridge_window_event_listener (GSignalInvocationHint *signal_hint,
-                               guint n_param_values,
-                               const GValue *param_values,
-                               gpointer data);
-static gboolean
-spi_atk_bridge_document_event_listener (GSignalInvocationHint *signal_hint,
-                                guint n_param_values,
-                                const GValue *param_values,
-                                gpointer data);
-static gboolean
-spi_atk_bridge_state_event_listener (GSignalInvocationHint *signal_hint,
-                                    guint n_param_values,
-                                    const GValue *param_values,
-                                    gpointer data);
-static gboolean spi_atk_bridge_signal_listener         (GSignalInvocationHint *signal_hint,
-                                                       guint                  n_param_values,
-                                                       const GValue          *param_values,
-                                                       gpointer               data);
-static gint     spi_atk_bridge_key_listener            (AtkKeyEventStruct     *event,
-                                                       gpointer               data);
 static void     spi_atk_tidy_windows                   (void);
 static void     deregister_application                 (SpiAppData *app);
 static void reinit_register_vars (void);
@@ -130,9 +74,6 @@ extern void gnome_accessibility_module_shutdown (void);
 
 static int     atk_bridge_initialized = FALSE;
 static pid_t   atk_bridge_pid = 0;
-static guint   atk_bridge_focus_tracker_id = 0;
-static guint   atk_bridge_key_event_listener_id = 0;
-static GArray *listener_ids = NULL;
 
 /*
  *   These exported symbols are hooked by gnome-program
@@ -141,29 +82,11 @@ static GArray *listener_ids = NULL;
 extern void gnome_accessibility_module_init     (void);
 extern void gnome_accessibility_module_shutdown (void);
 
-static void
-spi_atk_bridge_init_event_type_consts ()
-{
-  static gboolean done = FALSE;
-
-  if (done)
-    return;
+void
+spi_atk_register_event_listeners(void);
 
-  atk_signal_children_changed = g_signal_lookup ("children_changed", 
-                                             ATK_TYPE_OBJECT);
-  atk_signal_text_changed = g_signal_lookup ("text_changed", 
-                                            ATK_TYPE_TEXT);
-  atk_signal_bounds_changed = g_signal_lookup ("bounds_changed", 
-                                             ATK_TYPE_COMPONENT);
-  atk_signal_active_descendant_changed = 
-         g_signal_lookup ("active_descendant_changed", 
-                         ATK_TYPE_OBJECT); 
-  atk_signal_link_selected = g_signal_lookup ("link_selected", 
-                                             ATK_TYPE_HYPERTEXT);
-  atk_signal_text_selection_changed = g_signal_lookup ("text_selection_changed", 
-                                             ATK_TYPE_TEXT);
-  done = TRUE;
-}
+void
+spi_atk_deregister_event_listeners (void);
 
 static gboolean
 post_init (gpointer data)
@@ -179,32 +102,64 @@ static DBusObjectPathVTable droute_vtable =
   NULL, NULL, NULL, NULL
 };
 
+static gchar* atspi_dbus_name;
+static gboolean atspi_no_register; 
+
+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)
+spi_app_init (AtkObject *root, gint *argc, gchar **argv[])
 {
+  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);
-  SpiAppData *ad = (SpiAppData *)calloc(sizeof(SpiAppData), 1);
-  if (!ad) return NULL;
   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;
   }
-  //dbus_connection_set_exit_on_disconnect(ad->droute.bus, FALSE);
-  //dbus_bus_register(ad->droute.bus, &error);
-  spi_dbus_initialize (&ad->droute);
-  /* Below line for testing -- it should be removed once at-spi-registryd is working */
-  if (dbus_bus_request_name(ad->droute.bus, "test.atspi.tree", 0, &error)) printf("Got test name.\n");
-  spi_register_tree_object(ad->droute.bus, "/org/freedesktop/atspi/tree");
-  if (!dbus_connection_try_register_fallback (ad->droute.bus, "/org/freedesktop/atspi/accessible/", &droute_vtable, &ad->droute, &error))
+  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;
 }
 
@@ -237,7 +192,7 @@ atk_bridge_init (gint *argc, gchar **argv[])
       _dbg = (int) g_ascii_strtod (debug_env_string, NULL);
 
   /* Connect to dbus */
-  this_app = spi_app_init (atk_get_root ());
+  this_app = spi_app_init (atk_get_root (), argc, argv);
 
   /*
    * We only want to enable the bridge for top level
@@ -275,7 +230,6 @@ atk_bridge_init (gint *argc, gchar **argv[])
   if (success) 
     {
       spi_atk_register_event_listeners ();
-      spi_atk_bridge_init_event_type_consts ();
     }
   else
     {
@@ -297,7 +251,7 @@ spi_atk_bridge_do_registration (void)
 
   /* Create the accessible application server object */
   if (this_app == NULL)
-    this_app = spi_app_init (atk_get_root ());
+    this_app = spi_app_init (atk_get_root (), 0, NULL);
 
   DBG (1, g_message ("About to register application\n"));
 
@@ -342,9 +296,14 @@ spi_atk_bridge_toplevel_removed (AtkObject *object,
 static void
 spi_atk_bridge_register_application (const char *registry)
 {
-  bridge_threads_leave ();
-  // TODO: register
-  bridge_threads_enter ();
+  DBusMessage *message, *reply;
+  DBusError error;
+
+  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);
 }
 
 /* 
@@ -412,7 +371,6 @@ spi_atk_bridge_get_registry_ior (void)
      
 }
 
-
 static const char *
 spi_atk_bridge_get_registry (void)
 {
@@ -429,120 +387,15 @@ spi_atk_bridge_get_dec (void)
 int
 gtk_module_init (gint *argc, gchar **argv[])
 {
+       //printf("Pointer to argc %x %x\n", (short) ((argc && 0xffff0000) >> 16), (short) (argc && 0xffff));
        return atk_bridge_init (argc, argv);
 }
 
 static void
-add_signal_listener (const char *signal_name)
-{
-  guint id;
-
-  id = atk_add_global_event_listener (
-    spi_atk_bridge_signal_listener, signal_name);
-
-  g_array_append_val (listener_ids, id);
-}
-
-static void
-spi_atk_register_event_listeners (void)
-{
-  /*
-   * kludge to make sure the Atk interface types are registered, otherwise
-   * the AtkText signal handlers below won't get registered
-   */
-  guint      id;
-  GObject   *ao = g_object_new (ATK_TYPE_OBJECT, NULL);
-  AtkObject *bo = atk_no_op_object_new (ao);
-
-
-  if (atk_listeners_registered) 
-    {
-      g_object_unref (G_OBJECT (bo));
-      g_object_unref (ao);
-      return;
-    }
-
-  atk_listeners_registered = TRUE;
-
-  /* Register for focus event notifications, and register app with central registry  */
-
-  listener_ids = g_array_sized_new (FALSE, TRUE, sizeof (guint), 16);
-
-  atk_bridge_focus_tracker_id = atk_add_focus_tracker (spi_atk_bridge_focus_tracker);
-
-  id = atk_add_global_event_listener (spi_atk_bridge_property_event_listener,
-                                     "Gtk:AtkObject:property-change");
-  g_array_append_val (listener_ids, id);
-  id = atk_add_global_event_listener (spi_atk_bridge_window_event_listener,
-                                     "window:create");
-  g_array_append_val (listener_ids, id);
-  id = atk_add_global_event_listener (spi_atk_bridge_window_event_listener,
-                                     "window:destroy");
-  g_array_append_val (listener_ids, id);
-  id = atk_add_global_event_listener (spi_atk_bridge_window_event_listener,
-                                     "window:minimize");
-  g_array_append_val (listener_ids, id);
-  id = atk_add_global_event_listener (spi_atk_bridge_window_event_listener,
-                                     "window:maximize");
-  g_array_append_val (listener_ids, id);
-  id = atk_add_global_event_listener (spi_atk_bridge_window_event_listener,
-                                     "window:restore");
-  g_array_append_val (listener_ids, id);
-  id = atk_add_global_event_listener (spi_atk_bridge_window_event_listener,
-                                     "window:activate");
-  g_array_append_val (listener_ids, id);
-  id = atk_add_global_event_listener (spi_atk_bridge_window_event_listener,
-                                     "window:deactivate");
-  g_array_append_val (listener_ids, id);
-  id = atk_add_global_event_listener (spi_atk_bridge_document_event_listener,
-                                     "Gtk:AtkDocument:load-complete");
-  g_array_append_val (listener_ids, id);
-  id = atk_add_global_event_listener (spi_atk_bridge_document_event_listener,
-                                     "Gtk:AtkDocument:reload");
-  g_array_append_val (listener_ids, id);
-  id = atk_add_global_event_listener (spi_atk_bridge_document_event_listener,
-                                     "Gtk:AtkDocument:load-stopped");
-  g_array_append_val (listener_ids, id);
-  id = atk_add_global_event_listener (spi_atk_bridge_state_event_listener,
-                                     "Gtk:AtkObject:state-change");
-  g_array_append_val (listener_ids, id);
-
-  add_signal_listener ("Gtk:AtkObject:children-changed");
-  add_signal_listener ("Gtk:AtkObject:visible-data-changed");
-  add_signal_listener ("Gtk:AtkObject:active-descendant-changed");
-  add_signal_listener ("Gtk:AtkComponent:bounds-changed");
-  add_signal_listener ("Gtk:AtkSelection:selection-changed");
-  add_signal_listener ("Gtk:AtkText:text-selection-changed");
-  add_signal_listener ("Gtk:AtkText:text-changed");
-  add_signal_listener ("Gtk:AtkText:text-caret-moved");
-  add_signal_listener ("Gtk:AtkTable:row-inserted");
-  add_signal_listener ("Gtk:AtkTable:row-reordered");
-  add_signal_listener ("Gtk:AtkTable:row-deleted");
-  add_signal_listener ("Gtk:AtkTable:column-inserted");
-  add_signal_listener ("Gtk:AtkTable:column-reordered");
-  add_signal_listener ("Gtk:AtkTable:column-deleted");
-  add_signal_listener ("Gtk:AtkTable:model-changed");
-  add_signal_listener ("Gtk:AtkHypertext:link-selected");
-/*
- * May add the following listeners to implement preemptive key listening for GTK+
- *
- * atk_add_global_event_listener (spi_atk_bridge_widgetkey_listener, "Gtk:GtkWidget:key-press-event");
- * atk_add_global_event_listener (spi_atk_bridge_widgetkey_listener, "Gtk:GtkWidget:key-release-event");
- */
-  atk_bridge_key_event_listener_id = atk_add_key_event_listener (
-    spi_atk_bridge_key_listener, NULL);
-  
-  g_object_unref (G_OBJECT (bo));
-  g_object_unref (ao);
-}
-
-static void
 deregister_application (SpiAppData *app)
 {
   const char *registry = spi_atk_bridge_get_registry ();
-  bridge_threads_leave ();
   // todo: deregister
-  bridge_threads_enter ();
 }
 
 static void
@@ -587,7 +440,7 @@ spi_atk_bridge_exit_func (void)
 void
 gnome_accessibility_module_init (void)
 {
-  atk_bridge_init (NULL, NULL);
+  atk_bridge_init (0, NULL);
 
   if (g_getenv ("AT_BRIDGE_SHUTDOWN"))
     {
@@ -599,7 +452,6 @@ void
 gnome_accessibility_module_shutdown (void)
 {
   int     i;
-  GArray *ids = listener_ids;
   
   if (!atk_bridge_initialized)
     {
@@ -613,17 +465,7 @@ gnome_accessibility_module_shutdown (void)
        g_print("Atk Accessibility bridge shutdown\n");
     }
 
-  listener_ids = NULL;
-  if (atk_bridge_focus_tracker_id)
-        atk_remove_focus_tracker (atk_bridge_focus_tracker_id);
-  
-  for (i = 0; ids && i < ids->len; i++)
-    {
-          atk_remove_global_event_listener (g_array_index (ids, guint, i));
-    }
-  
-  if (atk_bridge_key_event_listener_id)
-          atk_remove_key_event_listener (atk_bridge_key_event_listener_id);
+  spi_atk_deregister_event_listeners();
 
   deregister_application (this_app);
   this_app = NULL;
@@ -631,539 +473,6 @@ gnome_accessibility_module_shutdown (void)
   misc = NULL;
 }
 
-static void emit(AtkObject *object, const char *name, int first_arg_type, ...)
-{
-  va_list args;
-  DBusMessage *sig;
-  char *path = spi_dbus_get_path(object);
-
-  spi_dbus_update_cache(&this_app->droute);
-  sig = dbus_message_new_signal(path, "org.freedesktop.atspi.Accessible", name);
-  va_start(args, first_arg_type);
-  if (first_arg_type != DBUS_TYPE_INVALID)
-  {
-    dbus_message_append_args_valist(sig, first_arg_type, args);
-  }
-  va_end(args);
-  dbus_connection_send(this_app->droute.bus, sig, NULL);
-  g_free(path);
-  dbus_message_unref(sig);
-}
-
-static void
-spi_atk_bridge_focus_tracker (AtkObject *object)
-{
-  emit(object, "focus", DBUS_TYPE_INVALID);
-}
-
-static void emit_property_change(AtkObject *object, const char *name, int type, void *val)
-{
-  DBusMessage *sig;
-  char *path = spi_dbus_get_path(object);
-  DBusMessageIter iter, sub;
-  const char *type_as_string = NULL;
-
-  spi_dbus_update_cache(&this_app->droute);
-  if (type == DBUS_TYPE_OBJECT_PATH)
-  {
-    type_as_string = "o";
-    if (!val) val = "";
-  }
-  else if (type == DBUS_TYPE_STRING) type_as_string = "s";
-  else if (type == DBUS_TYPE_INT32) type_as_string = "i";
-  else if (type == DBUS_TYPE_UINT32) type_as_string = "o";
-  else
-  {
-    g_warning("Unknown type %d in property change signal", type);
-  }
-  sig = dbus_message_new_signal(path, "org.freedesktop.atspi.Accessible", "PropertyChanged");
-  dbus_message_iter_init_append(sig, &iter);
-  dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &name);
-  dbus_message_iter_open_container(&iter, DBUS_TYPE_VARIANT, type_as_string, &sub);
-  dbus_message_iter_append_basic(&sub, type, val);
-  dbus_message_iter_close_container(&iter, &sub);
-  dbus_connection_send(this_app->droute.bus, sig, NULL);
-  g_free(path);
-  dbus_message_unref(sig);
-}
-
-static void emit_rect(AtkObject *object, const char *name, AtkRectangle *rect)
-{
-  DBusMessage *sig;
-  char *path = spi_dbus_get_path(object);
-  DBusMessageIter iter, sub;
-  dbus_uint32_t x, y, width, height;
-
-  spi_dbus_update_cache(&this_app->droute);
-  x = rect->x;
-  y = rect->y;
-  width = rect->width;
-  height = rect->height;
-  sig = dbus_message_new_signal(path, "org.freedesktop.atspi.Accessible", "PropertyChanged");
-  if (sig)
-    {
-      dbus_message_iter_init_append (sig, &iter);
-      dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &name);
-      if (!dbus_message_iter_open_container
-         (&iter, DBUS_TYPE_STRUCT, NULL, &sub))
-       goto oom;
-      dbus_message_iter_append_basic (&sub, DBUS_TYPE_INT32, &x);
-      dbus_message_iter_append_basic (&sub, DBUS_TYPE_INT32, &y);
-      dbus_message_iter_append_basic (&sub, DBUS_TYPE_INT32, &width);
-      dbus_message_iter_append_basic (&sub, DBUS_TYPE_INT32, &height);
-      if (!dbus_message_iter_close_container (&iter, &sub))
-       goto oom;
-    }
-  dbus_connection_send(this_app->droute.bus, sig, NULL);
-oom:
-  g_free(path);
-  dbus_message_unref(sig);
-}
-
-static gboolean
-spi_atk_bridge_property_event_listener (GSignalInvocationHint *signal_hint,
-                                       guint n_param_values,
-                                       const GValue *param_values,
-                                       gpointer data)
-{
-  AtkPropertyValues *values;
-  AtkObject *obj;
-  const gchar *prop_name;
-  const gchar *sp = NULL;
-  AtkObject *ao;
-  char *s_ao = NULL;
-  gint i;
-  const gchar *name = NULL;
-
-#ifdef SPI_BRIDGE_DEBUG
-  GSignalQuery signal_query;
-  const gchar *signame;
-  const gchar *s, *s2;
-  
-  g_signal_query (signal_hint->signal_id, &signal_query);
-  signame = signal_query.signal_name;
-
-  s2 = g_type_name (G_OBJECT_TYPE (g_value_get_object (param_values + 0)));
-  s = atk_object_get_name (ATK_OBJECT (g_value_get_object (param_values + 0)));
-  values = (AtkPropertyValues*) g_value_get_pointer (param_values + 1);
-  DBG (2, g_message ("Received (property) signal %s:%s:%s from object %s (gail %s)\n",
-          g_type_name (signal_query.itype), signame, values->property_name, s, s2));
-  
-#endif
-
-  obj = g_value_get_object (param_values + 0);
-  name = atk_object_get_name (obj);
-  values = (AtkPropertyValues*) g_value_get_pointer (param_values + 1);
-
-  prop_name = values->property_name;
-  if (strcmp (prop_name, "accessible-name") == 0)
-    {
-      spi_dbus_notify_change(obj, FALSE, &this_app->droute);
-    }
-  else if (strcmp (prop_name, "accessible-description") == 0)
-    {
-      spi_dbus_notify_change(obj, FALSE, &this_app->droute);
-    }
-  else if (strcmp (prop_name, "accessible-parent") == 0)
-    {
-      spi_dbus_notify_change(obj, FALSE, &this_app->droute);
-    }
-  else if (strcmp (prop_name, "accessible-table-summary") == 0)
-    {
-      ao = atk_table_get_summary (ATK_TABLE (obj));
-      s_ao = spi_dbus_get_path(ao);
-      emit_property_change(obj, prop_name, DBUS_TYPE_OBJECT_PATH, s_ao);
-    }
-  else if (strcmp (prop_name, "accessible-table-column-header") == 0)
-    {
-      i = g_value_get_int (&(values->new_value));
-      ao = atk_table_get_column_header (ATK_TABLE (obj), i);
-      s_ao = spi_dbus_get_path(ao);
-      emit_property_change(obj, prop_name, DBUS_TYPE_OBJECT_PATH, s_ao);
-    }
-  else if (strcmp (prop_name, "accessible-table-row-header") == 0)
-    {
-      i = g_value_get_int (&(values->new_value));
-      ao = atk_table_get_row_header (ATK_TABLE (obj), i);
-      s_ao = spi_dbus_get_path(ao);
-      emit_property_change(obj, prop_name, DBUS_TYPE_OBJECT_PATH, s_ao);
-    }
-  else if (strcmp (prop_name, "accessible-table-row-description") == 0)
-    {
-      i = g_value_get_int (&(values->new_value));
-      sp = atk_table_get_row_description (ATK_TABLE (obj), i);
-      emit_property_change(obj, prop_name, DBUS_TYPE_STRING, (void *)&sp);
-    }
-  else if (strcmp (prop_name, "accessible-table-column-description") == 0)
-    {
-      i = g_value_get_int (&(values->new_value));
-      sp = atk_table_get_column_description (ATK_TABLE(obj), i);
-      emit_property_change(obj, prop_name, DBUS_TYPE_STRING, (void *)&sp);
-    }
-  else if (strcmp (prop_name, "accessible-table-caption-object") == 0)
-    {
-      ao = atk_table_get_caption (ATK_TABLE(obj));
-      sp = atk_object_get_name (ao);
-      emit_property_change(obj, prop_name, DBUS_TYPE_STRING, (void *)&sp);
-    }
-  else
-    {
-      long v = 0;
-      emit_property_change(obj, prop_name, DBUS_TYPE_INT32, &v);
-    }
-  if (s_ao) g_free(s_ao);
-  return TRUE;
-}
-
-static gboolean
-spi_atk_bridge_state_event_listener (GSignalInvocationHint *signal_hint,
-                                    guint n_param_values,
-                                    const GValue *param_values,
-                                    gpointer data)
-{
-  AtkObject *obj;
-  gchar *property_name;
-  unsigned long detail1;
-#ifdef SPI_BRIDGE_DEBUG
-  GSignalQuery signal_query;
-  const gchar *name;
-  
-  g_signal_query (signal_hint->signal_id, &signal_query);
-  name = signal_query.signal_name;
-  fprintf (stderr, "Received (state) signal %s:%s\n",
-          g_type_name (signal_query.itype), name);
-#endif
-
-  obj = ATK_OBJECT(g_value_get_object (param_values + 0));
-  property_name = g_strdup (g_value_get_string (param_values + 1));
-  /* Ignore defunct for now; we'll send a tree update to remove it when
-     the object goes away */
-  /* Also ignore state changes for objects not yet broadcast */
-  if ((property_name && !strcmp(property_name, "defunct")) ||
-      !spi_dbus_object_is_known(obj))
-  {
-    g_free(property_name);
-    return TRUE;
-  }
-  detail1 = (g_value_get_boolean (param_values + 2))
-    ? 1 : 0;
-  emit(obj, "StateChanged", DBUS_TYPE_STRING, &property_name, DBUS_TYPE_UINT32, &detail1, DBUS_TYPE_INVALID);
-  g_free (property_name);
-  return TRUE;
-}
-
-static void
-spi_init_keystroke_from_atk_key_event (Accessibility_DeviceEvent  *keystroke,
-                                      AtkKeyEventStruct          *event)
-{
-#ifdef SPI_DEBUG
-  if (event)
-    {
-      g_print ("event %c (%d)\n", (int) event->keyval, (int) event->keycode);
-    }
-  else
-#endif
-  if (!event)
-    { /* this doesn't really need translating */
-      g_print (_("WARNING: NULL key event reported."));
-    }
-  
-  keystroke->id        = (dbus_int32_t) event->keyval;
-  keystroke->hw_code   = (dbus_int16_t) event->keycode;
-  keystroke->timestamp = (dbus_uint32_t) event->timestamp;
-  keystroke->modifiers = (dbus_uint16_t) (event->state & 0xFFFF);
-  if (event->string)
-    {
-      gunichar c;
-
-      keystroke->event_string = g_strdup (event->string);
-      c = g_utf8_get_char_validated (event->string, -1);
-      if (c > 0 && g_unichar_isprint (c))
-        keystroke->is_text = TRUE;
-      else
-        keystroke->is_text = FALSE;
-    }
-  else
-    {
-      keystroke->event_string = g_strdup ("");
-      keystroke->is_text = FALSE;
-    }
-  switch (event->type)
-    {
-    case (ATK_KEY_EVENT_PRESS):
-      keystroke->type = Accessibility_KEY_PRESSED_EVENT;
-      break;
-    case (ATK_KEY_EVENT_RELEASE):
-      keystroke->type = Accessibility_KEY_RELEASED_EVENT;
-      break;
-    default:
-      keystroke->type = 0;
-      break;
-    }
-#if 0  
-  g_print ("key_event type %d; val=%d code=%d modifiers=%x name=%s is_text=%d, time=%lx\n",
-          (int) keystroke->type, (int) keystroke->id, (int) keystroke->hw_code,
-          (int) keystroke->modifiers,
-          keystroke->event_string, (int) keystroke->is_text, (unsigned long) keystroke->timestamp);
-#endif
-}
-
-static gboolean Accessibility_DeviceEventController_notifyListenersSync(const Accessibility_DeviceEvent *key_event)
-{
-  DBusMessage *message = dbus_message_new_method_call(SPI_DBUS_NAME_REGISTRY, SPI_DBUS_PATH_REGISTRY, "org.freedesktop.atspi.DeviceEventController", "notifyListenersSync");
-  DBusError error;
-  dbus_bool_t consumed = FALSE;
-
-  dbus_error_init(&error);
-  if (spi_dbus_marshall_deviceEvent(message, key_event))
-  {
-    DBusMessage *reply = dbus_connection_send_with_reply_and_block(this_app->droute.bus, message, 1000, &error);
-    if (reply)
-    {
-      DBusError error;
-      dbus_error_init(&error);
-      dbus_message_get_args(reply, &error, DBUS_TYPE_BOOLEAN, &consumed, DBUS_TYPE_INVALID);
-      dbus_message_unref(reply);
-    }
-  }
-  dbus_message_unref(message);
-  return consumed;
-}
-
-static gint
-spi_atk_bridge_key_listener (AtkKeyEventStruct *event, gpointer data)
-{
-  gboolean             result;
-  Accessibility_DeviceEvent key_event;
-
-  spi_init_keystroke_from_atk_key_event (&key_event, event);
-
-  bridge_threads_leave ();
-  result = Accessibility_DeviceEventController_notifyListenersSync (&key_event);
-  bridge_threads_enter ();
-
-  if (key_event.event_string) g_free (key_event.event_string);
-
-  return result;
-}
-
-static gboolean
-spi_atk_bridge_signal_listener (GSignalInvocationHint *signal_hint,
-                               guint n_param_values,
-                               const GValue *param_values,
-                               gpointer data)
-{
-  AtkObject *obj;
-  GSignalQuery signal_query;
-  const gchar *name;
-  const gchar *detail;
-  char *sp = NULL;
-  AtkObject *ao;
-  gint detail1 = 0, detail2 = 0;
-  char *s_ao = NULL;
-  gchar *sig_name;
-  char *p;
-#ifdef SPI_BRIDGE_DEBUG
-  const gchar *s, *s2;
-#endif 
-  
-  g_signal_query (signal_hint->signal_id, &signal_query);
-
-  name = signal_query.signal_name;
-  if (signal_hint->detail)
-  {
-    detail = g_quark_to_string (signal_hint->detail);
-    sig_name = g_strdup_printf("object_%s_%s", name, detail);
-  }
-  else
-  {
-    detail = NULL;
-    sig_name = g_strdup_printf("object_%s", name);
-  }
-  while ((p = strchr(sig_name, '-')) != NULL) *p = '_';
-
-#ifdef SPI_BRIDGE_DEBUG
-  s2 = g_type_name (G_OBJECT_TYPE (g_value_get_object (param_values + 0)));
-  s = atk_object_get_name (ATK_OBJECT (g_value_get_object (param_values + 0)));
-  fprintf (stderr, "Received signal %s:%s detail: %s from object %s (gail %s)\n",
-          g_type_name (signal_query.itype), name, 
-          detail ? detail : "<NULL>", s ? s : "<NULL>" , s2);
-#endif
-  
-  obj = ATK_OBJECT(g_value_get_object (param_values + 0));
-
-  if (signal_query.signal_id == atk_signal_active_descendant_changed)
-    {
-      gpointer child = g_value_get_pointer (param_values + 1);
-
-      g_return_val_if_fail (ATK_IS_OBJECT (child), TRUE);
-
-      ao = ATK_OBJECT (child);
-
-      detail1 = atk_object_get_index_in_parent (ao);
-      s_ao = spi_dbus_get_path(child);
-      emit(obj, "name", DBUS_TYPE_OBJECT_PATH, s_ao, DBUS_TYPE_UINT32, &detail1, DBUS_TYPE_INVALID);
-      g_free(s_ao);
-    }
-  else if (signal_query.signal_id == atk_signal_link_selected)
-    {
-      if (G_VALUE_TYPE (param_values + 1) == G_TYPE_INT)
-        detail1 = g_value_get_int (param_values + 1);
-      emit(obj, "LinkSelected", DBUS_TYPE_UINT32, &detail1, DBUS_TYPE_INVALID);
-    }
-  else if (signal_query.signal_id == atk_signal_bounds_changed)
-    {
-      AtkRectangle *atk_rect = NULL;
-
-      if (G_VALUE_HOLDS_BOXED (param_values + 1))
-         atk_rect = g_value_get_boxed (param_values + 1);
-      emit_rect(obj, "BoundsChanged", atk_rect);
-    }
-  else if ((signal_query.signal_id == atk_signal_children_changed) && obj)
-    {
-      spi_dbus_notify_change(obj, FALSE, &this_app->droute);
-    }
-  else
-    {
-      if (n_param_values >= 2)
-        {
-          if (G_VALUE_TYPE (param_values + 1) == G_TYPE_INT)
-            detail1 = g_value_get_int (param_values + 1);
-          if (n_param_values >= 3)
-            {
-              if (G_VALUE_TYPE (param_values + 2) == G_TYPE_INT)
-                detail2 = g_value_get_int (param_values + 2);
-            }
-        }
-
-      if (signal_query.signal_id == atk_signal_text_changed)
-        {
-          sp = atk_text_get_text (ATK_TEXT (obj),
-                                 detail1,
-                                 detail1+detail2);
-          emit(obj, sig_name, DBUS_TYPE_UINT32, &detail1, DBUS_TYPE_UINT32, &detail2, DBUS_TYPE_STRING, &sp, DBUS_TYPE_INVALID);
-        }
-      else if (signal_query.signal_id == atk_signal_text_selection_changed)
-        {
-          /* Return NULL as the selected string */
-          // TODO
-          emit(obj, sig_name, DBUS_TYPE_INVALID);
-        }
-      else
-        {
-          emit(obj, sig_name, DBUS_TYPE_INVALID);
-        }
-    }
-
-  if (sp) 
-    g_free (sp);
-
-  if (s_ao)
-     g_free (s_ao);
-  g_free(sig_name);
-
-  return TRUE;
-}
-
-static gboolean
-spi_atk_bridge_window_event_listener (GSignalInvocationHint *signal_hint,
-                                     guint n_param_values,
-                                     const GValue *param_values,
-                                     gpointer data)
-{
-  AtkObject *obj;
-  GSignalQuery signal_query;
-  const gchar *name, *s;
-#ifdef SPI_BRIDGE_DEBUG
-  const gchar *s2;
-#endif
-  
-  g_signal_query (signal_hint->signal_id, &signal_query);
-
-  name = signal_query.signal_name;
-  gchar *sig_name;
-
-#ifdef SPI_BRIDGE_DEBUG
-  s2 = g_type_name (G_OBJECT_TYPE (g_value_get_object (param_values + 0)));
-  s = atk_object_get_name (ATK_OBJECT (g_value_get_object (param_values + 0)));
-  fprintf (stderr, "Received signal %s:%s from object %s (gail %s)\n",
-          g_type_name (signal_query.itype), name, s ? s : "<NULL>" , s2);
-#endif
-  
-  obj = ATK_OBJECT(g_value_get_object (param_values + 0));
-
-  s = atk_object_get_name (obj);
-  sig_name = g_strdup_printf("window_%s", name);
-  emit(obj, sig_name, DBUS_TYPE_STRING, &s, DBUS_TYPE_INVALID);
-  g_free(sig_name);
-
-  return TRUE;
-}
-
-static gboolean
-spi_atk_bridge_document_event_listener (GSignalInvocationHint *signal_hint,
-                                      guint n_param_values,
-                                      const GValue *param_values,
-                                      gpointer data)
-{
-  AtkObject *obj;
-  GSignalQuery signal_query;
-  const gchar *name, *s;
-  gchar *sig_name;
-#ifdef SPI_BRIDGE_DEBUG
-  const gchar *s2;
-#endif
-
-  g_signal_query (signal_hint->signal_id, &signal_query);
-
-  name = signal_query.signal_name;
-
-#ifdef SPI_BRIDGE_DEBUG
-  s2 = g_type_name (G_OBJECT_TYPE (g_value_get_object (param_values + 0)));
-  s = atk_object_get_name (ATK_OBJECT (g_value_get_object (param_values + 0)));
-  fprintf (stderr, "Received signal %s:%s from object %s (gail %s)\n",
-           g_type_name (signal_query.itype), name, s ? s : "<NULL>" , s2);
-#endif
-
-  obj = ATK_OBJECT(g_value_get_object (param_values + 0));
-
-  s = atk_object_get_name (obj);
-  sig_name = g_strdup_printf("document_%s", name);
-  emit(obj, sig_name, DBUS_TYPE_STRING, &s, DBUS_TYPE_INVALID);
-  g_free(sig_name);
-  return TRUE;
-}
-
-static void
-spi_atk_tidy_windows (void)
-{
-  AtkObject *root;
-  gint n_children;
-  gint i;
-
-  root = atk_get_root ();
-  n_children = atk_object_get_n_accessible_children (root);
-  for (i = 0; i < n_children; i++)
-    {
-      AtkObject *child;
-      AtkStateSet *stateset;
-      const gchar *name;
-     
-      child = atk_object_ref_accessible_child (root, i);
-      stateset = atk_object_ref_state_set (child);
-      
-      name = atk_object_get_name (child);
-      if (atk_state_set_contains_state (stateset, ATK_STATE_ACTIVE))
-        {
-         emit(child, "window:deactivate", DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID);
-        }
-      g_object_unref (stateset);
-
-      emit(child, "window:destroy", DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID);
-      g_object_unref (child);
-    }
-}
-
 static void
 reinit_register_vars (void)
 {