X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git;a=blobdiff_plain;f=atk-adaptor%2Fevent.c;h=586d19630e6e6271ddf282a5101d3a429366f845;hp=99c20411862eeb3038d6b18d99af27e960cb6bde;hb=51b5abcea9ee948d11aeb5d6062186f3d4f5ee59;hpb=c72a4b4b0330733b2c2e0ed768d76ff85cd31500 diff --git a/atk-adaptor/event.c b/atk-adaptor/event.c index 99c2041..586d196 100644 --- a/atk-adaptor/event.c +++ b/atk-adaptor/event.c @@ -2,6 +2,7 @@ * AT-SPI - Assistive Technology Service Provider Interface * (Gnome Accessibility Project; http://developer.gnome.org/projects/gap) * + * Copyright 2011, F123 Consulting & Mais Diferenças * Copyright 2008, 2009, Codethink Ltd. * Copyright 2001, 2002, 2003 Sun Microsystems Inc., * Copyright 2001, 2002, 2003 Ximian, Inc. @@ -32,7 +33,7 @@ #include "bridge.h" #include "accessible-register.h" -#include "common/spi-dbus.h" +#include "spi-dbus.h" #include "event.h" #include "object.h" @@ -52,8 +53,10 @@ static gint atk_bridge_focus_tracker_id; typedef struct _SpiReentrantCallClosure { + DBusConnection *bus; GMainLoop *loop; DBusMessage *reply; + guint timeout; } SpiReentrantCallClosure; static void @@ -80,25 +83,45 @@ set_reply (DBusPendingCall * pending, void *user_data) g_main_loop_quit (closure->loop); } +static gboolean +timeout_reply (void *data) +{ + SpiReentrantCallClosure *closure = data; + + if (!dbus_connection_get_is_connected (closure->bus)) + g_main_loop_quit (closure->loop); + closure->timeout = -1; + return FALSE; +} + static DBusMessage * send_and_allow_reentry (DBusConnection * bus, DBusMessage * message) { DBusPendingCall *pending; SpiReentrantCallClosure closure; GMainContext *main_context; + GSource *source; main_context = (g_getenv ("AT_SPI_CLIENT") ? NULL : spi_global_app_data->main_context); + closure.bus = bus; closure.loop = g_main_loop_new (main_context, FALSE); + closure.reply = NULL; switch_main_context (main_context); - if (!dbus_connection_send_with_reply (bus, message, &pending, -1) || !pending) + if (!dbus_connection_send_with_reply (bus, message, &pending, 9000) || !pending) { switch_main_context (NULL); return NULL; } dbus_pending_call_set_notify (pending, set_reply, (void *) &closure, NULL); + source = g_timeout_source_new (500); + g_source_set_callback (source, timeout_reply, &closure, NULL); + closure.timeout = g_source_attach (source, main_context); + g_source_unref (source); g_main_loop_run (closure.loop); + if (closure.timeout != -1) + g_source_destroy (source); g_main_loop_unref (closure.loop); return closure.reply; @@ -114,7 +137,7 @@ send_and_allow_reentry (DBusConnection * bus, DBusMessage * message) static gboolean Accessibility_DeviceEventController_NotifyListenersSync (const - Accessibility_DeviceEvent + AtspiDeviceEvent * key_event) { DBusMessage *message; @@ -123,8 +146,8 @@ Accessibility_DeviceEventController_NotifyListenersSync (const message = dbus_message_new_method_call (SPI_DBUS_NAME_REGISTRY, - SPI_DBUS_PATH_DEC, - SPI_DBUS_INTERFACE_DEC, + ATSPI_DBUS_PATH_DEC, + ATSPI_DBUS_INTERFACE_DEC, "NotifyListenersSync"); dbus_error_init (&error); @@ -146,7 +169,7 @@ Accessibility_DeviceEventController_NotifyListenersSync (const } static void -spi_init_keystroke_from_atk_key_event (Accessibility_DeviceEvent * keystroke, +spi_init_keystroke_from_atk_key_event (AtspiDeviceEvent * keystroke, AtkKeyEventStruct * event) { keystroke->id = (dbus_int32_t) event->keyval; @@ -172,10 +195,10 @@ spi_init_keystroke_from_atk_key_event (Accessibility_DeviceEvent * keystroke, switch (event->type) { case (ATK_KEY_EVENT_PRESS): - keystroke->type = Accessibility_KEY_PRESSED_EVENT; + keystroke->type = ATSPI_KEY_PRESSED; break; case (ATK_KEY_EVENT_RELEASE): - keystroke->type = Accessibility_KEY_RELEASED_EVENT; + keystroke->type = ATSPI_KEY_RELEASED; break; default: keystroke->type = 0; @@ -195,7 +218,7 @@ static gint spi_atk_bridge_key_listener (AtkKeyEventStruct * event, gpointer data) { gboolean result; - Accessibility_DeviceEvent key_event; + AtspiDeviceEvent key_event; spi_init_keystroke_from_atk_key_event (&key_event, event); @@ -613,7 +636,8 @@ state_event_listener (GSignalInvocationHint * signal_hint, DBUS_TYPE_INT32_AS_STRING, 0, append_basic); if (!g_strcmp0 (pname, "defunct")) - spi_register_deregister_object (spi_global_register, G_OBJECT (accessible)); + spi_register_deregister_object (spi_global_register, G_OBJECT (accessible), + TRUE); return TRUE; } @@ -759,7 +783,7 @@ link_selected_event_listener (GSignalInvocationHint * signal_hint, AtkObject *accessible; GSignalQuery signal_query; const gchar *name, *minor; - gint detail1; + gint detail1 = 0; g_signal_query (signal_hint->signal_id, &signal_query); name = signal_query.signal_name; @@ -793,7 +817,7 @@ text_changed_event_listener (GSignalInvocationHint * signal_hint, GSignalQuery signal_query; const gchar *name, *minor; gchar *selected; - gint detail1, detail2; + gint detail1 = 0, detail2 = 0; g_signal_query (signal_hint->signal_id, &signal_query); name = signal_query.signal_name; @@ -832,7 +856,7 @@ text_insert_event_listener (GSignalInvocationHint * signal_hint, GSignalQuery signal_query; const gchar *name; gchar *minor, *text; - gint detail1, detail2; + gint detail1 = 0, detail2 = 0; accessible = ATK_OBJECT (g_value_get_object (¶m_values[0])); /* Get signal name for 'Gtk:AtkText:text-changed' so @@ -880,7 +904,7 @@ text_remove_event_listener (GSignalInvocationHint * signal_hint, GSignalQuery signal_query; const gchar *name; gchar *minor, *text; - gint detail1, detail2; + gint detail1 = 0, detail2 = 0; accessible = ATK_OBJECT (g_value_get_object (¶m_values[0])); /* Get signal name for 'Gtk:AtkText:text-changed' so @@ -931,7 +955,7 @@ text_selection_changed_event_listener (GSignalInvocationHint * signal_hint, AtkObject *accessible; GSignalQuery signal_query; const gchar *name, *minor; - gint detail1, detail2; + gint detail1 = 0, detail2 = 0; g_signal_query (signal_hint->signal_id, &signal_query); name = signal_query.signal_name; @@ -969,7 +993,7 @@ children_changed_event_listener (GSignalInvocationHint * signal_hint, { GSignalQuery signal_query; const gchar *name, *minor; - gint detail1, detail2 = 0; + gint detail1 = 0, detail2 = 0; AtkObject *accessible, *ao=NULL; gpointer child; @@ -1068,13 +1092,17 @@ generic_event_listener (GSignalInvocationHint * signal_hint, * and stores the signal id returned so that the function may be * de-registered later. */ -static void +static guint add_signal_listener (GSignalEmissionHook listener, const char *signal_name) { guint id; id = atk_add_global_event_listener (listener, signal_name); - g_array_append_val (listener_ids, id); + + if (id > 0) /* id == 0 is a failure */ + g_array_append_val (listener_ids, id); + + return id; } /* @@ -1091,6 +1119,7 @@ spi_atk_register_event_listeners (void) */ GObject *ao = g_object_new (ATK_TYPE_OBJECT, NULL); AtkObject *bo = atk_no_op_object_new (ao); + guint id = 0; g_object_unref (G_OBJECT (bo)); g_object_unref (ao); @@ -1108,13 +1137,37 @@ spi_atk_register_event_listeners (void) add_signal_listener (property_event_listener, "Gtk:AtkObject:property-change"); - add_signal_listener (window_event_listener, "window:create"); - add_signal_listener (window_event_listener, "window:destroy"); - add_signal_listener (window_event_listener, "window:minimize"); - add_signal_listener (window_event_listener, "window:maximize"); - add_signal_listener (window_event_listener, "window:restore"); - add_signal_listener (window_event_listener, "window:activate"); - add_signal_listener (window_event_listener, "window:deactivate"); + + /* window events: we tentative try to register using the old format */ + id = add_signal_listener (window_event_listener, "window:create"); + + if (id != 0) + { + /* If we are able to register using the old format, we assume + * that the ATK implementor is managing window events without + * AtkWindow. We can't use the opposite test because after + * including AtkWindow on ATK you would be able to register to + * that event, although the ATK implementor could or not use it. + */ + + add_signal_listener (window_event_listener, "window:destroy"); + add_signal_listener (window_event_listener, "window:minimize"); + add_signal_listener (window_event_listener, "window:maximize"); + add_signal_listener (window_event_listener, "window:restore"); + add_signal_listener (window_event_listener, "window:activate"); + add_signal_listener (window_event_listener, "window:deactivate"); + } + else + { + add_signal_listener (window_event_listener, "Atk:AtkWindow:create"); + add_signal_listener (window_event_listener, "Atk:AtkWindow:destroy"); + add_signal_listener (window_event_listener, "Atk:AtkWindow:minimize"); + add_signal_listener (window_event_listener, "Atk:AtkWindow:maximize"); + add_signal_listener (window_event_listener, "Atk:AtkWindow:restore"); + add_signal_listener (window_event_listener, "Atk:AtkWindow:activate"); + add_signal_listener (window_event_listener, "Atk:AtkWindow:deactivate"); + } + add_signal_listener (document_event_listener, "Gtk:AtkDocument:load-complete"); add_signal_listener (document_event_listener, "Gtk:AtkDocument:reload"); @@ -1194,11 +1247,14 @@ spi_atk_deregister_event_listeners (void) atk_bridge_focus_tracker_id = 0; } - for (i = 0; ids && i < ids->len; i++) + if (ids) { - atk_remove_global_event_listener (g_array_index (ids, guint, i)); + for (i = 0; i < ids->len; i++) + { + atk_remove_global_event_listener (g_array_index (ids, guint, i)); + } + g_array_free (ids, TRUE); } - g_array_free (ids, TRUE); if (atk_bridge_key_event_listener_id) {