* AT-SPI - Assistive Technology Service Provider Interface
* (Gnome Accessibility Project; http://developer.gnome.org/projects/gap)
*
- * Copyright 2001 Sun Microsystems Inc.
+ * Copyright 2001, 2002 Sun Microsystems Inc.,
+ * Copyright 2001, 2002 Ximian, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
#include <stdarg.h>
#include <libbonobo.h>
#include <orbit/orbit.h>
+#include <glib-object.h>
#include <atk/atk.h>
#include <atk/atkobject.h>
#include <atk/atknoopobject.h>
#undef SPI_BRIDGE_DEBUG
+#define DBG(a,b) if(_dbg>=(a))b
+
+static int _dbg;
+
static CORBA_Environment ev;
-static Accessibility_Registry registry;
+static Accessibility_Registry registry = NULL;
static SpiApplication *this_app = NULL;
+static gboolean registry_died = FALSE;
+static guint toplevel_handler;
+
+/* NOT YET USED
+ static GQuark atk_quark_property_changed_name;
+ static GQuark atk_quark_property_changed_description;
+ static GQuark atk_quark_property_changed_parent;
+ static GQuark atk_quark_property_changed_role;
+ static GQuark atk_quark_property_changed_table_caption;
+ static GQuark atk_quark_property_changed_table_column_description;
+ static GQuark atk_quark_property_changed_table_row_description;
+ static guint atk_signal_property_changed;
+*/
+
+static guint atk_signal_text_changed;
+static guint atk_signal_child_changed;
+
+/* NOT YET USED
+ static guint atk_signal_text_selection_changed;
+ static guint atk_signal_active_descendant_changed;
+ 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;
+*/
+
+#define ATK_BRIDGE_RESERVED_CONTEXT_SIZE 16
+
+typedef enum {
+ ATK_BRIDGE_CONTEXT_TYPE_NONE = 0,
+ ATK_BRIDGE_CONTEXT_TYPE_STRING,
+ ATK_BRIDGE_CONTEXT_TYPE_OBJECT
+} AtkBridgeEventContextType;
+
+typedef union {
+ gchar *string;
+ AtkObject *object;
+ gpointer *foo;
+} AtkBridgeEventContextData;
+
+typedef struct {
+ AtkBridgeEventContextType _type;
+ AtkBridgeEventContextData _data;
+} AtkBridgeEventContext;
+
+static Accessibility_Registry spi_atk_bridge_get_registry (void);
+static void spi_atk_bridge_do_registration (void);
+static void spi_atk_bridge_toplevel_added (AtkObject *object,
+ guint index,
+ AtkObject *child);
static void spi_atk_bridge_exit_func (void);
static void spi_atk_register_event_listeners (void);
-static gboolean spi_atk_bridge_idle_init (gpointer user_data);
static void spi_atk_bridge_focus_tracker (AtkObject *object);
+static void spi_atk_bridge_register_application (Accessibility_Registry registry);
static gboolean spi_atk_bridge_property_event_listener (GSignalInvocationHint *signal_hint,
guint n_param_values,
const GValue *param_values,
static int atk_bridge_initialized = FALSE;
static guint atk_bridge_focus_tracker_id = 0;
static guint atk_bridge_key_event_listener_id = 0;
-static guint idle_init_id = 0;
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 ()
+{
+ atk_signal_child_changed = g_signal_lookup ("child_changed",
+ ATK_TYPE_OBJECT);
+ atk_signal_text_changed = g_signal_lookup ("text_changed",
+ ATK_TYPE_TEXT);
+}
+
static int
atk_bridge_init (gint *argc, gchar **argv[])
{
- CORBA_Environment ev;
-
if (atk_bridge_initialized)
{
return 0;
}
atk_bridge_initialized = TRUE;
+ _dbg = (int) g_ascii_strtod (g_getenv ("AT_SPI_DEBUG"), NULL);
+
if (!bonobo_init (argc, argv ? *argv : NULL))
{
g_error ("Could not initialize Bonobo");
}
/*
- * We only want to enable the bridge for top level
+ * 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.
*/
if (bonobo_activation_iid_get ())
- return 0;
-
- CORBA_exception_init(&ev);
-
- registry = bonobo_activation_activate_from_id (
- "OAFIID:Accessibility_Registry:1.0", 0, NULL, &ev);
-
- if (ev._major != CORBA_NO_EXCEPTION)
{
- g_error ("Accessibility app error: exception during "
- "registry activation from id: %s\n",
- CORBA_exception_id (&ev));
- CORBA_exception_free (&ev);
+ DBG (1, g_message ("Found Bonobo component\n"));
+ toplevel_handler = g_signal_connect (atk_get_root (),
+ "children-changed::add",
+ (GCallback) spi_atk_bridge_toplevel_added,
+ NULL);
}
+ else
+ {
+ spi_atk_bridge_do_registration ();
+ }
+
+ atk_bridge_init_event_type_consts ();
+
+ return 0;
+}
+
+static void
+spi_atk_bridge_do_registration (void)
+{
+ CORBA_Environment ev;
- if (registry == CORBA_OBJECT_NIL)
+ CORBA_exception_init(&ev);
+
+ if (spi_atk_bridge_get_registry () == CORBA_OBJECT_NIL)
{
g_error ("Could not locate registry");
}
this_app = spi_application_new (atk_get_root ());
- fprintf (stderr, "About to register application\n");
-
- Accessibility_Registry_registerApplication (registry,
- BONOBO_OBJREF (this_app),
- &ev);
+ DBG (1, g_message ("About to register application\n"));
+ spi_atk_bridge_register_application (spi_atk_bridge_get_registry ());
+
g_atexit (spi_atk_bridge_exit_func);
- idle_init_id = g_idle_add (spi_atk_bridge_idle_init, NULL);
+ DBG (1, g_message ("Application registered & listening\n"));
- return 0;
}
-int
-gtk_module_init (gint *argc, gchar **argv[])
+static void
+spi_atk_bridge_toplevel_added (AtkObject *object,
+ guint index,
+ AtkObject *child)
{
- return atk_bridge_init (argc, argv);
+ g_signal_handler_disconnect (object, toplevel_handler);
+ spi_atk_bridge_do_registration ();
}
-static gboolean
-spi_atk_bridge_idle_init (gpointer user_data)
+static void
+spi_atk_bridge_register_application (Accessibility_Registry registry)
{
- idle_init_id = 0;
-
+ Accessibility_Registry_registerApplication (spi_atk_bridge_get_registry (),
+ BONOBO_OBJREF (this_app),
+ &ev);
spi_atk_register_event_listeners ();
+}
- fprintf (stderr, "Application registered & listening\n");
+static Accessibility_Registry
+spi_atk_bridge_get_registry ()
+{
+ CORBA_Environment ev;
+
+ if (registry_died || (registry == NULL)) {
+ CORBA_exception_init (&ev);
+ if (registry_died)
+ DBG (1, g_warning ("registry died! restarting..."));
+ registry = bonobo_activation_activate_from_id (
+ "OAFIID:Accessibility_Registry:1.0", 0, NULL, &ev);
+
+ if (ev._major != CORBA_NO_EXCEPTION)
+ {
+ g_error ("Accessibility app error: exception during "
+ "registry activation from id: %s\n",
+ CORBA_exception_id (&ev));
+ CORBA_exception_free (&ev);
+ }
+
+ if (registry_died && registry) {
+ registry_died = FALSE;
+ spi_atk_bridge_register_application (registry);
+ }
+ }
+ return registry;
+}
- return FALSE;
+int
+gtk_module_init (gint *argc, gchar **argv[])
+{
+ return atk_bridge_init (argc, argv);
}
static void
-add_signal_listener (const char *signal_name)
+spi_atk_bridge_add_signal_listener (const char *signal_name)
{
guint id;
"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: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");
+ spi_atk_bridge_add_signal_listener ("Gtk:AtkObject:children-changed");
+ spi_atk_bridge_add_signal_listener ("Gtk:AtkObject:visible-data-changed");
+ spi_atk_bridge_add_signal_listener ("Gtk:AtkSelection:selection-changed");
+ spi_atk_bridge_add_signal_listener ("Gtk:AtkText:text-selection-changed");
+ spi_atk_bridge_add_signal_listener ("Gtk:AtkText:text-changed");
+ spi_atk_bridge_add_signal_listener ("Gtk:AtkText:text-caret-moved");
+ spi_atk_bridge_add_signal_listener ("Gtk:AtkTable:row-inserted");
+ spi_atk_bridge_add_signal_listener ("Gtk:AtkTable:row-reordered");
+ spi_atk_bridge_add_signal_listener ("Gtk:AtkTable:row-deleted");
+ spi_atk_bridge_add_signal_listener ("Gtk:AtkTable:column-inserted");
+ spi_atk_bridge_add_signal_listener ("Gtk:AtkTable:column-reordered");
+ spi_atk_bridge_add_signal_listener ("Gtk:AtkTable:column-deleted");
+ spi_atk_bridge_add_signal_listener ("Gtk:AtkTable:model-changed");
/*
* May add the following listeners to implement preemptive key listening for GTK+
*
}
static void
-deregister_application (BonoboObject *app)
+spi_atk_bridge_deregister_application (BonoboObject *app)
{
- Accessibility_Registry_deregisterApplication (
- registry, BONOBO_OBJREF (app), &ev);
+ Accessibility_Registry registry = spi_atk_bridge_get_registry ();
+ Accessibility_Registry_deregisterApplication (registry, BONOBO_OBJREF (app), &ev);
registry = bonobo_object_release_unref (registry, &ev);
{
BonoboObject *app = (BonoboObject *) this_app;
- fprintf (stderr, "exiting bridge\n");
+ DBG (1, g_message ("exiting bridge\n"));
if (!app)
{
*/
if (!bonobo_is_initialized ())
{
- fprintf (stderr, "Re-initializing bonobo\n");
+ DBG (1, g_warning ("Re-initializing bonobo\n"));
g_assert (bonobo_init (0, NULL));
g_assert (bonobo_activate ());
}
- deregister_application (app);
+ spi_atk_bridge_deregister_application (app);
- fprintf (stderr, "bridge exit func complete.\n");
+ DBG (1, g_message ("bridge exit func complete.\n"));
if (g_getenv ("AT_BRIDGE_SHUTDOWN"))
{
gnome_accessibility_module_shutdown (void)
{
BonoboObject *app = (BonoboObject *) this_app;
-
+ int i;
+ GArray *ids = listener_ids;
+
if (!atk_bridge_initialized)
{
return;
g_print("Atk Accessibilty bridge shutdown\n");
- if (idle_init_id)
+ listener_ids = NULL;
+ 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));
+ }
+
+ atk_remove_key_event_listener (atk_bridge_key_event_listener_id);
+
+ deregister_application (app);
+}
+
+static void
+spi_atk_bridge_event_context_init (CORBA_any *any,
+ AtkBridgeEventContext *ctx)
+{
+ SpiAccessible *accessible;
+ if (ctx)
{
- g_source_remove (idle_init_id);
- idle_init_id = 0;
+ switch (ctx->_type)
+ {
+ /* FIXME
+ case ATK_BRIDGE_CONTEXT_TYPE_OBJECT:
+ accessible = spi_accessible_new (ctx->_data.object);
+ spi_init_any_object (any, BONOBO_OBJREF (accessible));
+ break;
+ */
+ case ATK_BRIDGE_CONTEXT_TYPE_STRING:
+ spi_init_any_string (any, &ctx->_data.string);
+ break;
+ default:
+ spi_init_any_nil (any);
+ }
}
else
{
- int i;
- GArray *ids = listener_ids;
-
- listener_ids = NULL;
- 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));
- }
-
- atk_remove_key_event_listener (atk_bridge_key_event_listener_id);
+ spi_init_any_nil (any);
}
-
- deregister_application (app);
-}
+}
static void
spi_atk_bridge_focus_tracker (AtkObject *object)
e.source = BONOBO_OBJREF (source);
e.detail1 = 0;
e.detail2 = 0;
+ spi_init_any_nil (&e.any_data);
+ Accessibility_Registry_notifyEvent (spi_atk_bridge_get_registry (), &e, &ev);
+ if (BONOBO_EX (&ev)) registry_died = TRUE;
+
+ Accessibility_Accessible_unref (e.source, &ev);
+
+ CORBA_exception_free (&ev);
+}
+
+static
+AtkBridgeEventContext *
+spi_atk_bridge_event_context_create (GObject *gobject,
+ long detail1,
+ long detail2,
+ GSignalQuery *signal_query)
+{
+ AtkBridgeEventContext *ctx = g_new0 (AtkBridgeEventContext, 1);
+ /* don't free the context, it's on the stack */
- Accessibility_Registry_notifyEvent (registry, &e, &ev);
+ /* if it's a window event, then marshal the window name */
- CORBA_exception_free (&ev);
+ /*
+ if (signal_query->signal_id == atk_signal_child_changed)
+ {
+ ctx->_type = ATK_BRIDGE_CONTEXT_TYPE_OBJECT;
+ ctx->_data.object = atk_object_ref_accessible_child (ATK_OBJECT (gobject),
+ (gint) detail1);
+ }
+ else */ if (signal_query && (signal_query->signal_id == atk_signal_text_changed))
+ {
+ ctx->_type = ATK_BRIDGE_CONTEXT_TYPE_STRING;
+ ctx->_data.string = atk_text_get_text (ATK_TEXT (gobject),
+ (gint) detail1,
+ (gint) detail1+detail2);
+ }
+ else
+ {
+ ctx->_type = ATK_BRIDGE_CONTEXT_TYPE_NONE;
+ }
+ return ctx;
+}
+
+static void
+spi_atk_bridge_event_context_free (AtkBridgeEventContext *ctx)
+{
+ if (ctx->_type == ATK_BRIDGE_CONTEXT_TYPE_OBJECT)
+ g_object_unref (ctx->_data.object);
+ g_free (ctx);
+}
+
+
+static void
+spi_atk_bridge_any_init ()
+{
+ AtkBridgeEventContext *ctx;
+ /* build some event context data, depending on the type */
+ ctx = spi_atk_bridge_event_context_create (gobject,
+ detail1, detail2,
+ signal_query);
+ spi_atk_bridge_event_context_init (&e.any_data, ctx);
+ spi_atk_bridge_event_context_free (ctx);
}
static void
-spi_atk_emit_eventv (GObject *gobject,
- unsigned long detail1,
- unsigned long detail2,
+spi_atk_emit_eventv (GObject *gobject,
+ unsigned long detail1,
+ unsigned long detail2,
+ GSignalQuery *signal_query,
const char *format, ...)
{
va_list args;
Accessibility_Event e;
SpiAccessible *source;
AtkObject *aobject;
+ AtkBridgeEventContext *ctx;
#ifdef SPI_BRIDGE_DEBUG
CORBA_string s;
#endif
e.source = BONOBO_OBJREF (source);
e.detail1 = detail1;
e.detail2 = detail2;
-
#ifdef SPI_BRIDGE_DEBUG
s = Accessibility_Accessible__get_name (BONOBO_OBJREF (source), &ev);
g_warning ("Emitting event '%s' (%lu, %lu) on %s",
e.type, e.detail1, e.detail2, s);
CORBA_free (s);
#endif
-
- Accessibility_Registry_notifyEvent (registry, &e, &ev);
+ CORBA_exception_init (&ev);
+ spi_atk_bridge_event_any_init (&e.any_data, gobject,
+ detail1, detail2, signal_query);
+ Accessibility_Registry_notifyEvent (spi_atk_bridge_get_registry (),
+ &e, &ev);
+ /* I haven't freed any_data._value when it's a char*, does it leak ? */
+#ifdef SPI_BRIDGE_DEBUG
+ if (ev._major != CORBA_NO_EXCEPTION)
+ g_warning ("error emitting event %s, (%d) %s",
+ e.type,
+ ev._major,
+ CORBA_exception_id(&ev));
+#endif
+ if (BONOBO_EX (&ev)) registry_died = TRUE;
+ Accessibility_Accessible_unref (e.source, &ev);
CORBA_exception_free (&ev);
}
va_end (args);
+
}
static gboolean
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);
- fprintf (stderr, "Received (property) signal %s:%s:%s from object %s (gail %s)\n",
- g_type_name (signal_query.itype), name, values->property_name, s, s2);
+ DBG (2, g_message ("Received (property) signal %s:%s:%s from object %s (gail %s)\n",
+ g_type_name (signal_query.itype), name, values->property_name, s, s2));
#endif
gobject = g_value_get_object (param_values + 0);
values = (AtkPropertyValues*) g_value_get_pointer (param_values + 1);
- spi_atk_emit_eventv (gobject, 0, 0, "object:property-change:%s", values->property_name);
+ spi_atk_emit_eventv (gobject, 0, 0, NULL,
+ "object:property-change:%s", values->property_name);
return TRUE;
}
spi_atk_emit_eventv (gobject,
detail1,
0,
+ NULL,
type);
g_free (property_name);
g_free (type);
switch (event->type)
{
case (ATK_KEY_EVENT_PRESS):
- keystroke->type = Accessibility_KEY_PRESSED;
+ keystroke->type = Accessibility_KEY_PRESSED_EVENT;
break;
case (ATK_KEY_EVENT_RELEASE):
- keystroke->type = Accessibility_KEY_RELEASED;
+ keystroke->type = Accessibility_KEY_RELEASED_EVENT;
break;
default:
keystroke->type = 0;
{
CORBA_boolean result;
Accessibility_DeviceEvent key_event;
- Accessibility_DeviceEventController controller =
- Accessibility_Registry_getDeviceEventController (registry, &ev);
+ Accessibility_DeviceEventController controller;
+
+ if (BONOBO_EX (&ev))
+ g_warning ("failure: pre-listener get dec\n");
+
+ controller =
+ Accessibility_Registry_getDeviceEventController (
+ spi_atk_bridge_get_registry (), &ev);
if (BONOBO_EX (&ev))
{
g_warning ("failure: no deviceeventcontroller found\n");
CORBA_exception_free (&ev);
+ registry_died = TRUE;
result = FALSE;
}
else
result = Accessibility_DeviceEventController_notifyListenersSync (
controller, &key_event, &ev);
+ bonobo_object_release_unref (controller, &ev);
CORBA_exception_free (&ev);
}
GObject *gobject;
GSignalQuery signal_query;
const gchar *name;
+ const gchar *detail;
+ AtkBridgeEventContext *ctx = NULL;
+
gint detail1 = 0, detail2 = 0;
#ifdef SPI_BRIDGE_DEBUG
const gchar *s, *s2;
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);
+ else
+ detail = NULL;
#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);
+ 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
gobject = g_value_get_object (param_values + 0);
detail1 = g_value_get_int (param_values + 1);
if (G_VALUE_TYPE (param_values + 2) == G_TYPE_INT)
detail2 = g_value_get_int (param_values + 2);
-
- spi_atk_emit_eventv (gobject, detail1, detail2, "object:%s", name);
+
+ if (detail)
+ spi_atk_emit_eventv (gobject, detail1, detail2, &signal_query,
+ "object:%s:%s", name, detail);
+ else
+ spi_atk_emit_eventv (gobject, detail1, detail2, &signal_query,
+ "object:%s", name);
return TRUE;
}
-
-
static gboolean
spi_atk_bridge_window_event_listener (GSignalInvocationHint *signal_hint,
guint n_param_values,
{
GObject *gobject;
GSignalQuery signal_query;
- const gchar *name;
+ AtkBridgeEventContext ctx;
+
+ const gchar *name, *s;
#ifdef SPI_BRIDGE_DEBUG
- const gchar *s, *s2;
+ const gchar *s2;
#endif
g_signal_query (signal_hint->signal_id, &signal_query);
fprintf (stderr, "Received signal %s:%s from object %s (gail %s)\n",
g_type_name (signal_query.itype), name, s ? s : "<NULL>" , s2);
#endif
-
+
gobject = g_value_get_object (param_values + 0);
- spi_atk_emit_eventv (gobject, 0, 0, "window:%s", name);
+ spi_atk_emit_eventv (gobject, 0, 0, &signal_query, "window:%s", name);
return TRUE;
}