#undef SPI_BRIDGE_DEBUG
+#define DBG(a,b) if(_dbg>=(a))b
+
+static int _dbg = 0;
+static char *spi_nil_string = "";
+
static CORBA_Environment ev;
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;
+*/
+
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,
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[])
{
+ const char *debug_env_string = g_getenv ("AT_SPI_DEBUG");
+
if (atk_bridge_initialized)
{
return 0;
}
atk_bridge_initialized = TRUE;
+ if (debug_env_string)
+ _dbg = (int) g_ascii_strtod (debug_env_string, NULL);
+
if (!bonobo_init (argc, argv ? *argv : NULL))
{
g_error ("Could not initialize Bonobo");
*/
if (bonobo_activation_iid_get ())
{
- fprintf (stderr, "Found Bonobo component\n");
+ 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,
{
spi_atk_bridge_do_registration ();
}
+
+ spi_atk_bridge_init_event_type_consts ();
return 0;
}
+
static void
spi_atk_bridge_do_registration (void)
{
this_app = spi_application_new (atk_get_root ());
- fprintf (stderr, "About to register application\n");
+ 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);
- fprintf (stderr, "Application registered & listening\n");
+ DBG (1, g_message ("Application registered & listening\n"));
}
if (registry_died || (registry == NULL)) {
CORBA_exception_init (&ev);
- if (registry_died) g_warning ("registry died! restarting...");
+ if (registry_died)
+ DBG (1, g_warning ("registry died! restarting..."));
registry = bonobo_activation_activate_from_id (
"OAFIID:Accessibility_Registry:1.0", 0, NULL, &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);
- fprintf (stderr, "bridge exit func complete.\n");
+ DBG (1, g_message ("bridge exit func complete.\n"));
if (g_getenv ("AT_BRIDGE_SHUTDOWN"))
{
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;
}
static void
-spi_atk_emit_eventv (GObject *gobject,
- unsigned long detail1,
- unsigned long detail2,
- const char *format, ...)
+spi_atk_emit_eventv (const GObject *gobject,
+ long detail1,
+ long detail2,
+ CORBA_any *any,
+ const char *format, ...)
{
va_list args;
Accessibility_Event e;
{
aobject = NULL;
source = NULL;
- g_error ("received property-change event from non-AtkImplementor");
+ DBG (0, g_warning ("received property-change event from non-AtkImplementor"));
}
- if (source != NULL)
+ if (source)
{
e.type = g_strdup_vprintf (format, args);
e.source = BONOBO_OBJREF (source);
e.detail1 = detail1;
e.detail2 = detail2;
-
+ if (any) e.any_data = *any;
+ else spi_init_any_nil (&e.any_data);
+
#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 (spi_atk_bridge_get_registry (), &e, &ev);
+ CORBA_exception_init (&ev);
+ Accessibility_Registry_notifyEvent (spi_atk_bridge_get_registry (),
+ &e, &ev);
#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));
+ 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);
-
+
g_free (e.type);
}
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);
return result;
}
+
+static void
+spi_atk_signal_emit_event (const GObject *gobject,
+ const GSignalQuery *signal_query,
+ long detail1,
+ long detail2,
+ const gchar *name,
+ const gchar *detail)
+{
+ CORBA_any any;
+ CORBA_char *sp = NULL;
+ AtkObject *ao;
+
+ if (signal_query->signal_id == atk_signal_text_changed)
+ {
+ sp = atk_text_get_text (ATK_TEXT (gobject),
+ detail1,
+ detail1+detail2);
+ spi_init_any_string (&any, &sp);
+ }
+#ifdef EXTENDED_OBJECT_EVENTS_ARE_WORKING
+ else if ((signal_query->signal_id == atk_signal_child_changed) && gobject)
+ {
+ ao = atk_object_ref_accessible_child (ATK_OBJECT (gobject),
+ detail1);
+ if (ao)
+ {
+ spi_init_any_object (&any, ao);
+ atk_object_unref (ao);
+ }
+ else
+ {
+ spi_init_any_nil (&any);
+ }
+ }
+#endif
+ else
+ {
+ spi_init_any_nil (&any);
+ }
+
+ if (detail)
+ spi_atk_emit_eventv (gobject, detail1, detail2, &any,
+ "object:%s:%s", name, detail);
+ else
+ spi_atk_emit_eventv (gobject, detail1, detail2, &any,
+ "object:%s", name);
+}
+
+
+
static gboolean
spi_atk_bridge_signal_listener (GSignalInvocationHint *signal_hint,
guint n_param_values,
GSignalQuery signal_query;
const gchar *name;
const gchar *detail;
+ CORBA_char *sp;
gint detail1 = 0, detail2 = 0;
#ifdef SPI_BRIDGE_DEBUG
const gchar *s, *s2;
-#endif
+#endif
g_signal_query (signal_hint->signal_id, &signal_query);
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);
+ detail ? detail : "<NULL>", s ? s : "<NULL>" , s2);
#endif
-
+
gobject = g_value_get_object (param_values + 0);
if (G_VALUE_TYPE (param_values + 1) == G_TYPE_INT)
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);
- if (detail)
- spi_atk_emit_eventv (gobject, detail1, detail2, "object:%s:%s", name, detail);
- else
- spi_atk_emit_eventv (gobject, detail1, detail2, "object:%s", name);
-
+ spi_atk_signal_emit_event (gobject, &signal_query,
+ detail2, detail2,
+ name, detail);
return TRUE;
}
static gboolean
spi_atk_bridge_window_event_listener (GSignalInvocationHint *signal_hint,
- guint n_param_values,
- const GValue *param_values,
- gpointer data)
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer data)
{
GObject *gobject;
GSignalQuery signal_query;
- const gchar *name;
+ CORBA_any any;
+ 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);
+ s = atk_object_get_name (ATK_OBJECT (gobject));
+ spi_init_any_string (&any, &s);
+
+ spi_atk_emit_eventv (gobject, 0, 0, &any,
+ "window:%s", name);
return TRUE;
}