X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git;a=blobdiff_plain;f=atk-adaptor%2Fbridge.c;h=aeabb9199468b017bd7daa913fa83c6089ddb6f3;hp=a66f0e26fbc2de90025322a5c4fdf6272a35c0bf;hb=305e6dd2f4b8c551108b6907de8146eb8007d657;hpb=5431ebbe7f471a01014236100ec803631dc3941b diff --git a/atk-adaptor/bridge.c b/atk-adaptor/bridge.c index a66f0e2..aeabb91 100644 --- a/atk-adaptor/bridge.c +++ b/atk-adaptor/bridge.c @@ -60,25 +60,24 @@ static gboolean inited = FALSE; /*---------------------------------------------------------------------------*/ -static void +static event_data * add_event (const char *bus_name, const char *event) { event_data *evdata; gchar **data; spi_atk_add_client (bus_name); - evdata = (event_data *) g_malloc (sizeof (*evdata)); - if (!evdata) - return; + evdata = g_new0 (event_data, 1); data = g_strsplit (event, ":", 3); if (!data) { g_free (evdata); - return; + return NULL; } evdata->bus_name = g_strdup (bus_name); evdata->data = data; spi_global_app_data->events = g_list_append (spi_global_app_data->events, evdata); + return evdata; } static GSList *clients = NULL; @@ -88,6 +87,9 @@ tally_event_reply () { static int replies_received = 0; + if (!spi_global_app_data) + return; + replies_received++; if (replies_received == 3) { @@ -97,16 +99,146 @@ tally_event_reply () } } +GType +_atk_bridge_type_from_iface (const char *iface) +{ + if (!strcmp (iface, ATSPI_DBUS_INTERFACE_ACCESSIBLE)) + return ATK_TYPE_OBJECT; + if (!strcmp (iface, ATSPI_DBUS_INTERFACE_ACTION)) + return ATK_TYPE_ACTION; + if (!strcmp (iface, ATSPI_DBUS_INTERFACE_COMPONENT)) + return ATK_TYPE_COMPONENT; + if (!strcmp (iface, ATSPI_DBUS_INTERFACE_DOCUMENT)) + return ATK_TYPE_DOCUMENT; + if (!strcmp (iface, ATSPI_DBUS_INTERFACE_HYPERTEXT)) + return ATK_TYPE_HYPERTEXT; + if (!strcmp (iface, ATSPI_DBUS_INTERFACE_HYPERLINK)) + return ATK_TYPE_HYPERLINK; + if (!strcmp (iface, ATSPI_DBUS_INTERFACE_IMAGE)) + return ATK_TYPE_IMAGE; + if (!strcmp (iface, ATSPI_DBUS_INTERFACE_SELECTION)) + return ATK_TYPE_SELECTION; + if (!strcmp (iface, ATSPI_DBUS_INTERFACE_TABLE)) + return ATK_TYPE_TABLE; + if (!strcmp (iface, ATSPI_DBUS_INTERFACE_TEXT)) + return ATK_TYPE_TEXT; + if (!strcmp (iface, ATSPI_DBUS_INTERFACE_VALUE)) + return ATK_TYPE_VALUE; + return 0; +} + +DRoutePropertyFunction +_atk_bridge_find_property_func (const char *property, GType *type) +{ + const char *iface; + const char *member; + DRouteProperty *dp; + + if (!strncasecmp (property, "action.", 7)) + { + iface = ATSPI_DBUS_INTERFACE_ACTION; + member = property + 7; + } + else if (!strncasecmp (property, "component.", 10)) + { + iface = ATSPI_DBUS_INTERFACE_COMPONENT; + member = property + 10; + } + else if (!strncasecmp (property, "selection.", 10)) + { + iface = ATSPI_DBUS_INTERFACE_SELECTION; + member = property + 10; + } + else if (!strncasecmp (property, "table.", 6)) + { + iface = ATSPI_DBUS_INTERFACE_TABLE; + member = property + 6; + } + else if (!strncasecmp (property, "text.", 5)) + { + iface = ATSPI_DBUS_INTERFACE_TEXT; + member = property + 5; + } + else if (!strncasecmp (property, "value.", 6)) + { + iface = ATSPI_DBUS_INTERFACE_VALUE; + member = property + 6; + } + else + { + iface = ATSPI_DBUS_INTERFACE_ACCESSIBLE; + member = property; + } + + *type = _atk_bridge_type_from_iface (iface); + + dp = g_hash_table_lookup (spi_global_app_data->property_hash, iface); + + if (!dp) + return NULL; + + for (;dp->name; dp++) + { + if (!strcasecmp (dp->name, member)) + { + return dp->get; + } + } + return NULL; +} + +static void +add_property_to_event (event_data *evdata, const char *property) +{ + AtspiPropertyDefinition *prop = g_new0 (AtspiPropertyDefinition, 1); + prop->func = _atk_bridge_find_property_func (property, &prop->type); + if (!prop->func) + { + g_warning ("atk-bridge: Request for unknown property '%s'", property); + g_free (prop); + return; + } + + prop->name = g_strdup (property); + evdata->properties = g_slist_append (evdata->properties, prop); +} + +static void +add_event_from_iter (DBusMessageIter *iter) +{ + const char *bus_name, *event; + event_data *evdata; + + dbus_message_iter_get_basic (iter, &bus_name); + dbus_message_iter_next (iter); + dbus_message_iter_get_basic (iter, &event); + dbus_message_iter_next (iter); + evdata = add_event (bus_name, event); + if (dbus_message_iter_get_arg_type (iter) == DBUS_TYPE_ARRAY) + { + DBusMessageIter iter_sub_array; + dbus_message_iter_recurse (iter, &iter_sub_array); + while (dbus_message_iter_get_arg_type (&iter_sub_array) != DBUS_TYPE_INVALID) + { + const char *property; + dbus_message_iter_get_basic (&iter_sub_array, &property); + add_property_to_event (evdata, property); + dbus_message_iter_next (&iter_sub_array); + } + } +} + static void get_events_reply (DBusPendingCall *pending, void *user_data) { DBusMessage *reply = dbus_pending_call_steal_reply (pending); DBusMessageIter iter, iter_array, iter_struct; - if (!reply) + if (!reply || !spi_global_app_data) goto done; - if (strcmp (dbus_message_get_signature (reply), "a(ss)") != 0) + if (strcmp (dbus_message_get_signature (reply), "a(ss)") != 0 && + strcmp (dbus_message_get_signature (reply), "a(ssas)") != 0) { g_warning ("atk-bridge: GetRegisteredEvents returned message with unknown signature"); goto done; @@ -116,12 +248,8 @@ get_events_reply (DBusPendingCall *pending, void *user_data) dbus_message_iter_recurse (&iter, &iter_array); while (dbus_message_iter_get_arg_type (&iter_array) != DBUS_TYPE_INVALID) { - char *bus_name, *event; dbus_message_iter_recurse (&iter_array, &iter_struct); - dbus_message_iter_get_basic (&iter_struct, &bus_name); - dbus_message_iter_next (&iter_struct); - dbus_message_iter_get_basic (&iter_struct, &event); - add_event (bus_name, event); + add_event_from_iter (&iter_struct); dbus_message_iter_next (&iter_array); } @@ -232,6 +360,14 @@ register_reply (DBusPendingCall *pending, void *user_data) reply = dbus_pending_call_steal_reply (pending); dbus_pending_call_unref (pending); + + if (!spi_global_app_data) + { + if (reply) + dbus_message_unref (reply); + return; + } + if (reply) { gchar *app_name, *obj_path; @@ -262,7 +398,8 @@ register_reply (DBusPendingCall *pending, void *user_data) } dbus_message_unref (reply); - get_registered_event_listeners (spi_global_app_data); + if (!spi_global_app_data->events_initialized) + get_registered_event_listeners (spi_global_app_data); } static gboolean @@ -270,10 +407,10 @@ register_application (SpiBridge * app) { DBusMessage *message; DBusMessageIter iter; - DBusError error; DBusPendingCall *pending; - dbus_error_init (&error); + g_free (app->desktop_name); + g_free (app->desktop_path); /* These will be overridden when we get a reply, but in practice these defaults should always be correct */ @@ -291,6 +428,9 @@ register_application (SpiBridge * app) if (!dbus_connection_send_with_reply (app->bus, message, &pending, -1) || !pending) { + if (pending) + dbus_pending_call_unref (pending); + dbus_message_unref (message); return FALSE; } @@ -310,11 +450,8 @@ deregister_application (SpiBridge * app) { DBusMessage *message; DBusMessageIter iter; - DBusError error; const char *uname; - dbus_error_init (&error); - message = dbus_message_new_method_call (SPI_DBUS_NAME_REGISTRY, ATSPI_DBUS_PATH_REGISTRY, ATSPI_DBUS_INTERFACE_REGISTRY, @@ -431,6 +568,8 @@ socket_ref_state_set (AtkObject *accessible) static void socket_embed_hook (AtkSocket * socket, gchar * plug_id) { + g_return_if_fail (spi_global_register != NULL); + AtkObject *accessible = ATK_OBJECT(socket); gchar *plug_name, *plug_path; AtkObjectClass *klass; @@ -554,14 +693,27 @@ static void handle_event_listener_registered (DBusConnection *bus, DBusMessage *message, void *user_data) { - const char *name; - char *sender; + DBusMessageIter iter; + const char *signature = dbus_message_get_signature (message); - if (!dbus_message_get_args (message, NULL, DBUS_TYPE_STRING, &sender, - DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID)) + if (strcmp (signature, "ssas") != 0 && + strcmp (signature, "ss") != 0) + { + g_warning ("got RegisterEvent with invalid signature '%s'", signature); return; + } + + dbus_message_iter_init (message, &iter); + add_event_from_iter (&iter); +} + +static void +free_property_definition (void *data) +{ + AtspiPropertyDefinition *pd = data; - add_event (sender, name); + g_free (pd->name); + g_free (pd); } static void @@ -585,6 +737,7 @@ remove_events (const char *bus_name, const char *event) GList *events = spi_global_app_data->events; g_strfreev (evdata->data); g_free (evdata->bus_name); + g_slist_free_full (evdata->properties, free_property_definition); g_free (evdata); if (list->prev) { @@ -646,6 +799,7 @@ signal_filter (DBusConnection *bus, DBusMessage *message, void *user_data) const char *interface = dbus_message_get_interface (message); const char *member = dbus_message_get_member (message); DBusHandlerResult result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + static gboolean registry_lost = FALSE; if (dbus_message_get_type (message) != DBUS_MESSAGE_TYPE_SIGNAL) return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; @@ -675,14 +829,23 @@ signal_filter (DBusConnection *bus, DBusMessage *message, void *user_data) !g_strcmp0(member, "NameOwnerChanged")) { char *name, *old, *new; - result = DBUS_HANDLER_RESULT_HANDLED; if (dbus_message_get_args (message, NULL, DBUS_TYPE_STRING, &name, DBUS_TYPE_STRING, &old, DBUS_TYPE_STRING, &new, DBUS_TYPE_INVALID)) { - if (*old != '\0' && *new == '\0') + if (!strcmp (name, "org.a11y.atspi.Registry")) + { + if (registry_lost && !old[0]) + { + register_application (spi_global_app_data); + registry_lost = FALSE; + } + else if (!new[0]) + registry_lost = TRUE; + } + else if (*old != '\0' && *new == '\0') spi_atk_remove_client (old); } } @@ -695,7 +858,7 @@ spi_atk_create_socket (SpiBridge *app) { #ifndef DISABLE_P2P DBusServer *server; - DBusError err; + DBusError error; if (getuid () != 0) { @@ -718,12 +881,12 @@ spi_atk_create_socket (SpiBridge *app) if (!spi_global_app_data->app_bus_addr) return -1; - dbus_error_init(&err); - server = dbus_server_listen(spi_global_app_data->app_bus_addr, &err); + dbus_error_init(&error); + server = dbus_server_listen(spi_global_app_data->app_bus_addr, &error); if (server == NULL) { - g_warning ("atk-bridge: Couldn't listen on dbus server: %s", err.message); - dbus_error_init (&err); + g_warning ("atk-bridge: Couldn't listen on dbus server: %s", error.message); + dbus_error_free (&error); spi_global_app_data->app_bus_addr [0] = '\0'; g_main_context_unref (spi_global_app_data->main_context); spi_global_app_data->main_context = NULL; @@ -778,6 +941,8 @@ spi_atk_activate () return; } spi_initialize_cache (treepath); + if (spi_global_app_data->bus) + droute_path_register (treepath, spi_global_app_data->bus); } } @@ -902,6 +1067,7 @@ atk_bridge_adaptor_init (gint * argc, gchar ** argv[]) spi_initialize_selection (accpath); spi_initialize_socket (accpath); spi_initialize_table (accpath); + spi_initialize_table_cell (accpath); spi_initialize_text (accpath); spi_initialize_value (accpath); @@ -915,6 +1081,7 @@ atk_bridge_adaptor_init (gint * argc, gchar ** argv[]) /* Set up filter and match rules to catch signals */ dbus_bus_add_match (spi_global_app_data->bus, "type='signal', interface='org.a11y.atspi.Registry', sender='org.a11y.atspi.Registry'", NULL); dbus_bus_add_match (spi_global_app_data->bus, "type='signal', interface='org.a11y.atspi.DeviceEventListener', sender='org.a11y.atspi.Registry'", NULL); + dbus_bus_add_match (spi_global_app_data->bus, "type='signal', arg0='org.a11y.atspi.Registry', interface='org.freedesktop.DBus', member='NameOwnerChanged'", NULL); dbus_connection_add_filter (spi_global_app_data->bus, signal_filter, NULL, NULL); @@ -924,6 +1091,7 @@ atk_bridge_adaptor_init (gint * argc, gchar ** argv[]) else get_registered_event_listeners (spi_global_app_data); + dbus_error_free (&error); return 0; } @@ -933,7 +1101,8 @@ atk_bridge_adaptor_cleanup (void) GList *l; GSList *ls; - g_return_if_fail (inited); + if (!inited) + return; if (!spi_global_app_data) return; @@ -960,13 +1129,14 @@ atk_bridge_adaptor_cleanup (void) droute_context_unregister (spi_global_app_data->droute, connection); droute_unintercept_dbus (connection); + dbus_connection_close (connection); dbus_connection_unref (connection); } g_list_free (spi_global_app_data->direct_connections); spi_global_app_data->direct_connections = NULL; for (ls = clients; ls; ls = ls->next) - g_free (l->data); + g_free (ls->data); g_slist_free (clients); clients = NULL; @@ -1036,4 +1206,23 @@ spi_atk_remove_client (const char *bus_name) } } +void +spi_atk_add_interface (DRoutePath *path, + const char *name, + const char *introspect, + const DRouteMethod *methods, + const DRouteProperty *properties) +{ + droute_path_add_interface (path, name, introspect, methods, properties); + + if (properties) + { + if (!spi_global_app_data->property_hash) + spi_global_app_data->property_hash = g_hash_table_new_full (g_str_hash, + g_str_equal, + g_free, NULL); + g_hash_table_insert (spi_global_app_data->property_hash, g_strdup (name), + (gpointer) properties); + } +} /*END------------------------------------------------------------------------*/