X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=atk-adaptor%2Fbridge.c;h=1a36f140bd4be8801942ab88adfd752f7376bd26;hb=5515673936c5fa9af85e133ed070349db5fb098a;hp=69527c67bb9ce9b64ec225bf7800e4a1a1932abd;hpb=cf4cb7b2e7d546579735002e68fe0d5a2beceaac;p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git diff --git a/atk-adaptor/bridge.c b/atk-adaptor/bridge.c index 69527c6..1a36f14 100644 --- a/atk-adaptor/bridge.c +++ b/atk-adaptor/bridge.c @@ -88,6 +88,9 @@ tally_event_reply () { static int replies_received = 0; + if (!spi_global_app_data) + return; + replies_received++; if (replies_received == 3) { @@ -249,7 +252,9 @@ register_reply (DBusPendingCall *pending, void *user_data) dbus_message_iter_next (&iter_struct); dbus_message_iter_get_basic (&iter_struct, &obj_path); + g_free (app->desktop_name); app->desktop_name = g_strdup (app_name); + g_free (app->desktop_path); app->desktop_path = g_strdup (obj_path); } } @@ -260,7 +265,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 @@ -268,16 +274,15 @@ register_application (SpiBridge * app) { DBusMessage *message; DBusMessageIter iter; - DBusError error; DBusPendingCall *pending; - const int max_addr_length = 128; /* should be long enough */ - 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 */ - app->desktop_name = ATSPI_DBUS_NAME_REGISTRY; - app->desktop_path = ATSPI_DBUS_PATH_ROOT; + app->desktop_name = g_strdup (ATSPI_DBUS_NAME_REGISTRY); + app->desktop_path = g_strdup (ATSPI_DBUS_PATH_ROOT); message = dbus_message_new_method_call (SPI_DBUS_NAME_REGISTRY, ATSPI_DBUS_PATH_ROOT, @@ -290,6 +295,10 @@ 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; } @@ -298,18 +307,6 @@ register_application (SpiBridge * app) if (message) dbus_message_unref (message); - /* could this be better, we accept some amount of race in getting the temp name*/ - /* make sure the directory exists */ - mkdir ("/tmp/at-spi2/", S_IRWXU|S_IRWXG|S_IRWXO|S_ISVTX); - chmod ("/tmp/at-spi2/", S_IRWXU|S_IRWXG|S_IRWXO|S_ISVTX); - app->app_bus_addr = g_malloc(max_addr_length * sizeof(char)); -#ifndef DISABLE_P2P - sprintf (app->app_bus_addr, "unix:path=/tmp/at-spi2/socket-%d-%d", getpid(), - rand()); -#else - app->app_bus_addr [0] = '\0'; -#endif - return TRUE; } @@ -320,11 +317,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, @@ -338,6 +332,25 @@ deregister_application (SpiBridge * app) dbus_connection_send (app->bus, message, NULL); if (message) dbus_message_unref (message); + + if (app->app_bus_addr) + { + unlink (app->app_bus_addr); + g_free (app->app_bus_addr); + app->app_bus_addr = NULL; + } + + if (app->app_tmp_dir) + { + rmdir (app->app_tmp_dir); + g_free (app->app_tmp_dir); + app->app_tmp_dir = NULL; + } + + g_free (app->desktop_name); + app->desktop_name = NULL; + g_free (app->desktop_path); + app->desktop_path = NULL; } /*---------------------------------------------------------------------------*/ @@ -422,6 +435,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; @@ -518,34 +533,6 @@ new_connection_cb (DBusServer *server, DBusConnection *con, void *data) spi_global_app_data->direct_connections = g_list_append (spi_global_app_data->direct_connections, con); } -static int -setup_bus (void) -{ -#ifndef DISABLE_P2P - DBusServer *server; - DBusError err; - - dbus_error_init(&err); - server = dbus_server_listen(spi_global_app_data->app_bus_addr, &err); - if (server == NULL) - { - g_warning ("atk-bridge: Couldn't listen on dbus server: %s", err.message); - dbus_error_init (&err); - 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; - return -1; - } - - atspi_dbus_server_setup_with_g_main(server, NULL); - dbus_server_set_new_connection_function(server, new_connection_cb, NULL, NULL); - - spi_global_app_data->server = server; -#endif - - return 0; -} - gchar *atspi_dbus_name = NULL; static gboolean atspi_no_register = FALSE; @@ -602,11 +589,20 @@ remove_events (const char *bus_name, const char *event) spi_event_is_subtype (evdata->data, remove_data)) { GList *events = spi_global_app_data->events; - list = list->next; g_strfreev (evdata->data); g_free (evdata->bus_name); g_free (evdata); - spi_global_app_data->events = g_list_remove (events, evdata); + if (list->prev) + { + GList *next = list->next; + list->prev = g_list_remove (list->prev, evdata); + list = next; + } + else + { + spi_global_app_data->events = g_list_remove (events, evdata); + list = spi_global_app_data->events; + } } else { @@ -656,6 +652,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; @@ -685,14 +682,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); } } @@ -700,6 +706,55 @@ signal_filter (DBusConnection *bus, DBusMessage *message, void *user_data) return result; } +int +spi_atk_create_socket (SpiBridge *app) +{ +#ifndef DISABLE_P2P + DBusServer *server; + DBusError error; + + if (getuid () != 0) + { + app->app_tmp_dir = g_build_filename (g_get_user_runtime_dir (), + "at-spi2-XXXXXX", NULL); + if (!g_mkdtemp (app->app_tmp_dir)) + { + g_free (app->app_tmp_dir); + app->app_tmp_dir = NULL; + return FALSE; + } + } + + if (app->app_tmp_dir) + app->app_bus_addr = g_strdup_printf ("unix:path=%s/socket", app->app_tmp_dir); + else + app->app_bus_addr = g_strdup_printf ("unix:path=%s/at-spi2-socket-%d", + g_get_user_runtime_dir (), getpid ()); + + if (!spi_global_app_data->app_bus_addr) + return -1; + + 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", 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; + return -1; + } + + atspi_dbus_server_setup_with_g_main(server, NULL); + dbus_server_set_new_connection_function(server, new_connection_cb, NULL, NULL); + + spi_global_app_data->server = server; +#endif + + return 0; +} + /* * Checks the status of the environment variables * @@ -721,6 +776,29 @@ check_envvar (void) return TRUE; } +void +spi_atk_activate () +{ + DRoutePath *treepath; + + spi_atk_register_event_listeners (); + if (!spi_global_cache) + { + spi_global_cache = g_object_new (SPI_CACHE_TYPE, NULL); + treepath = droute_add_one (spi_global_app_data->droute, + "/org/a11y/atspi/cache", spi_global_cache); + + if (!treepath) + { + g_warning ("atk-bridge: Error in droute_add_one(). Already running?"); + return; + } + spi_initialize_cache (treepath); + if (spi_global_app_data->bus) + droute_path_register (treepath, spi_global_app_data->bus); + } +} + /* * spi_app_init * @@ -740,7 +818,7 @@ atk_bridge_adaptor_init (gint * argc, gchar ** argv[]) DBusError error; AtkObject *root; gboolean load_bridge; - DRoutePath *treepath, *accpath; + DRoutePath *accpath; load_bridge = check_envvar (); if (inited && !load_bridge) @@ -764,7 +842,10 @@ atk_bridge_adaptor_init (gint * argc, gchar ** argv[]) g_option_context_add_main_entries (opt, atspi_option_entries, NULL); g_option_context_set_ignore_unknown_options (opt, TRUE); if (!g_option_context_parse (opt, argc, argv, &err)) - g_warning ("AT-SPI Option parsing failed: %s\n", err->message); + { + g_warning ("AT-SPI Option parsing failed: %s\n", err->message); + g_error_free (err); + } g_option_context_free (opt); /* Allocate global data and do ATK initializations */ @@ -811,21 +892,11 @@ atk_bridge_adaptor_init (gint * argc, gchar ** argv[]) */ spi_global_register = g_object_new (SPI_REGISTER_TYPE, NULL); spi_global_leasing = g_object_new (SPI_LEASING_TYPE, NULL); - spi_global_cache = g_object_new (SPI_CACHE_TYPE, NULL); /* Register droute for routing AT-SPI messages */ spi_global_app_data->droute = droute_new (); - treepath = droute_add_one (spi_global_app_data->droute, - "/org/a11y/atspi/cache", spi_global_cache); - - if (!treepath) - { - g_warning ("atk-bridge: Error in droute_add_one(). Already running?"); - return -1; - } - accpath = droute_add_many (spi_global_app_data->droute, "/org/a11y/atspi/accessible", NULL, @@ -836,7 +907,6 @@ atk_bridge_adaptor_init (gint * argc, gchar ** argv[]) /* Register all interfaces with droute and set up application accessible db */ - spi_initialize_cache (treepath); spi_initialize_accessible (accpath); spi_initialize_application (accpath); spi_initialize_action (accpath); @@ -858,11 +928,12 @@ atk_bridge_adaptor_init (gint * argc, gchar ** argv[]) /* Register methods to send D-Bus signals on certain ATK events */ if (clients) - spi_atk_register_event_listeners (); + spi_atk_activate (); /* 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); @@ -872,8 +943,7 @@ atk_bridge_adaptor_init (gint * argc, gchar ** argv[]) else get_registered_event_listeners (spi_global_app_data); - setup_bus(); - + dbus_error_free (&error); return 0; } @@ -883,7 +953,8 @@ atk_bridge_adaptor_cleanup (void) GList *l; GSList *ls; - g_return_if_fail (inited); + if (!inited) + return; if (!spi_global_app_data) return; @@ -897,7 +968,9 @@ atk_bridge_adaptor_cleanup (void) { dbus_connection_remove_filter (spi_global_app_data->bus, signal_filter, NULL); droute_context_unregister (spi_global_app_data->droute, spi_global_app_data->bus); + dbus_connection_close (spi_global_app_data->bus); dbus_connection_unref (spi_global_app_data->bus); + spi_global_app_data->bus = NULL; } for (l = spi_global_app_data->direct_connections; l; l = l->next) @@ -908,18 +981,20 @@ 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; - g_object_unref (spi_global_cache); - g_object_unref (spi_global_leasing); - g_object_unref (spi_global_register); + g_clear_object (&spi_global_cache); + g_clear_object (&spi_global_leasing); + g_clear_object (&spi_global_register); if (spi_global_app_data->main_context) g_main_context_unref (spi_global_app_data->main_context); @@ -949,7 +1024,7 @@ spi_atk_add_client (const char *bus_name) return; } if (!clients) - spi_atk_register_event_listeners (); + spi_atk_activate (); clients = g_slist_append (clients, g_strdup (bus_name)); match = g_strdup_printf (name_match_tmpl, bus_name); dbus_bus_add_match (spi_global_app_data->bus, match, NULL); @@ -976,6 +1051,7 @@ spi_atk_remove_client (const char *bus_name) clients = g_slist_delete_link (clients, l); if (!clients) spi_atk_deregister_event_listeners (); + return; } l = next_node;