*/
#include <atk/atk.h>
+#include <string.h>
#include "accessible-cache.h"
#include "accessible-register.h"
static void
add_subtree (SpiCache *cache, AtkObject * accessible);
+static gboolean
+add_pending_items (gpointer data);
+
/*---------------------------------------------------------------------------*/
static void
spi_cache_finalize (GObject * object);
-static void
-spi_cache_dispose (GObject * object);
-
/*---------------------------------------------------------------------------*/
enum
spi_cache_parent_class = g_type_class_ref (G_TYPE_OBJECT);
object_class->finalize = spi_cache_finalize;
- object_class->dispose = spi_cache_dispose;
cache_signals [OBJECT_ADDED] = \
g_signal_new ("object-added",
spi_cache_init (SpiCache * cache)
{
cache->objects = g_hash_table_new (g_direct_hash, g_direct_equal);
+ cache->add_traversal = g_queue_new ();
#ifdef SPI_ATK_DEBUG
if (g_thread_supported ())
add_subtree (cache, spi_global_app_data->root);
- atk_add_global_event_listener (child_added_listener,
- "Gtk:AtkObject:children-changed");
+ cache->child_added_listener = atk_add_global_event_listener (child_added_listener,
+ "Gtk:AtkObject:children-changed");
g_signal_connect (G_OBJECT (spi_global_app_data->root),
"children-changed::add",
{
SpiCache *cache = SPI_CACHE (object);
- g_free (cache->objects);
+ while (!g_queue_is_empty (cache->add_traversal))
+ g_object_unref (G_OBJECT (g_queue_pop_head (cache->add_traversal)));
+ g_queue_free (cache->add_traversal);
+ g_hash_table_unref (cache->objects);
- G_OBJECT_CLASS (spi_cache_parent_class)->finalize (object);
-}
+ g_signal_handlers_disconnect_by_func (spi_global_register,
+ (GCallback) remove_object, cache);
-static void
-spi_cache_dispose (GObject * object)
-{
- SpiCache *cache = SPI_CACHE (object);
+ g_signal_handlers_disconnect_by_func (G_OBJECT (spi_global_app_data->root),
+ (GCallback) toplevel_added_listener, NULL);
- G_OBJECT_CLASS (spi_cache_parent_class)->dispose (object);
+ atk_remove_global_event_listener (cache->child_added_listener);
+
+ G_OBJECT_CLASS (spi_cache_parent_class)->finalize (object);
}
/*---------------------------------------------------------------------------*/
g_signal_emit (cache, cache_signals [OBJECT_REMOVED], 0, gobj);
g_hash_table_remove (cache->objects, gobj);
}
+ else if (g_queue_remove (cache->add_traversal, gobj))
+ {
+ g_object_unref (gobj);
+ }
}
static void
/*---------------------------------------------------------------------------*/
static GStaticRecMutex cache_mutex = G_STATIC_REC_MUTEX_INIT;
-static GStaticMutex recursion_check_guard = G_STATIC_MUTEX_INIT;
+#ifdef SPI_ATK_DEBUG
+static GStaticMutex recursion_check_guard = G_STATIC_MUTEX_INIT;
static gboolean recursion_check = FALSE;
static gboolean
recursion_check = FALSE;
g_static_mutex_unlock (&recursion_check_guard);
}
+#endif /* SPI_ATK_DEBUG */
/*---------------------------------------------------------------------------*/
static void
add_subtree (SpiCache *cache, AtkObject * accessible)
{
+ g_return_if_fail (ATK_IS_OBJECT (accessible));
+
+ g_object_ref (accessible);
+ g_queue_push_tail (cache->add_traversal, accessible);
+ add_pending_items (cache);
+}
+
+static gboolean
+add_pending_items (gpointer data)
+{
+ SpiCache *cache = SPI_CACHE (data);
AtkObject *current;
- GQueue *traversal;
GQueue *to_add;
- g_return_if_fail (ATK_IS_OBJECT (accessible));
-
- traversal = g_queue_new ();
to_add = g_queue_new ();
- g_object_ref (accessible);
- g_queue_push_tail (traversal, accessible);
-
- while (!g_queue_is_empty (traversal))
+ while (!g_queue_is_empty (cache->add_traversal))
{
AtkStateSet *set;
-
- current = g_queue_pop_head (traversal);
+
+ /* cache->add_traversal holds a ref to current */
+ current = g_queue_pop_head (cache->add_traversal);
set = atk_object_ref_state_set (current);
- if (!atk_state_set_contains_state (set, ATK_STATE_TRANSIENT))
+ if (set && !atk_state_set_contains_state (set, ATK_STATE_TRANSIENT))
{
+ /* transfer the ref into to_add */
g_queue_push_tail (to_add, current);
if (!spi_cache_in (cache, G_OBJECT (current)) &&
- !atk_state_set_contains_state (set, ATK_STATE_MANAGES_DESCENDANTS))
+ !atk_state_set_contains_state (set, ATK_STATE_MANAGES_DESCENDANTS) &&
+ !atk_state_set_contains_state (set, ATK_STATE_DEFUNCT))
{
- append_children (current, traversal);
+ append_children (current, cache->add_traversal);
}
}
+ else
+ {
+ /* drop the ref for the removed object */
+ g_object_unref (current);
+ }
- g_object_unref (set);
+ if (set)
+ g_object_unref (set);
}
while (!g_queue_is_empty (to_add))
{
current = g_queue_pop_head (to_add);
+
+ /* Make sure object is registerd so we are notified if it goes away */
+ g_free (spi_register_object_to_path (spi_global_register,
+ G_OBJECT (current)));
+
add_object (cache, G_OBJECT(current));
g_object_unref (G_OBJECT (current));
}
- g_queue_free (traversal);
g_queue_free (to_add);
+ cache->add_pending_idle = 0;
+ return FALSE;
}
/*---------------------------------------------------------------------------*/
const GValue * param_values, gpointer data)
{
SpiCache *cache = spi_global_cache;
-
AtkObject *accessible;
- AtkObject *child;
const gchar *detail = NULL;
if (signal_hint->detail)
detail = g_quark_to_string (signal_hint->detail);
- if (!g_strcmp0 (detail, "add"))
+ if (detail && !strncmp (detail, "add", 3))
{
gpointer child;
int index = g_value_get_uint (param_values + 1);
child = g_value_get_pointer (param_values + 2);
+ if (!child)
+ {
+ g_static_rec_mutex_unlock (&cache_mutex);
+ return;
+ }
- if (!ATK_IS_OBJECT (child))
- {
- child = atk_object_ref_accessible_child (accessible, index);
- }
- add_subtree (cache, child);
+ g_object_ref (child);
+ g_queue_push_tail (cache->add_traversal, child);
+
+ if (cache->add_pending_idle == 0)
+ cache->add_pending_idle = g_idle_add (add_pending_items, cache);
}
#ifdef SPI_ATK_DEBUG
recursion_check_unset ();
{
child = atk_object_ref_accessible_child (accessible, index);
}
- add_subtree (cache, child);
+ else
+ g_object_ref (child);
+
+ g_queue_push_tail (cache->add_traversal, child);
+
+ if (cache->add_pending_idle == 0)
+ cache->add_pending_idle = g_idle_add (add_pending_items, cache);
#ifdef SPI_ATK_DEBUG
recursion_check_unset ();
#endif
gboolean
spi_cache_in (SpiCache * cache, GObject * object)
{
+ if (!cache)
+ return FALSE;
+
if (g_hash_table_lookup_extended (cache->objects,
object,
NULL,