X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=atspi%2Fatspi-misc.c;h=678b566f14a31b04e401f23113f4c609a2412bb2;hb=8b853b5e6a4b0bba2b93ea411d8468b3db83eda5;hp=f45cd76e6b5d71df760924ab8793b8fb24c1fb02;hpb=8368296824454486926c33e1f1e28612ce90d726;p=platform%2Fupstream%2Fat-spi2-core.git diff --git a/atspi/atspi-misc.c b/atspi/atspi-misc.c index f45cd76..678b566 100644 --- a/atspi/atspi-misc.c +++ b/atspi/atspi-misc.c @@ -29,7 +29,9 @@ */ #include "atspi-private.h" +#ifdef HAVE_X11 #include "X11/Xlib.h" +#endif #include "atspi-gmain.h" #include #include @@ -40,8 +42,10 @@ static DBusConnection *bus = NULL; static GHashTable *live_refs = NULL; static gint method_call_timeout = 800; static gint app_startup_time = 15000; +static gboolean allow_sync = TRUE; GMainLoop *atspi_main_loop; +GMainContext *atspi_main_context; gboolean atspi_no_cache; const char *atspi_path_dec = ATSPI_DBUS_PATH_DEC; @@ -64,6 +68,7 @@ const char *atspi_interface_image = ATSPI_DBUS_INTERFACE_IMAGE; const char *atspi_interface_registry = ATSPI_DBUS_INTERFACE_REGISTRY; const char *atspi_interface_selection = ATSPI_DBUS_INTERFACE_SELECTION; const char *atspi_interface_table = ATSPI_DBUS_INTERFACE_TABLE; +const char *atspi_interface_table_cell = ATSPI_DBUS_INTERFACE_TABLE_CELL; const char *atspi_interface_text = ATSPI_DBUS_INTERFACE_TEXT; const char *atspi_interface_cache = ATSPI_DBUS_INTERFACE_CACHE; const char *atspi_interface_value = ATSPI_DBUS_INTERFACE_VALUE; @@ -83,6 +88,7 @@ static const char *interfaces[] = "org.a11y.atspi.LoginHelper", ATSPI_DBUS_INTERFACE_SELECTION, ATSPI_DBUS_INTERFACE_TABLE, + ATSPI_DBUS_INTERFACE_TABLE_CELL, ATSPI_DBUS_INTERFACE_TEXT, ATSPI_DBUS_INTERFACE_VALUE, NULL @@ -101,10 +107,10 @@ _atspi_get_iface_num (const char *iface) return -1; } -static GHashTable * -get_live_refs (void) +GHashTable * +_atspi_get_live_refs (void) { - if (!live_refs) + if (!live_refs) { live_refs = g_hash_table_new (g_direct_hash, g_direct_equal); } @@ -118,16 +124,19 @@ _atspi_bus () if (!bus) atspi_init (); if (!bus) - g_error ("AT-SPI: COuldn't connect to accessibility bus. Is at-spi-bus-launcher running?"); + g_error ("AT-SPI: Couldn't connect to accessibility bus. Is at-spi-bus-launcher running?"); return bus; } #define APP_IS_REGISTRY(app) (!strcmp (app->bus_name, atspi_bus_registry)) +static AtspiAccessible *desktop; + static void cleanup () { GHashTable *refs; + GList *l; refs = live_refs; live_refs = NULL; @@ -142,6 +151,20 @@ cleanup () dbus_connection_unref (bus); bus = NULL; } + + if (!desktop) + return; + for (l = desktop->children; l;) + { + GList *next = l->next; + AtspiAccessible *child = l->data; + g_object_run_dispose (G_OBJECT (child->parent.app)); + g_object_run_dispose (G_OBJECT (child)); + l = next; + } + g_object_run_dispose (G_OBJECT (desktop->parent.app)); + g_object_unref (desktop); + desktop = NULL; } static gboolean atspi_inited = FALSE; @@ -160,7 +183,7 @@ handle_get_bus_address (DBusPendingCall *pending, void *user_data) if (dbus_message_get_type (reply) == DBUS_MESSAGE_TYPE_METHOD_RETURN) { if (dbus_message_get_args (reply, NULL, DBUS_TYPE_STRING, &address, - DBUS_TYPE_INVALID)) + DBUS_TYPE_INVALID) && address [0]) { DBusError error; DBusConnection *bus; @@ -192,9 +215,11 @@ handle_get_bus_address (DBusPendingCall *pending, void *user_data) "/org/a11y/atspi/cache", atspi_interface_cache, "GetItems"); - dbus_connection_send_with_reply (app->bus, message, &new_pending, 2000); - dbus_pending_call_set_notify (new_pending, handle_get_items, app, NULL); + dbus_connection_send_with_reply (app->bus, message, &new_pending, 2000); dbus_message_unref (message); + if (!new_pending) + return; + dbus_pending_call_set_notify (new_pending, handle_get_items, app, NULL); } static AtspiApplication * @@ -204,6 +229,7 @@ get_application (const char *bus_name) char *bus_name_dup; DBusMessage *message; DBusPendingCall *pending = NULL; + dbus_bool_t result; if (!app_hash) { @@ -224,13 +250,18 @@ get_application (const char *bus_name) message = dbus_message_new_method_call (bus_name, atspi_path_root, atspi_interface_application, "GetApplicationBusAddress"); - dbus_connection_send_with_reply (app->bus, message, &pending, 2000); - dbus_pending_call_set_notify (pending, handle_get_bus_address, app, NULL); + result = dbus_connection_send_with_reply (app->bus, message, &pending, 2000); dbus_message_unref (message); + if (!result || !pending) + { + g_hash_table_remove (app_hash, bus_name_dup); + return NULL; + } + dbus_pending_call_set_notify (pending, handle_get_bus_address, app, NULL); return app; } -static AtspiAccessible * +AtspiAccessible * ref_accessible (const char *app_name, const char *path) { AtspiApplication *app; @@ -247,6 +278,7 @@ ref_accessible (const char *app_name, const char *path) { app->root = _atspi_accessible_new (app, atspi_path_root); app->root->accessible_parent = atspi_get_desktop (0); + app->root->accessible_parent->children = g_list_append (app->root->accessible_parent->children, g_object_ref (app->root)); } return g_object_ref (app->root); } @@ -259,8 +291,7 @@ ref_accessible (const char *app_name, const char *path) a = _atspi_accessible_new (app, path); if (!a) return NULL; - g_hash_table_insert (app->hash, g_strdup (a->parent.path), a); - g_object_ref (a); /* for the hash */ + g_hash_table_insert (app->hash, g_strdup (a->parent.path), g_object_ref (a)); return a; } @@ -328,70 +359,51 @@ handle_remove_accessible (DBusConnection *bus, DBusMessage *message, void *user_ return DBUS_HANDLER_RESULT_HANDLED; } -static gboolean -add_app_to_desktop (AtspiAccessible *a, const char *bus_name) +static DBusHandlerResult +handle_name_owner_changed (DBusConnection *bus, DBusMessage *message, void *user_data) { - AtspiAccessible *obj = ref_accessible (bus_name, atspi_path_root); - if (obj) + const char *name, *new, *old; + static gboolean registry_lost = FALSE; + + if (!dbus_message_get_args (message, NULL, + DBUS_TYPE_STRING, &name, + DBUS_TYPE_STRING, &old, + DBUS_TYPE_STRING, &new, + DBUS_TYPE_INVALID)) { - a->children = g_list_append (a->children, obj); - return TRUE; + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } - else + + if (!strcmp (name, "org.a11y.atspi.Registry")) { - g_warning ("AT-SPI: Error calling getRoot for %s", bus_name); + if (registry_lost && !old[0]) + { + _atspi_reregister_event_listeners (); + _atspi_reregister_device_listeners (); + registry_lost = FALSE; + } + else if (!new[0]) + registry_lost = TRUE; } - return FALSE; -} - -static void -send_children_changed (AtspiAccessible *parent, AtspiAccessible *child, gboolean add) -{ - AtspiEvent e; - - memset (&e, 0, sizeof (e)); - e.type = (add? "object:children-changed:add": "object:children-changed:remove"); - e.source = parent; - e.detail1 = g_list_index (parent->children, child); - e.detail2 = 0; - _atspi_send_event (&e); -} - -static void -unref_object_and_descendants (AtspiAccessible *obj) -{ - GList *l; - - for (l = obj->children; l; l = l->next) + else if (app_hash) { - unref_object_and_descendants (l->data); + AtspiApplication *app = g_hash_table_lookup (app_hash, old); + if (app && app->bus_name && !strcmp(app->bus_name, name)) + g_object_run_dispose (G_OBJECT (app)); } - g_object_unref (obj); + return DBUS_HANDLER_RESULT_HANDLED; } static gboolean -remove_app_from_desktop (AtspiAccessible *a, const char *bus_name) +add_app_to_desktop (AtspiAccessible *a, const char *bus_name) { - GList *l; - AtspiAccessible *child; - - for (l = a->children; l; l = l->next) - { - child = l->data; - if (!strcmp (bus_name, child->parent.app->bus_name)) break; - } - if (!l) - { - return FALSE; - } - send_children_changed (a, child, FALSE); - a->children = g_list_remove (a->children, child); - unref_object_and_descendants (child); - return TRUE; + AtspiAccessible *obj = ref_accessible (bus_name, atspi_path_root); + /* The app will be added to the desktop as a side-effect of calling + * ref_accessible */ + g_object_unref (obj); + return (obj != NULL); } -static AtspiAccessible *desktop; - void get_reference_from_iter (DBusMessageIter *iter, const char **app_name, const char **path) { @@ -531,8 +543,9 @@ ref_accessible_desktop (AtspiApplication *app) { return NULL; } - g_hash_table_insert (app->hash, desktop->parent.path, desktop); - g_object_ref (desktop); /* for the hash */ + g_hash_table_insert (app->hash, g_strdup (desktop->parent.path), + g_object_ref (desktop)); + app->root = g_object_ref (desktop); desktop->name = g_strdup ("main"); message = dbus_message_new_method_call (atspi_bus_registry, atspi_path_root, @@ -568,17 +581,20 @@ ref_accessible_desktop (AtspiApplication *app) if (bus_name_dup) g_hash_table_insert (app_hash, bus_name_dup, app); - return desktop; + return g_object_ref (desktop); } AtspiAccessible * _atspi_ref_accessible (const char *app, const char *path) { AtspiApplication *a = get_application (app); - if (!a) return NULL; + if (!a) + return NULL; if ( APP_IS_REGISTRY(a)) { - return a->root = ref_accessible_desktop (a); + if (!a->root) + g_object_unref (ref_accessible_desktop (a)); /* sets a->root */ + return g_object_ref (a->root); } return ref_accessible (app, path); } @@ -622,7 +638,7 @@ _atspi_dbus_return_hyperlink_from_message (DBusMessage *message) DBusMessageIter iter; AtspiHyperlink *retval = NULL; const char *signature; - + if (!message) return NULL; @@ -655,7 +671,6 @@ static DBusHandlerResult handle_add_accessible (DBusConnection *bus, DBusMessage *message, void *user_data) { DBusMessageIter iter; - const char *sender = dbus_message_get_sender (message); if (strcmp (dbus_message_get_signature (message), cache_signal_type) != 0) { @@ -676,7 +691,7 @@ typedef struct void *data; } BusDataClosure; -static guint process_deferred_messages_id = -1; +static GSource *process_deferred_messages_source = NULL; static void process_deferred_message (BusDataClosure *closure) @@ -702,12 +717,16 @@ process_deferred_message (BusDataClosure *closure) { handle_remove_accessible (closure->bus, closure->message, closure->data); } + if (dbus_message_is_signal (closure->message, "org.freedesktop.DBus", "NameOwnerChanged")) + { + handle_name_owner_changed (closure->bus, closure->message, closure->data); + } } static GQueue *deferred_messages = NULL; -gboolean -_atspi_process_deferred_messages (gpointer data) +static gboolean +process_deferred_messages (void) { static int in_process_deferred_messages = 0; BusDataClosure *closure; @@ -715,20 +734,27 @@ _atspi_process_deferred_messages (gpointer data) if (in_process_deferred_messages) return TRUE; in_process_deferred_messages = 1; - while (closure = g_queue_pop_head (deferred_messages)) + while ((closure = g_queue_pop_head (deferred_messages))) { process_deferred_message (closure); dbus_message_unref (closure->message); dbus_connection_unref (closure->bus); g_free (closure); } - /* If data is NULL, assume that we were called from GLib */ - if (!data) - process_deferred_messages_id = -1; in_process_deferred_messages = 0; return FALSE; } +static gboolean +process_deferred_messages_callback (gpointer data) +{ + if (process_deferred_messages ()) + return G_SOURCE_CONTINUE; + + process_deferred_messages_source = NULL; + return G_SOURCE_REMOVE; +} + static DBusHandlerResult defer_message (DBusConnection *connection, DBusMessage *message, void *user_data) { @@ -740,8 +766,15 @@ defer_message (DBusConnection *connection, DBusMessage *message, void *user_data g_queue_push_tail (deferred_messages, closure); - if (process_deferred_messages_id == -1) - process_deferred_messages_id = g_idle_add (_atspi_process_deferred_messages, NULL); + if (process_deferred_messages_source == NULL) + { + process_deferred_messages_source = g_idle_source_new (); + g_source_set_callback (process_deferred_messages_source, + process_deferred_messages_callback, NULL, NULL); + g_source_attach (process_deferred_messages_source, atspi_main_context); + g_source_unref (process_deferred_messages_source); + } + return DBUS_HANDLER_RESULT_HANDLED; } @@ -768,20 +801,14 @@ atspi_dbus_filter (DBusConnection *bus, DBusMessage *message, void *data) { return defer_message (bus, message, data); } + if (dbus_message_is_signal (message, "org.freedesktop.DBus", "NameOwnerChanged")) + { + defer_message (bus, message, data); + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + } return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } -static const char *signal_interfaces[] = -{ - "org.a11y.atspi.Event.Object", - "org.a11y.atspi.Event.Window", - "org.a11y.atspi.Event.Mouse", - "org.a11y.atspi.Event.Terminal", - "org.a11y.atspi.Event.Document", - "org.a11y.atspi.Event.Focus", - NULL -}; - /* * Returns a 'canonicalized' value for DISPLAY, * with the screen number stripped off if present. @@ -798,7 +825,7 @@ spi_display_name (void) { display_env = g_getenv ("DISPLAY"); if (!display_env || !display_env[0]) - canonical_display_name = g_strdup (":0"); + return NULL; else { gchar *display_p, *screen_p; @@ -824,7 +851,7 @@ spi_display_name (void) * * Connects to the accessibility registry and initializes the SPI. * - * Returns: 0 on success, otherwise an integer error code. + * Returns: 0 on success, 1 if already initialized, or an integer error code. **/ int atspi_init (void) @@ -839,9 +866,7 @@ atspi_init (void) atspi_inited = TRUE; - g_type_init (); - - get_live_refs(); + _atspi_get_live_refs(); bus = atspi_get_a11y_bus (); if (!bus) @@ -865,6 +890,10 @@ atspi_init (void) dbus_bus_add_match (bus, match, NULL); g_free (match); + dbus_bus_add_match (bus, + "type='signal', interface='org.freedesktop.DBus', member='NameOwnerChanged'", + NULL); + no_cache = g_getenv ("ATSPI_NO_CACHE"); if (no_cache && g_strcmp0 (no_cache, "0") != 0) atspi_no_cache = TRUE; @@ -875,6 +904,19 @@ atspi_init (void) } /** + * atspi_is_initialized: + * + * Indicates whether AT-SPI has been initialized. + * + * Returns: %True if initialized; %False otherwise. + */ +gboolean +atspi_is_initialized () +{ + return atspi_inited; +} + +/** * atspi_event_main: * * Starts/enters the main event loop for the AT-SPI services. @@ -906,7 +948,7 @@ atspi_event_quit (void) /** * atspi_exit: * - * Disconnects from #AtspiRegistry instances and releases + * Disconnects from #AtspiRegistry instances and releases * any floating resources. Call only once at exit. * * Returns: 0 if there were no leaks, otherwise other integer values. @@ -942,7 +984,6 @@ static GSList *hung_processes; static void remove_hung_process (DBusPendingCall *pending, void *data) { - gchar *bus_name = data; hung_processes = g_slist_remove (hung_processes, data); g_free (data); @@ -959,6 +1000,7 @@ check_for_hang (DBusMessage *message, DBusError *error, DBusConnection *bus, con DBusMessage *message; gchar *bus_name_dup; DBusPendingCall *pending = NULL; + dbus_bool_t result; for (l = hung_processes; l; l = l->next) if (!strcmp (l->data, bus_name)) return; @@ -967,9 +1009,9 @@ check_for_hang (DBusMessage *message, DBusError *error, DBusConnection *bus, con "Ping"); if (!message) return; - dbus_connection_send_with_reply (bus, message, &pending, -1); + result = dbus_connection_send_with_reply (bus, message, &pending, -1); dbus_message_unref (message); - if (!pending) + if (!result || !pending) return; bus_name_dup = g_strdup (bus_name); hung_processes = g_slist_append (hung_processes, bus_name_dup); @@ -1035,6 +1077,12 @@ _atspi_dbus_call (gpointer obj, const char *interface, const char *method, GErro if (!check_app (aobj->app, error)) return FALSE; + if (!allow_sync) + { + _atspi_set_error_no_sync (error); + return FALSE; + } + va_start (args, type); dbus_error_init (&err); set_timeout (aobj->app); @@ -1043,7 +1091,7 @@ _atspi_dbus_call (gpointer obj, const char *interface, const char *method, GErro type, args); va_end (args); check_for_hang (NULL, &err, aobj->app->bus, aobj->app->bus_name); - _atspi_process_deferred_messages ((gpointer)TRUE); + process_deferred_messages (); if (dbus_error_is_set (&err)) { g_set_error(error, ATSPI_ERROR, ATSPI_ERROR_IPC, "%s", err.message); @@ -1060,9 +1108,11 @@ _atspi_dbus_call_partial (gpointer obj, const char *type, ...) { va_list args; - + DBusMessage * result; va_start (args, type); - return _atspi_dbus_call_partial_va (obj, interface, method, error, type, args); + result = _atspi_dbus_call_partial_va (obj, interface, method, error, type, args); + va_end (args); + return result; } @@ -1076,9 +1126,9 @@ _atspi_dbus_call_partial_va (gpointer obj, { AtspiObject *aobj = ATSPI_OBJECT (obj); DBusError err; - DBusMessage *msg = NULL, *reply = NULL; - DBusMessageIter iter; - const char *p; + DBusMessage *msg = NULL, *reply = NULL; + DBusMessageIter iter; + const char *p; dbus_error_init (&err); @@ -1100,11 +1150,23 @@ out: va_end (args); if (msg) dbus_message_unref (msg); - _atspi_process_deferred_messages ((gpointer)TRUE); + process_deferred_messages (); if (dbus_error_is_set (&err)) { - /* TODO: Set gerror */ + g_set_error_literal(error, ATSPI_ERROR, ATSPI_ERROR_IPC, err.message); dbus_error_free (&err); + if (reply) + dbus_message_unref(reply); + return NULL; + } + else if (reply && dbus_message_get_type(reply) == DBUS_MESSAGE_TYPE_ERROR) + { + const char *err_str = NULL; + dbus_message_get_args (reply, NULL, DBUS_TYPE_STRING, &err_str, DBUS_TYPE_INVALID); + if (err_str) + g_set_error_literal (error, ATSPI_ERROR, ATSPI_ERROR_IPC, err_str); + dbus_message_unref (reply); + return NULL; } return reply; } @@ -1125,6 +1187,12 @@ _atspi_dbus_get_property (gpointer obj, const char *interface, const char *name, if (!check_app (aobj->app, error)) return FALSE; + if (!allow_sync) + { + _atspi_set_error_no_sync (error); + return FALSE; + } + message = dbus_message_new_method_call (aobj->app->bus_name, aobj->path, "org.freedesktop.DBus.Properties", @@ -1140,7 +1208,7 @@ _atspi_dbus_get_property (gpointer obj, const char *interface, const char *name, reply = dbind_send_and_allow_reentry (aobj->app->bus, message, &err); check_for_hang (reply, &err, aobj->app->bus, aobj->app->bus_name); dbus_message_unref (message); - _atspi_process_deferred_messages ((gpointer)TRUE); + process_deferred_messages (); if (!reply) { // TODO: throw exception @@ -1203,7 +1271,7 @@ _atspi_dbus_send_with_reply_and_block (DBusMessage *message, GError **error) dbus_error_init (&err); set_timeout (app); reply = dbind_send_and_allow_reentry (bus, message, &err); - _atspi_process_deferred_messages ((gpointer)TRUE); + process_deferred_messages (); dbus_message_unref (message); if (dbus_error_is_set (&err)) { @@ -1297,8 +1365,16 @@ void _atspi_dbus_set_interfaces (AtspiAccessible *accessible, DBusMessageIter *iter) { DBusMessageIter iter_array; + char *iter_sig = dbus_message_iter_get_signature (iter); accessible->interfaces = 0; + if (strcmp (iter_sig, "as") != 0) + { + g_warning ("_atspi_dbus_set_interfaces: Passed iterator with invalid signature %s", dbus_message_iter_get_signature (iter)); + dbus_free (iter_sig); + return; + } + dbus_free (iter_sig); dbus_message_iter_recurse (iter, &iter_array); while (dbus_message_iter_get_arg_type (&iter_array) != DBUS_TYPE_INVALID) { @@ -1354,6 +1430,7 @@ _atspi_error_quark (void) /* * Gets the IOR from the XDisplay. */ +#ifdef HAVE_X11 static char * get_accessibility_bus_address_x11 (void) { @@ -1368,17 +1445,18 @@ get_accessibility_bus_address_x11 (void) char *display_name; display_name = spi_display_name (); - if (display_name != NULL) - { - bridge_display = XOpenDisplay (display_name); - g_free (display_name); - } + if (!display_name) + return NULL; + + bridge_display = XOpenDisplay (display_name); + g_free (display_name); + if (!bridge_display) { g_warning ("Could not open X display"); return NULL; } - + AT_SPI_BUS = XInternAtom (bridge_display, "AT_SPI_BUS", False); XGetWindowProperty (bridge_display, XDefaultRootWindow (bridge_display), @@ -1388,10 +1466,11 @@ get_accessibility_bus_address_x11 (void) &nitems, &leftover, &data_x11); XCloseDisplay (bridge_display); - data = g_strdup (data_x11); + data = g_strdup ((gchar *)data_x11); XFree (data_x11); return data; } +#endif static char * get_accessibility_bus_address_dbus (void) @@ -1423,9 +1502,9 @@ get_accessibility_bus_address_dbus (void) g_warning ("Error retrieving accessibility bus address: %s: %s", error.name, error.message); dbus_error_free (&error); - return NULL; + goto out; } - + { const char *tmp_address; if (!dbus_message_get_args (reply, @@ -1435,12 +1514,14 @@ get_accessibility_bus_address_dbus (void) DBUS_TYPE_INVALID)) { dbus_message_unref (reply); - return NULL; + goto out; } address = g_strdup (tmp_address); dbus_message_unref (reply); } - + +out: + dbus_connection_unref (session_bus); return address; } @@ -1457,12 +1538,14 @@ a11y_bus_free (void *data) } } +/** + * atspi_get_a11y_bus: (skip) + */ DBusConnection * atspi_get_a11y_bus (void) { - DBusConnection *bus = NULL; DBusError error; - char *address; + char *address = NULL; if (a11y_bus && dbus_connection_get_is_connected (a11y_bus)) return a11y_bus; @@ -1471,7 +1554,9 @@ atspi_get_a11y_bus (void) if (!dbus_connection_allocate_data_slot (&a11y_dbus_slot)) g_warning ("at-spi: Unable to allocate D-Bus slot"); +#ifdef HAVE_X11 address = get_accessibility_bus_address_x11 (); +#endif if (!address) address = get_accessibility_bus_address_dbus (); if (!address) @@ -1499,7 +1584,7 @@ atspi_get_a11y_bus (void) return NULL; } } - + /* Simulate a weak ref on the bus */ dbus_connection_set_data (a11y_bus, a11y_dbus_slot, a11y_bus, a11y_bus_free); @@ -1507,23 +1592,24 @@ atspi_get_a11y_bus (void) } /** - * Set the timeout used for method calls. If this is not set explicitly, - * a default of 0.8 ms is used. - * Note that at-spi2-registryd currently uses a timeout of 3 seconds when - * sending a keyboard event notification. This means that, if an AT makes - * a call in response to the keyboard notification and the application - * being called does not respond before the timeout is reached, - * at-spi2-registryd will time out on the keyboard event notification and - * pass the key onto the application (ie, reply to indicate that the key - * was not consumed), so this may make it undesirable to set a timeout - * larger than 3 seconds. + * atspi_set_timeout: + * @val: The timeout value, in milliseconds, or -1 to disable the timeout. + * @startup_time: The amount of time, in milliseconds, to allow to pass + * before enforcing timeouts on an application. Can be used to prevent + * timeout exceptions if an application is likely to block for an extended + * period of time on initialization. -1 can be passed to disable this + * behavior. * - * @val: The timeout value, in milliseconds, or -1 to disable the timeout. - * @startup_time: The amount of time, in milliseconds, to allow to pass - * before enforcing timeouts on an application. Can be used to prevent - * timeout exceptions if an application is likely to block for an extended - * period of time on initialization. -1 can be passed to disable this - * behavior. + * Set the timeout used for method calls. If this is not set explicitly, + * a default of 0.8 ms is used. + * Note that at-spi2-registryd currently uses a timeout of 3 seconds when + * sending a keyboard event notification. This means that, if an AT makes + * a call in response to the keyboard notification and the application + * being called does not respond before the timeout is reached, + * at-spi2-registryd will time out on the keyboard event notification and + * pass the key onto the application (ie, reply to indicate that the key + * was not consumed), so this may make it undesirable to set a timeout + * larger than 3 seconds. * * By default, the normal timeout is set to 800 ms, and the application startup * timeout is set to 15 seconds. @@ -1534,3 +1620,184 @@ atspi_set_timeout (gint val, gint startup_time) method_call_timeout = val; app_startup_time = startup_time; } + +/** + * atspi_set_main_context: + * @cnx: The #GMainContext to use. + * + * Sets the main loop context that AT-SPI should assume is in use when + * setting an idle callback. + * This function should be called by application-side implementors (ie, + * at-spi2-atk) when it is desirable to re-enter the main loop. + */ +void +atspi_set_main_context (GMainContext *cnx) +{ + if (atspi_main_context == cnx) + return; + if (process_deferred_messages_source != NULL) + { + g_source_destroy (process_deferred_messages_source); + process_deferred_messages_source = g_idle_source_new (); + g_source_set_callback (process_deferred_messages_source, + process_deferred_messages_callback, NULL, NULL); + g_source_attach (process_deferred_messages_source, cnx); + g_source_unref (process_deferred_messages_source); + } + atspi_main_context = cnx; + atspi_dbus_connection_setup_with_g_main (atspi_get_a11y_bus (), cnx); +} + +#ifdef DEBUG_REF_COUNTS +static void +print_disposed (gpointer key, gpointer value, gpointer data) +{ + AtspiAccessible *accessible = key; + if (accessible->parent.app) + return; + g_print ("disposed: %s %d\n", accessible->name, accessible->role); +} + +void +debug_disposed () +{ + g_hash_table_foreach (live_refs, print_disposed, NULL); +} +#endif + +gchar * +_atspi_name_compat (gchar *name) +{ + gchar *p = name; + + while (*p) + { + if (*p == '-') + *p = ' '; + p++; + } + return name; +} + +/** + * atspi_role_get_name: + * @role: an #AtspiRole object to query. + * + * Gets a localizable string that indicates the name of an #AtspiRole. + * DEPRECATED. + * + * Returns: a localizable string name for an #AtspiRole enumerated type. + **/ +gchar * +atspi_role_get_name (AtspiRole role) +{ + gchar *retval = NULL; + GTypeClass *type_class; + GEnumValue *value; + + type_class = g_type_class_ref (ATSPI_TYPE_ROLE); + g_return_val_if_fail (G_IS_ENUM_CLASS (type_class), NULL); + + value = g_enum_get_value (G_ENUM_CLASS (type_class), role); + + if (value) + { + retval = g_strdup (value->value_nick); + } + + g_type_class_unref (type_class); + + if (retval) + return _atspi_name_compat (retval); + + return NULL; +} + +GHashTable * +_atspi_dbus_update_cache_from_dict (AtspiAccessible *accessible, DBusMessageIter *iter) +{ + GHashTable *cache = _atspi_accessible_ref_cache (accessible); + DBusMessageIter iter_dict, iter_dict_entry, iter_struct, iter_variant; + + dbus_message_iter_recurse (iter, &iter_dict); + while (dbus_message_iter_get_arg_type (&iter_dict) != DBUS_TYPE_INVALID) + { + const char *key; + GValue *val = NULL; + dbus_message_iter_recurse (&iter_dict, &iter_dict_entry); + dbus_message_iter_get_basic (&iter_dict_entry, &key); + dbus_message_iter_next (&iter_dict_entry); + dbus_message_iter_recurse (&iter_dict_entry, &iter_variant); + if (!strcmp (key, "interfaces")) + { + _atspi_dbus_set_interfaces (accessible, &iter_variant); + } + else if (!strcmp (key, "Attributes")) + { + char *iter_sig = dbus_message_iter_get_signature (&iter_variant); + val = g_new0 (GValue, 1);; + g_value_init (val, G_TYPE_HASH_TABLE); + if (strcmp (iter_sig, "a{ss}") != 0) + { + dbus_free (iter_sig); + break; + } + dbus_free (iter_sig); + g_value_take_boxed (val, _atspi_dbus_hash_from_iter (&iter_variant)); + } + else if (!strcmp (key, "Component.ScreenExtents")) + { + dbus_int32_t d_int; + AtspiRect extents; + char *iter_sig = dbus_message_iter_get_signature (&iter_variant); + val = g_new0 (GValue, 1);; + g_value_init (val, ATSPI_TYPE_RECT); + if (strcmp (iter_sig, "(iiii)") != 0) + { + dbus_free (iter_sig); + break; + } + dbus_free (iter_sig); + dbus_message_iter_recurse (&iter_variant, &iter_struct); + dbus_message_iter_get_basic (&iter_struct, &d_int); + extents.x = d_int; + dbus_message_iter_next (&iter_struct); + dbus_message_iter_get_basic (&iter_struct, &d_int); + extents.y = d_int; + dbus_message_iter_next (&iter_struct); + dbus_message_iter_get_basic (&iter_struct, &d_int); + extents.width = d_int; + dbus_message_iter_next (&iter_struct); + dbus_message_iter_get_basic (&iter_struct, &d_int); + extents.height = d_int; + g_value_set_boxed (val, &extents); + } + if (val) + g_hash_table_insert (cache, g_strdup (key), val); + dbus_message_iter_next (&iter_dict); + } + + return cache; +} + +gboolean +_atspi_get_allow_sync () +{ + return allow_sync; +} + +gboolean +_atspi_set_allow_sync (gboolean val) +{ + gboolean ret = allow_sync; + + allow_sync = val; + return ret; +} + +void +_atspi_set_error_no_sync (GError **error) +{ + g_set_error_literal (error, ATSPI_ERROR, ATSPI_ERROR_SYNC_NOT_ALLOWED, + _("Attempted synchronous call where prohibited")); +}