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=a66f0e26fbc2de90025322a5c4fdf6272a35c0bf;hp=faec3939cbb3e3777ce82e6577f303816572b24d;hb=5431ebbe7f471a01014236100ec803631dc3941b;hpb=ad04db75090495c894c7307c14b0400c9a6d9a79 diff --git a/atk-adaptor/bridge.c b/atk-adaptor/bridge.c index faec393..a66f0e2 100644 --- a/atk-adaptor/bridge.c +++ b/atk-adaptor/bridge.c @@ -25,8 +25,6 @@ #define _GNU_SOURCE #include "config.h" -#include -#include #include #include #include @@ -36,8 +34,8 @@ #include #include -#include #include +#include #include "bridge.h" #include "event.h" @@ -58,55 +56,7 @@ signal_filter (DBusConnection *bus, DBusMessage *message, void *user_data); SpiBridge *spi_global_app_data = NULL; -/*---------------------------------------------------------------------------*/ - -/* - * Returns a 'canonicalized' value for DISPLAY, - * with the screen number stripped off if present. - * - */ -static const gchar * -spi_display_name (void) -{ - static const char *canonical_display_name = NULL; - if (!canonical_display_name) - { - const gchar *display_env = g_getenv ("AT_SPI_DISPLAY"); - if (!display_env) - { - display_env = g_getenv ("DISPLAY"); - if (!display_env || !display_env[0]) - canonical_display_name = ":0"; - else - { - gchar *display_p, *screen_p; - canonical_display_name = g_strdup (display_env); - display_p = strrchr (canonical_display_name, ':'); - screen_p = strrchr (canonical_display_name, '.'); - if (screen_p && display_p && (screen_p > display_p)) - { - *screen_p = '\0'; - } - } - } - else - { - canonical_display_name = display_env; - } - } - return canonical_display_name; -} - -/*---------------------------------------------------------------------------*/ - -static void -set_reply (DBusPendingCall *pending, void *user_data) -{ - void **replyptr = (void **)user_data; - - *replyptr = dbus_pending_call_steal_reply (pending); - dbus_pending_call_unref (pending); -} +static gboolean inited = FALSE; /*---------------------------------------------------------------------------*/ @@ -115,7 +65,6 @@ add_event (const char *bus_name, const char *event) { event_data *evdata; gchar **data; - GList *new_list; spi_atk_add_client (bus_name); evdata = (event_data *) g_malloc (sizeof (*evdata)); @@ -129,9 +78,7 @@ add_event (const char *bus_name, const char *event) } evdata->bus_name = g_strdup (bus_name); evdata->data = data; - new_list = g_list_append (spi_global_app_data->events, evdata); - if (new_list) - spi_global_app_data->events = new_list; + spi_global_app_data->events = g_list_append (spi_global_app_data->events, evdata); } static GSList *clients = NULL; @@ -282,7 +229,6 @@ register_reply (DBusPendingCall *pending, void *user_data) { DBusMessage *reply; SpiBridge *app = user_data; - DBusMessage *message; reply = dbus_pending_call_steal_reply (pending); dbus_pending_call_unref (pending); @@ -303,7 +249,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); } } @@ -320,18 +268,17 @@ register_reply (DBusPendingCall *pending, void *user_data) static gboolean register_application (SpiBridge * app) { - DBusMessage *message, *reply; + DBusMessage *message; DBusMessageIter iter; DBusError error; DBusPendingCall *pending; - const int max_addr_length = 128; /* should be long enough */ dbus_error_init (&error); /* 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, @@ -344,6 +291,7 @@ register_application (SpiBridge * app) if (!dbus_connection_send_with_reply (app->bus, message, &pending, -1) || !pending) { + dbus_message_unref (message); return FALSE; } @@ -352,18 +300,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; } @@ -392,6 +328,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; } /*---------------------------------------------------------------------------*/ @@ -518,8 +473,8 @@ install_plug_hooks () socket_class->embed = socket_embed_hook; } -static uint -get_ancestral_uid (uint pid) +static guint +get_ancestral_uid (guint pid) { FILE *fp; char buf [80]; @@ -563,8 +518,6 @@ user_check (DBusConnection *bus, unsigned long uid, void *data) static void new_connection_cb (DBusServer *server, DBusConnection *con, void *data) { - GList *new_list; - dbus_connection_set_unix_user_function (con, user_check, NULL, NULL); dbus_connection_ref(con); atspi_dbus_connection_setup_with_g_main(con, NULL); @@ -574,34 +527,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; @@ -642,7 +567,6 @@ handle_event_listener_registered (DBusConnection *bus, DBusMessage *message, static void remove_events (const char *bus_name, const char *event) { - event_data *evdata; gchar **remove_data; GList *list; @@ -659,11 +583,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 { @@ -678,7 +611,6 @@ static void handle_event_listener_deregistered (DBusConnection *bus, DBusMessage *message, void *user_data) { - const char *orig_name; gchar *name; char *sender; @@ -758,6 +690,97 @@ signal_filter (DBusConnection *bus, DBusMessage *message, void *user_data) return result; } +int +spi_atk_create_socket (SpiBridge *app) +{ +#ifndef DISABLE_P2P + DBusServer *server; + DBusError err; + + 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(&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; +} + +/* + * Checks the status of the environment variables + * + * At this moment it only checks NO_AT_BRIDGE + * + * Returns TRUE if there isn't anything on the environment preventing + * you to load the bridge, FALSE otherwise + */ +static gboolean +check_envvar (void) +{ + const gchar *envvar; + + envvar = g_getenv ("NO_AT_BRIDGE"); + + if (envvar && atoi (envvar) == 1) + return FALSE; + else + 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); + } +} + /* * spi_app_init * @@ -769,23 +792,25 @@ signal_filter (DBusConnection *bus, DBusMessage *message, void *user_data) * - Application registration with the AT-SPI registry. * */ -static int -adaptor_init (gint * argc, gchar ** argv[]) +int +atk_bridge_adaptor_init (gint * argc, gchar ** argv[]) { GOptionContext *opt; GError *err = NULL; DBusError error; AtkObject *root; - gchar *introspection_directory; - static gboolean inited = FALSE; + gboolean load_bridge; + DRoutePath *accpath; - if (inited) + load_bridge = check_envvar (); + if (inited && !load_bridge) + g_warning ("ATK Bridge is disabled but a11y has already been enabled."); + + if (inited || !load_bridge) return 0; inited = TRUE; - DRoutePath *treepath, *accpath; - root = atk_get_root (); g_warn_if_fail (root); if (!root) @@ -799,7 +824,10 @@ 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 */ @@ -846,21 +874,11 @@ 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, @@ -871,7 +889,6 @@ 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); @@ -892,7 +909,8 @@ adaptor_init (gint * argc, gchar ** argv[]) spi_global_app_data->bus); /* Register methods to send D-Bus signals on certain ATK events */ - spi_atk_register_event_listeners (); + if (clients) + 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); @@ -906,55 +924,17 @@ adaptor_init (gint * argc, gchar ** argv[]) else get_registered_event_listeners (spi_global_app_data); - setup_bus(); - - return 0; -} - -/*---------------------------------------------------------------------------*/ - -int -gtk_module_init (gint * argc, gchar ** argv[]) -{ - const gchar *load_bridge = g_getenv ("NO_AT_BRIDGE"); - - if (!load_bridge || g_ascii_strtod (load_bridge, NULL) == 0) - { - return adaptor_init (argc, argv); - } return 0; } -gchar* -g_module_check_init (GModule *module) -{ - g_module_make_resident (module); - - return NULL; -} - void -gnome_accessibility_module_init (void) -{ - const gchar *load_bridge = g_getenv ("NO_AT_BRIDGE"); - - if (!load_bridge || g_ascii_strtod (load_bridge, NULL) == 0) - { - adaptor_init (NULL, NULL); - - if (g_getenv ("AT_SPI_DEBUG")) - { - g_print ("Atk Accessibility bridge initialized\n"); - } - } -} - -void -gnome_accessibility_module_shutdown (void) +atk_bridge_adaptor_cleanup (void) { GList *l; GSList *ls; + g_return_if_fail (inited); + if (!spi_global_app_data) return; @@ -967,7 +947,9 @@ gnome_accessibility_module_shutdown (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) @@ -981,15 +963,16 @@ gnome_accessibility_module_shutdown (void) 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_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); @@ -998,6 +981,8 @@ gnome_accessibility_module_shutdown (void) g_free (spi_global_app_data); spi_global_app_data = NULL; + + inited = FALSE; } /*---------------------------------------------------------------------------*/ @@ -1016,8 +1001,8 @@ spi_atk_add_client (const char *bus_name) if (!g_strcmp0 (l->data, bus_name)) return; } - if (!clients && spi_global_app_data->events_initialized) - spi_atk_register_event_listeners (); + if (!clients) + 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); @@ -1044,6 +1029,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;