X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=atk-bridge%2Fbridge.c;h=96f64fc17d18365e01fe0e2094946f90fdfc2e7f;hb=09b09daa2b88f6b54895ee49f59cd060b14a5acf;hp=ed9bd7ea2bc7bc2fdb2e8a879e1d67ec2a6e0b13;hpb=bb15517d35b4ae3718afe7880cfa4a9dc09106d2;p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git diff --git a/atk-bridge/bridge.c b/atk-bridge/bridge.c index ed9bd7e..96f64fc 100644 --- a/atk-bridge/bridge.c +++ b/atk-bridge/bridge.c @@ -32,42 +32,76 @@ #include "accessible.h" #include "application.h" +#include + #undef SPI_BRIDGE_DEBUG static CORBA_Environment ev; static Accessibility_Registry registry; static SpiApplication *this_app = 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); +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_bridge_focus_tracker (AtkObject *object); +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_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 guint idle_init_id = 0; +static GArray *listener_ids = NULL; -static gint bridge_key_listener (AtkKeyEventStruct *event, - 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); -int -gtk_module_init (gint *argc, gchar **argv[]) +static int +atk_bridge_init (gint *argc, gchar **argv[]) { CORBA_Environment ev; - if (!bonobo_init (argc, *argv)) + if (atk_bridge_initialized) + { + return 0; + } + atk_bridge_initialized = TRUE; + + if (!bonobo_init (argc, argv ? *argv : NULL)) { g_error ("Could not initialize Bonobo"); } + /* + * 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 ( @@ -81,7 +115,7 @@ gtk_module_init (gint *argc, gchar **argv[]) CORBA_exception_free (&ev); } - if (CORBA_Object_is_nil (registry, &ev)) + if (registry == CORBA_OBJECT_NIL) { g_error ("Could not locate registry"); } @@ -98,17 +132,25 @@ gtk_module_init (gint *argc, gchar **argv[]) BONOBO_OBJREF (this_app), &ev); - g_atexit (bridge_exit_func); + g_atexit (spi_atk_bridge_exit_func); - g_idle_add (bridge_idle_init, NULL); + idle_init_id = g_idle_add (spi_atk_bridge_idle_init, NULL); return 0; } +int +gtk_module_init (gint *argc, gchar **argv[]) +{ + return atk_bridge_init (argc, argv); +} + static gboolean -bridge_idle_init (gpointer user_data) +spi_atk_bridge_idle_init (gpointer user_data) { - register_atk_event_listeners (); + idle_init_id = 0; + + spi_atk_register_event_listeners (); fprintf (stderr, "Application registered & listening\n"); @@ -116,40 +158,98 @@ bridge_idle_init (gpointer user_data) } static void -register_atk_event_listeners (void) +add_signal_listener (const char *signal_name) +{ + guint id; + + id = atk_add_global_event_listener ( + spi_atk_bridge_signal_listener, signal_name); + + g_array_append_val (listener_ids, id); +} + +static 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"); - atk_add_key_event_listener (bridge_key_listener, NULL); - + 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); + + add_signal_listener ("Gtk:AtkObject:state-change"); + add_signal_listener ("Gtk:AtkObject:children-changed"); + add_signal_listener ("Gtk:AtkObject:visible-data-changed"); + add_signal_listener ("Gtk:AtkSelection:selection-changed"); + add_signal_listener ("Gtk:AtkText:text-selection-changed"); + add_signal_listener ("Gtk:AtkText:text-changed"); + add_signal_listener ("Gtk:AtkText:text-caret-moved"); + add_signal_listener ("Gtk:AtkTable:row-inserted"); + add_signal_listener ("Gtk:AtkTable:row-reordered"); + add_signal_listener ("Gtk:AtkTable:row-deleted"); + add_signal_listener ("Gtk:AtkTable:column-inserted"); + add_signal_listener ("Gtk:AtkTable:column-reordered"); + add_signal_listener ("Gtk:AtkTable:column-deleted"); + add_signal_listener ("Gtk:AtkTable:model-changed"); +/* + * May add the following listeners to implement preemptive key listening for GTK+ + * + * 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_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) +deregister_application (BonoboObject *app) +{ + 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; @@ -173,13 +273,8 @@ bridge_exit_func (void) g_assert (bonobo_activate ()); } - Accessibility_Registry_deregisterApplication ( - registry, BONOBO_OBJREF (app), &ev); + deregister_application (app); - bonobo_object_release_unref (registry, &ev); - - bonobo_object_unref (app); - fprintf (stderr, "bridge exit func complete.\n"); if (g_getenv ("AT_BRIDGE_SHUTDOWN")) @@ -188,8 +283,54 @@ 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; + + if (!atk_bridge_initialized) + { + return; + } + atk_bridge_initialized = FALSE; + this_app = NULL; + + 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++) + { + 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 -bridge_focus_tracker (AtkObject *object) +spi_atk_bridge_focus_tracker (AtkObject *object) { SpiAccessible *source; Accessibility_Event e; @@ -207,10 +348,10 @@ bridge_focus_tracker (AtkObject *object) } static void -emit_eventv (GObject *gobject, - unsigned long detail1, - unsigned long detail2, - const char *format, ...) +spi_atk_emit_eventv (GObject *gobject, + unsigned long detail1, + unsigned long detail2, + const char *format, ...) { va_list args; Accessibility_Event e; @@ -265,10 +406,10 @@ emit_eventv (GObject *gobject, } 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; @@ -276,29 +417,33 @@ bridge_property_event_listener (GSignalInvocationHint *signal_hint, #ifdef SPI_BRIDGE_DEBUG GSignalQuery signal_query; const gchar *name; - gchar *s; + 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\n", - g_type_name (signal_query.itype), name, s); + values = (AtkPropertyValues*) g_value_get_pointer (param_values + 1); + fprintf (stderr, "Received (property) signal %s:%s:%s from object %s (gail %s)\n", + g_type_name (signal_query.itype), name, values->property_name, s, s2); + #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, "object:property-change:%s", values->property_name); return TRUE; } +#if THIS_WILL_EVER_BE_USED 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; @@ -315,17 +460,18 @@ bridge_state_event_listener (GSignalInvocationHint *signal_hint, 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); - + 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); + return TRUE; } +#endif static void -accessibility_init_keystroke_from_atk_key_event (Accessibility_KeyStroke *keystroke, - AtkKeyEventStruct *event) +spi_init_keystroke_from_atk_key_event (Accessibility_DeviceEvent *keystroke, + AtkKeyEventStruct *event) { #ifdef SPI_DEBUG if (event) @@ -339,11 +485,20 @@ accessibility_init_keystroke_from_atk_key_event (Accessibility_KeyStroke *keystr g_print ("WARNING: NULL key event!"); } - keystroke->keyID = (CORBA_long) event->keyval; - keystroke->keycode = (CORBA_short) event->keycode; + keystroke->id = (CORBA_long) event->keyval; + 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): @@ -356,29 +511,35 @@ accessibility_init_keystroke_from_atk_key_event (Accessibility_KeyStroke *keystr 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_KeyStroke key_event; + 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 { - accessibility_init_keystroke_from_atk_key_event (&key_event, event); + spi_init_keystroke_from_atk_key_event (&key_event, event); - /* FIXME: this casting is just totaly bogus */ result = Accessibility_DeviceEventController_notifyListenersSync ( - controller, (Accessibility_DeviceEvent *) &key_event, &ev); + controller, &key_event, &ev); CORBA_exception_free (&ev); } @@ -387,27 +548,69 @@ 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; + gint detail1 = 0, detail2 = 0; +#ifdef SPI_BRIDGE_DEBUG + const gchar *s, *s2; +#endif g_signal_query (signal_hint->signal_id, &signal_query); name = signal_query.signal_name; #ifdef SPI_BRIDGE_DEBUG - fprintf (stderr, "Received signal %s:%s\n", - g_type_name (signal_query.itype), 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 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); + + spi_atk_emit_eventv (gobject, detail1, detail2, "object:%s", name); + + return TRUE; +} + - emit_eventv (gobject, 0, 0, "object:%s", name); + +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; + const gchar *name; +#ifdef SPI_BRIDGE_DEBUG + const gchar *s, *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, "window:%s", name); return TRUE; }