X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=atk-adaptor%2Fbridge.c;h=6aacd121e9d7b01344260274c046fdbc3b433dcf;hb=a75394295fca667976b703a376e4034cc2031540;hp=8bad17c954cd027c4c97c27197fc08a4f2ac0e50;hpb=df5695a948da0886dd506430959d4de88a940eb9;p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git diff --git a/atk-adaptor/bridge.c b/atk-adaptor/bridge.c index 8bad17c..6aacd12 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 @@ -38,6 +38,7 @@ #include #include #include +#include #include "bridge.h" #include "event.h" @@ -55,8 +56,6 @@ SpiBridge *spi_global_app_data = NULL; -static const AtkMisc *atk_misc = NULL; - /*static Display *bridge_display = NULL;*/ /*---------------------------------------------------------------------------*/ @@ -100,78 +99,6 @@ 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); - XFree (data); - 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; - } - dbus_connection_set_exit_on_disconnect (bus, FALSE); - } - } - - return bus; -} - static void set_reply (DBusPendingCall *pending, void *user_data) { @@ -190,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; @@ -206,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) { @@ -216,18 +146,21 @@ get_registered_event_listeners (SpiBridge *app) SPI_DBUS_PATH_REGISTRY, SPI_DBUS_INTERFACE_REGISTRY, "GetRegisteredEvents"); - spi_global_app_data->events_initialized = TRUE; if (!message) return; 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); @@ -243,6 +176,10 @@ get_registered_event_listeners (SpiBridge *app) 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 @@ -508,13 +445,56 @@ 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); - dbus_connection_setup_with_g_main(con, NULL); + atspi_dbus_connection_setup_with_g_main(con, NULL); droute_intercept_dbus (con); droute_context_register (spi_global_app_data->droute, con); @@ -542,7 +522,7 @@ setup_bus (void) return -1; } - dbus_server_setup_with_g_main(server, NULL); + 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; @@ -658,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; } @@ -707,12 +704,11 @@ adaptor_init (gint * argc, gchar ** argv[]) /* 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); @@ -736,13 +732,9 @@ adaptor_init (gint * argc, gchar ** argv[]) } } -#ifndef DISABLE_P2P spi_global_app_data->main_context = g_main_context_new (); -#else - spi_global_app_data->main_context = NULL; -#endif - dbus_connection_setup_with_g_main (spi_global_app_data->bus, NULL); + atspi_dbus_connection_setup_with_g_main (spi_global_app_data->bus, NULL); /* Hook our plug-and socket functions */ install_plug_hooks (); @@ -863,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------------------------------------------------------------------------*/