2007-12-03 Li Yuan <li.yuan@sun.com>

        * idl/Accessibility_Collection.idl:
        * libspi/accessible.c: (spi_accessible_construct):
        * libspi/collection.c: (spi_collection_interface_new),
        (get_atkobject_from_servant), (get_collection_from_servant),
        (impl_createMatchRule), (impl_freeMatchRule), (child_interface_p),
        (match_states_all_p), (match_states_any_p), (match_states_none_p),
        (match_states_lookup), (match_roles_all_p), (match_roles_any_p),
        (match_roles_none_p), (match_roles_lookup),
        (match_interfaces_all_p), (match_interfaces_any_p),
        (match_interfaces_none_p), (match_interfaces_lookup),
        (match_attributes_all_p), (match_attributes_any_p),
        (match_attributes_none_p), (match_attributes_lookup), (traverse_p),
        (sort_order_canonical), (query_exec), (_accessible_list_to_set),
        (impl_getMatchesFrom), (impl_getMatchesTo), (impl_getMatches),
        (spi_collection_class_init), (spi_collection_init):
        * libspi/collection.h:
        Bug #326516. Patch from Ariel. Enhance collection support.


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

1 files changed, 13 insertions, 15 deletions

diff --git a/idl/Accessibility_Collection.idl b/idl/Accessibility_Collection.idl
index 738755ec..4af765f8 100644
--- a/idl/Accessibility_Collection.idl
+++ b/idl/Accessibility_Collection.idl
@@ -24,14 +24,10 @@
 #define __ACCESSIBILITY_COLLECTION_DEFINED__
  
 module Accessibility {
+  
 
-struct AccessibleSetEntry {
-         Accessible accessible;
-         string     name;
-         Role       role;
-};
+  typedef sequence<Accessible> AccessibleSet;
 
-typedef sequence<AccessibleSetEntry> AccessibleSet;
  
      interface MatchRule {
      };
@@ -74,23 +70,25 @@ typedef sequence<AccessibleSetEntry> AccessibleSet;
 
 	void             freeMatchRule (in MatchRule rule);
 
-	AccessibleSet getChildren (in MatchRule rule,
-                                   in SortOrder sortby,
-				   in boolean recurse,
-                                   inout long count); /* inOut not accepted */
+	AccessibleSet getMatches (in MatchRule rule,
+                                  in SortOrder sortby,
+				  in long count,
+                                  in boolean traverse); 
 
-	AccessibleSet getPreviousChildren (in Accessible current_object,
+	AccessibleSet getMatchesTo (in Accessible current_object,
                                            in MatchRule rule, 
                                            in SortOrder sortby, 
                                            in boolean recurse,
-                                           inout long count);
+                                           in long count,
+                                           in boolean traverse);
 
 
-        AccessibleSet getNextChildren (in Accessible current_object,
+        AccessibleSet getMatchesFrom (in Accessible current_object,
 				       in MatchRule rule, 
                                        in SortOrder sortby, 
-                                       in boolean recurse,
-                                       inout long count);
+                                       in boolean restrict,
+				       in long count,
+                                       in boolean traverse);
 
         Accessible getActiveDescendant ();