* AT-SPI - Assistive Technology Service Provider Interface
* (Gnome Accessibility Project; http://developer.gnome.org/projects/gap)
*
- * Copyright 2001, 2002 Sun Microsystems Inc.,
- * Copyright 2001, 2002 Ximian, Inc.
+ * Copyright 2001, 2002, 2003 Sun Microsystems Inc.,
+ * Copyright 2001, 2002, 2003 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>
#include <libspi/Accessibility.h>
+#include <libspi/spi-private.h>
#include "accessible.h"
#include "application.h"
#define DBG(a,b) if(_dbg>=(a))b
-static int _dbg;
-
+static int _dbg = 0;
static CORBA_Environment ev;
-static Accessibility_Registry registry = NULL;
+static Accessibility_Registry registry = CORBA_OBJECT_NIL;
+static Accessibility_DeviceEventController device_event_controller = CORBA_OBJECT_NIL;
static SpiApplication *this_app = NULL;
static gboolean registry_died = FALSE;
+static gboolean atk_listeners_registered = FALSE;
static guint toplevel_handler;
/* NOT YET USED
static guint atk_signal_text_changed;
static guint atk_signal_child_changed;
+static guint atk_signal_active_descendant_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_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 guint atk_signal_link_selected;
static Accessibility_Registry spi_atk_bridge_get_registry (void);
static void spi_atk_bridge_do_registration (void);
ATK_TYPE_OBJECT);
atk_signal_text_changed = g_signal_lookup ("text_changed",
ATK_TYPE_TEXT);
+ 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);
}
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;
- _dbg = (int) g_ascii_strtod (g_getenv ("AT_SPI_DEBUG"), NULL);
+ if (debug_env_string)
+ _dbg = (int) g_ascii_strtod (debug_env_string, NULL);
if (!bonobo_init (argc, argv ? *argv : NULL))
{
spi_atk_bridge_do_registration ();
}
- atk_bridge_init_event_type_consts ();
+ spi_atk_bridge_init_event_type_consts ();
return 0;
}
+
static void
spi_atk_bridge_do_registration (void)
{
}
static Accessibility_Registry
-spi_atk_bridge_get_registry ()
+spi_atk_bridge_get_registry (void)
{
CORBA_Environment ev;
return registry;
}
+static Accessibility_DeviceEventController
+spi_atk_bridget_get_dec (void)
+{
+ CORBA_Environment ev;
+
+ if (device_event_controller != CORBA_OBJECT_NIL)
+ {
+ if (ORBit_small_get_connection_status (device_event_controller)
+ == ORBIT_CONNECTION_CONNECTED)
+ return device_event_controller;
+ }
+
+ CORBA_exception_init (&ev);
+
+ device_event_controller =
+ Accessibility_Registry_getDeviceEventController (
+ spi_atk_bridge_get_registry (), &ev);
+
+ if (BONOBO_EX (&ev))
+ {
+ g_warning ("failure: no deviceeventcontroller found\n");
+ registry_died = TRUE;
+ device_event_controller = CORBA_OBJECT_NIL;
+ }
+
+ return device_event_controller;
+}
+
int
gtk_module_init (gint *argc, gchar **argv[])
{
}
static void
-spi_atk_bridge_add_signal_listener (const char *signal_name)
+add_signal_listener (const char *signal_name)
{
guint id;
guint id;
GObject *ao = g_object_new (ATK_TYPE_OBJECT, NULL);
AtkObject *bo = atk_no_op_object_new (ao);
-
+
+
+ if (atk_listeners_registered) 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);
"Gtk:AtkObject:state-change");
g_array_append_val (listener_ids, id);
- 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");
+ 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: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+
*
}
static void
-spi_atk_bridge_deregister_application (BonoboObject *app)
+deregister_application (BonoboObject *app)
{
Accessibility_Registry registry = spi_atk_bridge_get_registry ();
Accessibility_Registry_deregisterApplication (registry, BONOBO_OBJREF (app), &ev);
+ device_event_controller = bonobo_object_release_unref (device_event_controller, &ev);
registry = bonobo_object_release_unref (registry, &ev);
app = bonobo_object_unref (app);
g_assert (bonobo_activate ());
}
- spi_atk_bridge_deregister_application (app);
+ deregister_application (app);
DBG (1, g_message ("bridge exit func complete.\n"));
}
static void
-spi_atk_bridge_event_context_init (CORBA_any *any,
- AtkBridgeEventContext *ctx)
-{
- SpiAccessible *accessible;
- if (ctx)
- {
- 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
- {
- spi_init_any_nil (any);
- }
-}
-
-static void
spi_atk_bridge_focus_tracker (AtkObject *object)
{
SpiAccessible *source;
e.detail1 = 0;
e.detail2 = 0;
spi_init_any_nil (&e.any_data);
+
+ CORBA_exception_init (&ev);
Accessibility_Registry_notifyEvent (spi_atk_bridge_get_registry (), &e, &ev);
- if (BONOBO_EX (&ev)) registry_died = TRUE;
-
- Accessibility_Accessible_unref (e.source, &ev);
+ if (BONOBO_EX (&ev))
+ registry_died = TRUE;
+
+ bonobo_object_unref (source);
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 */
-
- /* if it's a window event, then marshal the window name */
-
- /*
- 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,
- GSignalQuery *signal_query,
- 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;
SpiAccessible *source;
AtkObject *aobject;
- AtkBridgeEventContext *ctx;
#ifdef SPI_BRIDGE_DEBUG
CORBA_string s;
#endif
{
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",
CORBA_free (s);
#endif
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));
+ 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);
}
return TRUE;
}
-
static void
spi_init_keystroke_from_atk_key_event (Accessibility_DeviceEvent *keystroke,
AtkKeyEventStruct *event)
{
CORBA_boolean result;
Accessibility_DeviceEvent key_event;
- 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);
+ CORBA_exception_init (&ev);
- if (BONOBO_EX (&ev))
- {
- g_warning ("failure: no deviceeventcontroller found\n");
- CORBA_exception_free (&ev);
- registry_died = TRUE;
- result = FALSE;
- }
- else
- {
+ spi_init_keystroke_from_atk_key_event (&key_event, event);
- spi_init_keystroke_from_atk_key_event (&key_event, event);
+ result = Accessibility_DeviceEventController_notifyListenersSync (
+ spi_atk_bridget_get_dec (), &key_event, &ev);
- result = Accessibility_DeviceEventController_notifyListenersSync (
- controller, &key_event, &ev);
-
- bonobo_object_release_unref (controller, &ev);
- CORBA_exception_free (&ev);
- }
+ CORBA_exception_free (&ev);
return result;
}
GSignalQuery signal_query;
const gchar *name;
const gchar *detail;
- AtkBridgeEventContext *ctx = NULL;
-
+ CORBA_any any;
+ CORBA_Object c_obj;
+ char *sp = NULL;
+ AtkObject *ao;
gint detail1 = 0, detail2 = 0;
+ SpiAccessible *s_ao = NULL;
#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 (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_accessible_new (ao);
+ c_obj = BONOBO_OBJREF (s_ao);
+ spi_init_any_object (&any, &c_obj);
+ }
+ 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);
+ spi_init_any_nil (&any);
+ }
+ else
+ {
+ 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 (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);
+ }
+ else if ((signal_query.signal_id == atk_signal_child_changed) && gobject)
+ {
+ ao = atk_object_ref_accessible_child (ATK_OBJECT (gobject),
+ detail1);
+ if (ao)
+ {
+ s_ao = spi_accessible_new (ao);
+ c_obj = BONOBO_OBJREF (s_ao);
+ spi_init_any_object (&any, &c_obj);
+ g_object_unref (ao);
+ }
+ else
+ {
+ spi_init_any_nil (&any);
+ }
+ }
+ else
+ {
+ spi_init_any_nil (&any);
+ }
+ }
if (detail)
- spi_atk_emit_eventv (gobject, detail1, detail2, &signal_query,
+ spi_atk_emit_eventv (gobject, detail1, detail2, &any,
"object:%s:%s", name, detail);
else
- spi_atk_emit_eventv (gobject, detail1, detail2, &signal_query,
+ spi_atk_emit_eventv (gobject, detail1, detail2, &any,
"object:%s", name);
+ if (sp)
+ g_free (sp);
+
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;
- AtkBridgeEventContext ctx;
-
+ CORBA_any any;
const gchar *name, *s;
#ifdef SPI_BRIDGE_DEBUG
const gchar *s2;
#endif
gobject = g_value_get_object (param_values + 0);
- spi_atk_emit_eventv (gobject, 0, 0, &signal_query, "window:%s", name);
+ s = atk_object_get_name (ATK_OBJECT (gobject));
+ spi_init_any_string (&any, (char **) &s);
+
+ spi_atk_emit_eventv (gobject, 0, 0, &any,
+ "window:%s", name);
return TRUE;
}
projects / platform / core / uifw / at-spi2-atk.git / blobdiff