X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=atspi%2Fatspi-event-listener.c;h=5c4b44280fea9d3c975fc574acbfc35efd29a5a3;hb=59196d54df4ccefff67fc31afb56f9ad35a75a9c;hp=ba5d1262ded7496b0ba8164577381b4c4d90778a;hpb=0927d749d332c1719856545f53a00ea28a7d4e25;p=platform%2Fupstream%2Fat-spi2-core.git diff --git a/atspi/atspi-event-listener.c b/atspi/atspi-event-listener.c index ba5d126..5c4b442 100644 --- a/atspi/atspi-event-listener.c +++ b/atspi/atspi-event-listener.c @@ -23,6 +23,7 @@ */ #include "atspi-private.h" +#include "atspi-accessible-private.h" #include #include @@ -31,9 +32,11 @@ typedef struct AtspiEventListenerCB callback; void *user_data; GDestroyNotify callback_destroyed; + char *event_type; char *category; char *name; char *detail; + GArray *properties; } EventListenerEntry; G_DEFINE_TYPE (AtspiEventListener, atspi_event_listener, G_TYPE_OBJECT) @@ -49,7 +52,7 @@ atspi_event_listener_class_init (AtspiEventListenerClass *klass) } static void -remove_datum (const AtspiEvent *event, void *user_data) +remove_datum (AtspiEvent *event, void *user_data) { AtspiEventListenerSimpleCB cb = user_data; cb (event); @@ -116,7 +119,7 @@ callback_unref (gpointer callback) /** * atspi_event_listener_new: - * @callback: (scope notified): An #AtspiEventListenerSimpleCB to be called + * @callback: (scope notified): An #AtspiEventListenerCB to be called * when an event is fired. * @user_data: (closure): data to pass to the callback. * @callback_destroyed: A #GDestroyNotify called when the listener is freed @@ -140,7 +143,7 @@ atspi_event_listener_new (AtspiEventListenerCB callback, } /** - * atspi_event_listener_new_simple: + * atspi_event_listener_new_simple: (skip) * @callback: (scope notified): An #AtspiEventListenerSimpleCB to be called * when an event is fired. * @callback_destroyed: A #GDestroyNotify called when the listener is freed @@ -400,6 +403,7 @@ static void listener_entry_free (EventListenerEntry *e) { gpointer callback = (e->callback == remove_datum ? (gpointer)e->user_data : (gpointer)e->callback); + g_free (e->event_type); g_free (e->category); g_free (e->name); if (e->detail) g_free (e->detail); @@ -512,6 +516,59 @@ atspi_event_listener_register (AtspiEventListener *listener, } /** + * atspi_event_listener_register_full: + * @listener: The #AtspiEventListener to register against an event type. + * @event_type: a character string indicating the type of events for which + * notification is requested. See #atspi_event_listener_register + * for a description of the format and legal event types. +* @properties: (element-type gchar*) (transfer none) (allow-none): a list of + * properties that should be sent along with the event. The + * properties are valued for the duration of the event callback.k + * TODO: Document. + * + * Adds an in-process callback function to an existing #AtspiEventListener. + * + * Returns: #TRUE if successful, otherwise #FALSE. + **/ +gboolean +atspi_event_listener_register_full (AtspiEventListener *listener, + const gchar *event_type, + GArray *properties, + GError **error) +{ + /* TODO: Keep track of which events have been registered, so that we + * deregister all of them when the event listener is destroyed */ + + return atspi_event_listener_register_from_callback_full (listener->callback, + listener->user_data, + listener->cb_destroyed, + event_type, + properties, + error); +} + +static gboolean +notify_event_registered (EventListenerEntry *e) +{ + + if (e->properties) + dbind_method_call_reentrant (_atspi_bus (), atspi_bus_registry, + atspi_path_registry, + atspi_interface_registry, + "RegisterEvent", + NULL, "sas", e->event_type, + e->properties); + else + dbind_method_call_reentrant (_atspi_bus (), atspi_bus_registry, + atspi_path_registry, + atspi_interface_registry, + "RegisterEvent", + NULL, "s", e->event_type); + + return TRUE; +} + +/** * atspi_event_listener_register_from_callback: * @callback: (scope notified): the #AtspiEventListenerCB to be registered * against an event type. @@ -533,9 +590,40 @@ atspi_event_listener_register_from_callback (AtspiEventListenerCB callback, const gchar *event_type, GError **error) { + return atspi_event_listener_register_from_callback_full (callback, + user_data, + callback_destroyed, + event_type, NULL, + error); +} + +static GArray * +copy_event_properties (GArray *src) +{ + gint i; + + GArray *dst = g_array_new (FALSE, FALSE, sizeof (char *)); + + if (!src) + return dst; + for (i = 0; i < src->len; i++) + { + gchar *dup = g_strdup (g_array_index (src, char *, i)); + g_array_append_val (dst, dup); + } + return dst; +} + +gboolean +atspi_event_listener_register_from_callback_full (AtspiEventListenerCB callback, + void *user_data, + GDestroyNotify callback_destroyed, + const gchar *event_type, + GArray *properties, + GError **error) +{ EventListenerEntry *e; DBusError d_error; - DBusMessage *message, *reply; GPtrArray *matchrule_array; gint i; @@ -551,6 +639,7 @@ atspi_event_listener_register_from_callback (AtspiEventListenerCB callback, } e = g_new (EventListenerEntry, 1); + e->event_type = g_strdup (event_type); e->callback = callback; e->user_data = user_data; e->callback_destroyed = callback_destroyed; @@ -561,6 +650,7 @@ atspi_event_listener_register_from_callback (AtspiEventListenerCB callback, g_free (e); return FALSE; } + e->properties = copy_event_properties (properties); event_listeners = g_list_prepend (event_listeners, e); for (i = 0; i < matchrule_array->len; i++) { @@ -578,22 +668,25 @@ atspi_event_listener_register_from_callback (AtspiEventListenerCB callback, } g_ptr_array_free (matchrule_array, TRUE); - message = dbus_message_new_method_call (atspi_bus_registry, - atspi_path_registry, - atspi_interface_registry, - "RegisterEvent"); - if (!message) - return FALSE; - dbus_message_append_args (message, DBUS_TYPE_STRING, &event_type, DBUS_TYPE_INVALID); - reply = _atspi_dbus_send_with_reply_and_block (message, error); - if (reply) - dbus_message_unref (reply); - + notify_event_registered (e); return TRUE; } +void +_atspi_reregister_event_listeners () +{ + GList *l; + EventListenerEntry *e; + + for (l = event_listeners; l; l = l->next) + { + e = l->data; + notify_event_registered (e); + } +} + /** - * atspi_event_listener_register_no_data: + * atspi_event_listener_register_no_data: (skip) * @callback: (scope notified): the #AtspiEventListenerSimpleCB to be * registered against an event type. * @callback_destroyed: A #GDestroyNotify called when the callback is destroyed. @@ -728,7 +821,7 @@ atspi_event_listener_deregister_from_callback (AtspiEventListenerCB callback, } /** - * atspi_event_listener_deregister_no_data: + * atspi_event_listener_deregister_no_data: (skip) * @callback: (scope call): the #AtspiEventListenerSimpleCB registered against * an event type. * @event_type: a string specifying the event type for which this @@ -777,6 +870,9 @@ detail_matches_listener (const char *event_detail, const char *listener_detail) if (!listener_detail) return TRUE; + if (!event_detail) + return (listener_detail ? FALSE : TRUE); + return !(listener_detail [strcspn (listener_detail, ":")] == '\0' ? strncmp (listener_detail, event_detail, strcspn (event_detail, ":")) @@ -844,8 +940,10 @@ _atspi_dbus_handle_event (DBusConnection *bus, DBusMessage *message, void *data) AtspiEvent e; dbus_int32_t detail1, detail2; char *p; + GHashTable *cache = NULL; - if (strcmp (signature, "siiv(so)") != 0) + if (strcmp (signature, "siiv(so)") != 0 && + strcmp (signature, "siiva{sv}") != 0) { g_warning ("Got invalid signature %s for signal %s from interface %s\n", signature, member, category); return DBUS_HANDLER_RESULT_HANDLED; @@ -853,16 +951,20 @@ _atspi_dbus_handle_event (DBusConnection *bus, DBusMessage *message, void *data) memset (&e, 0, sizeof (e)); - if (category) + if (!category) { - category = g_utf8_strrchr (category, -1, '.'); - if (category == NULL) - { - // TODO: Error - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; - } - category++; + // TODO: Error + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + } + + category = g_utf8_strrchr (category, -1, '.'); + if (category == NULL) + { + // TODO: Error + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } + category++; + dbus_message_iter_get_basic (&iter, &detail); dbus_message_iter_next (&iter); dbus_message_iter_get_basic (&iter, &detail1); @@ -897,6 +999,14 @@ _atspi_dbus_handle_event (DBusConnection *bus, DBusMessage *message, void *data) } e.type = converted_type; e.source = _atspi_ref_accessible (dbus_message_get_sender(message), dbus_message_get_path(message)); + if (e.source == NULL) + { + g_warning ("Got no valid source accessible for signal for signal %s from interface %s\n", member, category); + g_free (converted_type); + g_free (name); + g_free (detail); + return DBUS_HANDLER_RESULT_HANDLED; + } dbus_message_iter_recurse (&iter, &iter_variant); switch (dbus_message_iter_get_arg_type (&iter_variant)) @@ -931,6 +1041,13 @@ _atspi_dbus_handle_event (DBusConnection *bus, DBusMessage *message, void *data) break; } + dbus_message_iter_next (&iter); + if (dbus_message_iter_get_arg_type (&iter) == DBUS_TYPE_ARRAY) + { + /* new form -- parse properties sent with event */ + cache = _atspi_dbus_update_cache_from_dict (e.source, &iter); + } + if (!strncmp (e.type, "object:children-changed", 23)) { cache_process_children_changed (&e); @@ -951,6 +1068,9 @@ _atspi_dbus_handle_event (DBusConnection *bus, DBusMessage *message, void *data) _atspi_send_event (&e); + if (cache) + _atspi_accessible_unref_cache (e.source); + g_free (converted_type); g_free (name); g_free (detail);