X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=atk-bridge%2Fbridge.c;h=7a3362a691f6d1710eebad5c4e427974767c2bc7;hb=1549eff5b0fda58d3684a4a01953a2c9892f59f5;hp=d45f4635373845d94cea78e610c7873ee92e5d75;hpb=92458bbffd350b574b27f64a315653c94d847dcf;p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git diff --git a/atk-bridge/bridge.c b/atk-bridge/bridge.c index d45f463..7a3362a 100644 --- a/atk-bridge/bridge.c +++ b/atk-bridge/bridge.c @@ -2,8 +2,8 @@ * 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 @@ -21,7 +21,13 @@ * Boston, MA 02111-1307, USA. */ +#include "config.h" + +#include +#include +#include #include +#include #include #include #include @@ -30,41 +36,39 @@ #include #include #include +#include +#include "remoteobject.h" #include "accessible.h" #include "application.h" - #include #undef SPI_BRIDGE_DEBUG #define DBG(a,b) if(_dbg>=(a))b -static int _dbg = 0; -static char *spi_nil_string = ""; +#define bridge_threads_leave() \ + if (!during_init_shutdown && !g_main_context_is_owner (NULL)) atk_misc_threads_leave(misc); +#define bridge_threads_enter() \ + if (!during_init_shutdown && !g_main_context_is_owner (NULL)) atk_misc_threads_enter(misc); +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 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 gboolean atk_listeners_registered = FALSE; +static gint toplevels = 0; +static gboolean exiting = FALSE; +static AtkMisc *misc = NULL; +static gboolean during_init_shutdown = TRUE; static guint atk_signal_text_changed; -static guint atk_signal_child_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_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; @@ -73,26 +77,51 @@ static guint atk_signal_child_changed; static guint atk_signal_column_deleted; */ +static guint atk_signal_link_selected; +static guint atk_signal_bounds_changed; + static Accessibility_Registry spi_atk_bridge_get_registry (void); -static void spi_atk_bridge_do_registration (void); +static gboolean 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 void spi_atk_bridge_focus_tracker (AtkObject *object); +static gchar *spi_atk_bridge_get_registry_ior (void); 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 void spi_atk_bridge_init_nil (CORBA_any *any, + AtkObject *obj); +static void spi_atk_bridge_init_object (CORBA_any *any, + AtkObject *obj, + CORBA_Object *c_obj); +static void spi_atk_bridge_init_string (CORBA_any *any, + AtkObject *obj, + gchar **string); +static void spi_atk_bridge_init_rect (CORBA_any *any, + AtkObject *obj, + AtkRectangle *rect); + 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_document_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, @@ -103,12 +132,16 @@ static gboolean spi_atk_bridge_signal_listener (GSignalInvocationHint *s 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); extern void gnome_accessibility_module_shutdown (void); static int atk_bridge_initialized = FALSE; +static pid_t atk_bridge_pid = 0; static guint atk_bridge_focus_tracker_id = 0; static guint atk_bridge_key_event_listener_id = 0; static GArray *listener_ids = NULL; @@ -123,31 +156,71 @@ 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", + 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_bounds_changed = g_signal_lookup ("bounds_changed", + ATK_TYPE_COMPONENT); + 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 gboolean +post_init (void) +{ + during_init_shutdown = FALSE; + return FALSE; } static int atk_bridge_init (gint *argc, gchar **argv[]) { const char *debug_env_string = g_getenv ("AT_SPI_DEBUG"); + gchar *fname; + gboolean success = FALSE; if (atk_bridge_initialized) { return 0; } atk_bridge_initialized = TRUE; + atk_bridge_pid = getpid (); + + misc = atk_misc_get_instance(); + + if (g_getenv ("ATK_BRIDGE_REDIRECT_LOG")) + { + fname = g_strconcat ("/tmp/", g_get_prgname (), ".at-spi-log", NULL); + /* make sure we're not being redirected - security issue */ + if (!g_file_test (fname, G_FILE_TEST_IS_SYMLINK)) + freopen (fname, "w", stderr); + g_free (fname); + } - if (debug_env_string) - _dbg = (int) g_ascii_strtod (debug_env_string, NULL); + 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"); } + bonobo_activate (); + + /* Create the accessible application server object */ + this_app = spi_application_new (atk_get_root ()); /* * We only want to enable the bridge for top level * applications, we detect bonobo components by seeing @@ -157,23 +230,41 @@ atk_bridge_init (gint *argc, gchar **argv[]) if (bonobo_activation_iid_get ()) { 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); + 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); + /* in this case we redefine 'success' to mean 'registry is present' */ + success = (spi_atk_bridge_get_registry () != CORBA_OBJECT_NIL); } else { - spi_atk_bridge_do_registration (); + success = spi_atk_bridge_do_registration (); } - - spi_atk_bridge_init_event_type_consts (); + /* + * we must emit events even if we are not registered as a + * full-fledged app; See bugzilla #400709. + */ + if (success) + { + spi_atk_register_event_listeners (); + spi_atk_bridge_init_event_type_consts (); + } + else + { + atk_bridge_initialized = FALSE; + } + g_idle_add (post_init, NULL); return 0; } -static void +static gboolean spi_atk_bridge_do_registration (void) { CORBA_Environment ev; @@ -182,14 +273,13 @@ spi_atk_bridge_do_registration (void) if (spi_atk_bridge_get_registry () == CORBA_OBJECT_NIL) { - g_error ("Could not locate registry"); + g_warning ("Could not locate registry"); + return FALSE; } - bonobo_activate (); - /* Create the accessible application server object */ - - this_app = spi_application_new (atk_get_root ()); + if (this_app == NULL) + this_app = spi_application_new (atk_get_root ()); DBG (1, g_message ("About to register application\n")); @@ -198,7 +288,7 @@ spi_atk_bridge_do_registration (void) g_atexit (spi_atk_bridge_exit_func); DBG (1, g_message ("Application registered & listening\n")); - + return TRUE; } static void @@ -206,47 +296,188 @@ spi_atk_bridge_toplevel_added (AtkObject *object, guint index, AtkObject *child) { - g_signal_handler_disconnect (object, toplevel_handler); - spi_atk_bridge_do_registration (); + if (toplevels == 0) + { + spi_atk_bridge_do_registration (); + } + toplevels++; +} + +static void +spi_atk_bridge_toplevel_removed (AtkObject *object, + guint index, + AtkObject *child) +{ + BonoboObject *app = (BonoboObject *) this_app; + + toplevels--; + if (toplevels == 0) + { + deregister_application (app); + 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) { + bridge_threads_leave (); Accessibility_Registry_registerApplication (spi_atk_bridge_get_registry (), BONOBO_OBJREF (this_app), &ev); - spi_atk_register_event_listeners (); + bridge_threads_enter (); + if (ev._major != CORBA_NO_EXCEPTION) + CORBA_exception_free (&ev); +} + +/* + * Returns a 'canonicalized' value for DISPLAY, + * with the screen number stripped off if present. + */ +static const gchar* +spi_display_name (void) +{ + static const char *canonical_display_name = NULL; + if (!canonical_display_name) + { + const gchar *display_env = g_getenv ("AT_SPI_DISPLAY"); + if (!display_env) + { + display_env = g_getenv ("DISPLAY"); + if (!display_env || !display_env[0]) + canonical_display_name = ":0"; + else + { + gchar *display_p, *screen_p; + canonical_display_name = g_strdup (display_env); + display_p = strrchr (canonical_display_name, ':'); + screen_p = strrchr (canonical_display_name, '.'); + if (screen_p && display_p && (screen_p > display_p)) + { + *screen_p = '\0'; + } + } + } + else + { + canonical_display_name = display_env; + } + } + return canonical_display_name; +} + +static Display *bridge_display = NULL; + +static gchar * +spi_atk_bridge_get_registry_ior (void) +{ + + Atom AT_SPI_IOR; + Atom actual_type; + int actual_format; + unsigned char *data = NULL; + unsigned long nitems; + unsigned long leftover; + if (!bridge_display) + bridge_display = XOpenDisplay (spi_display_name ()); + + AT_SPI_IOR = XInternAtom (bridge_display, "AT_SPI_IOR", False); + XGetWindowProperty(bridge_display, + XDefaultRootWindow (bridge_display), + AT_SPI_IOR, 0L, + (long)BUFSIZ, False, + (Atom) 31, &actual_type, &actual_format, + &nitems, &leftover, &data); + if (data == NULL) + g_warning (_("AT_SPI_REGISTRY was not started at session startup.")); + + return (gchar *) data; + } + static Accessibility_Registry -spi_atk_bridge_get_registry () +spi_atk_bridge_get_registry (void) { CORBA_Environment ev; + char *ior = 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 (registry_died || (registry == CORBA_OBJECT_NIL)) + { + CORBA_exception_init (&ev); + if (registry_died) + { + if (exiting) + return CORBA_OBJECT_NIL; + else + DBG (1, g_warning ("registry died! restarting...")); + } + + /* XXX: This presumes that the registry has successfully restarted itself already...*/ + ior = (char *) spi_atk_bridge_get_registry_ior (); + + if (ior != NULL) + { + registry = CORBA_ORB_string_to_object (bonobo_activation_orb_get (), + ior, &ev); + XFree (ior); + } + else + { + g_warning ("IOR not set."); + registry = CORBA_OBJECT_NIL; + } - 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 (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); - } - } + 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 device event controller found.\n")); + registry_died = TRUE; + device_event_controller = CORBA_OBJECT_NIL; + } + + return device_event_controller; +} + int gtk_module_init (gint *argc, gchar **argv[]) { @@ -274,7 +505,17 @@ 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) + { + g_object_unref (G_OBJECT (bo)); + g_object_unref (ao); + 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); @@ -305,12 +546,23 @@ spi_atk_register_event_listeners (void) 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_document_event_listener, + "Gtk:AtkDocument:load-complete"); + g_array_append_val (listener_ids, id); + id = atk_add_global_event_listener (spi_atk_bridge_document_event_listener, + "Gtk:AtkDocument:reload"); + g_array_append_val (listener_ids, id); + id = atk_add_global_event_listener (spi_atk_bridge_document_event_listener, + "Gtk:AtkDocument:load-stopped"); + 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:AtkComponent:bounds-changed"); add_signal_listener ("Gtk:AtkSelection:selection-changed"); add_signal_listener ("Gtk:AtkText:text-selection-changed"); add_signal_listener ("Gtk:AtkText:text-changed"); @@ -322,6 +574,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+ * @@ -338,12 +591,13 @@ spi_atk_register_event_listeners (void) static void deregister_application (BonoboObject *app) { - Accessibility_Registry registry = spi_atk_bridge_get_registry (); + Accessibility_Registry registry = spi_atk_bridge_get_registry (); + bridge_threads_leave (); Accessibility_Registry_deregisterApplication (registry, BONOBO_OBJREF (app), &ev); + bridge_threads_enter (); + device_event_controller = bonobo_object_release_unref (device_event_controller, &ev); registry = bonobo_object_release_unref (registry, &ev); - - app = bonobo_object_unref (app); } static void @@ -358,7 +612,17 @@ spi_atk_bridge_exit_func (void) return; } this_app = NULL; + if (atk_bridge_pid != getpid ()) + { + _exit (0); + } + during_init_shutdown = TRUE; + exiting = TRUE; + /* + * 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 @@ -371,7 +635,8 @@ spi_atk_bridge_exit_func (void) g_assert (bonobo_activate ()); } - deregister_application (app); + if (!registry_died) + deregister_application (app); DBG (1, g_message ("bridge exit func complete.\n")); @@ -379,6 +644,8 @@ spi_atk_bridge_exit_func (void) { g_assert (!bonobo_debug_shutdown ()); } + if (bridge_display) + XCloseDisplay (bridge_display); } void @@ -386,7 +653,10 @@ gnome_accessibility_module_init (void) { atk_bridge_init (NULL, NULL); - g_print("Atk Accessibilty bridge initialized\n"); + if (g_getenv ("AT_BRIDGE_SHUTDOWN")) + { + g_print("Atk Accessibility bridge initialized\n"); + } } void @@ -400,22 +670,30 @@ gnome_accessibility_module_shutdown (void) { return; } + during_init_shutdown = TRUE; atk_bridge_initialized = FALSE; this_app = NULL; - g_print("Atk Accessibilty bridge shutdown\n"); + if (g_getenv ("AT_BRIDGE_SHUTDOWN")) + { + g_print("Atk Accessibility bridge shutdown\n"); + } listener_ids = NULL; - atk_remove_focus_tracker (atk_bridge_focus_tracker_id); + if (atk_bridge_focus_tracker_id) + 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); + if (atk_bridge_key_event_listener_id) + atk_remove_key_event_listener (atk_bridge_key_event_listener_id); deregister_application (app); + + misc = NULL; } static void @@ -423,19 +701,33 @@ spi_atk_bridge_focus_tracker (AtkObject *object) { SpiAccessible *source; Accessibility_Event e; - + source = spi_accessible_new (object); - + + CORBA_exception_init (&ev); + e.type = "focus:"; 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); - + spi_atk_bridge_init_nil (&e.any_data, object); + if (BONOBO_EX (&ev)) + registry_died = TRUE; + else + { + bridge_threads_leave (); + Accessibility_Registry_notifyEvent (spi_atk_bridge_get_registry (), + &e, &ev); + bridge_threads_enter (); + } + if (BONOBO_EX (&ev)) + registry_died = TRUE; + + bonobo_object_unref (source); + + if (e.any_data._release) + CORBA_free (e.any_data._value); + CORBA_exception_free (&ev); } @@ -448,10 +740,11 @@ spi_atk_emit_eventv (const GObject *gobject, { va_list args; Accessibility_Event e; - SpiAccessible *source; AtkObject *aobject; + SpiAccessible *source = NULL; + Accessibility_Registry registry; #ifdef SPI_BRIDGE_DEBUG - CORBA_string s; + CORBA_string s = NULL; #endif va_start (args, format); @@ -465,48 +758,63 @@ spi_atk_emit_eventv (const GObject *gobject, else if (ATK_IS_OBJECT (gobject)) { aobject = ATK_OBJECT (gobject); - source = spi_accessible_new (aobject); + if (SPI_IS_REMOTE_OBJECT (aobject)) + e.source = spi_remote_object_get_accessible (SPI_REMOTE_OBJECT (aobject)); + else + source = spi_accessible_new (aobject); } else { aobject = NULL; - source = NULL; DBG (0, g_warning ("received property-change event from non-AtkImplementor")); + va_end (args); + return; } + e.type = g_strdup_vprintf (format, args); + if (source) e.source = BONOBO_OBJREF (source); + e.detail1 = detail1; + e.detail2 = detail2; + if (any) e.any_data = *any; + else spi_atk_bridge_init_nil (&e.any_data, aobject); - 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); + if (e.source != CORBA_OBJECT_NIL) + s = Accessibility_Accessible__get_name (e.source, &ev); + g_message ("Emitting event '%s' (%lu, %lu) on %s", + e.type, e.detail1, e.detail2, s); + CORBA_free (s); #endif - CORBA_exception_init (&ev); - Accessibility_Registry_notifyEvent (spi_atk_bridge_get_registry (), - &e, &ev); + CORBA_exception_init (&ev); + registry = spi_atk_bridge_get_registry (); + if (!registry_died) + { + bridge_threads_leave (); + Accessibility_Registry_notifyEvent (registry, + &e, &ev); + bridge_threads_enter (); #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)); + if (ev._major != CORBA_NO_EXCEPTION) + g_message ("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); + if (BONOBO_EX (&ev)) registry_died = TRUE; } + if (source) + bonobo_object_unref (BONOBO_OBJECT (source)); + else + Bonobo_Unknown_unref (e.source, &ev); + + CORBA_exception_free (&ev); + + g_free (e.type); + + if (!any && e.any_data._release) CORBA_free (e.any_data._value); + + if (any && any->_release) CORBA_free (any->_value); + va_end (args); } @@ -519,28 +827,146 @@ 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; + const gchar *name = NULL; #ifdef SPI_BRIDGE_DEBUG GSignalQuery signal_query; - const gchar *name; + const gchar *signame; const gchar *s, *s2; g_signal_query (signal_hint->signal_id, &signal_query); - name = signal_query.signal_name; + signame = 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))); 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)); + g_type_name (signal_query.itype), signame, values->property_name, s, s2)); #endif gobject = g_value_get_object (param_values + 0); + name = atk_object_get_name (ATK_OBJECT (gobject)); values = (AtkPropertyValues*) g_value_get_pointer (param_values + 1); - spi_atk_emit_eventv (gobject, 0, 0, NULL, - "object:property-change:%s", values->property_name); + prop_name = values->property_name; + if (strcmp (prop_name, "accessible-name") == 0) + { + spi_atk_bridge_init_string (&any, + ATK_OBJECT (gobject), + (gchar **)&name); + } + else if (strcmp (prop_name, "accessible-description") == 0) + { + sp = atk_object_get_description (ATK_OBJECT (gobject)); + spi_atk_bridge_init_string (&any, + ATK_OBJECT (gobject), + (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_atk_bridge_init_object (&any, + ATK_OBJECT (gobject), + &c_obj); + } + else + { + spi_atk_bridge_init_nil (&any, + ATK_OBJECT (gobject)); + } + } + 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_atk_bridge_init_object (&any, + ATK_OBJECT (gobject), + &c_obj); + } + else + { + spi_atk_bridge_init_nil (&any, + ATK_OBJECT (gobject)); + } + } + 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_atk_bridge_init_object (&any, + ATK_OBJECT (gobject), + &c_obj); + } + else + { + spi_atk_bridge_init_nil (&any, ATK_OBJECT (gobject)); + } + } + 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_atk_bridge_init_object (&any, ATK_OBJECT (gobject), &c_obj); + } + else + { + spi_atk_bridge_init_nil (&any, ATK_OBJECT (gobject)); + } + } + 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_atk_bridge_init_string (&any, ATK_OBJECT (gobject), + (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_atk_bridge_init_string (&any, ATK_OBJECT (gobject), + (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_atk_bridge_init_string (&any, ATK_OBJECT (gobject), + (gchar **)&sp); + } + else + { + spi_atk_bridge_init_nil (&any, ATK_OBJECT (gobject)); + } + + spi_atk_emit_eventv (gobject, 0, 0, &any, + "object:property-change:%s", prop_name); + + if (s_ao) + bonobo_object_unref (BONOBO_OBJECT (s_ao)); return TRUE; } @@ -580,7 +1006,6 @@ spi_atk_bridge_state_event_listener (GSignalInvocationHint *signal_hint, return TRUE; } - static void spi_init_keystroke_from_atk_key_event (Accessibility_DeviceEvent *keystroke, AtkKeyEventStruct *event) @@ -593,8 +1018,8 @@ spi_init_keystroke_from_atk_key_event (Accessibility_DeviceEvent *keystroke, else #endif if (!event) - { - g_print ("WARNING: NULL key event!"); + { /* this doesn't really need translating */ + g_print (_("WARNING: NULL key event reported.")); } keystroke->id = (CORBA_long) event->keyval; @@ -603,8 +1028,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 { @@ -636,76 +1067,139 @@ spi_atk_bridge_key_listener (AtkKeyEventStruct *event, gpointer data) { 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); + bridge_threads_leave (); + result = Accessibility_DeviceEventController_notifyListenersSync ( + spi_atk_bridget_get_dec (), &key_event, &ev); + bridge_threads_enter (); - result = Accessibility_DeviceEventController_notifyListenersSync ( - controller, &key_event, &ev); + if (key_event.event_string) CORBA_free (key_event.event_string); - bonobo_object_release_unref (controller, &ev); + if (BONOBO_EX(&ev)) + { + result = FALSE; CORBA_exception_free (&ev); } 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) +static gboolean +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; CORBA_any any; - CORBA_char *sp = NULL; + 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 + + g_signal_query (signal_hint->signal_id, &signal_query); - if (signal_query->signal_id == atk_signal_text_changed) + 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_atk_bridge_init_object (&any, ATK_OBJECT (gobject), &c_obj); + } + else if (signal_query.signal_id == atk_signal_link_selected) { - sp = atk_text_get_text (ATK_TEXT (gobject), - detail1, - detail1+detail2); - spi_init_any_string (&any, &sp); + if (G_VALUE_TYPE (param_values + 1) == G_TYPE_INT) + detail1 = g_value_get_int (param_values + 1); + spi_atk_bridge_init_nil (&any, ATK_OBJECT (gobject)); } -#ifdef EXTENDED_OBJECT_EVENTS_ARE_WORKING - else if ((signal_query->signal_id == atk_signal_child_changed) && gobject) + else if (signal_query.signal_id == atk_signal_bounds_changed) { + AtkRectangle *atk_rect = NULL; + + if (G_VALUE_HOLDS_BOXED (param_values + 1)) + atk_rect = g_value_get_boxed (param_values + 1); + spi_atk_bridge_init_rect (&any, ATK_OBJECT (gobject), atk_rect); + } + else if ((signal_query.signal_id == atk_signal_children_changed) && gobject) + { + detail1 = g_value_get_uint (param_values + 1); ao = atk_object_ref_accessible_child (ATK_OBJECT (gobject), - detail1); + detail1); if (ao) - { - spi_init_any_object (&any, ao); - atk_object_unref (ao); + { + s_ao = spi_accessible_new (ao); + c_obj = BONOBO_OBJREF (s_ao); + spi_atk_bridge_init_object (&any, ATK_OBJECT (gobject), &c_obj); + g_object_unref (ao); } else { - spi_init_any_nil (&any); + spi_atk_bridge_init_nil (&any, ATK_OBJECT (gobject)); } } -#endif else { - spi_init_any_nil (&any); + 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_atk_bridge_init_string (&any, ATK_OBJECT (gobject), + (gchar **) &sp); + } + else if (signal_query.signal_id == atk_signal_text_selection_changed) + { + /* Return NULL as the selected string */ + spi_atk_bridge_init_nil (&any, ATK_OBJECT (gobject)); + } + else + { + spi_atk_bridge_init_nil (&any, ATK_OBJECT (gobject)); + } } if (detail) @@ -714,60 +1208,56 @@ spi_atk_signal_emit_event (const GObject *gobject, else spi_atk_emit_eventv (gobject, detail1, detail2, &any, "object:%s", name); -} + if (sp) + g_free (sp); + if (s_ao) + bonobo_object_unref (BONOBO_OBJECT (s_ao)); + + return TRUE; +} static gboolean -spi_atk_bridge_signal_listener (GSignalInvocationHint *signal_hint, - guint n_param_values, - const GValue *param_values, - gpointer data) +spi_atk_bridge_window_event_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; - CORBA_char *sp; - - gint detail1 = 0, detail2 = 0; + CORBA_any any; + const gchar *name, *s; #ifdef SPI_BRIDGE_DEBUG - const gchar *s, *s2; -#endif + const gchar *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); + 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); - 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); + + s = atk_object_get_name (ATK_OBJECT (gobject)); + spi_atk_bridge_init_string (&any, ATK_OBJECT (gobject), (gchar **) &s); - spi_atk_signal_emit_event (gobject, &signal_query, - detail2, detail2, - name, detail); + spi_atk_emit_eventv (gobject, 0, 0, &any, + "window:%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) +spi_atk_bridge_document_event_listener (GSignalInvocationHint *signal_hint, + guint n_param_values, + const GValue *param_values, + gpointer data) { GObject *gobject; GSignalQuery signal_query; @@ -776,7 +1266,7 @@ spi_atk_bridge_window_event_listener (GSignalInvocationHint *signal_hint, #ifdef SPI_BRIDGE_DEBUG const gchar *s2; #endif - + g_signal_query (signal_hint->signal_id, &signal_query); name = signal_query.signal_name; @@ -785,15 +1275,110 @@ spi_atk_bridge_window_event_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 ? s : "" , s2); + g_type_name (signal_query.itype), name, s ? s : "" , s2); #endif - + gobject = g_value_get_object (param_values + 0); s = atk_object_get_name (ATK_OBJECT (gobject)); - spi_init_any_string (&any, &s); - + spi_atk_bridge_init_string (&any, ATK_OBJECT (gobject), (gchar **) &s); + spi_atk_emit_eventv (gobject, 0, 0, &any, - "window:%s", name); + "document:%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); + if (atk_state_set_contains_state (stateset, ATK_STATE_ACTIVE)) + { + spi_atk_bridge_init_string (&any, child, (gchar**) &name); + spi_atk_emit_eventv (G_OBJECT (child), 0, 0, &any, "window:deactivate"); + if (registry_died) + return; + } + g_object_unref (stateset); + + spi_atk_bridge_init_string (&any, child, (gchar**) &name); + 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; +} + +static void +spi_atk_bridge_init_base (CORBA_any *any, AtkObject *obj, + Accessibility_Application *app, Accessibility_Role *role, + CORBA_string *name) +{ + const gchar *s = atk_object_get_name (obj); + *app = spi_accessible_new_return (atk_get_root (), FALSE, NULL); + *role = spi_role_from_atk_role (atk_object_get_role (obj)); + *name = s ? s : ""; /* string gets dup-ed in util.c spi_init_any_* */ +} + +static void +spi_atk_bridge_init_nil (CORBA_any *any, AtkObject *obj) +{ + Accessibility_Application app = CORBA_OBJECT_NIL; + Accessibility_Role role = Accessibility_ROLE_UNKNOWN; + CORBA_string name; + spi_atk_bridge_init_base (any, obj, &app, &role, &name); + spi_init_any_nil (any, app, role, name); +} + +static void +spi_atk_bridge_init_object (CORBA_any *any, AtkObject *obj, CORBA_Object *c_obj) +{ + Accessibility_Application app = CORBA_OBJECT_NIL; + Accessibility_Role role = Accessibility_ROLE_UNKNOWN; + CORBA_string name; + spi_atk_bridge_init_base (any, obj, &app, &role, &name); + spi_init_any_object (any, app, role, name, c_obj); +} + +static void +spi_atk_bridge_init_string (CORBA_any *any, AtkObject *obj, gchar **string) +{ + Accessibility_Application app = CORBA_OBJECT_NIL; + Accessibility_Role role = Accessibility_ROLE_UNKNOWN; + CORBA_string name; + spi_atk_bridge_init_base (any, obj, &app, &role, &name); + spi_init_any_string (any, app, role, name, string); +} + +static void +spi_atk_bridge_init_rect (CORBA_any *any, AtkObject *obj, AtkRectangle *rect) +{ + Accessibility_Application app = CORBA_OBJECT_NIL; + Accessibility_Role role = Accessibility_ROLE_UNKNOWN; + CORBA_string name; + spi_atk_bridge_init_base (any, obj, &app, &role, &name); + spi_init_any_rect (any, app, role, name, rect); +} +