X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=at-bridge%2Fbridge.c;h=29fb56941d7b8690a923126dbc584ea1b22ec69d;hb=4328426aeae1eeed7c2e696536351b224eeddbce;hp=6e08153aa308d376f5472fd132570c87aeaebc04;hpb=408978dd34f3338e49b6ace5f60b7606579ce7a9;p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git diff --git a/at-bridge/bridge.c b/at-bridge/bridge.c index 6e08153..29fb569 100644 --- a/at-bridge/bridge.c +++ b/at-bridge/bridge.c @@ -26,10 +26,13 @@ #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; @@ -40,7 +43,7 @@ struct _ArgStruct { }; static CORBA_Environment ev; -static Accessibility_SpiRegistry registry; +static Accessibility_Registry registry; static SpiApplication *this_app; static gboolean bridge_register_app (gpointer p); @@ -52,11 +55,18 @@ static gboolean bridge_property_event_listener (GSignalInvocationHint *signal_hi 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 (AtkKeyEventStruct *event, + gpointer data); + int gtk_module_init(gint *argc, gchar **argv[]) { @@ -85,7 +95,7 @@ bridge_register_app (gpointer gp) /* Create the accesssible application server object */ this_app = spi_application_new(atk_get_root ()); - obj_id = "OAFIID:Accessibility_SpiRegistry:proto0.1"; + obj_id = "OAFIID:Accessibility_Registry:proto0.1"; oclient = bonobo_activation_activate_from_id (obj_id, 0, NULL, &ev); if (ev._major != CORBA_NO_EXCEPTION) { @@ -101,13 +111,13 @@ bridge_register_app (gpointer gp) g_error ("Could not locate registry"); } - registry = (Accessibility_SpiRegistry) oclient; + registry = (Accessibility_Registry) oclient; fprintf(stderr, "About to register application\n"); bonobo_activate (); - Accessibility_SpiRegistry_registerSpiApplication (registry, + Accessibility_Registry_registerApplication (registry, CORBA_Object_duplicate (BONOBO_OBJREF (this_app), &ev), &ev); @@ -119,24 +129,39 @@ bridge_register_app (gpointer gp) static void register_atk_event_listeners () { - /* Register for focus event notifications, and register app with central registry */ + GType t; + + /* + * kludge to make sure the Atk interface types are registered, otherwise + * the AtkText signal handlers below won't get registered + */ -/* kludge to make sure the Atk interface types are registered, otherwise - the AtkText signal handlers below won't get registered */ + AtkObject *o = atk_no_op_object_new (g_object_new (ATK_TYPE_OBJECT, NULL)); - ATK_TYPE_TEXT; + /* 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: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: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); } static void bridge_exit_func() { fprintf (stderr, "exiting bridge\n"); - Accessibility_SpiRegistry_deregisterSpiApplication (registry, + Accessibility_Registry_deregisterApplication (registry, CORBA_Object_duplicate (BONOBO_OBJREF (this_app), &ev), &ev); fprintf (stderr, "bridge exit func complete.\n"); @@ -149,7 +174,7 @@ static void bridge_focus_tracker (AtkObject *object) e->source = CORBA_Object_duplicate (BONOBO_OBJREF (spi_accessible_new (object)), &ev); e->detail1 = 0; e->detail2 = 0; - Accessibility_SpiRegistry_notifyEvent (registry, e, &ev); + Accessibility_Registry_notifyEvent (registry, e, &ev); } static gboolean @@ -199,11 +224,107 @@ bridge_property_event_listener (GSignalInvocationHint *signal_hint, e->detail1 = 0; e->detail2 = 0; if (source) - Accessibility_SpiRegistry_notifyEvent (registry, e, &ev); + Accessibility_Registry_notifyEvent (registry, e, &ev); return TRUE; } static gboolean +bridge_state_event_listener (GSignalInvocationHint *signal_hint, + guint n_param_values, + const GValue *param_values, + gpointer data) +{ + Accessibility_Event *e = Accessibility_Event__alloc(); + Bonobo_Unknown source = NULL; + AtkObject *aobject; + AtkPropertyValues *values; + GObject *gobject; + GSignalQuery signal_query; + gchar *name; + char sbuf[APP_STATIC_BUFF_SZ]; + + g_signal_query (signal_hint->signal_id, &signal_query); + name = signal_query.signal_name; +#ifdef SPI_BRIDGE_DEBUG + 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); + } + else + { + g_error("received property-change event from non-AtkImplementor"); + } + + snprintf(sbuf, APP_STATIC_BUFF_SZ, "object:%s:%s", values->property_name, "?"); + e->type = CORBA_string_dup (sbuf); + e->source = source; + e->detail1 = (unsigned long) values->old_value.data[0].v_ulong; + e->detail2 = (unsigned long) values->new_value.data[0].v_ulong; + if (source) + Accessibility_Registry_notifyEvent (registry, e, &ev); + return TRUE; +} + +#define SPI_DEBUG + +static Accessibility_KeyStroke * +accessibility_keystroke_from_atk_key_event (AtkKeyEventStruct *event) +{ + Accessibility_KeyStroke *keystroke; + keystroke = Accessibility_KeyStroke__alloc (); + +#ifdef SPI_DEBUG + if (event) g_print ("event %c (%d)\n", (int) event->keyval, (int) event->keycode); + else +#endif + if (!event) g_print ("WARNING: NULL key event!"); + + 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: + } + + return keystroke; +} + +static gint +bridge_key_listener (AtkKeyEventStruct *event, gpointer data) +{ + Accessibility_KeyStroke *key_event = accessibility_keystroke_from_atk_key_event (event); + CORBA_boolean result; + Accessibility_DeviceEventController controller = + Accessibility_Registry_getDeviceEventController (registry, &ev); + result = Accessibility_DeviceEventController_notifyListenersSync (controller, + (Accessibility_DeviceEvent *) key_event, + &ev); +} + +static gboolean bridge_signal_listener (GSignalInvocationHint *signal_hint, guint n_param_values, const GValue *param_values, @@ -221,7 +342,7 @@ bridge_signal_listener (GSignalInvocationHint *signal_hint, 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", + fprintf (stderr, "Received signal %s:%s\n", g_type_name (signal_query.itype), name); #endif gobject = g_value_get_object (param_values + 0); @@ -247,12 +368,12 @@ bridge_signal_listener (GSignalInvocationHint *signal_hint, e->source = source; e->detail1 = 0; e->detail2 = 0; - Accessibility_SpiRegistry_notifyEvent (registry, e, &ev); + Accessibility_Registry_notifyEvent (registry, e, &ev); g_object_unref (aobject); return TRUE; } -static Accessibility_SpiRegistry bridge_get_registry () +static Accessibility_Registry bridge_get_registry () { return registry; }