[at-spi2-atk] Ensure the child data is added to children-changed events properly.
- From: Mark Doffman <markdoffman src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [at-spi2-atk] Ensure the child data is added to children-changed events properly.
- Date: Mon, 11 Jan 2010 18:45:46 +0000 (UTC)
commit 69ac4b1ac14a6da7fd248e97918088eee59e3d6d
Author: Mark Doffman <mark doffman codethink co uk>
Date: Mon Jan 11 10:24:57 2010 -0800
Ensure the child data is added to children-changed events properly.
atk-adaptor/event.c | 53 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 45 insertions(+), 8 deletions(-)
---
diff --git a/atk-adaptor/event.c b/atk-adaptor/event.c
index e65cdd4..f9f78f2 100644
--- a/atk-adaptor/event.c
+++ b/atk-adaptor/event.c
@@ -715,10 +715,12 @@ children_changed_event_listener (GSignalInvocationHint * signal_hint,
guint n_param_values,
const GValue * param_values, gpointer data)
{
- AtkObject *accessible, *child;
GSignalQuery signal_query;
const gchar *name, *minor;
- gint detail1, detail2;
+ gint detail1, detail2 = 0;
+
+ AtkObject *accessible, *ao;
+ gpointer child;
g_signal_query (signal_hint->signal_id, &signal_query);
name = signal_query.signal_name;
@@ -726,25 +728,50 @@ children_changed_event_listener (GSignalInvocationHint * signal_hint,
accessible = ATK_OBJECT (g_value_get_object (¶m_values[0]));
minor = g_quark_to_string (signal_hint->detail);
- if (G_VALUE_TYPE (¶m_values[1]) == G_TYPE_INT)
- detail1 = g_value_get_int (¶m_values[1]);
+ detail1 = g_value_get_uint (param_values + 1);
+ child = g_value_get_pointer (param_values + 2);
- if (G_VALUE_TYPE (¶m_values[2]) == G_TYPE_OBJECT)
+ if (ATK_IS_OBJECT (child))
{
- child = ATK_OBJECT(g_value_get_pointer (¶m_values[2]));
+ ao = ATK_OBJECT (child);
emit_event (accessible, ITF_EVENT_OBJECT, name, minor, detail1, detail2,
- "(so)", child, append_object);
+ "(so)", ao, append_object);
+ }
+ else if ((minor != NULL) && (strcmp (minor, "add") == 0))
+ {
+ ao = atk_object_ref_accessible_child (accessible,
+ detail1);
+ emit_event (accessible, ITF_EVENT_OBJECT, name, minor, detail1, detail2,
+ "(so)", ao, append_object);
}
else
{
emit_event (accessible, ITF_EVENT_OBJECT, name, minor, detail1, detail2,
- "s", "", append_basic);
+ "(so)", ao, append_object);
}
+
return TRUE;
}
/*---------------------------------------------------------------------------*/
+static void
+toplevel_added_event_listener (AtkObject * accessible,
+ guint index, AtkObject * child)
+{
+ emit_event (accessible, ITF_EVENT_OBJECT, "children-changed", "add", index, 0,
+ "(so)", child, append_object);
+}
+
+static void
+toplevel_removed_event_listener (AtkObject * accessible,
+ guint index, AtkObject * child)
+{
+ emit_event (accessible, ITF_EVENT_OBJECT, "children-changed", "remove", index, 0,
+ "(so)", child, append_object);
+}
+
+/*---------------------------------------------------------------------------*/
/*
* Generic signal converter and forwarder.
@@ -870,6 +897,16 @@ spi_atk_register_event_listeners (void)
atk_add_global_event_listener (children_changed_event_listener,
"Gtk:AtkObject:children-changed");
+#if 0
+ g_signal_connect (G_OBJECT (spi_global_app_data->root),
+ "children-changed::add",
+ (GCallback) toplevel_added_event_listener, NULL);
+
+ g_signal_connect (G_OBJECT (spi_global_app_data->root),
+ "children-changed::remove",
+ (GCallback) toplevel_removed_event_listener, NULL);
+#endif
+
/*
* May add the following listeners to implement preemptive key listening for GTK+
*
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]