X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=atk-bridge%2Fbridge.c;h=cabf00957a87d81e6d883c545b029f8ec3b6e3df;hb=14510349f973cc3a5a4905638f54735bce4b0f73;hp=e58440cc1ada442f8165440e74dc7bccbf564be6;hpb=0cd076473b00a6ef39eebaf1fc8800fef48a49fb;p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git diff --git a/atk-bridge/bridge.c b/atk-bridge/bridge.c index e58440c..cabf009 100644 --- a/atk-bridge/bridge.c +++ b/atk-bridge/bridge.c @@ -2,7 +2,8 @@ * 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 @@ -25,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -32,56 +34,168 @@ #include "accessible.h" #include "application.h" +#include + #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 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, + 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_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); + +/* 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 guint atk_bridge_focus_tracker_id = 0; +static guint atk_bridge_key_event_listener_id = 0; +static GArray *listener_ids = NULL; -static gboolean bridge_idle_init (gpointer user_data); -static void bridge_focus_tracker (AtkObject *object); -static void bridge_exit_func (void); -static void register_atk_event_listeners (void); -static gboolean bridge_property_event_listener (GSignalInvocationHint *signal_hint, - guint n_param_values, - const GValue *param_values, - gpointer data); -static gboolean bridge_state_event_listener (GSignalInvocationHint *signal_hint, - guint n_param_values, - const GValue *param_values, - gpointer data); -static gboolean bridge_signal_listener (GSignalInvocationHint *signal_hint, - guint n_param_values, - const GValue *param_values, - gpointer data); +/* + * 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); -static gint bridge_key_listener (AtkKeyEventStruct *event, - gpointer data); +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); +} -int -gtk_module_init (gint *argc, gchar **argv[]) +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)) + if (!bonobo_init (argc, argv ? *argv : NULL)) { g_error ("Could not initialize Bonobo"); } - CORBA_exception_init(&ev); - - registry = bonobo_activation_activate_from_id ( - "OAFIID:Accessibility_Registry:proto0.1", 0, NULL, &ev); - - if (ev._major != CORBA_NO_EXCEPTION) + /* + * 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 ()) { - 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 (); - if (CORBA_Object_is_nil (registry, &ev)) + return 0; +} + +static void +spi_atk_bridge_do_registration (void) +{ + CORBA_Environment ev; + + CORBA_exception_init(&ev); + + if (spi_atk_bridge_get_registry () == CORBA_OBJECT_NIL) { g_error ("Could not locate registry"); } @@ -92,74 +206,167 @@ gtk_module_init (gint *argc, gchar **argv[]) 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); + + DBG (1, g_message ("Application registered & listening\n")); + +} + +static void +spi_atk_bridge_toplevel_added (AtkObject *object, + guint index, + AtkObject *child) +{ + g_signal_handler_disconnect (object, toplevel_handler); + spi_atk_bridge_do_registration (); +} - Accessibility_Registry_registerApplication (registry, +static void +spi_atk_bridge_register_application (Accessibility_Registry registry) +{ + Accessibility_Registry_registerApplication (spi_atk_bridge_get_registry (), BONOBO_OBJREF (this_app), &ev); + spi_atk_register_event_listeners (); +} - g_atexit (bridge_exit_func); +static Accessibility_Registry +spi_atk_bridge_get_registry () +{ + CORBA_Environment ev; - g_idle_add (bridge_idle_init, NULL); + 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 0; +int +gtk_module_init (gint *argc, gchar **argv[]) +{ + return atk_bridge_init (argc, argv); } -static gboolean -bridge_idle_init (gpointer user_data) +static void +spi_atk_bridge_add_signal_listener (const char *signal_name) { - register_atk_event_listeners (); + guint id; - fprintf (stderr, "Application registered & listening\n"); + id = atk_add_global_event_listener ( + spi_atk_bridge_signal_listener, signal_name); - return FALSE; + g_array_append_val (listener_ids, id); } static void -register_atk_event_listeners (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); /* Register for focus event notifications, and register app with central registry */ - atk_add_focus_tracker (bridge_focus_tracker); - atk_add_global_event_listener (bridge_property_event_listener, "Gtk:AtkObject:property-change"); - atk_add_global_event_listener (bridge_signal_listener, "Gtk:AtkObject:children-changed"); - atk_add_global_event_listener (bridge_signal_listener, "Gtk:AtkObject:visible-data-changed"); - atk_add_global_event_listener (bridge_signal_listener, "Gtk:AtkSelection:selection-changed"); - atk_add_global_event_listener (bridge_signal_listener, "Gtk:AtkText:text-selection-changed"); - atk_add_global_event_listener (bridge_signal_listener, "Gtk:AtkText:text-changed"); - atk_add_global_event_listener (bridge_signal_listener, "Gtk:AtkText:text-caret-moved"); - atk_add_global_event_listener (bridge_signal_listener, "Gtk:AtkTable:row-inserted"); - atk_add_global_event_listener (bridge_signal_listener, "Gtk:AtkTable:row-reordered"); - atk_add_global_event_listener (bridge_signal_listener, "Gtk:AtkTable:row-deleted"); - atk_add_global_event_listener (bridge_signal_listener, "Gtk:AtkTable:column-inserted"); - atk_add_global_event_listener (bridge_signal_listener, "Gtk:AtkTable:column-reordered"); - atk_add_global_event_listener (bridge_signal_listener, "Gtk:AtkTable:column-deleted"); - atk_add_global_event_listener (bridge_signal_listener, "Gtk:AtkTable:model-changed"); + 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_state_event_listener, + "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"); /* * May add the following listeners to implement preemptive key listening for GTK+ * - * atk_add_global_event_listener (bridge_widgetkey_listener, "Gtk:GtkWidget:key-press-event"); - * atk_add_global_event_listener (bridge_widgetkey_listener, "Gtk:GtkWidget:key-release-event"); + * 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_add_key_event_listener (bridge_key_listener, NULL); + 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 -bridge_exit_func (void) +spi_atk_bridge_deregister_application (BonoboObject *app) +{ + Accessibility_Registry registry = spi_atk_bridge_get_registry (); + Accessibility_Registry_deregisterApplication (registry, BONOBO_OBJREF (app), &ev); + + registry = bonobo_object_release_unref (registry, &ev); + + app = bonobo_object_unref (app); +} + +static void +spi_atk_bridge_exit_func (void) { BonoboObject *app = (BonoboObject *) this_app; - fprintf (stderr, "exiting bridge\n"); + DBG (1, g_message ("exiting bridge\n")); if (!app) { @@ -174,19 +381,14 @@ bridge_exit_func (void) */ 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 ()); } - Accessibility_Registry_deregisterApplication ( - registry, BONOBO_OBJREF (app), &ev); + spi_atk_bridge_deregister_application (app); - bonobo_object_release_unref (registry, &ev); - - bonobo_object_unref (app); - - fprintf (stderr, "bridge exit func complete.\n"); + DBG (1, g_message ("bridge exit func complete.\n")); if (g_getenv ("AT_BRIDGE_SHUTDOWN")) { @@ -194,8 +396,73 @@ bridge_exit_func (void) } } +void +gnome_accessibility_module_init (void) +{ + atk_bridge_init (NULL, NULL); + + g_print("Atk Accessibilty bridge initialized\n"); +} + +void +gnome_accessibility_module_shutdown (void) +{ + BonoboObject *app = (BonoboObject *) this_app; + int i; + GArray *ids = listener_ids; + + if (!atk_bridge_initialized) + { + return; + } + atk_bridge_initialized = FALSE; + this_app = NULL; + + g_print("Atk Accessibilty bridge shutdown\n"); + + 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) + { + 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 -bridge_focus_tracker (AtkObject *object) +spi_atk_bridge_focus_tracker (AtkObject *object) { SpiAccessible *source; Accessibility_Event e; @@ -206,22 +473,81 @@ 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); +} - Accessibility_Registry_notifyEvent (registry, &e, &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 */ - CORBA_exception_free (&ev); + /* 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 -emit_eventv (GObject *gobject, - unsigned long detail1, - unsigned long detail2, - const char *format, ...) +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, ...) { va_list args; Accessibility_Event e; SpiAccessible *source; AtkObject *aobject; + AtkBridgeEventContext *ctx; #ifdef SPI_BRIDGE_DEBUG CORBA_string s; #endif @@ -252,15 +578,27 @@ emit_eventv (GObject *gobject, 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); @@ -268,13 +606,14 @@ emit_eventv (GObject *gobject, } va_end (args); + } static gboolean -bridge_property_event_listener (GSignalInvocationHint *signal_hint, - guint n_param_values, - const GValue *param_values, - gpointer data) +spi_atk_bridge_property_event_listener (GSignalInvocationHint *signal_hint, + guint n_param_values, + const GValue *param_values, + gpointer data) { AtkPropertyValues *values; GObject *gobject; @@ -282,33 +621,38 @@ bridge_property_event_listener (GSignalInvocationHint *signal_hint, #ifdef SPI_BRIDGE_DEBUG GSignalQuery signal_query; const gchar *name; - gchar *s, *s2; + const gchar *s, *s2; g_signal_query (signal_hint->signal_id, &signal_query); name = 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))); - fprintf (stderr, "Received (property) signal %s:%s from object %s (gail %s)\n", - g_type_name (signal_query.itype), name, s, s2); + 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), name, values->property_name, s, s2)); + #endif gobject = g_value_get_object (param_values + 0); values = (AtkPropertyValues*) g_value_get_pointer (param_values + 1); - 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; } static gboolean -bridge_state_event_listener (GSignalInvocationHint *signal_hint, - guint n_param_values, - const GValue *param_values, - gpointer data) +spi_atk_bridge_state_event_listener (GSignalInvocationHint *signal_hint, + guint n_param_values, + const GValue *param_values, + gpointer data) { GObject *gobject; - AtkPropertyValues *values; + gchar *property_name; + gchar *type; + unsigned long detail1; #ifdef SPI_BRIDGE_DEBUG GSignalQuery signal_query; const gchar *name; @@ -320,19 +664,24 @@ bridge_state_event_listener (GSignalInvocationHint *signal_hint, #endif gobject = g_value_get_object (param_values + 0); - values = (AtkPropertyValues*) g_value_get_pointer (param_values + 1); - - emit_eventv (gobject, - (unsigned long) values->old_value.data[0].v_ulong, - (unsigned long) values->new_value.data[0].v_ulong, - "object:%s:?", values->property_name); - + property_name = g_strdup (g_value_get_string (param_values + 1)); + detail1 = (g_value_get_boolean (param_values + 2)) + ? 1 : 0; + type = g_strdup_printf ("object:state-changed:%s", property_name); + spi_atk_emit_eventv (gobject, + detail1, + 0, + NULL, + type); + g_free (property_name); + g_free (type); return TRUE; } + static void -accessibility_init_keystroke_from_atk_key_event (Accessibility_DeviceEvent *keystroke, - AtkKeyEventStruct *event) +spi_init_keystroke_from_atk_key_event (Accessibility_DeviceEvent *keystroke, + AtkKeyEventStruct *event) { #ifdef SPI_DEBUG if (event) @@ -350,42 +699,66 @@ accessibility_init_keystroke_from_atk_key_event (Accessibility_DeviceEvent *key keystroke->hw_code = (CORBA_short) event->keycode; keystroke->timestamp = (CORBA_unsigned_long) event->timestamp; keystroke->modifiers = (CORBA_unsigned_short) (event->state & 0xFFFF); - + if (event->string) + { + keystroke->event_string = CORBA_string_dup (event->string); + keystroke->is_text = CORBA_TRUE; + } + else + { + keystroke->event_string = CORBA_string_dup (""); + keystroke->is_text = CORBA_FALSE; + } 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; 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 gint -bridge_key_listener (AtkKeyEventStruct *event, gpointer data) +spi_atk_bridge_key_listener (AtkKeyEventStruct *event, gpointer data) { 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 { - accessibility_init_keystroke_from_atk_key_event (&key_event, event); + spi_init_keystroke_from_atk_key_event (&key_event, event); result = Accessibility_DeviceEventController_notifyListenersSync ( controller, &key_event, &ev); + bonobo_object_release_unref (controller, &ev); CORBA_exception_free (&ev); } @@ -393,39 +766,82 @@ bridge_key_listener (AtkKeyEventStruct *event, gpointer data) } static gboolean -bridge_signal_listener (GSignalInvocationHint *signal_hint, - guint n_param_values, - const GValue *param_values, - gpointer data) +spi_atk_bridge_signal_listener (GSignalInvocationHint *signal_hint, + guint n_param_values, + const GValue *param_values, + gpointer data) { GObject *gobject; GSignalQuery signal_query; const gchar *name; + const gchar *detail; + AtkBridgeEventContext *ctx = NULL; + + gint detail1 = 0, detail2 = 0; #ifdef SPI_BRIDGE_DEBUG - gchar *s, *s2; + 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); + 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, s2); + fprintf (stderr, "Received signal %s:%s detail: %s from object %s (gail %s)\n", + g_type_name (signal_query.itype), name, + detail ? detail : "", s ? s : "" , s2); #endif gobject = g_value_get_object (param_values + 0); - - emit_eventv (gobject, 0, 0, "object:%s", name); + 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, &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, + const GValue *param_values, + gpointer data) +{ + GObject *gobject; + GSignalQuery signal_query; + AtkBridgeEventContext ctx; + 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; +#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 : "" , s2); +#endif + + gobject = g_value_get_object (param_values + 0); + spi_atk_emit_eventv (gobject, 0, 0, &signal_query, "window:%s", name); - - + return TRUE; +}