X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=atk-bridge%2Fbridge.c;h=1d3c73250845cf340e1e896a9c612c6fc44d66d3;hb=8228cc05105506c3bcfb5a88ff38165c55c89ecc;hp=a3e565367cbc3a430398d764477d32709e1da3fe;hpb=1a85caf547857f645f7ebec88e0615e54d39b9a4;p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git diff --git a/atk-bridge/bridge.c b/atk-bridge/bridge.c index a3e5653..1d3c732 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, 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 @@ -20,6 +21,7 @@ * Boston, MA 02111-1307, USA. */ +#include #include #include #include @@ -29,6 +31,7 @@ #include #include #include +#include #include "accessible.h" #include "application.h" @@ -36,24 +39,70 @@ #undef SPI_BRIDGE_DEBUG +#define DBG(a,b) if(_dbg>=(a))b + +static int _dbg = 0; static CORBA_Environment ev; -static Accessibility_Registry registry; +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 gint toplevels = 0; + +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 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_toplevel_removed (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_deregister_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); +static void spi_atk_tidy_windows (void); +static void deregister_application (BonoboObject *app); +static void reinit_register_vars (void); /* For automatic libgnome init */ extern void gnome_accessibility_module_init (void); @@ -62,7 +111,6 @@ 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 guint idle_init_id = 0; static GArray *listener_ids = NULL; /* @@ -72,10 +120,32 @@ 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; + + 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_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; +} + static int atk_bridge_init (gint *argc, gchar **argv[]) { - CORBA_Environment ev; + const char *debug_env_string = g_getenv ("AT_SPI_DEBUG"); if (atk_bridge_initialized) { @@ -83,34 +153,50 @@ atk_bridge_init (gint *argc, gchar **argv[]) } 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"); } /* - * 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:proto0.1", 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")); + g_signal_connect (atk_get_root (), + "children-changed::add", + (GCallback) spi_atk_bridge_toplevel_added, + NULL); + g_signal_connect (atk_get_root (), + "children-changed::remove", + (GCallback) spi_atk_bridge_toplevel_removed, + NULL); + } + else + { + spi_atk_bridge_do_registration (); + spi_atk_bridge_init_event_type_consts (); } + + return 0; +} + + +static void +spi_atk_bridge_do_registration (void) +{ + CORBA_Environment ev; + + CORBA_exception_init(&ev); - if (registry == CORBA_OBJECT_NIL) + if (spi_atk_bridge_get_registry () == CORBA_OBJECT_NIL) { g_error ("Could not locate registry"); } @@ -121,35 +207,119 @@ atk_bridge_init (gint *argc, gchar **argv[]) 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); + if (toplevels == 0) + { + spi_atk_bridge_do_registration (); + spi_atk_bridge_init_event_type_consts (); + } + toplevels++; } -static gboolean -spi_atk_bridge_idle_init (gpointer user_data) +static void +spi_atk_bridge_toplevel_removed (AtkObject *object, + guint index, + AtkObject *child) { - idle_init_id = 0; + BonoboObject *app = (BonoboObject *) this_app; + toplevels--; + if (toplevels == 0) + { + deregister_application (app); + spi_atk_deregister_event_listeners (); + reinit_register_vars (); + } + if (toplevels < 0) + { + g_warning ("More toplevels removed than added\n"); + toplevels = 0; + } +} + +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 (); +} - fprintf (stderr, "Application registered & listening\n"); +static Accessibility_Registry +spi_atk_bridge_get_registry (void) +{ + CORBA_Environment ev; - return FALSE; + if (registry_died || (registry == CORBA_OBJECT_NIL)) { + 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; +} + +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[]) +{ + return atk_bridge_init (argc, argv); } static void @@ -173,7 +343,12 @@ spi_atk_register_event_listeners (void) 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); @@ -183,9 +358,34 @@ spi_atk_register_event_listeners (void) 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); 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"); @@ -197,6 +397,7 @@ spi_atk_register_event_listeners (void) 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+ * @@ -211,11 +412,38 @@ spi_atk_register_event_listeners (void) } static void +spi_atk_deregister_event_listeners (void) +{ + gint i; + guint id; + + if (!atk_listeners_registered) + return; + + atk_listeners_registered = FALSE; + + for (i = 0; i < listener_ids->len; i++) + { + id = g_array_index (listener_ids, guint, i); + atk_remove_global_event_listener (id); + } + g_array_free (listener_ids, TRUE); + listener_ids = NULL; + + atk_remove_focus_tracker (atk_bridge_focus_tracker_id); + atk_bridge_focus_tracker_id = 0; + + atk_remove_key_event_listener (atk_bridge_key_event_listener_id); + atk_bridge_key_event_listener_id = 0; +} + +static void 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); + device_event_controller = bonobo_object_release_unref (device_event_controller, &ev); registry = bonobo_object_release_unref (registry, &ev); app = bonobo_object_unref (app); @@ -226,7 +454,7 @@ 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) { @@ -235,20 +463,24 @@ spi_atk_bridge_exit_func (void) this_app = NULL; /* + * Check whether we still have windows which have not been deleted. + */ + spi_atk_tidy_windows (); + /* * FIXME: this may be incorrect for apps that do their own bonobo * shutdown, until we can explicitly shutdown to get the ordering * right. */ 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")) { @@ -268,7 +500,9 @@ void gnome_accessibility_module_shutdown (void) { BonoboObject *app = (BonoboObject *) this_app; - + int i; + GArray *ids = listener_ids; + if (!atk_bridge_initialized) { return; @@ -278,26 +512,15 @@ gnome_accessibility_module_shutdown (void) g_print("Atk Accessibilty bridge shutdown\n"); - if (idle_init_id) - { - g_source_remove (idle_init_id); - idle_init_id = 0; - } - 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++) - { + 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); - } + } + + atk_remove_key_event_listener (atk_bridge_key_event_listener_id); deregister_application (app); } @@ -314,17 +537,24 @@ 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 (registry, &e, &ev); + CORBA_exception_init (&ev); + Accessibility_Registry_notifyEvent (spi_atk_bridge_get_registry (), &e, &ev); + if (BONOBO_EX (&ev)) + registry_died = TRUE; + bonobo_object_unref (source); + CORBA_exception_free (&ev); } 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; @@ -351,15 +581,17 @@ spi_atk_emit_eventv (GObject *gobject, { 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); @@ -367,15 +599,26 @@ spi_atk_emit_eventv (GObject *gobject, e.type, e.detail1, e.detail2, s); CORBA_free (s); #endif - - Accessibility_Registry_notifyEvent (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)); +#endif + if (BONOBO_EX (&ev)) registry_died = TRUE; + Accessibility_Accessible_unref (e.source, &ev); + CORBA_exception_free (&ev); - + g_free (e.type); } va_end (args); + } static gboolean @@ -386,30 +629,132 @@ spi_atk_bridge_property_event_listener (GSignalInvocationHint *signal_hint, { AtkPropertyValues *values; GObject *gobject; + const gchar *prop_name; + CORBA_any any; + const gchar *sp = NULL; + AtkObject *ao; + SpiAccessible *s_ao = NULL; + CORBA_Object c_obj; + gint i; #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); - spi_atk_emit_eventv (gobject, 0, 0, "object:property-change:%s", values->property_name); + prop_name = values->property_name; + if (strcmp (prop_name, "accessible-name") == 0) + { + sp = atk_object_get_name (ATK_OBJECT (gobject)); + spi_init_any_string (&any, (gchar **)&sp); + } + else if (strcmp (prop_name, "accessible-description") == 0) + { + sp = atk_object_get_description (ATK_OBJECT (gobject)); + spi_init_any_string (&any, (gchar **)&sp); + } + else if (strcmp (prop_name, "accessible-parent") == 0) + { + ao = atk_object_get_parent (ATK_OBJECT (gobject)); + if (ao) + { + s_ao = spi_accessible_new (ao); + c_obj = BONOBO_OBJREF (s_ao); + spi_init_any_object (&any, &c_obj); + } + else + { + spi_init_any_nil (&any); + } + } + else if (strcmp (prop_name, "accessible-table-summary") == 0) + { + ao = atk_table_get_summary (ATK_TABLE (gobject)); + if (ao) + { + s_ao = spi_accessible_new (ao); + c_obj = BONOBO_OBJREF (s_ao); + spi_init_any_object (&any, &c_obj); + } + else + { + spi_init_any_nil (&any); + } + } + 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 (gobject), i); + if (ao) + { + s_ao = spi_accessible_new (ao); + c_obj = BONOBO_OBJREF (s_ao); + spi_init_any_object (&any, &c_obj); + } + else + { + spi_init_any_nil (&any); + } + } + 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 (gobject), i); + if (ao) + { + s_ao = spi_accessible_new (ao); + c_obj = BONOBO_OBJREF (s_ao); + spi_init_any_object (&any, &c_obj); + } + else + { + spi_init_any_nil (&any); + } + } + 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 (gobject), i); + spi_init_any_string (&any, (gchar **)&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 (gobject), i); + spi_init_any_string (&any, (gchar **)&sp); + } + else if (strcmp (prop_name, "accessible-table-caption-object") == 0) + { + ao = atk_table_get_caption (ATK_TABLE (gobject)); + sp = atk_object_get_name (ao); + spi_init_any_string (&any, (gchar **)&sp); + } + else + { + spi_init_any_nil (&any); + } + + spi_atk_emit_eventv (gobject, 0, 0, &any, + "object:property-change:%s", prop_name); + return TRUE; } -#if THIS_WILL_EVER_BE_USED static gboolean spi_atk_bridge_state_event_listener (GSignalInvocationHint *signal_hint, guint n_param_values, @@ -417,7 +762,9 @@ spi_atk_bridge_state_event_listener (GSignalInvocationHint *signal_hint, gpointer data) { GObject *gobject; - AtkPropertyValues *values; + gchar *property_name; + gchar *type; + unsigned long detail1; #ifdef SPI_BRIDGE_DEBUG GSignalQuery signal_query; const gchar *name; @@ -429,16 +776,19 @@ spi_atk_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); - + 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, - (unsigned long) values->old_value.data[0].v_ulong, - (unsigned long) values->new_value.data[0].v_ulong, - "object:%s:?", values->property_name); - + detail1, + 0, + NULL, + type); + g_free (property_name); + g_free (type); return TRUE; } -#endif static void spi_init_keystroke_from_atk_key_event (Accessibility_DeviceEvent *keystroke, @@ -462,8 +812,14 @@ spi_init_keystroke_from_atk_key_event (Accessibility_DeviceEvent *keystroke, keystroke->modifiers = (CORBA_unsigned_short) (event->state & 0xFFFF); if (event->string) { + gunichar c; + keystroke->event_string = CORBA_string_dup (event->string); - keystroke->is_text = CORBA_TRUE; + c = g_utf8_get_char_validated (event->string, -1); + if (c > 0 && g_unichar_isprint (c)) + keystroke->is_text = CORBA_TRUE; + else + keystroke->is_text = CORBA_FALSE; } else { @@ -473,10 +829,10 @@ spi_init_keystroke_from_atk_key_event (Accessibility_DeviceEvent *keystroke, 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; @@ -495,25 +851,15 @@ spi_atk_bridge_key_listener (AtkKeyEventStruct *event, gpointer data) { CORBA_boolean result; Accessibility_DeviceEvent key_event; - Accessibility_DeviceEventController controller = - Accessibility_Registry_getDeviceEventController (registry, &ev); - if (BONOBO_EX (&ev)) - { - g_warning ("failure: no deviceeventcontroller found\n"); - CORBA_exception_free (&ev); - result = FALSE; - } - else - { + CORBA_exception_init (&ev); - spi_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); + result = Accessibility_DeviceEventController_notifyListenersSync ( + spi_atk_bridget_get_dec (), &key_event, &ev); - CORBA_exception_free (&ev); - } + CORBA_exception_free (&ev); return result; } @@ -527,9 +873,129 @@ spi_atk_bridge_signal_listener (GSignalInvocationHint *signal_hint, GObject *gobject; GSignalQuery signal_query; const gchar *name; + const gchar *detail; + CORBA_any any; + CORBA_Object c_obj; + char *sp = NULL; + AtkObject *ao; + AtkText *text; gint detail1 = 0, detail2 = 0; + SpiAccessible *s_ao = NULL; #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 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); + + 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 ((signal_query.signal_id == atk_signal_children_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 + { + 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 (gobject), + detail1, + detail1+detail2); + spi_init_any_string (&any, &sp); + } + else if (signal_query.signal_id == atk_signal_text_selection_changed) + { + text = ATK_TEXT (gobject); + + /* Return NULL as the selected string */ + spi_init_any_nil (&any); + } + 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); + + 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) +{ + GObject *gobject; + GSignalQuery signal_query; + CORBA_any any; + const gchar *name, *s; +#ifdef SPI_BRIDGE_DEBUG + const gchar *s2; #endif g_signal_query (signal_hint->signal_id, &signal_query); @@ -540,16 +1006,56 @@ spi_atk_bridge_signal_listener (GSignalInvocationHint *signal_hint, 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); + g_type_name (signal_query.itype), name, s ? s : "" , 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); - spi_atk_emit_eventv (gobject, detail1, detail2, "object:%s", name); + gobject = g_value_get_object (param_values + 0); + 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; } + +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; + CORBA_any any; + const gchar *name; + + child = atk_object_ref_accessible_child (root, i); + stateset = atk_object_ref_state_set (child); + + name = atk_object_get_name (child); + spi_init_any_string (&any, (char**) &name); + if (atk_state_set_contains_state (stateset, ATK_STATE_ACTIVE)) + { + spi_atk_emit_eventv (G_OBJECT (child), 0, 0, &any, "window:deactivate"); + } + g_free (stateset); + + spi_atk_emit_eventv (G_OBJECT (child), 0, 0, &any, "window:destroy"); + g_object_unref (child); + } +} + +static void +reinit_register_vars (void) +{ + registry = CORBA_OBJECT_NIL; + device_event_controller = CORBA_OBJECT_NIL; + this_app = NULL; +} +