X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git;a=blobdiff_plain;f=atk-bridge%2Fbridge.c;h=e32dfaf0f02105924b376eaba75ec2d01b0c6b96;hp=dc89a7ae3df8221a00894a3ec852e14270a26609;hb=d35cd400a36b0f1393c17ce47015bf753327ccae;hpb=6cf5aca394787ce29eb620a3c2e665a1c74b3a4c diff --git a/atk-bridge/bridge.c b/atk-bridge/bridge.c index dc89a7a..e32dfaf 100644 --- a/atk-bridge/bridge.c +++ b/atk-bridge/bridge.c @@ -22,141 +22,246 @@ #include #include +#include #include #include #include #include +#include #include #include "accessible.h" #include "application.h" -#define SPI_BRIDGE_DEBUG 1 - -#define APP_STATIC_BUFF_SZ 64 - -typedef struct _ArgStruct ArgStruct; - -struct _ArgStruct { - gint c; - char **v; -}; +#undef SPI_BRIDGE_DEBUG static CORBA_Environment ev; static Accessibility_Registry registry; -static SpiApplication *this_app; +static SpiApplication *this_app = NULL; -static gboolean bridge_register_app (gpointer p); +static gboolean bridge_idle_init (gpointer user_data); static void bridge_focus_tracker (AtkObject *object); -static void bridge_exit_func(void); -static gboolean bridge_register_event_listener (); -static void register_atk_event_listeners(); +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 gint bridge_key_listener (AtkImplementor *atk_impl, - AtkKeyEventStruct *event, +static gint bridge_key_listener (AtkKeyEventStruct *event, gpointer data); int -gtk_module_init(gint *argc, gchar **argv[]) +gtk_module_init (gint *argc, gchar **argv[]) { - ArgStruct *args = (ArgStruct *) g_new0(ArgStruct, 1); - args->c = *argc; - args->v = *argv; - g_idle_add (bridge_register_app, args); - g_atexit (bridge_exit_func); -} - -static gboolean -bridge_register_app (gpointer gp) -{ - CORBA_Object oclient; - AtkObject *atko; - char *obj_id; - ArgStruct *args = (ArgStruct *)gp; - - CORBA_exception_init(&ev); + CORBA_Environment ev; - if (!bonobo_init (&(args->c), args->v)) + if (!bonobo_init (argc, *argv)) { g_error ("Could not initialize Bonobo"); } - /* Create the accesssible application server object */ - this_app = spi_application_new(atk_get_root ()); - - obj_id = "OAFIID:Accessibility_Registry:proto0.1"; + CORBA_exception_init(&ev); - oclient = bonobo_activation_activate_from_id (obj_id, 0, NULL, &ev); - if (ev._major != CORBA_NO_EXCEPTION) { - fprintf(stderr, - ("Accessibility app error: exception during registry activation from id: %s\n"), - CORBA_exception_id(&ev)); - CORBA_exception_free(&ev); - exit(-1); - } + 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); + } - if (CORBA_Object_is_nil (oclient, &ev)) + if (CORBA_Object_is_nil (registry, &ev)) { g_error ("Could not locate registry"); } - registry = (Accessibility_Registry) oclient; + bonobo_activate (); + + /* Create the accessible application server object */ - fprintf(stderr, "About to register application\n"); + this_app = spi_application_new (atk_get_root ()); - bonobo_activate (); + fprintf (stderr, "About to register application\n"); Accessibility_Registry_registerApplication (registry, - CORBA_Object_duplicate (BONOBO_OBJREF (this_app), &ev), + BONOBO_OBJREF (this_app), &ev); + g_atexit (bridge_exit_func); + + g_idle_add (bridge_idle_init, NULL); + + return 0; +} + +static gboolean +bridge_idle_init (gpointer user_data) +{ register_atk_event_listeners (); + fprintf (stderr, "Application registered & listening\n"); + return FALSE; } static void -register_atk_event_listeners () +register_atk_event_listeners (void) { + /* + * kludge to make sure the Atk interface types are registered, otherwise + * the AtkText signal handlers below won't get registered + */ + 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 */ -/* kludge to make sure the Atk interface types are registered, otherwise - the AtkText signal handlers below won't get registered */ - - ATK_TYPE_TEXT; - 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); + + g_object_unref (G_OBJECT (bo)); + g_object_unref (ao); } -static void bridge_exit_func() +static void +bridge_exit_func (void) { + BonoboObject *app = (BonoboObject *) this_app; + fprintf (stderr, "exiting bridge\n"); - Accessibility_Registry_deregisterApplication (registry, - CORBA_Object_duplicate (BONOBO_OBJREF (this_app), &ev), - &ev); + + if (!app) + { + return; + } + this_app = NULL; + + /* + * 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"); + g_assert (bonobo_init (0, NULL)); + g_assert (bonobo_activate ()); + } + + Accessibility_Registry_deregisterApplication ( + registry, BONOBO_OBJREF (app), &ev); + + bonobo_object_release_unref (registry, &ev); + + bonobo_object_unref (app); + fprintf (stderr, "bridge exit func complete.\n"); + + if (g_getenv ("AT_BRIDGE_SHUTDOWN")) + { + g_assert (!bonobo_debug_shutdown ()); + } +} + +static void +bridge_focus_tracker (AtkObject *object) +{ + SpiAccessible *source; + Accessibility_Event e; + + source = spi_accessible_new (object); + + e.type = "focus:"; + e.source = BONOBO_OBJREF (source); + e.detail1 = 0; + e.detail2 = 0; + + Accessibility_Registry_notifyEvent (registry, &e, &ev); + + CORBA_exception_free (&ev); } -static void bridge_focus_tracker (AtkObject *object) +static void +emit_eventv (GObject *gobject, + unsigned long detail1, + unsigned long detail2, + const char *format, ...) { - Accessibility_Event *e = Accessibility_Event__alloc(); - e->type = CORBA_string_dup ("focus:"); - e->source = CORBA_Object_duplicate (BONOBO_OBJREF (spi_accessible_new (object)), &ev); - e->detail1 = 0; - e->detail2 = 0; - Accessibility_Registry_notifyEvent (registry, e, &ev); + va_list args; + Accessibility_Event e; + SpiAccessible *source; + AtkObject *aobject; +#ifdef SPI_BRIDGE_DEBUG + CORBA_string s; +#endif + + va_start (args, format); + + if (ATK_IS_IMPLEMENTOR (gobject)) + { + aobject = atk_implementor_ref_accessible (ATK_IMPLEMENTOR (gobject)); + source = spi_accessible_new (aobject); + g_object_unref (G_OBJECT (aobject)); + } + else if (ATK_IS_OBJECT (gobject)) + { + aobject = ATK_OBJECT (gobject); + source = spi_accessible_new (aobject); + } + else + { + aobject = NULL; + source = NULL; + g_error ("received property-change event from non-AtkImplementor"); + } + + if (source != NULL) + { + e.type = g_strdup_vprintf (format, args); + 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_free (&ev); + + g_free (e.type); + } + + va_end (args); } static gboolean @@ -165,55 +270,121 @@ bridge_property_event_listener (GSignalInvocationHint *signal_hint, const GValue *param_values, gpointer data) { - Accessibility_Event *e = Accessibility_Event__alloc(); - Bonobo_Unknown source = NULL; - AtkObject *aobject; AtkPropertyValues *values; GObject *gobject; + +#ifdef SPI_BRIDGE_DEBUG GSignalQuery signal_query; - gchar *name; - char sbuf[APP_STATIC_BUFF_SZ]; + const gchar *name; + 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); +#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); + + return TRUE; +} + +static gboolean +bridge_state_event_listener (GSignalInvocationHint *signal_hint, + guint n_param_values, + const GValue *param_values, + gpointer data) +{ + GObject *gobject; + AtkPropertyValues *values; #ifdef SPI_BRIDGE_DEBUG - fprintf (stderr, "Received (property) signal %s:%s\n", + GSignalQuery signal_query; + const gchar *name; + + g_signal_query (signal_hint->signal_id, &signal_query); + name = signal_query.signal_name; + fprintf (stderr, "Received (state) signal %s:%s\n", g_type_name (signal_query.itype), name); #endif + gobject = g_value_get_object (param_values + 0); values = (AtkPropertyValues*) g_value_get_pointer (param_values + 1); - /* notify the actual listeners */ - if (ATK_IS_IMPLEMENTOR (gobject)) - { - aobject = atk_implementor_ref_accessible (ATK_IMPLEMENTOR (gobject)); - source = CORBA_Object_duplicate (BONOBO_OBJREF (spi_accessible_new (aobject)), &ev); - g_object_unref (G_OBJECT(aobject)); - } - else if (ATK_IS_OBJECT (gobject)) - { - aobject = ATK_OBJECT (gobject); - source = CORBA_Object_duplicate (BONOBO_OBJREF (spi_accessible_new (aobject)), &ev); - } + 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; +} + +static void +accessibility_init_keystroke_from_atk_key_event (Accessibility_KeyStroke *keystroke, + AtkKeyEventStruct *event) +{ +#ifdef SPI_DEBUG + if (event) + { + g_print ("event %c (%d)\n", (int) event->keyval, (int) event->keycode); + } else - { - g_error("received property-change event from non-AtkImplementor"); - } +#endif + if (!event) + { + g_print ("WARNING: NULL key event!"); + } - snprintf(sbuf, APP_STATIC_BUFF_SZ, "object:property-change:%s", values->property_name); - e->type = CORBA_string_dup (sbuf); - e->source = source; - e->detail1 = 0; - e->detail2 = 0; - if (source) - Accessibility_Registry_notifyEvent (registry, e, &ev); - return TRUE; + keystroke->keyID = (CORBA_long) event->keyval; + keystroke->keycode = (CORBA_short) event->keycode; + keystroke->timestamp = (CORBA_unsigned_long) event->timestamp; + keystroke->modifiers = (CORBA_unsigned_short) (event->state & 0xFFFF); + + switch (event->type) + { + case (ATK_KEY_EVENT_PRESS): + keystroke->type = Accessibility_KEY_PRESSED; + break; + case (ATK_KEY_EVENT_RELEASE): + keystroke->type = Accessibility_KEY_RELEASED; + break; + default: + keystroke->type = 0; + break; + } } static gint -bridge_key_listener (AtkImplementor *atk_impl, AtkKeyEventStruct *event, gpointer data) +bridge_key_listener (AtkKeyEventStruct *event, gpointer data) { - g_print ("bridge key listener!\n"); + CORBA_boolean result; + Accessibility_KeyStroke key_event; + Accessibility_DeviceEventController controller = + Accessibility_Registry_getDeviceEventController (registry, &ev); + + if (BONOBO_EX (&ev)) + { + CORBA_exception_free (&ev); + result = FALSE; + } + else + { + + accessibility_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); + + CORBA_exception_free (&ev); + } + + return result; } static gboolean @@ -222,50 +393,27 @@ bridge_signal_listener (GSignalInvocationHint *signal_hint, const GValue *param_values, gpointer data) { - Accessibility_Event *e = g_new0(Accessibility_Event, 1); - AtkObject *aobject; - Bonobo_Unknown source; - AtkPropertyValues *values; GObject *gobject; GSignalQuery signal_query; - gchar *name; - char sbuf[APP_STATIC_BUFF_SZ]; + const gchar *name; +#ifdef SPI_BRIDGE_DEBUG + 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 (property) 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, s2); #endif + gobject = g_value_get_object (param_values + 0); - /* notify the actual listeners */ - if (ATK_IS_IMPLEMENTOR (gobject)) - { - aobject = atk_implementor_ref_accessible (ATK_IMPLEMENTOR (gobject)); - } - else if (ATK_IS_OBJECT (gobject)) - { - aobject = ATK_OBJECT (gobject); - g_object_ref (aobject); - } - else - { - g_error("received property-change event from non-AtkImplementor"); - } - - snprintf(sbuf, APP_STATIC_BUFF_SZ, "%s:%s", name, g_type_name (signal_query.itype)); - source = CORBA_Object_duplicate (BONOBO_OBJREF (spi_accessible_new (aobject)), &ev); - e->type = CORBA_string_dup (sbuf); - e->source = source; - e->detail1 = 0; - e->detail2 = 0; - Accessibility_Registry_notifyEvent (registry, e, &ev); - g_object_unref (aobject); - return TRUE; -} + emit_eventv (gobject, 0, 0, "object:%s", name); -static Accessibility_Registry bridge_get_registry () -{ - return registry; + return TRUE; }