2007-04-02 Ariel Rios <ariel@gnu.org>

        Implement the Matchrule interface required for Collection.
        See bug #405774.

        * cspi/Makefile.am:
        * cspi/spi-impl.h:
        * cspi/spi.h:
        * cspi/spi_accessible.c: (Accessible_isCollection),
        (Accessible_isMatchRule), (Accessible_getCollection),
        (Accessible_getMatchRule):
        * cspi/spi_collection.c:  new file.
        * cspi/spi_matchrule.c:  new file.
        * idl/Accessibility.idl:
        * idl/Accessibility_Collection.idl: new file.
        * idl/Makefile.am:
        * libspi/Makefile.am:
        * libspi/collection.c: new file.
        * libspi/collection.h: new file.
        * libspi/libspi.h:
        * libspi/matchrule.c: new file.
        * libspi/matchrule.h: new file.



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

3 files changed, 106 insertions, 0 deletions

diff --git a/idl/Accessibility.idl b/idl/Accessibility.idl
index c5be877f..2b9b08e2 100644
--- a/idl/Accessibility.idl
+++ b/idl/Accessibility.idl
@@ -100,6 +100,7 @@
  */
 #include <Accessibility_Accessible.idl>
 #include <Accessibility_Action.idl>
+#include <Accessibility_Collection.idl>
 #include <Accessibility_Component.idl>
 #include <Accessibility_Document.idl>
 #include <Accessibility_Hyperlink.idl>
diff --git a/idl/Accessibility_Collection.idl b/idl/Accessibility_Collection.idl
new file mode 100644
index 00000000..738755ec
--- /dev/null
+++ b/idl/Accessibility_Collection.idl
@@ -0,0 +1,104 @@
+ /* 
+  * AT-SPI - Assistive Technology Service Provider Interface 
+  * (Gnome Accessibility Project; http://developer.gnome.org/projects/gap)
+  *
+  * Copyright 2005 Sun Microsystems, Inc.
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Library General Public
+  * License as published by the Free Software Foundation; either
+  * version 2 of the License, or (at your option) any later version.
+  *
+  * This library is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  * Library General Public License for more details.
+  *
+  * You should have received a copy of the GNU Library General Public
+  * License along with this library; if not, write to the
+  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+  * Boston, MA 02111-1307, USA.
+  */
+
+#ifndef __ACCESSIBILITY_COLLECTION_DEFINED__
+#define __ACCESSIBILITY_COLLECTION_DEFINED__
+ 
+module Accessibility {
+
+struct AccessibleSetEntry {
+         Accessible accessible;
+         string     name;
+         Role       role;
+};
+
+typedef sequence<AccessibleSetEntry> AccessibleSet;
+ 
+     interface MatchRule {
+     };
+
+
+     interface Collection : Bonobo::Unknown {
+ 
+       enum SortOrder {
+	    SORT_ORDER_INVALID,
+	    SORT_ORDER_CANONICAL, 
+	    SORT_ORDER_FLOW, 
+	    SORT_ORDER_TAB, 
+	    SORT_ORDER_REVERSE_CANONICAL, 
+	    SORT_ORDER_REVERSE_FLOW, 
+	    SORT_ORDER_REVERSE_TAB, 
+	    SORT_ORDER_LAST_DEFINED
+       };
+   
+       enum MatchType {
+           MATCH_INVALID, 
+           MATCH_ALL, 
+           MATCH_ANY, 
+	   MATCH_NONE,
+	   MATCH_EMPTY,
+           MATCH_LAST_DEFINED
+	   };
+
+
+	boolean isAncestorOf (in Accessible object); 
+  
+	MatchRule        createMatchRule (in StateSet states,
+					  in MatchType statematchtype,
+                                          in AttributeSet attributes,
+                                          in MatchType attributematchtype,
+                                          in RoleSet roles,
+					  in MatchType rolematchtype,
+                                          in string interfaces,
+                                          in MatchType interfacematchtype,
+                                          in boolean invert);
+
+	void             freeMatchRule (in MatchRule rule);
+
+	AccessibleSet getChildren (in MatchRule rule,
+                                   in SortOrder sortby,
+				   in boolean recurse,
+                                   inout long count); /* inOut not accepted */
+
+	AccessibleSet getPreviousChildren (in Accessible current_object,
+                                           in MatchRule rule, 
+                                           in SortOrder sortby, 
+                                           in boolean recurse,
+                                           inout long count);
+
+
+        AccessibleSet getNextChildren (in Accessible current_object,
+				       in MatchRule rule, 
+                                       in SortOrder sortby, 
+                                       in boolean recurse,
+                                       inout long count);
+
+        Accessible getActiveDescendant ();
+        
+	void unImplemented ();
+	void unImplemented2 ();
+        void unImplemented3 ();
+        void unImplemented4 ();	
+   };
+};
+
+#endif
diff --git a/idl/Makefile.am b/idl/Makefile.am
index 261f4e69..e7fa5ce3 100644
--- a/idl/Makefile.am
+++ b/idl/Makefile.am
@@ -5,6 +5,7 @@ idl_DATA =					\
 	Accessibility_Accessible.idl		\
 	Accessibility_Action.idl		\
 	Accessibility_Application.idl		\
+	Accessibility_Collection.idl		\
 	Accessibility_Component.idl		\
 	Accessibility_Desktop.idl		\
 	Accessibility_Document.idl		\