X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=atk-adaptor%2Fbridge.c;h=d03f0c36423babbffc984faea7b531701f1eba55;hb=f6a0fdcf50c5bcbab547996313161ee4200266e4;hp=55ac68b0d003000b6223302807608bd67c2f7ae9;hpb=32a7655b0a0788ce654ab1afba9fb952c7c28331;p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git diff --git a/atk-adaptor/bridge.c b/atk-adaptor/bridge.c index 55ac68b..d03f0c3 100644 --- a/atk-adaptor/bridge.c +++ b/atk-adaptor/bridge.c @@ -32,9 +32,12 @@ #include #include #include +#include #include #include +#include +#include #include "bridge.h" #include "event.h" @@ -119,7 +122,10 @@ spi_atk_bridge_get_bus (void) bridge_display = XOpenDisplay (spi_display_name ()); if (!bridge_display) - g_error ("AT_SPI: Could not get the display\n"); + { + 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, @@ -137,19 +143,26 @@ spi_atk_bridge_get_bus (void) ("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); + { + 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_error ("AT-SPI: Couldn't connect to bus: %s\n", error.message); + g_warning ("AT-SPI: Couldn't connect to bus: %s\n", error.message); + return NULL; } else { if (!dbus_bus_register (bus, &error)) - g_error ("AT-SPI: Couldn't register with bus: %s\n", error.message); + { + g_warning ("AT-SPI: Couldn't register with bus: %s\n", error.message); + return NULL; + } } } @@ -162,54 +175,102 @@ 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) +/*---------------------------------------------------------------------------*/ + +static void +add_event (const char *bus_name, const char *event) { - DBusPendingCall *pending; - DBusMessage *reply = NULL; + 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) + { + g_free (evdata); + return; + } + 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 +get_registered_event_listeners (SpiBridge *app) +{ + DBusMessage *message, *reply; + DBusMessageIter iter, iter_array, iter_struct; - if (!dbus_connection_send_with_reply (bus, message, &pending, -1)) + 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) { - return NULL; + /* TODO: Add a warning when it's okay to add strings */ + dbus_message_unref (reply); + return; } - dbus_pending_call_set_notify (pending, set_reply, (void *)&reply, NULL); - while (!reply) + 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) { - if (!dbus_connection_read_write_dispatch (bus, -1)) return NULL; + 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); } - return reply; + dbus_message_unref (reply); } -/*---------------------------------------------------------------------------*/ static void register_reply (DBusPendingCall *pending, void *user_data) { DBusMessage *reply; 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) { - 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"); - dbus_message_unref (reply); - return; } - - 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); + 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); + } } else { @@ -217,6 +278,8 @@ register_reply (DBusPendingCall *pending, void *user_data) return; } dbus_message_unref (reply); + + get_registered_event_listeners (spi_global_app_data); } static gboolean @@ -226,6 +289,7 @@ register_application (SpiBridge * app) DBusMessageIter iter; DBusError error; DBusPendingCall *pending; + const int max_addr_length = 128; /* should be long enough */ dbus_error_init (&error); @@ -242,7 +306,8 @@ register_application (SpiBridge * app) 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; } @@ -252,6 +317,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; } @@ -428,6 +505,50 @@ install_plug_hooks () socket_class->embed = socket_embed_hook; } +static void +new_connection_cb (DBusServer *server, DBusConnection *con, void *data) +{ + GList *new_list; + + dbus_connection_ref(con); + 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; + } + + 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; @@ -450,6 +571,91 @@ introspect_children_cb (const 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; + } + } +} + +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 * @@ -457,6 +663,7 @@ introspect_children_cb (const 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. * */ @@ -466,7 +673,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; @@ -479,7 +685,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); @@ -500,7 +711,8 @@ adaptor_init (gint * argc, gchar ** argv[]) { g_free (spi_global_app_data); spi_global_app_data = NULL; - return 0; + inited = FALSE; + return -1; } if (atspi_dbus_name != NULL) @@ -518,8 +730,13 @@ adaptor_init (gint * argc, gchar ** argv[]) } } - dbus_connection_setup_with_g_main (spi_global_app_data->bus, - g_main_context_default ()); +#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); /* Hook our plug-and socket functions */ install_plug_hooks (); @@ -535,7 +752,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); @@ -543,7 +760,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, @@ -573,14 +790,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; } @@ -599,6 +826,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) {