2003-03-07 Padraig O'Briain <padraig.obriain@sun.com>

	* atk-bridge/bridge.c:
	Change atk_signal_child_changed to atk_signal_children_changed.
	Reorganize code in spi_atk_bridge_signal_listener().

	* test/event-listener-test.c:
	Add children_changed_listener and report_children_changed_event()
	to test AccessibleChildEvent_getChildAccessible.

git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@409 e2bd861d-eb25-0410-b326-f6ed22b6b98c

diff --git a/ChangeLog b/ChangeLog
index 1229b45..4db5b67 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2003-03-07  Padraig O'Briain <padraig.obriain@sun.com>
+
+       * atk-bridge/bridge.c:
+       Change atk_signal_child_changed to atk_signal_children_changed. 
+       Reorganize code in spi_atk_bridge_signal_listener().
+
+       * test/event-listener-test.c:
+       Add children_changed_listener and report_children_changed_event()
+       to test AccessibleChildEvent_getChildAccessible.
+
 2003-03-05  Padraig O'Briain <padraig.obriain@sun.com>
 
        * cspi/spi_event.c (cspi_internal_event_get_text): Change

diff --git a/atk-bridge/bridge.c b/atk-bridge/bridge.c
index b1666da..0d83791 100644 (file)
--- a/atk-bridge/bridge.c
+++ b/atk-bridge/bridge.c
@@ -57,11 +57,10 @@ static guint toplevel_handler;
    static GQuark atk_quark_property_changed_table_caption;
    static GQuark atk_quark_property_changed_table_column_description;
    static GQuark atk_quark_property_changed_table_row_description;
-   static guint atk_signal_property_changed;
 */
 
 static guint atk_signal_text_changed;
-static guint atk_signal_child_changed;
+static guint atk_signal_children_changed;
 static guint atk_signal_active_descendant_changed;
 
 /* NOT YET USED
@@ -126,7 +125,7 @@ extern void gnome_accessibility_module_shutdown (void);
 static void
 spi_atk_bridge_init_event_type_consts ()
 {
-  atk_signal_child_changed = g_signal_lookup ("child_changed", 
+  atk_signal_children_changed = g_signal_lookup ("children_changed", 
                                              ATK_TYPE_OBJECT);
   atk_signal_text_changed = g_signal_lookup ("text_changed", 
                                             ATK_TYPE_TEXT);
@@ -752,6 +751,22 @@ spi_atk_bridge_signal_listener (GSignalInvocationHint *signal_hint,
         detail1 = g_value_get_int (param_values + 1);
       spi_init_any_nil (&any);
     }
+  else if ((signal_query.signal_id == atk_signal_children_changed) && gobject)
+    {
+      ao = atk_object_ref_accessible_child (ATK_OBJECT (gobject), 
+                                           detail1);
+      if (ao) 
+        {
+          s_ao = spi_accessible_new (ao);
+          c_obj = BONOBO_OBJREF (s_ao);
+          spi_init_any_object (&any, &c_obj);
+         g_object_unref (ao);
+       }
+      else
+       {
+         spi_init_any_nil (&any);
+       }
+    }
   else
     {
       if (G_VALUE_TYPE (param_values + 1) == G_TYPE_INT)
@@ -766,22 +781,6 @@ spi_atk_bridge_signal_listener (GSignalInvocationHint *signal_hint,
                                  detail1+detail2);
           spi_init_any_string (&any, &sp);
         }
-      else if ((signal_query.signal_id == atk_signal_child_changed) && gobject)
-        {
-          ao = atk_object_ref_accessible_child (ATK_OBJECT (gobject), 
-                                               detail1);
-          if (ao) 
-           {
-              s_ao = spi_accessible_new (ao);
-              c_obj = BONOBO_OBJREF (s_ao);
-              spi_init_any_object (&any, &c_obj);
-             g_object_unref (ao);
-           }
-          else
-           {
-             spi_init_any_nil (&any);
-           }
-        }
       else
         {
          spi_init_any_nil (&any);

diff --git a/test/event-listener-test.c b/test/event-listener-test.c
index 15aff94..a6ca6fa 100644 (file)
--- a/test/event-listener-test.c
+++ b/test/event-listener-test.c
@@ -31,6 +31,7 @@ static void report_event  (const AccessibleEvent *event, void *user_data);
 static void report_detail_event  (const AccessibleEvent *event, void *user_data);
 static void report_detail1_event  (const AccessibleEvent *event, void *user_data);
 static void report_text_event  (const AccessibleEvent *event, void *user_data);
+static void report_children_changed_event (const AccessibleEvent *event, void *user_data);
 static void timing_test_event (const AccessibleEvent *event, void *user_data);
 static SPIBoolean report_mouse_event  (const AccessibleDeviceEvent *event, void *user_data);
 
@@ -39,6 +40,7 @@ static AccessibleEventListener *specific_listener;
 static AccessibleEventListener *detail1_listener;
 static AccessibleEventListener *test_listener;
 static AccessibleEventListener *text_listener;
+static AccessibleEventListener *children_changed_listener;
 static AccessibleDeviceListener *mouse_device_listener;
 static gint n_elements_traversed = 0;
 static GTimer *timer;
@@ -94,6 +96,8 @@ main (int argc, char **argv)
          report_detail_event, NULL); 
   text_listener = SPI_createAccessibleEventListener (
          report_text_event, NULL);
+  children_changed_listener = SPI_createAccessibleEventListener (
+         report_children_changed_event, NULL);
   test_listener = SPI_createAccessibleEventListener (
          timing_test_event, NULL);
   mouse_device_listener = SPI_createAccessibleDeviceListener (
@@ -126,10 +130,8 @@ main (int argc, char **argv)
     "object:state-changed:focused"); */
   SPI_registerGlobalEventListener (generic_listener,
                                   "object:selection-changed"); 
-  SPI_registerGlobalEventListener (generic_listener,
+  SPI_registerGlobalEventListener (children_changed_listener,
                                   "object:children-changed"); 
-/*  SPI_registerGlobalEventListener (specific_listener,
-    "object:children-changed:add"); */
   SPI_registerGlobalEventListener (generic_listener,
                                   "object:active-descendant"); 
   SPI_registerGlobalEventListener (generic_listener,
@@ -289,12 +291,29 @@ report_text_event (const AccessibleEvent *event, void *user_data)
   char *s = Accessible_getName (event->source);
   fprintf (stderr, "(detail) %s %s %d %d\n", event->type, s,
           event->detail1, event->detail2);
-  if (s) SPI_freeString (s);
+  SPI_freeString (s);
   s = AccessibleTextChangedEvent_getChangeString (event);
   fprintf (stderr, "context string %s\n", (s) ? s : "<nil>");
   SPI_freeString (s);
 }
 
+void
+report_children_changed_event (const AccessibleEvent *event, void *user_data)
+{
+  char *s = Accessible_getName (event->source);
+  char *s1;
+  Accessible *ao;
+
+  ao = AccessibleChildChangedEvent_getChildAccessible (event);
+  s1 = Accessible_getName (ao);
+  fprintf (stderr, "(detail) %s parent: %s child: %s %d %d\n", event->type, 
+           s ? s : "<null>", s1 ? s1 : "<null>",
+          event->detail1, event->detail2);
+  SPI_freeString (s);
+  SPI_freeString (s1);
+  Accessible_unref (ao);
+}
+
 SPIBoolean
 report_mouse_event (const AccessibleDeviceEvent *event, void *user_data)
 {