X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=atk-adaptor%2Fbridge.c;h=9cd9ba97e487c80b0e573a26776a41378dba96d7;hb=e9d07f63b34219ce5fab8a3b979b1c98653faf57;hp=489f1b1b0a26bb547291a4b3858942c37d2f0dda;hpb=c22a02deaa59a6568c989df606cf84b3860933d3;p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git diff --git a/atk-adaptor/bridge.c b/atk-adaptor/bridge.c index 489f1b1..9cd9ba9 100644 --- a/atk-adaptor/bridge.c +++ b/atk-adaptor/bridge.c @@ -119,7 +119,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,72 +140,82 @@ 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; + } } } return bus; } -/*---------------------------------------------------------------------------*/ - -static gboolean -register_application (SpiBridge * app) +static void +set_reply (DBusPendingCall *pending, void *user_data) { - DBusMessage *message, *reply; - DBusMessageIter iter; - DBusError error; - - dbus_error_init (&error); + void **replyptr = (void **)user_data; - message = dbus_message_new_method_call (SPI_DBUS_NAME_REGISTRY, - SPI_DBUS_PATH_ROOT, - SPI_DBUS_INTERFACE_SOCKET, - "Embed"); + *replyptr = dbus_pending_call_steal_reply (pending); +} - dbus_message_iter_init_append (message, &iter); - spi_object_append_reference (&iter, app->root); +static DBusMessage * +send_and_allow_reentry (DBusConnection *bus, DBusMessage *message, DBusError *error) +{ + DBusPendingCall *pending; + DBusMessage *reply = NULL; - reply = dbus_connection_send_with_reply_and_block (app->bus, message, -1, &error); + 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; +} +/*---------------------------------------------------------------------------*/ - if (message) - dbus_message_unref (message); +static void +register_reply (DBusPendingCall *pending, void *user_data) +{ + DBusMessage *reply; + SpiBridge *app = user_data; + reply = dbus_pending_call_steal_reply (pending); if (reply) { DBusMessageIter iter, iter_struct; gchar *app_name, *obj_path; - dbus_message_iter_init (reply, &iter); - dbus_message_iter_recurse (&iter, &iter_struct); - if (!(dbus_message_iter_get_arg_type (&iter_struct) == DBUS_TYPE_STRING)) + 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_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); - if (!dbus_message_iter_next (&iter_struct)) - { - g_warning ("AT-SPI: Could not obtain desktop name"); - return FALSE; - } - if (!(dbus_message_iter_get_arg_type (&iter_struct) == DBUS_TYPE_OBJECT_PATH)) - { - g_warning ("AT-SPI: Could not obtain desktop path"); - return FALSE; - } + dbus_message_iter_next (&iter_struct); dbus_message_iter_get_basic (&iter_struct, &obj_path); app->desktop_name = g_strdup (app_name); @@ -210,9 +223,45 @@ register_application (SpiBridge * app) } else { - g_warning ("AT-SPI: Could not embed inside desktop: %s\n", error.message); - return FALSE; + g_warning ("AT-SPI: Could not embed inside desktop"); + return; + } + dbus_message_unref (reply); +} + +static gboolean +register_application (SpiBridge * app) +{ + DBusMessage *message, *reply; + DBusMessageIter iter; + DBusError error; + DBusPendingCall *pending; + + 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, + "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)) + { + return FALSE; } + + dbus_pending_call_set_notify (pending, register_reply, app, NULL); + + if (message) + dbus_message_unref (message); + return TRUE; } @@ -285,11 +334,71 @@ get_plug_id (AtkPlug * plug) return g_string_free (str, FALSE); } +AtkStateSet * +socket_ref_state_set (AtkObject *accessible) +{ + char *child_name, *child_path; + AtkSocket *socket = ATK_SOCKET (accessible); + int count = 0; + int j; + int v; + DBusMessage *message, *reply; + DBusMessageIter iter, iter_array; + AtkStateSet *set; + + if (!socket->embedded_plug_id) + return NULL; + + child_name = g_strdup (socket->embedded_plug_id); + if (!child_name) + return NULL; + child_path = g_utf8_strchr (child_name + 1, -1, ':'); + if (!child_path) + { + g_free (child_name); + return NULL; + } + *(child_path++) = '\0'; + message = dbus_message_new_method_call (child_name, child_path, SPI_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); + if (reply == NULL) + return NULL; + if (strcmp (dbus_message_get_signature (reply), "au") != 0) + { + dbus_message_unref (reply); + return NULL; + } + set = atk_state_set_new (); + if (!set) + return NULL; + dbus_message_iter_init (reply, &iter); + dbus_message_iter_recurse (&iter, &iter_array); + do + { + dbus_message_iter_get_basic (&iter_array, &v); + for (j = 0; j < 32; j++) + { + if (v & (1 << j)) + { + AtkState state = spi_atk_state_from_spi_state ((count << 5) + j); + atk_state_set_add_state (set, state); + } + } + count++; + } + while (dbus_message_iter_next (&iter_array)); + dbus_message_unref (reply); + return set; +} + static void socket_embed_hook (AtkSocket * socket, gchar * plug_id) { AtkObject *accessible = ATK_OBJECT(socket); gchar *plug_name, *plug_path; + AtkObjectClass *klass; /* Force registration */ gchar *path = spi_register_object_to_path (spi_global_register, G_OBJECT (accessible)); @@ -311,6 +420,9 @@ socket_embed_hook (AtkSocket * socket, gchar * plug_id) } g_free (plug_name); g_free (path); + + klass = ATK_OBJECT_GET_CLASS (accessible); + klass->ref_state_set = socket_ref_state_set; } static void @@ -337,6 +449,17 @@ static GOptionEntry atspi_option_entries[] = { {NULL} }; +static gchar * +introspect_children_cb (const char *path, void *data) +{ + if (!strcmp (path, "/org/a11y/atspi/accessible")) + { + return g_strdup ("\n"); + /* TODO: Should we place the whole hierarchy here? */ + } + return NULL; +} + /* * spi_app_init * @@ -366,7 +489,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); @@ -387,7 +515,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) @@ -408,6 +537,9 @@ adaptor_init (gint * argc, gchar ** argv[]) dbus_connection_setup_with_g_main (spi_global_app_data->bus, g_main_context_default ()); + /* Hook our plug-and socket functions */ + install_plug_hooks (); + /* * Create the leasing, register and cache objects. * The order is important here, the cache depends on the @@ -422,17 +554,19 @@ adaptor_init (gint * argc, gchar ** argv[]) droute_new (spi_global_app_data->bus); treepath = droute_add_one (spi_global_app_data->droute, - "/org/at_spi/cache", spi_global_cache); + "/org/a11y/atspi/cache", spi_global_cache); 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, "/org/a11y/atspi/accessible", NULL, + introspect_children_cb, + NULL, (DRouteGetDatumFunction) spi_global_register_path_to_object); @@ -458,9 +592,6 @@ adaptor_init (gint * argc, gchar ** argv[]) /* Register methods to send D-Bus signals on certain ATK events */ spi_atk_register_event_listeners (); - /* Hook our plug-and socket functions */ - install_plug_hooks (); - /* 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);