X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=atk-adaptor%2Fbridge.c;h=bcae3b96bcce62e0c345fea4abe9df4829a3d05a;hb=6fc02645f8c017457a051344353bedeb9dffb034;hp=a8e03359aa90be58f8117af1ada8560a2a6dcf33;hpb=fba14bfd184d14524692ce168a214ce9b1ca869e;p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git diff --git a/atk-adaptor/bridge.c b/atk-adaptor/bridge.c index a8e0335..bcae3b9 100644 --- a/atk-adaptor/bridge.c +++ b/atk-adaptor/bridge.c @@ -22,8 +22,8 @@ * Boston, MA 02111-1307, USA. */ +#define _GNU_SOURCE #include "config.h" -#include "dbus/dbus-glib-lowlevel.h" #include #include @@ -32,28 +32,30 @@ #include #include #include +#include #include #include #include +#include +#include #include "bridge.h" #include "event.h" #include "adaptors.h" #include "object.h" +#include "accessible-stateset.h" #include "accessible-register.h" #include "accessible-leasing.h" #include "accessible-cache.h" -#include "common/spi-dbus.h" +#include "spi-dbus.h" /*---------------------------------------------------------------------------*/ SpiBridge *spi_global_app_data = NULL; -static const AtkMisc *atk_misc = NULL; - /*static Display *bridge_display = NULL;*/ /*---------------------------------------------------------------------------*/ @@ -97,101 +99,15 @@ spi_display_name (void) /*---------------------------------------------------------------------------*/ -/* - * Gets the IOR from the XDisplay. - * Not currently used in D-Bus version, but something similar - * may be employed in the future for accessing the registry daemon - * bus name. - */ - -static DBusConnection * -spi_atk_bridge_get_bus (void) -{ - Atom AT_SPI_BUS; - Atom actual_type; - Display *bridge_display; - int actual_format; - unsigned char *data = NULL; - unsigned long nitems; - unsigned long leftover; - - DBusConnection *bus = NULL; - DBusError error; - - bridge_display = XOpenDisplay (spi_display_name ()); - if (!bridge_display) - { - g_warning ("AT_SPI: Could not get the display\n"); - return NULL; - } - - AT_SPI_BUS = XInternAtom (bridge_display, "AT_SPI_BUS", False); - XGetWindowProperty (bridge_display, - XDefaultRootWindow (bridge_display), - AT_SPI_BUS, 0L, - (long) BUFSIZ, False, - (Atom) 31, &actual_type, &actual_format, - &nitems, &leftover, &data); - - dbus_error_init (&error); - - if (data == NULL) - { - g_warning - ("AT-SPI: Accessibility bus not found - Using session bus.\n"); - bus = dbus_bus_get (DBUS_BUS_SESSION, &error); - if (!bus) - { - g_warning ("AT-SPI: Couldn't connect to bus: %s\n", error.message); - return NULL; - } - } - else - { - bus = dbus_connection_open (data, &error); - if (!bus) - { - g_warning ("AT-SPI: Couldn't connect to bus: %s\n", error.message); - return NULL; - } - else - { - if (!dbus_bus_register (bus, &error)) - { - g_warning ("AT-SPI: Couldn't register with bus: %s\n", error.message); - return NULL; - } - } - } - - return bus; -} - 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 DBusMessage * -send_and_allow_reentry (DBusConnection *bus, DBusMessage *message, DBusError *error) -{ - DBusPendingCall *pending; - DBusMessage *reply = NULL; - - if (!dbus_connection_send_with_reply (bus, message, &pending, -1)) - { - return NULL; - } - dbus_pending_call_set_notify (pending, set_reply, (void *)&reply, NULL); - while (!reply) - { - if (!dbus_connection_read_write_dispatch (bus, -1)) return NULL; - } - return reply; -} /*---------------------------------------------------------------------------*/ static void @@ -201,6 +117,7 @@ add_event (const char *bus_name, const char *event) gchar **data; GList *new_list; + spi_atk_add_client (bus_name); evdata = (event_data *) g_malloc (sizeof (*evdata)); if (!evdata) return; @@ -217,6 +134,8 @@ add_event (const char *bus_name, const char *event) spi_global_app_data->events = new_list; } +static GSList *clients = NULL; + static void get_registered_event_listeners (SpiBridge *app) { @@ -224,8 +143,8 @@ get_registered_event_listeners (SpiBridge *app) DBusMessageIter iter, iter_array, iter_struct; message = dbus_message_new_method_call (SPI_DBUS_NAME_REGISTRY, - SPI_DBUS_PATH_REGISTRY, - SPI_DBUS_INTERFACE_REGISTRY, + ATSPI_DBUS_PATH_REGISTRY, + ATSPI_DBUS_INTERFACE_REGISTRY, "GetRegisteredEvents"); if (!message) return; @@ -233,19 +152,20 @@ get_registered_event_listeners (SpiBridge *app) reply = dbus_connection_send_with_reply_and_block (app->bus, message, 5000, NULL); dbus_message_unref (message); if (!reply) - return; + { + spi_global_app_data->events_initialized = TRUE; + return; + } if (strcmp (dbus_message_get_signature (reply), "a(ss)") != 0) { - /* TODO: Add a warning when it's okay to add strings */ + g_warning ("atk-bridge: GetRegisteredEvents returned message with unknown signature"); dbus_message_unref (reply); + spi_global_app_data->events_initialized = TRUE; return; } dbus_message_iter_init (reply, &iter); dbus_message_iter_recurse (&iter, &iter_array); - /* TODO: This is bad. Need to determine that the array is non-empty, - so that we don't initially read a value rom it in that case, but using - a deprecated function. */ - if (dbus_message_iter_get_array_len (&iter_array) > 0) do + while (dbus_message_iter_get_arg_type (&iter_array) != DBUS_TYPE_INVALID) { char *bus_name, *event; dbus_message_iter_recurse (&iter_array, &iter_struct); @@ -253,9 +173,13 @@ get_registered_event_listeners (SpiBridge *app) dbus_message_iter_next (&iter_struct); dbus_message_iter_get_basic (&iter_struct, &event); add_event (bus_name, event); + dbus_message_iter_next (&iter_array); } - while (dbus_message_iter_next (&iter_array)); dbus_message_unref (reply); + + if (!clients) + spi_atk_deregister_event_listeners (); + spi_global_app_data->events_initialized = TRUE; } static void @@ -265,7 +189,8 @@ register_reply (DBusPendingCall *pending, void *user_data) SpiBridge *app = user_data; DBusMessage *message; - reply = dbus_pending_call_steal_reply (pending); + reply = dbus_pending_call_steal_reply (pending); + dbus_pending_call_unref (pending); if (reply) { gchar *app_name, *obj_path; @@ -273,7 +198,6 @@ register_reply (DBusPendingCall *pending, void *user_data) if (strcmp (dbus_message_get_signature (reply), "(so)") != 0) { g_warning ("AT-SPI: Could not obtain desktop path or name\n"); -printf("sig: %s\n", dbus_message_get_signature(reply)); } else { @@ -305,23 +229,25 @@ register_application (SpiBridge * app) 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 = SPI_DBUS_NAME_REGISTRY; - app->desktop_path = SPI_DBUS_PATH_ROOT; + app->desktop_name = ATSPI_DBUS_NAME_REGISTRY; + app->desktop_path = ATSPI_DBUS_PATH_ROOT; message = dbus_message_new_method_call (SPI_DBUS_NAME_REGISTRY, - SPI_DBUS_PATH_ROOT, - SPI_DBUS_INTERFACE_SOCKET, + ATSPI_DBUS_PATH_ROOT, + ATSPI_DBUS_INTERFACE_SOCKET, "Embed"); dbus_message_iter_init_append (message, &iter); spi_object_append_reference (&iter, app->root); - if (!dbus_connection_send_with_reply (app->bus, message, &pending, -1)) + if (!dbus_connection_send_with_reply (app->bus, message, &pending, -1) + || !pending) { return FALSE; } @@ -331,6 +257,18 @@ 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; } @@ -347,8 +285,8 @@ deregister_application (SpiBridge * app) dbus_error_init (&error); message = dbus_message_new_method_call (SPI_DBUS_NAME_REGISTRY, - SPI_DBUS_PATH_REGISTRY, - SPI_DBUS_INTERFACE_REGISTRY, + ATSPI_DBUS_PATH_REGISTRY, + ATSPI_DBUS_INTERFACE_REGISTRY, "DeregisterApplication"); dbus_message_set_no_reply (message, TRUE); @@ -428,7 +366,7 @@ socket_ref_state_set (AtkObject *accessible) return NULL; } *(child_path++) = '\0'; - message = dbus_message_new_method_call (child_name, child_path, SPI_DBUS_INTERFACE_ACCESSIBLE, "GetState"); + message = dbus_message_new_method_call (child_name, child_path, ATSPI_DBUS_INTERFACE_ACCESSIBLE, "GetState"); g_free (child_name); reply = dbus_connection_send_with_reply_and_block (spi_global_app_data->bus, message, 1, NULL); dbus_message_unref (message); @@ -483,7 +421,7 @@ socket_embed_hook (AtkSocket * socket, gchar * plug_id) { DBusMessage *message; *(plug_path++) = '\0'; - message = dbus_message_new_method_call (plug_name, plug_path, SPI_DBUS_INTERFACE_SOCKET, "Embedded"); + message = dbus_message_new_method_call (plug_name, plug_path, ATSPI_DBUS_INTERFACE_SOCKET, "Embedded"); dbus_message_append_args (message, DBUS_TYPE_STRING, &path, DBUS_TYPE_INVALID); dbus_connection_send (spi_global_app_data->bus, message, NULL); } @@ -507,6 +445,93 @@ install_plug_hooks () socket_class->embed = socket_embed_hook; } +static uint +get_ancestral_uid (uint pid) +{ + FILE *fp; + char buf [80]; + int ppid = 0; + int uid = 0; + gboolean got_ppid = 0; + gboolean got_uid = 0; + + sprintf (buf, "/proc/%d/status", pid); + fp = fopen (buf, "r"); + if (!fp) + return 0; + while ((!got_ppid || !got_uid) && fgets (buf, sizeof (buf), fp)) + { + if (sscanf (buf, "PPid:\t%d", &ppid) == 1) + got_ppid = TRUE; + else if (sscanf (buf, "Uid:\t%d", &uid) == 1) + got_uid = TRUE; + } + fclose (fp); + + if (!got_ppid || !got_uid) + return 0; + if (uid != 0) + return uid; + if (ppid == 0 || ppid == 1) + return 0; + return get_ancestral_uid (ppid); +} + +static dbus_bool_t +user_check (DBusConnection *bus, unsigned long uid) +{ + if (uid == getuid () || uid == geteuid ()) + return TRUE; + if (getuid () == 0) + return get_ancestral_uid (getpid ()) == uid; + return FALSE; +} + +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); + droute_intercept_dbus (con); + droute_context_register (spi_global_app_data->droute, con); + + new_list = g_list_append (spi_global_app_data->direct_connections, con); + if (new_list) + spi_global_app_data->direct_connections = new_list; +} + +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; @@ -574,6 +599,8 @@ remove_events (const char *bus_name, const char *event) list = list->next; } } + + g_strfreev (remove_data); } static void @@ -601,7 +628,7 @@ signal_filter (DBusConnection *bus, DBusMessage *message, void *user_data) if (dbus_message_get_type (message) != DBUS_MESSAGE_TYPE_SIGNAL) return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; - if (!strcmp (interface, SPI_DBUS_INTERFACE_REGISTRY)) + if (!strcmp (interface, ATSPI_DBUS_INTERFACE_REGISTRY)) { result = DBUS_HANDLER_RESULT_HANDLED; if (!strcmp (member, "EventListenerRegistered")) @@ -611,6 +638,23 @@ signal_filter (DBusConnection *bus, DBusMessage *message, void *user_data) else result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } + + if (!g_strcmp0(interface, DBUS_INTERFACE_DBUS) && + !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') + spi_atk_remove_client (old); + } + } + return result; } @@ -621,6 +665,7 @@ signal_filter (DBusConnection *bus, DBusMessage *message, void *user_data) * * - DRoute for routing message to their accessible objects. * - Event handlers for emmitting signals on specific ATK events. + * - setup the bus for p2p communication * - Application registration with the AT-SPI registry. * */ @@ -655,15 +700,15 @@ adaptor_init (gint * argc, gchar ** argv[]) 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_option_context_free (opt); /* Allocate global data and do ATK initializations */ spi_global_app_data = g_new0 (SpiBridge, 1); - atk_misc = atk_misc_get_instance (); spi_global_app_data->root = g_object_ref (root); /* Set up D-Bus connection and register bus name */ dbus_error_init (&error); - spi_global_app_data->bus = spi_atk_bridge_get_bus (); + spi_global_app_data->bus = atspi_get_a11y_bus (); if (!spi_global_app_data->bus) { g_free (spi_global_app_data); @@ -687,8 +732,9 @@ adaptor_init (gint * argc, gchar ** argv[]) } } - dbus_connection_setup_with_g_main (spi_global_app_data->bus, - g_main_context_default ()); + spi_global_app_data->main_context = g_main_context_new (); + + atspi_dbus_connection_setup_with_g_main (spi_global_app_data->bus, NULL); /* Hook our plug-and socket functions */ install_plug_hooks (); @@ -704,7 +750,7 @@ adaptor_init (gint * argc, gchar ** argv[]) /* Register droute for routing AT-SPI messages */ spi_global_app_data->droute = - droute_new (spi_global_app_data->bus); + droute_new (); treepath = droute_add_one (spi_global_app_data->droute, "/org/a11y/atspi/cache", spi_global_cache); @@ -742,6 +788,9 @@ adaptor_init (gint * argc, gchar ** argv[]) spi_initialize_text (accpath); spi_initialize_value (accpath); + droute_context_register (spi_global_app_data->droute, + spi_global_app_data->bus); + /* Register methods to send D-Bus signals on certain ATK events */ spi_atk_register_event_listeners (); @@ -756,7 +805,7 @@ adaptor_init (gint * argc, gchar ** argv[]) else get_registered_event_listeners (spi_global_app_data); - g_atexit (exit_func); + setup_bus(); return 0; } @@ -806,4 +855,46 @@ gnome_accessibility_module_shutdown (void) exit_func (); } +static gchar *name_match_tmpl = + "type='signal', interface='org.freedesktop.DBus', member='NameOwnerChanged', arg0='%s'"; + +void +spi_atk_add_client (const char *bus_name) +{ + GSList *l; + gchar *match; + + for (l = clients; l; l = l->next) + { + if (!g_strcmp0 (l->data, bus_name)) + return; + } + if (!clients && spi_global_app_data->events_initialized) + spi_atk_register_event_listeners (); + 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); + g_free (match); +} + +void +spi_atk_remove_client (const char *bus_name) +{ + GSList *l; + + for (l = clients; l; l = l->next) + { + if (!g_strcmp0 (l->data, bus_name)) + { + gchar *match = g_strdup_printf (name_match_tmpl, l->data); + dbus_bus_remove_match (spi_global_app_data->bus, match, NULL); + g_free (match); + g_free (l->data); + clients = g_slist_remove_link (clients, l); + if (!clients) + spi_atk_deregister_event_listeners (); + } + } +} + /*END------------------------------------------------------------------------*/