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=2253ec0fa6b12f9d354766051a4f6cb3a3c63be1;hp=9930d2c9bdc9a58a86de1412ed7e7c7c503701fa;hb=bf2e5788c56e02322e8e4b80a9be16301ffd1a49;hpb=b4e7556caa3b65e635246adfd8d67cfd922f19ba diff --git a/atk-adaptor/event.c b/atk-adaptor/event.c index 9930d2c..2253ec0 100644 --- a/atk-adaptor/event.c +++ b/atk-adaptor/event.c @@ -23,6 +23,7 @@ */ #include +#include #include #include @@ -31,6 +32,9 @@ #include "accessible-register.h" #include "common/spi-dbus.h" +#include "event.h" +#include "object.h" +#include "dbus/dbus-glib-lowlevel.h" static GArray *listener_ids = NULL; @@ -39,10 +43,10 @@ static gint atk_bridge_focus_tracker_id; /*---------------------------------------------------------------------------*/ -#define ITF_EVENT_OBJECT "org.freedesktop.atspi.Event.Object" -#define ITF_EVENT_WINDOW "org.freedesktop.atspi.Event.Window" -#define ITF_EVENT_DOCUMENT "org.freedesktop.atspi.Event.Document" -#define ITF_EVENT_FOCUS "org.freedesktop.atspi.Event.Focus" +#define ITF_EVENT_OBJECT "org.a11y.atspi.Event.Object" +#define ITF_EVENT_WINDOW "org.a11y.atspi.Event.Window" +#define ITF_EVENT_DOCUMENT "org.a11y.atspi.Event.Document" +#define ITF_EVENT_FOCUS "org.a11y.atspi.Event.Focus" /*---------------------------------------------------------------------------*/ @@ -53,11 +57,28 @@ typedef struct _SpiReentrantCallClosure } SpiReentrantCallClosure; static void +switch_main_context (GMainContext *cnx) +{ +/* This code won't work on dbus-glib earlier than 0.9.0 because of FDO#30574 */ + if (spi_global_app_data->app_bus_addr [0] == '\0') + return; + + GList *list; + + dbus_server_setup_with_g_main (spi_global_app_data->server, cnx); + dbus_connection_setup_with_g_main (spi_global_app_data->bus, cnx); + for (list = spi_global_app_data->direct_connections; list; list = list->next) + dbus_connection_setup_with_g_main (list->data, cnx); +} + +static void set_reply (DBusPendingCall * pending, void *user_data) { SpiReentrantCallClosure* closure = (SpiReentrantCallClosure *) user_data; closure->reply = dbus_pending_call_steal_reply (pending); + dbus_pending_call_unref (pending); + switch_main_context (NULL); g_main_loop_quit (closure->loop); } @@ -66,12 +87,19 @@ send_and_allow_reentry (DBusConnection * bus, DBusMessage * message) { DBusPendingCall *pending; SpiReentrantCallClosure closure; + GMainContext *main_context; + + main_context = (g_getenv ("AT_SPI_CLIENT") ? NULL : + spi_global_app_data->main_context); + closure.loop = g_main_loop_new (main_context, FALSE); + switch_main_context (main_context); - if (!dbus_connection_send_with_reply (bus, message, &pending, -1)) + if (!dbus_connection_send_with_reply (bus, message, &pending, -1) || !pending) + { + switch_main_context (NULL); return NULL; + } dbus_pending_call_set_notify (pending, set_reply, (void *) &closure, NULL); - closure.loop = g_main_loop_new (NULL, FALSE); - g_main_loop_run (closure.loop); g_main_loop_unref (closure.loop); @@ -281,6 +309,77 @@ signal_name_to_dbus (const gchar *s) } /* + * Converts names of the form "active-descendant-changed" to + * "ActiveDescendantChanged" + */ +static gchar * +ensure_proper_format (const char *name) +{ + gchar *ret = (gchar *) g_malloc (strlen (name) * 2 + 2); + gchar *p = ret; + gboolean need_upper = TRUE; + + if (!ret) + return NULL; + while (*name) + { + if (need_upper) + { + *p++ = toupper (*name); + need_upper = FALSE; + } + else if (*name == '-') + need_upper = TRUE; + else if (*name == ':') + { + need_upper = TRUE; + *p++ = *name; + } + else + *p++ = *name; + name++; + } + *p = '\0'; + return ret; +} + +static gboolean +signal_is_needed (const gchar *klass, const gchar *major, const gchar *minor) +{ + gchar *data [4]; + GList *iter; + event_data *evdata; + gboolean ret = FALSE; + GList *list; + + if (!spi_global_app_data->events_initialized) + return TRUE; + + data [0] = ensure_proper_format (klass + 21); + data [1] = ensure_proper_format (major); + data [2] = ensure_proper_format (minor); + data [3] = NULL; + + /* Hack: events such as "object::text-changed::insert:system" as + generated by Gecko */ + data [2][strcspn (data [2], ":")] = '\0'; + for (list = spi_global_app_data->events; list; list = list->next) + { + evdata = list->data; + if (spi_event_is_subtype (data, evdata->data)) + { + ret = TRUE; + break; + } + } + + g_free (data [2]); + g_free (data [1]); + g_free (data [0]); + return ret; +} + +/* * Emits an AT-SPI event. * AT-SPI events names are split into three parts: * class:major:minor @@ -302,8 +401,7 @@ emit_event (AtkObject *obj, void (*append_variant) (DBusMessageIter *, const char *, const void *)) { DBusConnection *bus = spi_global_app_data->bus; - const char *path = spi_register_object_to_path (spi_global_register, - G_OBJECT (obj)); + const char *path; gchar *cname, *t; DBusMessage *sig; @@ -314,6 +412,11 @@ emit_event (AtkObject *obj, if (!minor) minor = ""; if (!type) type = "u"; + if (!signal_is_needed (klass, major, minor)) + return; + + path = spi_register_object_to_path (spi_global_register, G_OBJECT (obj)); + /* * This is very annoying, but as '-' isn't a legal signal * name in D-Bus (Why not??!?) The names need converting @@ -321,19 +424,23 @@ emit_event (AtkObject *obj, */ cname = signal_name_to_dbus (major); sig = dbus_message_new_signal(path, klass, cname); - g_free(cname); dbus_message_iter_init_append(sig, &iter); - spi_object_append_reference (&iter, spi_global_app_data->root); dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &minor); dbus_message_iter_append_basic(&iter, DBUS_TYPE_INT32, &detail1); dbus_message_iter_append_basic(&iter, DBUS_TYPE_INT32, &detail2); - append_variant (&iter, type, val); + spi_object_append_reference (&iter, spi_global_app_data->root); dbus_connection_send(bus, sig, NULL); dbus_message_unref(sig); + + if (g_strcmp0 (cname, "ChildrenChanged") != 0) + spi_object_lease_if_needed (G_OBJECT (obj)); + + g_free(cname); + g_free (path); } /*---------------------------------------------------------------------------*/ @@ -406,9 +513,9 @@ property_event_listener (GSignalInvocationHint * signal_hint, } else if (strcmp (pname, "accessible-role") == 0) { - dbus_uint32_t role = atk_object_get_role (accessible); + i = atk_object_get_role (accessible); emit_event (accessible, ITF_EVENT_OBJECT, PCHANGE, pname, 0, 0, - DBUS_TYPE_UINT32_AS_STRING, role, append_basic); + DBUS_TYPE_UINT32_AS_STRING, GINT_TO_POINTER(i), append_basic); } else if (strcmp (pname, "accessible-table-summary") == 0) { @@ -602,7 +709,6 @@ active_descendant_event_listener (GSignalInvocationHint * signal_hint, AtkObject *child; GSignalQuery signal_query; const gchar *name, *minor; - gchar *s; gint detail1; g_signal_query (signal_hint->signal_id, &signal_query); @@ -617,7 +723,6 @@ active_descendant_event_listener (GSignalInvocationHint * signal_hint, emit_event (accessible, ITF_EVENT_OBJECT, name, "", detail1, 0, "(so)", child, append_object); - g_free (s); return TRUE; } @@ -730,7 +835,7 @@ text_selection_changed_event_listener (GSignalInvocationHint * signal_hint, /* * Children changed signal converter and forwarder. * - * Klass (Interface) org.freedesktop.atspi.Event.Object + * Klass (Interface) org.a11y.atspi.Event.Object * Major is the signal name. * Minor is 'add' or 'remove' * detail1 is the index. @@ -746,7 +851,7 @@ children_changed_event_listener (GSignalInvocationHint * signal_hint, const gchar *name, *minor; gint detail1, detail2 = 0; - AtkObject *accessible, *ao; + AtkObject *accessible, *ao=NULL; gpointer child; g_signal_query (signal_hint->signal_id, &signal_query); @@ -803,7 +908,7 @@ toplevel_removed_event_listener (AtkObject * accessible, /* * Generic signal converter and forwarder. * - * Klass (Interface) org.freedesktop.atspi.Event.Object + * Klass (Interface) org.a11y.atspi.Event.Object * Major is the signal name. * Minor is NULL. * detail1 is 0. @@ -1009,4 +1114,17 @@ spi_atk_tidy_windows (void) } } +gboolean +spi_event_is_subtype (gchar **needle, gchar **haystack) +{ + while (*haystack && **haystack) + { + if (g_strcmp0 (*needle, *haystack)) + return FALSE; + needle++; + haystack++; + } + return TRUE; +} + /*END------------------------------------------------------------------------*/