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=51b12bc3beb73b95d91fa2463be247f8d73c37d3;hp=9183a8e44818c6207c25db10f921915f1e726cd8;hb=00ba99d6f1c1352bc40cf33b4db28d8d221695a2;hpb=b4aec05e08333d375b8df5af1006b9fc22531ace

diff --git a/atk-adaptor/bridge.c b/atk-adaptor/bridge.c
index 9183a8e..51b12bc 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 <X11/Xlib.h>
 #include <X11/Xatom.h>
@@ -32,14 +32,19 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <string.h>
+#include<sys/stat.h>
 #include <atk/atk.h>
 
 #include <droute/droute.h>
+#include <gmodule.h>
+#include <glib/gi18n.h>
+#include <atspi/atspi.h>
 
 #include "bridge.h"
 #include "event.h"
 #include "adaptors.h"
 #include "object.h"
+#include "common/spi-stateset.h"
 
 #include "accessible-register.h"
 #include "accessible-leasing.h"
@@ -51,8 +56,6 @@
 
 SpiBridge *spi_global_app_data = NULL;
 
-static const AtkMisc *atk_misc = NULL;
-
 /*static Display *bridge_display = NULL;*/
 
 /*---------------------------------------------------------------------------*/
@@ -96,92 +99,118 @@ 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)
+static void
+set_reply (DBusPendingCall *pending, void *user_data)
 {
-  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_error ("AT_SPI: Could not get the display\n");
+    void **replyptr = (void **)user_data;
 
-  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);
+    *replyptr = dbus_pending_call_steal_reply (pending);
+  dbus_pending_call_unref (pending);
+}
 
-  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_error ("AT-SPI: Couldn't connect to bus: %s\n", error.message);
-    }
-  else
+static void
+add_event (const char *bus_name, const char *event)
+{
+  event_data *evdata;
+  gchar **data;
+  GList *new_list;
+
+  evdata = (event_data *) g_malloc (sizeof (*evdata));
+  if (!evdata)
+    return;
+  data = g_strsplit (event, ":", 3);
+  if (!data)
     {
-      bus = dbus_connection_open (data, &error);
-      if (!bus)
-        {
-          g_error ("AT-SPI: Couldn't connect to bus: %s\n", error.message);
-        }
-      else
-        {
-          if (!dbus_bus_register (bus, &error))
-            g_error ("AT-SPI: Couldn't register with bus: %s\n", error.message);
-        }
+      g_free (evdata);
+      return;
     }
-
-  return bus;
+  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;
 }
 
 static void
-set_reply (DBusPendingCall *pending, void *user_data)
+get_registered_event_listeners (SpiBridge *app)
 {
-    void **replyptr = (void **)user_data;
+  DBusMessage *message, *reply;
+  DBusMessageIter iter, iter_array, iter_struct;
 
-    *replyptr = dbus_pending_call_steal_reply (pending);
+  message = dbus_message_new_method_call (SPI_DBUS_NAME_REGISTRY,
+                                         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;
+  if (strcmp (dbus_message_get_signature (reply), "a(ss)") != 0)
+    {
+      /* TODO: Add a warning when it's okay to add strings */
+      dbus_message_unref (reply);
+      return;
+    }
+  dbus_message_iter_init (reply, &iter);
+  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);
+      dbus_message_iter_next (&iter_array);
+    }
+  dbus_message_unref (reply);
 }
 
-static DBusMessage *
-send_and_allow_reentry (DBusConnection *bus, DBusMessage *message, DBusError *error)
+static void
+register_reply (DBusPendingCall *pending, void *user_data)
 {
-    DBusPendingCall *pending;
-    DBusMessage *reply = NULL;
+  DBusMessage *reply;
+  SpiBridge *app = user_data;
+  DBusMessage *message;
 
-    if (!dbus_connection_send_with_reply (bus, message, &pending, -1))
+  reply = dbus_pending_call_steal_reply (pending);
+  dbus_pending_call_unref (pending);
+  if (reply)
     {
-        return NULL;
+      gchar *app_name, *obj_path;
+
+      if (strcmp (dbus_message_get_signature (reply), "(so)") != 0)
+        {
+          g_warning ("AT-SPI: Could not obtain desktop path or name\n");
+        }
+      else
+        {
+          DBusMessageIter iter, iter_struct;
+          dbus_message_iter_init (reply, &iter);
+          dbus_message_iter_recurse (&iter, &iter_struct);
+          dbus_message_iter_get_basic (&iter_struct, &app_name);
+          dbus_message_iter_next (&iter_struct);
+          dbus_message_iter_get_basic (&iter_struct, &obj_path);
+
+          app->desktop_name = g_strdup (app_name);
+          app->desktop_path = g_strdup (obj_path);
+        }
     }
-    dbus_pending_call_set_notify (pending, set_reply, (void *)&reply, NULL);
-    while (!reply)
+  else
     {
-      if (!dbus_connection_read_write_dispatch (bus, -1)) return NULL;
+      g_warning ("AT-SPI: Could not embed inside desktop");
+      return;
     }
-    return reply;
+  dbus_message_unref (reply);
+
+  get_registered_event_listeners (spi_global_app_data);
 }
-/*---------------------------------------------------------------------------*/
 
 static gboolean
 register_application (SpiBridge * app)
@@ -189,9 +218,16 @@ register_application (SpiBridge * app)
   DBusMessage *message, *reply;
   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;
+
   message = dbus_message_new_method_call (SPI_DBUS_NAME_REGISTRY,
                                           SPI_DBUS_PATH_ROOT,
                                           SPI_DBUS_INTERFACE_SOCKET,
@@ -200,36 +236,29 @@ register_application (SpiBridge * app)
   dbus_message_iter_init_append (message, &iter);
   spi_object_append_reference (&iter, app->root);
   
-  reply = send_and_allow_reentry (app->bus, message, &error);
+    if (!dbus_connection_send_with_reply (app->bus, message, &pending, -1)
+        || !pending)
+    {
+        return FALSE;
+    }
+
+    dbus_pending_call_set_notify (pending, register_reply, app, NULL);
 
   if (message)
     dbus_message_unref (message);
 
-  if (reply)
-    {
-      DBusMessageIter iter, iter_struct;
-      gchar *app_name, *obj_path;
-
-      if (strcmp (dbus_message_get_signature (reply), "(so)") != 0)
-        {
-          g_warning ("AT-SPI: Could not obtain desktop path or name\n");
-          return FALSE;
-        }
-
-      dbus_message_iter_init (reply, &iter);
-      dbus_message_iter_recurse (&iter, &iter_struct);
-      dbus_message_iter_get_basic (&iter_struct, &app_name);
-      dbus_message_iter_next (&iter_struct);
-      dbus_message_iter_get_basic (&iter_struct, &obj_path);
+  /* 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
 
-      app->desktop_name = g_strdup (app_name);
-      app->desktop_path = g_strdup (obj_path);
-    }
-  else
-    {
-      g_warning ("AT-SPI: Could not embed inside desktop: %s\n", error.message);
-      return FALSE;
-    }
   return TRUE;
 }
 
@@ -406,6 +435,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;
 
@@ -418,7 +534,7 @@ static GOptionEntry atspi_option_entries[] = {
 };
 
 static gchar *
-introspect_children_cb (char *path, void *data)
+introspect_children_cb (const char *path, void *data)
 {
   if (!strcmp (path, "/org/a11y/atspi/accessible"))
     {
@@ -428,6 +544,93 @@ introspect_children_cb (char *path, void *data)
   return NULL;
 }
 
+static void
+handle_event_listener_registered (DBusConnection *bus, DBusMessage *message,
+                                  void *user_data)
+{
+  const char *name;
+  char *sender;
+
+  if (!dbus_message_get_args (message, NULL, DBUS_TYPE_STRING, &sender,
+    DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID))
+    return;
+
+  add_event (sender, name);
+}
+
+static void
+remove_events (const char *bus_name, const char *event)
+{
+  event_data *evdata;
+  gchar **remove_data;
+  GList *list;
+
+  remove_data = g_strsplit (event, ":", 3);
+  if (!remove_data)
+    {
+      return;
+    }
+
+  for (list = spi_global_app_data->events; list;)
+    {
+      event_data *evdata = list->data;
+      if (!g_strcmp0 (evdata->bus_name, bus_name) &&
+          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);
+        }
+      else
+        {
+          list = list->next;
+        }
+    }
+
+  g_strfreev (remove_data);
+}
+
+static void
+handle_event_listener_deregistered (DBusConnection *bus, DBusMessage *message,
+                                    void *user_data)
+{
+  const char *orig_name;
+  gchar *name;
+  char *sender;
+
+  if (!dbus_message_get_args (message, NULL, DBUS_TYPE_STRING, &sender,
+                              DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID))
+    return;
+
+  remove_events (sender, name);
+}
+
+static DBusHandlerResult
+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;
+
+  if (dbus_message_get_type (message) != DBUS_MESSAGE_TYPE_SIGNAL)
+    return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+
+  if (!strcmp (interface, SPI_DBUS_INTERFACE_REGISTRY))
+    {
+      result = DBUS_HANDLER_RESULT_HANDLED;
+      if (!strcmp (member, "EventListenerRegistered"))
+        handle_event_listener_registered (bus, message, user_data);
+      else if (!strcmp (member, "EventListenerDeregistered"))
+        handle_event_listener_deregistered (bus, message, user_data);
+      else
+        result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+    }
+  return result;
+}
+
 /*
  * spi_app_init
  *
@@ -435,6 +638,7 @@ introspect_children_cb (char *path, void *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.
  *
  */
@@ -444,7 +648,6 @@ adaptor_init (gint * argc, gchar ** argv[])
   GOptionContext *opt;
   GError *err = NULL;
   DBusError error;
-  DBusConnection *bus;
   AtkObject *root;
   gchar *introspection_directory;
   static gboolean inited = FALSE;
@@ -457,7 +660,12 @@ adaptor_init (gint * argc, gchar ** argv[])
   DRoutePath *treepath, *accpath;
 
   root = atk_get_root ();
-  g_return_val_if_fail (root, 0);
+  g_warn_if_fail (root);
+  if (!root)
+    {
+      inited = FALSE;
+      return -1;
+    }
 
   /* Parse command line options */
   opt = g_option_context_new (NULL);
@@ -465,20 +673,21 @@ 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);
       spi_global_app_data = NULL;
-      return 0;
+      inited = FALSE;
+      return -1;
     }
 
   if (atspi_dbus_name != NULL)
@@ -496,8 +705,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 ();
@@ -513,7 +723,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);
@@ -521,7 +731,7 @@ adaptor_init (gint * argc, gchar ** argv[])
   if (!treepath)
     {
       g_warning ("atk-bridge: Error in droute_add_one().  Already running?");
-      return 0;
+      return -1;
     }
 
   accpath = droute_add_many (spi_global_app_data->droute,
@@ -551,14 +761,24 @@ 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 ();
 
+  /* 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_connection_add_filter (spi_global_app_data->bus, signal_filter, NULL,
+                              NULL);
+
   /* Register this app by sending a signal out to AT-SPI registry daemon */
   if (!atspi_no_register && (!root || !ATK_IS_PLUG (root)))
     register_application (spi_global_app_data);
+  else
+    get_registered_event_listeners (spi_global_app_data);
 
-  g_atexit (exit_func);
+  setup_bus();
 
   return 0;
 }
@@ -577,6 +797,14 @@ gtk_module_init (gint * argc, gchar ** argv[])
   return 0;
 }
 
+gchar*
+g_module_check_init (GModule *module)
+{
+  g_module_make_resident (module);
+
+  return NULL;
+}
+
 void
 gnome_accessibility_module_init (void)
 {