X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=atspi%2Fatspi-event-listener.c;h=752547d5cf04fd45fdd58ee530987fdcbef56205;hb=79e6331c743db0365112c10ca49133b2d1a8480f;hp=e545bda7cd8a65c6febd1e68bc1e66b9f738d4e2;hpb=e74c40ea4b7616930557ca2e9eda73f5b344a4b5;p=platform%2Fupstream%2Fat-spi2-core.git diff --git a/atspi/atspi-event-listener.c b/atspi/atspi-event-listener.c index e545bda..752547d 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 @@ -35,6 +36,7 @@ typedef struct char *category; char *name; char *detail; + GArray *properties; } EventListenerEntry; G_DEFINE_TYPE (AtspiEventListener, atspi_event_listener, G_TYPE_OBJECT) @@ -50,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); @@ -141,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 @@ -205,21 +207,29 @@ cache_process_children_changed (AtspiEvent *event) return; child = g_value_get_object (&event->any_data); + if (child == NULL) + return; if (!strncmp (event->type, "object:children-changed:add", 27)) { - if (g_list_find (event->source->children, child)) + g_ptr_array_remove (event->source->children, child); /* just to be safe */ + if (event->detail1 < 0 || event->detail1 > event->source->children->len) + { + event->source->cached_properties &= ~ATSPI_CACHE_CHILDREN; return; - event->source->children = g_list_insert (event->source->children, - g_object_ref (child), - event->detail1); + } + /* Unfortunately, there's no g_ptr_array_insert or similar */ + g_ptr_array_add (event->source->children, NULL); + memmove (event->source->children->pdata + event->detail1 + 1, + event->source->children->pdata + event->detail1, + (event->source->children->len - event->detail1 - 1) * sizeof (gpointer)); + g_ptr_array_index (event->source->children, event->detail1) = g_object_ref (child); } - else if (g_list_find (event->source->children, child)) + else { - event->source->children = g_list_remove (event->source->children, child); + g_ptr_array_remove (event->source->children, child); if (child == child->parent.app->root) g_object_run_dispose (G_OBJECT (child->parent.app)); - g_object_unref (child); } } @@ -513,22 +523,56 @@ atspi_event_listener_register (AtspiEventListener *listener, event_type, error); } +/** + * 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) { - DBusMessage *message, *reply; - 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, &e->event_type, DBUS_TYPE_INVALID); - reply = _atspi_dbus_send_with_reply_and_block (message, NULL); + 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); - if (reply) - dbus_message_unref (reply); return TRUE; } @@ -554,6 +598,50 @@ 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; +} + +/** + * atspi_event_listener_register_from_callback_full: + * @callback: (scope async): an #AtspiEventListenerCB function pointer. + * @user_data: (closure callback) + * @callback_destroyed: (destroy callback) + * @event_type: + * @properties: (element-type utf8) + * @error: + * + * Returns: #TRUE if successful, otherwise #FALSE. + * + **/ +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; GPtrArray *matchrule_array; @@ -582,6 +670,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++) { @@ -617,7 +706,7 @@ _atspi_reregister_event_listeners () } /** - * 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. @@ -752,7 +841,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 @@ -871,8 +960,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; @@ -924,6 +1015,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)) @@ -958,6 +1057,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); @@ -978,6 +1084,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);