2001-12-08 Michael Meeks <michael@ximian.com>
[platform/core/uifw/at-spi2-atk.git] / cspi / spi.h
index de73082..a0ca6c8 100644 (file)
@@ -1,25 +1,27 @@
-
 #ifndef _SPI_H
 #define _SPI_H
 
-/* Implementation private definitions */
-#include "spi-impl.h"
+#include <glib/gmacros.h>
+
+#include <cspi/spi-impl.h>
+/*
+ * Definitions for AccessibleRole, AccessibleState,
+ * AccessibleEvent, and event listeners.
+ */
+#include <cspi/spi-roletypes.h>
+#include <cspi/spi-statetypes.h>
+#include <cspi/spi-listener.h>
 
 /*
- * Definitions for SPI_ACCESSIBLE_STATE , SPI_ACCESSIBLE_ROLE, SpiAccessibleEvent,
- *      and event listeners.
+ * Auxiliary typedefs and mask definitions
  */
+#include <libspi/keymasks.h>
 
-#include "spi-roletypes.h"
-#include "spi-statetypes.h"
-#include "spi-listener.h"
+G_BEGIN_DECLS
 
 /*
- *
  * Enumerated type for text boundary types
- *
  */
-
 typedef enum
 {
   SPI_TEXT_BOUNDARY_CHAR,
@@ -31,9 +33,7 @@ typedef enum
   SPI_TEXT_BOUNDARY_LINE_START,
   SPI_TEXT_BOUNDARY_LINE_END,
   SPI_TEXT_BOUNDARY_ATTRIBUTE_RANGE
-} SPI_TEXT_BOUNDARY_TYPE;
-
-
+} AccessibleTextBoundaryType;
 
 /*
  *
@@ -43,711 +43,259 @@ typedef enum
 
 typedef enum
 {
-  RELATION_LABEL_FOR,
-  RELATION_LABELED_BY,
-  RELATION_CONTROLLER_FOR,
-  RELATION_CONTROLLED_BY,
-  RELATION_MEMBER_OF
-} RELATION_TYPE;
+  SPI_RELATION_LABEL_FOR,
+  SPI_RELATION_LABELED_BY,
+  SPI_RELATION_CONTROLLER_FOR,
+  SPI_RELATION_CONTROLLED_BY,
+  SPI_RELATION_MEMBER_OF
+} AccessibleRelationType;
 
 
 /* don't change the order of these ! */
-typedef enum _AccessibleCoordType {
-  COORD_TYPE_SCREEN,
-  COORD_TYPE_WINDOW
-} SpiAccessibleCoordType;
-
-typedef enum _KeyEventType {
-  KEY_PRESSED,
-  KEY_RELEASED
-} KeyEventType;
-
-typedef enum _KeySynthType {
-  KEY_PRESS,
-  KEY_RELEASE, 
-  KEY_PRESSRELEASE,
-  KEY_SYM
-} KeySynthType;
-
-typedef enum _KeyListenerSyncType {
-  KEYSPI_LISTENER_SYNCHRONOUS = 1,
-  KEYSPI_LISTENER_CANCONSUME = 2,
-  KEYSPI_LISTENER_ALLWINDOWS = 4
-} KeyListenerSyncType;
-
-typedef unsigned long KeyEventMask;
-
-typedef struct _KeyStroke
-{
-       long keyID;
-       short keycode;
-       KeyEventType type;
-       unsigned short modifiers;
-} KeyStroke;
-
-typedef struct _KeySet
+typedef enum {
+  SPI_COORD_TYPE_SCREEN,
+  SPI_COORD_TYPE_WINDOW
+} AccessibleCoordType;
+
+typedef enum {
+  SPI_KEY_PRESS,
+  SPI_KEY_RELEASE, 
+  SPI_KEY_PRESSRELEASE,
+  SPI_KEY_SYM
+} AccessibleKeySynthType;
+
+typedef enum {
+  SPI_KEYLISTENER_NOSYNC = 0,
+  SPI_KEYLISTENER_SYNCHRONOUS = 1,
+  SPI_KEYLISTENER_CANCONSUME = 2,
+  SPI_KEYLISTENER_ALL_WINDOWS = 4
+} AccessibleKeyListenerSyncType;
+
+typedef unsigned long AccessibleKeyEventMask;
+
+/**
+ * AccessibleComponentLayer:
+ * @SPI_LAYER_INVALID: The layer cannot be determined or is somehow undefined.
+ * @SPI_LAYER_BACKGROUND: Component belongs to the destop background.
+ * @SPI_LAYER_CANVAS: Component is a canvas backdrop or drawing area.
+ * @SPI_LAYER_WIDGET: Component is a 'normal' widget.
+ * @SPI_LAYER_MDI: Component is drawn in the MDI layer and may have valid
+ *                          Z-information relative to other MDI-layer components.
+ * @SPI_LAYER_POPUP: Component is in the popup layer, above other widgets and
+ *                          MDI components.
+ * @SPI_LAYER_OVERLAY: Component is in the overlay plane - this value is reserved
+ *                          for future use.
+ * @SPI_LAYER_LAST_DEFINED: Used to determine the last valid value in the enum,
+ *                          should not be encountered. 
+ **/
+typedef enum {
+    SPI_LAYER_INVALID,
+    SPI_LAYER_BACKGROUND,
+    SPI_LAYER_CANVAS,
+    SPI_LAYER_WIDGET,
+    SPI_LAYER_MDI,
+    SPI_LAYER_POPUP,
+    SPI_LAYER_OVERLAY,
+    SPI_LAYER_LAST_DEFINED     
+} AccessibleComponentLayer;
+
+
+/**
+ * AccessibleKeySet:
+ * @keysyms:
+ * @keycodes:
+ * @len:
+ *
+ * Structure containing identifying information about a set of keycode or
+ *        keysyms.
+ **/
+typedef struct _AccessibleKeySet
 {
        unsigned long *keysyms;
        unsigned short *keycodes;
        short len;
-} KeySet;
-
-#define ALL_KEYS ((void *)NULL)
-
-/*
- *
- * Basic SPI initialization and event loop function prototypes
- *
- */
-
-/**
- * SPI_init:
- *
- * Connects to the accessibility registry and initializes the SPI.
- *
- * Returns: 0 on success, otherwise an integer error code.
- **/
-int
-SPI_init (void);
-
-/**
- * SPI_event_main:
- * @isGNOMEApp: a #boolean indicating whether the client of the SPI
- *              will use the Gnome event loop or not.
- *
- * Starts/enters the main event loop for the SPI services.
- *
- * (NOTE: This method does not return control, it is exited via a call to exit()
- * from within an event handler).
- *
- **/
-void
-SPI_event_main (boolean isGNOMEApp);
-
-/**
- * SPI_event_is_ready:
- *
- * Checks to see if an SPI event is waiting in the event queue.
- * Used by clients that don't wish to use SPI_event_main().
- * Not Yet Implemented.
- *
- * Returns: #TRUE if an event is waiting, otherwise #FALSE.
- *
- **/
-boolean
-SPI_eventIsReady ();
-
-/**
- * SPI_nextEvent:
- *
- * Gets the next event in the SPI event queue; blocks if no event
- * is pending.
- * Used by clients that don't wish to use SPI_event_main().
- * Not Yet Implemented.
- *
- * Returns: the next #AccessibleEvent in the SPI event queue.
- *
- **/
-SpiAccessibleEvent *
-SPI_nextEvent (boolean waitForEvent);
-
-/**
- * SPI_exit:
- *
- * Disconnects from the Accessibility SpiRegistry and releases resources.
- * Not Yet Implemented.
- *
- **/
-void
-SPI_exit (void);
-
-/*
- * Event SpiListener creation and support.
- */
-
-/**
- * createEventListener:
- * @callback : an #AccessibleEventListenerCB callback function, or NULL.
- *
- * Create a new #AccessibleEventListener with a specified callback function.
- *
- * Returns: a pointer to a newly-created #AccessibleEventListener.
- *
- **/
-SpiAccessibleEventListener *
-createEventListener (SpiAccessibleEventListenerCB callback);
-
-/**
- * EventListener_addCallback:
- * @listener: the #AccessibleEventListener instance to modify.
- * @callback: an #AccessibleEventListenerCB function pointer.
- *
- * Add an in-process callback function to an existing SpiAccessibleEventListener.
- *
- * Returns: #TRUE if successful, otherwise #FALSE.
- *
- **/
-boolean
-EventListener_addCallback (SpiAccessibleEventListener *listener,
-                           SpiAccessibleEventListenerCB callback);
-
-/**
- * EventListener_removeCallback:
- * @listener: the #AccessibleEventListener instance to modify.
- * @callback: an #AccessibleEventListenerCB function pointer.
- *
- * Remove an in-process callback function from an existing SpiAccessibleEventListener.
- *
- * Returns: #TRUE if successful, otherwise #FALSE.
- *
- **/
-boolean
-EventListener_removeCallback (SpiAccessibleEventListener *listener,
-                              SpiAccessibleEventListenerCB callback);
-
-/**
- * createKeyListener:
- * @callback : an #KeystrokeListenerCB callback function, or NULL.
- *
- * Create a new #KeystrokeListener with a specified callback function.
- *
- * Returns: a pointer to a newly-created #KeystrokeListener.
- *
- **/
-KeystrokeListener *
-createKeystrokeListener (KeystrokeListenerCB callback);
-
-/**
- * KeystrokeListener_addCallback:
- * @listener: the #KeystrokeListener instance to modify.
- * @callback: an #KeystrokeListenerCB function pointer.
- *
- * Add an in-process callback function to an existing #KeystrokeListener.
- *
- * Returns: #TRUE if successful, otherwise #FALSE.
- *
- **/
-boolean
-KeystrokeListener_addCallback (KeystrokeListener *listener,
-                              KeystrokeListenerCB callback);
-
-/**
- * KeystrokeListener_removeCallback:
- * @listener: the #KeystrokeListener instance to modify.
- * @callback: an #KeystrokeListenerCB function pointer.
- *
- * Remove an in-process callback function from an existing #KeystrokeListener.
- *
- * Returns: #TRUE if successful, otherwise #FALSE.
- *
- **/
-boolean
-KeystrokeListener_removeCallback (KeystrokeListener *listener,
-                                 KeystrokeListenerCB callback);
-
-/*
- *
- * Global functions serviced by the registry
- *
- */
-
-/**
- * registerGlobalEventListener:
- * @listener: the #AccessibleEventListener to be registered against an event type.
- * @callback: a character string indicating the type of events for which
- *            notification is requested.  Format is
- *            EventClass:major_type:minor_type:detail
- *            where all subfields other than EventClass are optional.
- *            EventClasses include "Focus", "Window", "Mouse",
- *            and toolkit events (e.g. "Gtk", "AWT").
- *            Examples: "focus:", "Gtk:GtkWidget:button_press_event".
- *
- * NOTE: this string may be UTF-8, but should not contain byte value 56 (ascii ':'),
- *            except as a delimiter, since non-UTF-8 string delimiting
- *            functions are used internally.  In general, listening to
- *            toolkit-specific events is not recommended.
- *
- * Add an in-process callback function to an existing SpiAccessibleEventListener.
- *
- * Returns: #TRUE if successful, otherwise #FALSE.
- *
- **/
-boolean
-registerGlobalEventListener (SpiAccessibleEventListener *listener,
-                             char *eventType);
-
-/**
- * getDesktopCount:
- *
- * Get the number of virtual desktops.
- * NOTE: currently multiple virtual desktops are not implemented, this
- *       function always returns '1'.
- *
- * Returns: an integer indicating the number of active virtual desktops.
- *
- **/
-int
-getDesktopCount ();
-
-/**
- * getDesktop:
- * @i: an integer indicating which of the accessible desktops is to be returned.
- *
- * Get the virtual desktop indicated by index @i.
- * NOTE: currently multiple virtual desktops are not implemented, this
- *       function always returns '1'.
- *
- * Returns: a pointer to the 'i-th' virtual desktop's #Accessible representation.
- *
- **/
-SpiAccessible*
-getDesktop (int n);
-
-/**
- * getDesktopList:
- * @list: a pointer to an array of #Accessible objects.
- *
- * Get the list of virtual desktops.  On return, @list will point
- *     to a newly-created array of virtual desktop pointers.
- *     It is the responsibility of the caller to free this array when
- *     it is no longer needed.
- *
- * Not Yet Implemented.
- *
- * Returns: an integer indicating how many virtual desktops have been
- *          placed in the list pointed to by parameter @list.
- **/
-int
-getDesktopList (SpiAccessible **list);
+} AccessibleKeySet;
+
+/**
+ * SPI_KEYSET_ALL_KEYS:
+ * @SPI_KEYSET_ALL_KEYS: A special value for an AccessibleKeySet type, which tacitly
+ *                       includes all keycodes and keyvals for the specified modifier set.
+ **/
+#define SPI_KEYSET_ALL_KEYS NULL
+
+typedef unsigned long AccessibleKeyMaskType;
+
+
+/* Basic SPI initialization and event loop function prototypes */
+
+int              SPI_init         (void);
+void             SPI_event_main   (void);
+void             SPI_event_quit   (void);
+SPIBoolean       SPI_eventIsReady (void);
+AccessibleEvent *SPI_nextEvent    (SPIBoolean waitForEvent);
+int              SPI_exit         (void);
+
+/* Event Listener creation and support.  */
+
+AccessibleEventListener *
+           createAccessibleEventListener          (AccessibleEventListenerCB callback,
+                                                  void                     *user_data);
+SPIBoolean AccessibleEventListener_addCallback    (AccessibleEventListener  *listener,
+                                                  AccessibleEventListenerCB callback,
+                                                  void                     *user_data);
+SPIBoolean AccessibleEventListener_removeCallback (AccessibleEventListener  *listener,
+                                                  AccessibleEventListenerCB callback);
+void       AccessibleEventListener_unref          (AccessibleEventListener  *listener);
+
+/* Keystroke Listener creation and support.  */
+
+AccessibleKeystrokeListener *
+           createAccessibleKeystrokeListener          (AccessibleKeystrokeListenerCB callback,
+                                                      void                         *user_data);
+SPIBoolean AccessibleKeystrokeListener_addCallback    (AccessibleKeystrokeListener  *listener,
+                                                      AccessibleKeystrokeListenerCB callback,
+                                                      void                         *user_data);
+SPIBoolean AccessibleKeystrokeListener_removeCallback (AccessibleKeystrokeListener *listener,
+                                                      AccessibleKeystrokeListenerCB callback);
+void       AccessibleKeystrokeListener_unref         (AccessibleKeystrokeListener *listener);
+
+/* Global functions serviced by the registry */
+
+SPIBoolean  registerGlobalEventListener      (AccessibleEventListener *listener,
+                                             const char              *eventType);
+SPIBoolean  deregisterGlobalEventListener    (AccessibleEventListener *listener,
+                                             const char              *eventType);
+SPIBoolean  deregisterGlobalEventListenerAll (AccessibleEventListener *listener);
+
+void        registerAccessibleKeystrokeListener (
+                                              AccessibleKeystrokeListener *listener,
+                                             AccessibleKeySet             *keys,
+                                             AccessibleKeyMaskType         modmask,
+                                             AccessibleKeyEventMask        eventmask,
+                                             AccessibleKeyListenerSyncType sync_type);
+void        deregisterAccessibleKeystrokeListener (
+                                              AccessibleKeystrokeListener *listener,
+                                             AccessibleKeyMaskType        modmask);
+
+int         getDesktopCount                  (void);
+Accessible *getDesktop                       (int i);
+int         getDesktopList                   (Accessible **list);
+
+void        generateKeyEvent                 (long int                    keyval,
+                                             AccessibleKeySynthType      synth_type);
+void        generateMouseEvent               (long int x, long int y, char *name);
+
+/* Accessible function prototypes  */
+
+int                  Accessible_ref              (Accessible *obj);
+int                  Accessible_unref            (Accessible *obj);
+char *               Accessible_getName          (Accessible *obj);
+char *               Accessible_getDescription   (Accessible *obj);
+Accessible *         Accessible_getParent        (Accessible *obj);
+long                 Accessible_getChildCount    (Accessible *obj);
+Accessible *         Accessible_getChildAtIndex  (Accessible *obj,
+                                                 long int    childIndex);
+long                 Accessible_getIndexInParent (Accessible *obj);
+AccessibleRelation **Accessible_getRelationSet   (Accessible *obj);
+const char *         Accessible_getRole          (Accessible *obj);
+AccessibleStateSet * Accessible_getStateSet      (Accessible *obj);
 
-/**
- * registerKeystrokeListener:
- * @listener: a pointer to the #KeystrokeListener for which
- *            keystroke events are requested.
- *
- * Not Yet Implemented.
- *
- **/
-void
-registerKeystrokeListener (KeystrokeListener *listener,
-                          KeySet *keys,
-                          KeyMaskType modmask,
-                          KeyEventMask eventmask,
-                          KeyListenerSyncType sync_type);
+/* Interface query methods */
 
-/**
- * generateKeyEvent:
- * @keycode: a #long indicating the keycode of the key event
- *           being synthesized.
- * @synth_type: a #KeySynthType indicating whether this should be a
- *        KEY_PRESS, KEY_RELEASE, both (KEY_PRESSRELEASE), or
- *        a press/release pair for a KEYSYM.
- *
- * Synthesize a keyboard event (as if a hardware keyboard event occurred in the
- * current UI context).
- *
- **/
-void
-generateKeyEvent (long keyCode, KeySynthType synth_type);
-
-/**
- * generateMouseEvent:
- * @x: a #long indicating the screen x coordinate of the mouse event.
- * @y: a #long indicating the screen y coordinate of the mouse event.
- * @name: a string indicating which mouse event to be synthesized
- *        (e.g. "button1", "button2", "mousemove").
- *
- * Synthesize a mouse event at a specific screen coordinate.
- * Not Yet Implemented.
- *
- **/
-void
-generateMouseEvent (long x, long y, char *name);
+SPIBoolean Accessible_isAction       (Accessible *obj);
+SPIBoolean Accessible_isApplication  (Accessible *obj);
+SPIBoolean Accessible_isComponent    (Accessible *obj);
+SPIBoolean Accessible_isEditableText (Accessible *obj);
+SPIBoolean Accessible_isHypertext    (Accessible *obj);
+SPIBoolean Accessible_isImage        (Accessible *obj);
+SPIBoolean Accessible_isSelection    (Accessible *obj);
+SPIBoolean Accessible_isTable        (Accessible *obj);
+SPIBoolean Accessible_isText         (Accessible *obj);
+SPIBoolean Accessible_isValue        (Accessible *obj);
+
+AccessibleAction *       Accessible_getAction       (Accessible *obj);
+AccessibleApplication *  Accessible_getApplication  (Accessible *obj);
+AccessibleComponent *    Accessible_getComponent    (Accessible *obj);
+AccessibleEditableText * Accessible_getEditableText (Accessible *obj);
+AccessibleHypertext *    Accessible_getHypertext    (Accessible *obj);
+AccessibleImage *        Accessible_getImage        (Accessible *obj);
+AccessibleSelection *    Accessible_getSelection    (Accessible *obj);
+AccessibleTable *        Accessible_getTable        (Accessible *obj);
+AccessibleText *         Accessible_getText         (Accessible *obj);
+AccessibleValue *        Accessible_getValue        (Accessible *obj);
+GenericInterface *       Accessible_queryInterface  (Accessible *obj,
+                                                    const char *interface_name);
 
 /*
- *
- * SpiAccessible function prototypes
- *
+ * AccessibleAction function prototypes
  */
 
-/**
- * SpiAccessible_ref:
- * @obj: a pointer to the #Accessible object on which to operate.
- *
- * Increment the reference count for an #Accessible object.
- *
- * Returns: (no return code implemented yet).
- *
- **/
 int
-SpiAccessible_ref (SpiAccessible *obj);
+AccessibleAction_ref (AccessibleAction *obj);
 
-/**
- * SpiAccessible_unref:
- * @obj: a pointer to the #Accessible object on which to operate.
- *
- * Decrement the reference count for an #Accessible object.
- *
- * Returns: (no return code implemented yet).
- *
- **/
 int
-SpiAccessible_unref (SpiAccessible *obj);
+AccessibleAction_unref (AccessibleAction *obj);
 
-/**
- * SpiAccessible_getName:
- * @obj: a pointer to the #Accessible object on which to operate.
- *
- * Get the name of an #Accessible object.
- *
- * Returns: a UTF-8 string indicating the name of the #Accessible object.
- *
- **/
-char *
-SpiAccessible_getName (SpiAccessible *obj);
-
-/**
- * SpiAccessible_getDescription:
- * @obj: a pointer to the #Accessible object on which to operate.
- *
- * Get the description of an #Accessible object.
- *
- * Returns: a UTF-8 string describing the #Accessible object.
- *
- **/
-char *
-SpiAccessible_getDescription (SpiAccessible *obj);
-
-/**
- * SpiAccessible_getParent:
- * @obj: a pointer to the #Accessible object to query.
- *
- * Get an #Accessible object's parent container.
- *
- * Returns: a pointer to the #Accessible object which contains the given
- *          #Accessible instance, or NULL if the @obj has no parent container.
- *
- **/
-SpiAccessible *
-SpiAccessible_getParent (SpiAccessible *obj);
-
-/**
- * SpiAccessible_getChildCount:
- *
- * @obj: a pointer to the #Accessible object on which to operate.
- *
- * Get the number of children contained by an #Accessible object.
- *
- * Returns: a #long indicating the number of #Accessible children
- *          contained by an #Accessible object.
- *
- **/
 long
-SpiAccessible_getChildCount (SpiAccessible *obj);
-
-/**
- * SpiAccessible_getChildAtIndex:
- *
- * @obj: a pointer to the #Accessible object on which to operate.
- * @childIndex: a #long indicating which child is specified.
- *
- * Get the #Accessible child of an #Accessible object at a given index.
- *
- * Returns: a pointer to the #Accessible child object at index
- *          @childIndex.
- *
- **/
-SpiAccessible *
-SpiAccessible_getChildAtIndex (SpiAccessible *obj,
-                            long childIndex);
-
-/**
- * SpiAccessible_getIndexInParent:
- *
- * @obj: a pointer to the #Accessible object on which to operate.
- *
- * Get the index of an #Accessible object in its containing #Accessible.
- *
- * Returns: a #long indicating the index of the #Accessible object
- *          in its parent (i.e. containing) #Accessible instance,
- *          or -1 if @obj has no containing parent.
- *
- **/
-long
-SpiAccessible_getIndexInParent (SpiAccessible *obj);
-
-/**
- * SpiAccessible_getRelationSet:
- *
- * Not Yet Implemented.
- *
- **/
-SpiAccessibleRelation **
-SpiAccessible_getRelationSet (SpiAccessible *obj);
+AccessibleAction_getNActions (AccessibleAction *obj);
 
 /**
- * SpiAccessible_getRole:
- * @obj: a pointer to the #Accessible object on which to operate.
+ * AccessibleAction_getName:
+ * @obj: a pointer to the #AccessibleAction implementor to query.
+ * @i: a long integer indicating which action to query.
  *
- * Get the UI role of an #Accessible object.
+ * Get the name of the '@i-th' action invokable on an
+ *      object implementing #AccessibleAction.
  *
- * Returns: a UTF-8 string indicating the UI role of the #Accessible object.
+ * Returns: the 'event type' name of the action, as a UTF-8 string.
  *
  **/
 char *
-SpiAccessible_getRole (SpiAccessible *obj);
+AccessibleAction_getName (AccessibleAction *obj, long int i);
 
 /**
- * SpiAccessible_getStateSet:
- *
- * Not Yet Implemented.
- *
- **/
-SpiAccessibleStateSet *
-SpiAccessible_getStateSet (SpiAccessible *obj);
-
-/* Interface query methods */
-
-/**
- * SpiAccessible_isAction:
- * @obj: a pointer to the #Accessible instance to query.
- *
- * Query whether the specified #Accessible implements #AccessibleAction.
- * Not Yet Implemented.
- *
- * Returns: #TRUE if @obj implements the #AccessibleAction interface,
- *          #FALSE otherwise.
- **/
-boolean
-SpiAccessible_isAction (SpiAccessible *obj);
-
-/**
- * SpiAccessible_isComponent:
- * @obj: a pointer to the #Accessible instance to query.
- *
- * Query whether the specified #Accessible implements #AccessibleComponent.
- *
- * Returns: #TRUE if @obj implements the #AccessibleComponent interface,
- *          #FALSE otherwise.
- **/
-boolean
-SpiAccessible_isComponent (SpiAccessible *obj);
-
-/**
- * SpiAccessible_isEditableText:
- * @obj: a pointer to the #Accessible instance to query.
- *
- * Query whether the specified #Accessible implements #AccessibleEditableText.
- * Not Yet Implemented.
- *
- * Returns: #TRUE if @obj implements the #AccessibleEditableText interface,
- *          #FALSE otherwise.
- **/
-boolean
-SpiAccessible_isEditableText (SpiAccessible *obj);
-
-/**
- * SpiAccessible_isHypertext:
- * @obj: a pointer to the #Accessible instance to query.
- *
- * Query whether the specified #Accessible implements #AccessibleHypertext.
- * Not Yet Implemented.
- *
- * Returns: #TRUE if @obj implements the #AccessibleHypertext interface,
- *          #FALSE otherwise.
- **/
-boolean
-SpiAccessible_isHypertext (SpiAccessible *obj);
-
-/**
- * SpiAccessible_isImage:
- * @obj: a pointer to the #Accessible instance to query.
- *
- * Query whether the specified #Accessible implements #AccessibleImage.
- * Not Yet Implemented.
- *
- * Returns: #TRUE if @obj implements the #AccessibleImage interface,
- *          #FALSE otherwise.
-**/
-boolean
-SpiAccessible_isImage (SpiAccessible *obj);
-
-/**
-  * SpiAccessible_isSelection:
- * @obj: a pointer to the #Accessible instance to query.
- *
- * Query whether the specified #Accessible implements #AccessibleSelection.
- * Not Yet Implemented.
- *
- * Returns: #TRUE if @obj implements the #AccessibleSelection interface,
- *          #FALSE otherwise.
-**/
-boolean
-SpiAccessible_isSelection (SpiAccessible *obj);
-
-/**
- * SpiAccessible_isTable:
- * @obj: a pointer to the #Accessible instance to query.
- *
- * Query whether the specified #Accessible implements #AccessibleTable.
- * Not Yet Implemented.
- *
- * Returns: #TRUE if @obj implements the #AccessibleTable interface,
- *          #FALSE otherwise.
-**/
-boolean
-SpiAccessible_isTable (SpiAccessible *obj);
-
-/**
- * SpiAccessible_isText:
- * @obj: a pointer to the #Accessible instance to query.
- *
- * Query whether the specified #Accessible implements #AccessibleText.
- * Not Yet Implemented.
- *
- * Returns: #TRUE if @obj implements the #AccessibleText interface,
- *          #FALSE otherwise.
-**/
-boolean
-SpiAccessible_isText (SpiAccessible *obj);
-
-/**
- * SpiAccessible_getAction:
- *
- * Not Yet Implemented.
- *
- **/
-SpiAccessibleAction *
-SpiAccessible_getAction (SpiAccessible *obj);
-
-/**
- * SpiAccessible_getComponent:
- * @obj: a pointer to the #Accessible instance to query.
- *
- * Get the #AccessibleComponent interface for an #Accessible.
- *
- * Returns: a pointer to an #AccessibleComponent interface instance, or
- *          NULL if @obj does not implement #AccessibleComponent.
- **/
-SpiAccessibleComponent *
-SpiAccessible_getComponent (SpiAccessible *obj);
-
-/**
- * SpiAccessible_getEditableText:
- *
- * Not Yet Implemented.
- *
- **/
-SpiAccessibleEditableText *
-SpiAccessible_getEditableText (SpiAccessible *obj);
-
-/**
- * SpiAccessible_getHypertext:
- *
- * Not Yet Implemented.
- *
- **/
-SpiAccessibleHypertext *
-SpiAccessible_getHypertext (SpiAccessible *obj);
-
-/**
- * SpiAccessible_getImage:
- *
- * Not Yet Implemented.
- *
- **/
-SpiAccessibleImage *
-SpiAccessible_getImage (SpiAccessible *obj);
-
-/**
- * SpiAccessible_getSelection:
- *
- * Not Yet Implemented.
- *
- **/
-SpiAccessibleSelection *
-SpiAccessible_getSelection (SpiAccessible *obj);
-
-/**
- * SpiAccessible_getTable:
- *
- * Not Yet Implemented.
- *
- **/
-SpiAccessibleTable *
-SpiAccessible_getTable (SpiAccessible *obj);
-
-/**
- * SpiAccessible_getText:
- *
- * Not Yet Implemented.
- *
- **/
-SpiAccessibleText *
-SpiAccessible_getText (SpiAccessible *obj);
-
-/**
- * SpiAccessible_queryInterface:
- * @obj: a pointer to the #Accessible instance to query.
- * @interface_name: a UTF-8 character string specifiying the requested interface.
+ * AccessibleAction_getDescription:
+ * @obj: a pointer to the #AccessibleAction to query.
+ * @i: a long integer indicating which action to query.
  *
- * Query an #Accessible object to for a named interface.
+ * Get the description of '@i-th' action invokable on an
+ *      object implementing #AccessibleAction.
  *
- * Returns: an instance of the named interface object, if it is implemented
- *          by @obj, or NULL otherwise.
+ * Returns: a UTF-8 string describing the '@i-th' invokable action.
  *
  **/
-GenericInterface *
-SpiAccessible_queryInterface (SpiAccessible *obj, char *interface_name);
-
-/*
- *
- * SpiAccessibleAction function prototypes
- *
- */
-
-int
-SpiAccessibleAction_ref (
-                      SpiAccessibleAction *obj);
-
-int
-SpiAccessibleAction_unref (SpiAccessibleAction *obj);
+char *
+AccessibleAction_getDescription (AccessibleAction *obj,
+                                 long int i);
 
-long
-SpiAccessibleAction_getNActions (SpiAccessibleAction *obj);
+SPIBoolean
+AccessibleAction_doAction (AccessibleAction *obj,
+                           long int i);
 
 /**
- * SpiAccessibleAction_getDescription:
- * @obj: a pointer to the #AccessibleAction to query.
+ * AccessibleAction_getKeybinding:
+ * @obj: a pointer to the #AccessibleAction implementor to query.
+ * @i: a long integer indicating which action to query.
  *
- * Get the description of 'i-th' action invokable on an
- *      object implementing #AccessibleAction.
- *
- * Not Yet Implemented.
+ * Get the keybindings for the @i-th action invokable on an
+ *      object implementing #AccessibleAction, if any are defined.
  *
- * Returns: a UTF-8 string describing the 'i-th' invokable action.
+ * Returns: a UTF-8 string which can be parsed to determine the @i-th
+ * invokable action's keybindings.
  *
  **/
 char *
-SpiAccessibleAction_getDescription (SpiAccessibleAction *obj,
-                                 long index);
-
-boolean
-SpiAccessibleAction_doAction (SpiAccessibleAction *obj,
-                           long index);
-
-char *
-SpiAccessibleAction_getKeyBinding (SpiAccessibleAction *obj,
-                                long index);
+AccessibleAction_getKeyBinding (AccessibleAction *obj,
+                                long int i);
 
 /*
  *
- * SpiAccessibleApplication function prototypes
+ * AccessibleApplication function prototypes
  *
  */
 
 /**
- * SpiAccessibleApplication_unref:
+ * AccessibleApplication_unref:
  * @obj: a pointer to the #AccessibleApplication on which to operate.
  *
  * Decrement the reference count for an #AccessibleApplication.
@@ -756,10 +304,10 @@ SpiAccessibleAction_getKeyBinding (SpiAccessibleAction *obj,
  *
  **/
 int
-SpiAccessibleApplication_ref (SpiAccessibleApplication *obj);
+AccessibleApplication_ref (AccessibleApplication *obj);
 
 /**
- * SpiAccessibleApplication_unref:
+ * AccessibleApplication_unref:
  * @obj: a pointer to the #AccessibleApplication object on which to operate.
  *
  * Decrement the reference count for an #AccessibleApplication.
@@ -768,10 +316,10 @@ SpiAccessibleApplication_ref (SpiAccessibleApplication *obj);
  *
  **/
 int
-SpiAccessibleApplication_unref (SpiAccessibleApplication *obj);
+AccessibleApplication_unref (AccessibleApplication *obj);
 
 /**
- * SpiAccessibleApplication_getToolkitName:
+ * AccessibleApplication_getToolkitName:
  * @obj: a pointer to the #AccessibleApplication to query.
  *
  * Get the name of the UI toolkit used by an #AccessibleApplication.
@@ -781,10 +329,10 @@ SpiAccessibleApplication_unref (SpiAccessibleApplication *obj);
  *
  **/
 char *
-SpiAccessibleApplication_getToolkitName (SpiAccessibleApplication *obj);
+AccessibleApplication_getToolkitName (AccessibleApplication *obj);
 
 /**
- * SpiAccessibleApplication_getVersion:
+ * AccessibleApplication_getVersion:
  * @obj: a pointer to the #AccessibleApplication being queried.
  *
  * Get the version of the at-spi bridge exported by an
@@ -795,24 +343,25 @@ SpiAccessibleApplication_getToolkitName (SpiAccessibleApplication *obj);
  *
  **/
 char *
-SpiAccessibleApplication_getVersion (SpiAccessibleApplication *obj);
+AccessibleApplication_getVersion (AccessibleApplication *obj);
 
 /**
- * SpiAccessibleApplication_getID:
+ * AccessibleApplication_getID:
  * @obj: a pointer to the #AccessibleApplication being queried.
  *
- * Get the unique ID assigned by the SpiRegistry to an
+ * Get the unique ID assigned by the Registry to an
  *      #AccessibleApplication instance.
  * (Not Yet Implemented by the registry).
  *
  * Returns: a unique #long integer associated with the application
- *          by the SpiRegistry, or 0 if the application is not registered.
+ *          by the Registry, or 0 if the application is not registered.
  **/
 long
-SpiAccessibleApplication_getID (SpiAccessibleApplication *obj);
+AccessibleApplication_getID (AccessibleApplication *obj);
 
 /**
- * SpiAccessibleApplication_pause:
+ * AccessibleApplication_pause:
+ * @obj: a pointer to the #Accessible object on which to operate.
  *
  * Attempt to pause the application (used when client event queue is
  *  over-full).
@@ -821,11 +370,12 @@ SpiAccessibleApplication_getID (SpiAccessibleApplication *obj);
  * Returns: #TRUE if the application was paused successfully, #FALSE otherwise.
  *
  **/
-boolean
-SpiAccessibleApplication_pause (SpiAccessibleApplication *obj);
+SPIBoolean
+AccessibleApplication_pause (AccessibleApplication *obj);
 
 /**
- * SpiAccessibleApplication_pause:
+ * AccessibleApplication_resume:
+ * @obj: a pointer to the #Accessible object on which to operate.
  *
  * Attempt to resume the application (used after #AccessibleApplication_pause).
  * Not Yet Implemented.
@@ -833,35 +383,35 @@ SpiAccessibleApplication_pause (SpiAccessibleApplication *obj);
  * Returns: #TRUE if application processing resumed successfully, #FALSE otherwise.
  *
  **/
-boolean
-SpiAccessibleApplication_resume (SpiAccessibleApplication *obj);
+SPIBoolean
+AccessibleApplication_resume (AccessibleApplication *obj);
 
 /*
  *
- * SpiAccessibleComponent function prototypes
+ * AccessibleComponent function prototypes
  *
  */
 
 int
-SpiAccessibleComponent_ref (SpiAccessibleComponent *obj);
+AccessibleComponent_ref (AccessibleComponent *obj);
 
 int
-SpiAccessibleComponent_unref (SpiAccessibleComponent *obj);
+AccessibleComponent_unref (AccessibleComponent *obj);
 
-boolean
-SpiAccessibleComponent_contains (SpiAccessibleComponent *obj,
-                              long x,
-                              long y,
-                              SpiAccessibleCoordType ctype);
+SPIBoolean
+AccessibleComponent_contains (AccessibleComponent *obj,
+                              long int x,
+                              long int y,
+                              AccessibleCoordType ctype);
 
-SpiAccessible *
-SpiAccessibleComponent_getAccessibleAtPoint (SpiAccessibleComponent *obj,
-                                          long x,
-                                          long y,
-                                          SpiAccessibleCoordType ctype);
+Accessible *
+AccessibleComponent_getAccessibleAtPoint (AccessibleComponent *obj,
+                                          long int x,
+                                          long int y,
+                                          AccessibleCoordType ctype);
 
 /**
- * SpiAccessibleComponent_getExtents:
+ * AccessibleComponent_getExtents:
  * @obj: a pointer to the #AccessibleComponent to query.
  * @x: a pointer to a #long into which the minimum x coordinate will be returned.
  * @y: a pointer to a #long into which the minimum y coordinate will be returned.
@@ -874,454 +424,498 @@ SpiAccessibleComponent_getAccessibleAtPoint (SpiAccessibleComponent *obj,
  *
  **/
 void
-SpiAccessibleComponent_getExtents (SpiAccessibleComponent *obj,
-                                long *x,
-                                long *y,
-                                long *width,
-                                long *height,
-                                SpiAccessibleCoordType ctype);
+AccessibleComponent_getExtents (AccessibleComponent *obj,
+                                long int *x,
+                                long int *y,
+                                long int *width,
+                                long int *height,
+                                AccessibleCoordType ctype);
 
 void
-SpiAccessibleComponent_getPosition (SpiAccessibleComponent *obj,
-                                 long *x,
-                                 long *y,
-                                 SpiAccessibleCoordType ctype);
+AccessibleComponent_getPosition (AccessibleComponent *obj,
+                                 long int *x,
+                                 long int *y,
+                                 AccessibleCoordType ctype);
 
 void
-SpiAccessibleComponent_getSize (SpiAccessibleComponent *obj,
-                             long *width,
-                             long *height);
+AccessibleComponent_getSize (AccessibleComponent *obj,
+                             long int *width,
+                             long int *height);
+
+/**
+ * AccessibleComponent_getLayer:
+ * @obj: a pointer to the #AccessibleComponent to query.
+ *
+ * Query which layer the component is painted into, to help determine its 
+ *      visibility in terms of stacking order.
+ *
+ * Returns: the #AccessibleComponentLayer into which this component is painted.
+ **/
+AccessibleComponentLayer
+AccessibleComponent_getLayer (AccessibleComponent *obj);
+
+/**
+ * AccessibleComponent_getMDIZOrder:
+ * @obj: a pointer to the #AccessibleComponent to query.
+ *
+ * Query the z stacking order of a component which is in the MDI layer.
+ *
+ * Returns: a short integer indicating the stacking order of the component 
+ *       in the MDI layer, or -1 if the component is not in the MDI layer.
+ **/
+short
+AccessibleComponent_getMDIZOrder (AccessibleComponent *obj);
 
 void
-SpiAccessibleComponent_grabFocus (SpiAccessibleComponent *obj);
+AccessibleComponent_grabFocus (AccessibleComponent *obj);
 
 /*
  *
- * SpiAccessibleEditableText function prototypes
+ * AccessibleEditableText function prototypes
  *
  */
 
 int
-SpiAccessibleEditableText_ref (SpiAccessibleEditableText *obj);
+AccessibleEditableText_ref (AccessibleEditableText *obj);
 
 int
-SpiAccessibleEditableText_unref (SpiAccessibleEditableText *obj);
+AccessibleEditableText_unref (AccessibleEditableText *obj);
 
-boolean
-SpiAccessibleEditableText_setRunAttributes (SpiAccessibleEditableText *obj,
-                                        const char *attributes,
-                                        long startPos, long endPos);
+SPIBoolean
+AccessibleEditableText_setAttributes (AccessibleEditableText *obj,
+                                     const char *attributes,
+                                     long int startOffset,
+                                     long int endOffset);
 
-void
-SpiAccessibleEditableText_setTextContents (SpiAccessibleEditableText *obj,
+SPIBoolean
+AccessibleEditableText_setTextContents (AccessibleEditableText *obj,
                                         const char *newContents);
 
-void
-SpiAccessibleEditableText_insertText (SpiAccessibleEditableText *obj,
-                                   long position,
-                                   char *text,
-                                   long length);
+SPIBoolean
+AccessibleEditableText_insertText (AccessibleEditableText *obj,
+                                   long int position,
+                                   const char *text,
+                                   long int length);
 
-void
-SpiAccessibleEditableText_copyText (SpiAccessibleText *obj,
-                                 long startPos,
-                                 long endPos);
+SPIBoolean
+AccessibleEditableText_copyText (AccessibleText *obj,
+                                 long int startPos,
+                                 long int endPos);
 
-void
-SpiAccessibleEditableText_cutText (SpiAccessibleEditableText *obj,
-                                long startPos,
-                                long endPos);
+SPIBoolean
+AccessibleEditableText_cutText (AccessibleEditableText *obj,
+                                long int startPos,
+                                long int endPos);
 
-void
-SpiAccessibleEditableText_deleteText (SpiAccessibleEditableText *obj,
-                                   long startPos,
-                                   long endPos);
+SPIBoolean
+AccessibleEditableText_deleteText (AccessibleEditableText *obj,
+                                   long int startPos,
+                                   long int endPos);
 
-void
-SpiAccessibleEditableText_pasteText (SpiAccessibleEditableText *obj,
-                                  long position);
+SPIBoolean
+AccessibleEditableText_pasteText (AccessibleEditableText *obj,
+                                  long int position);
 
 /*
  *
- * SpiAccessibleHyperlink function prototypes
+ * AccessibleHyperlink function prototypes
  *
  */
 
-int
-SpiAccessibleHyperlink_ref (SpiAccessibleHyperlink *obj);
-
-int
-SpiAccessibleHyperlink_unref (SpiAccessibleHyperlink *obj);
-
 long
-SpiAccessibleHyperlink_getNAnchors (SpiAccessibleHyperlink *obj);
+AccessibleHyperlink_getNAnchors (AccessibleHyperlink *obj);
 
 char *
-SpiAccessibleHyperlink_getURI (SpiAccessibleHyperlink *obj,
-                            long i);
+AccessibleHyperlink_getURI (AccessibleHyperlink *obj,
+                            long int i);
 
-SpiAccessible
-SpiAccessibleHyperlink_getObject (SpiAccessibleHyperlink *obj,
-                               long i);
+Accessible *
+AccessibleHyperlink_getObject (AccessibleHyperlink *obj,
+                               long int i);
 
 void
-SpiAccessibleHyperlink_getIndexRange (SpiAccessibleHyperlink *obj,
-                                   long *startIndex,
-                                   long *endIndex);
+AccessibleHyperlink_getIndexRange (AccessibleHyperlink *obj,
+                                   long int *startIndex,
+                                   long int *endIndex);
 
-boolean
-SpiAccessibleHyperlink_isValid (SpiAccessibleHyperlink *obj);
+SPIBoolean
+AccessibleHyperlink_isValid (AccessibleHyperlink *obj);
 
 /*
  *
- * SpiAccessibleHypertext function prototypes
+ * AccessibleHypertext function prototypes
  *
  */
 
 int
-SpiAccessibleHypertext_ref (SpiAccessibleHypertext *obj);
+AccessibleHypertext_ref (AccessibleHypertext *obj);
 
 int
-SpiAccessibleHypertext_unref (SpiAccessibleHypertext *obj);
+AccessibleHypertext_unref (AccessibleHypertext *obj);
 
 long
-SpiAccessibleHypertext_getNLinks (SpiAccessibleHypertext *obj);
+AccessibleHypertext_getNLinks (AccessibleHypertext *obj);
 
-SpiAccessibleHyperlink *
-SpiAccessibleHyperText_getLink (SpiAccessibleHypertext *obj,
-                             long linkIndex);
+AccessibleHyperlink *
+AccessibleHypertext_getLink (AccessibleHypertext *obj,
+                             long int linkIndex);
 
 long
-SpiAccessibleHypertext_getLinkIndex (SpiAccessibleHypertext *obj,
-                                  long characterIndex);
+AccessibleHypertext_getLinkIndex (AccessibleHypertext *obj,
+                                  long int characterOffset);
 
 /*
  *
- * SpiAccessibleImage function prototypes
+ * AccessibleImage function prototypes
  *
  */
 
 int
-SpiAccessibleImage_ref (SpiAccessibleImage *obj);
+AccessibleImage_ref (AccessibleImage *obj);
 
 int
-SpiAccessibleImage_unref (SpiAccessibleImage *obj);
+AccessibleImage_unref (AccessibleImage *obj);
 
 char *
-SpiAccessibleImage_getImageDescription (SpiAccessibleImage *obj);
+AccessibleImage_getImageDescription (AccessibleImage *obj);
 
 void
-SpiAccessibleImage_getImageSize (SpiAccessibleImage *obj,
-                              long *width,
-                              long *height);
+AccessibleImage_getImageSize (AccessibleImage *obj,
+                              long int *width,
+                              long int *height);
 
 void
-SpiAccessibleImage_getImagePosition (SpiAccessibleImage *obj,
-                                  long *x,
-                                  long *y,
-                                  SpiAccessibleCoordType ctype);
+AccessibleImage_getImagePosition (AccessibleImage *obj,
+                                  long int *x,
+                                  long int *y,
+                                  AccessibleCoordType ctype);
 
+void
+AccessibleImage_getImageExtents (AccessibleImage *obj,
+                                long int *x,
+                                long int *y,
+                                long int *width,
+                                long int *height,
+                                AccessibleCoordType ctype);
 /*
  *
- * SpiAccessibleRelation function prototypes
+ * AccessibleRelation function prototypes
  *
  */
 
 int
-SpiAccessibleRelation_ref (SpiAccessibleRelation *obj);
+AccessibleRelation_ref (AccessibleRelation *obj);
 
 int
-SpiAccessibleRelation_unref (SpiAccessibleRelation *obj);
+AccessibleRelation_unref (AccessibleRelation *obj);
 
-RELATION_TYPE
-SpiAccessibleRelation_getRelationType (SpiAccessibleRelation *obj);
+AccessibleRelationType
+AccessibleRelation_getRelationType (AccessibleRelation *obj);
 
-SpiAccessible *
-SpiAccessibleRelation_getTarget (SpiAccessibleRelation *obj);
+int
+AccessibleRelation_getNTargets (AccessibleRelation *obj);
 
+Accessible *
+AccessibleRelation_getTarget (AccessibleRelation *obj, int i);
 
 
 /*
  *
- * SpiAccessibleSelection function prototypes
+ * AccessibleSelection function prototypes
  *
  */
 
 int
-SpiAccessibleSelection_ref (SpiAccessibleSelection *obj);
+AccessibleSelection_ref (AccessibleSelection *obj);
 
 int
-SpiAccessibleSelection_unref (SpiAccessibleSelection *obj);
+AccessibleSelection_unref (AccessibleSelection *obj);
 
 long
-SpiAccessibleSelection_getNSelectedChildren (SpiAccessibleSelection *obj);
+AccessibleSelection_getNSelectedChildren (AccessibleSelection *obj);
 
-SpiAccessible *
-SpiAccessibleSelection_getSelectedChild (SpiAccessibleSelection *obj,
-                                      long selectedChildIndex);
+Accessible *
+AccessibleSelection_getSelectedChild (AccessibleSelection *obj,
+                                      long int selectedChildIndex);
 
-boolean
-SpiAccessibleSelection_selectChild (SpiAccessibleSelection *obj,
-                                 long childIndex);
+SPIBoolean
+AccessibleSelection_selectChild (AccessibleSelection *obj,
+                                 long int childIndex);
 
-boolean
-SpiAccessibleSelection_deselectSelectedChild (SpiAccessibleSelection *obj,
-                                           long selectedChildIndex);
+SPIBoolean
+AccessibleSelection_deselectSelectedChild (AccessibleSelection *obj,
+                                           long int selectedChildIndex);
 
-boolean
-SpiAccessibleSelection_isChildSelected (SpiAccessibleSelection *obj,
-                                     long childIndex);
+SPIBoolean
+AccessibleSelection_isChildSelected (AccessibleSelection *obj,
+                                     long int childIndex);
 
-void
-SpiAccessibleSelection_selectAll (SpiAccessibleSelection *obj);
+SPIBoolean
+AccessibleSelection_selectAll (AccessibleSelection *obj);
 
 void
-SpiAccessibleSelection_clearSelection (SpiAccessibleSelection *obj);
+AccessibleSelection_clearSelection (AccessibleSelection *obj);
 
 
 /*
  *
- * SpiAccessibleStateSet function prototypes
+ * AccessibleStateSet function prototypes
  *
  */
 
 int
-SpiAccessibleStateSet_ref (SpiAccessibleStateSet *obj);
+AccessibleStateSet_ref (AccessibleStateSet *obj);
 
 int
-SpiAccessibleStateSet_unref (SpiAccessibleStateSet *obj);
+AccessibleStateSet_unref (AccessibleStateSet *obj);
 
-boolean
-SpiAccessibleStateSet_contains (SpiAccessibleStateSet *obj,
-                             SPI_ACCESSIBLE_STATE state);
+SPIBoolean
+AccessibleStateSet_contains (AccessibleStateSet *obj,
+                             AccessibleState state);
 
 void
-SpiAccessibleStateSet_add (SpiAccessibleStateSet *obj,
-                        SPI_ACCESSIBLE_STATE state);
+AccessibleStateSet_add (AccessibleStateSet *obj,
+                        AccessibleState state);
 
 void
-SpiAccessibleStateSet_remove (SpiAccessibleStateSet *obj,
-                           SPI_ACCESSIBLE_STATE state);
+AccessibleStateSet_remove (AccessibleStateSet *obj,
+                           AccessibleState state);
 
-boolean
-SpiAccessibleStateSet_equals (SpiAccessibleStateSet *obj,
-                           SpiAccessibleStateSet *obj2);
+SPIBoolean
+AccessibleStateSet_equals (AccessibleStateSet *obj,
+                           AccessibleStateSet *obj2);
 
 void
-SpiAccessibleStateSet_compare (SpiAccessibleStateSet *obj,
-                            SpiAccessibleStateSet *obj2,
-                            SpiAccessibleStateSet **differenceSet);
+AccessibleStateSet_compare (AccessibleStateSet *obj,
+                            AccessibleStateSet *obj2,
+                            AccessibleStateSet **differenceSet);
 
-boolean
-SpiAccessibleStateSet_isEmpty (SpiAccessibleStateSet *obj);
+SPIBoolean
+AccessibleStateSet_isEmpty (AccessibleStateSet *obj);
 
 
 /*
  *
- * SpiAccessibleTable function prototypes
+ * AccessibleTable function prototypes
  *
  */
 
 int
-SpiAccessibleTable_ref (SpiAccessibleTable *obj);
+AccessibleTable_ref (AccessibleTable *obj);
 
 int
-SpiAccessibleTable_unref (SpiAccessibleTable *obj);
+AccessibleTable_unref (AccessibleTable *obj);
 
-SpiAccessible *
-SpiAccessibleTable_getCaption (SpiAccessibleTable *obj);
+Accessible *
+AccessibleTable_getCaption (AccessibleTable *obj);
 
-SpiAccessible *
-SpiAccessibleTable_getSummary (SpiAccessibleTable *obj);
+Accessible *
+AccessibleTable_getSummary (AccessibleTable *obj);
 
 long
-SpiAccessibleTable_getNRows (SpiAccessibleTable *obj);
+AccessibleTable_getNRows (AccessibleTable *obj);
 
 long
-SpiAccessibleTable_getNColumns (SpiAccessibleTable *obj);
+AccessibleTable_getNColumns (AccessibleTable *obj);
 
-SpiAccessible *
-SpiAccessibleTable_refAt (SpiAccessibleTable *obj,
-                                 long row,
-                                 long column);
+Accessible *
+AccessibleTable_getAccessibleAt (AccessibleTable *obj,
+                                 long int row,
+                                 long int column);
 
 long
-SpiAccessibleTable_getIndexAt (SpiAccessibleTable *obj,
-                            long row,
-                            long column);
+AccessibleTable_getIndexAt (AccessibleTable *obj,
+                            long int row,
+                            long int column);
 
 long
-SpiAccessibleTable_getRowAtIndex (SpiAccessibleTable *obj,
-                               long index);
+AccessibleTable_getRowAtIndex (AccessibleTable *obj,
+                               long int index);
 
 long
-SpiAccessibleTable_getColumnAtIndex (SpiAccessibleTable *obj,
-                                  long index);
+AccessibleTable_getColumnAtIndex (AccessibleTable *obj,
+                                  long int index);
 
 char *
-SpiAccessibleTable_getRowDescription (SpiAccessibleTable *obj,
-                                  long row);
+AccessibleTable_getRowDescription (AccessibleTable *obj,
+                                  long int row);
 
 char *
-SpiAccessibleTable_getColumnDescription (SpiAccessibleTable *obj,
-                                     long column);
+AccessibleTable_getColumnDescription (AccessibleTable *obj,
+                                     long int column);
 
 long
-SpiAccessibleTable_getRowExtentAt (SpiAccessibleTable *obj,
-                                long row,
-                                long column);
+AccessibleTable_getRowExtentAt (AccessibleTable *obj,
+                                long int row,
+                                long int column);
 
 long
-SpiAccessibleTable_getColumnExtentAt (SpiAccessibleTable *obj,
-                                   long row,
-                                   long column);
+AccessibleTable_getColumnExtentAt (AccessibleTable *obj,
+                                   long int row,
+                                   long int column);
 
-SpiAccessible *
-SpiAccessibleTable_getRowHeader (SpiAccessibleTable *obj,
-                             long row);
+Accessible *
+AccessibleTable_getRowHeader (AccessibleTable *obj,
+                             long int row);
 
-SpiAccessible *
-SpiAccessibleTable_getColumnHeader (SpiAccessibleTable *obj,
-                                long column);
+Accessible *
+AccessibleTable_getColumnHeader (AccessibleTable *obj,
+                                long int column);
 
 long
-SpiAccessibleTable_getNSelectedRows (SpiAccessibleTable *obj);
+AccessibleTable_getNSelectedRows (AccessibleTable *obj);
 
 long
-SpiAccessibleTable_getSelectedRows (SpiAccessibleTable *obj,
-                                 long **selectedRows);
+AccessibleTable_getSelectedRows (AccessibleTable *obj,
+                                 long int **selectedRows);
 
 long
-SpiAccessibleTable_getNSelectedColumns (SpiAccessibleTable *obj);
+AccessibleTable_getNSelectedColumns (AccessibleTable *obj);
 
 long
-SpiAccessibleTable_getSelectedColumns (SpiAccessibleTable *obj,
-                                    long **selectedColumns);
+AccessibleTable_getSelectedColumns (AccessibleTable *obj,
+                                    long int **selectedColumns);
 
-boolean
-SpiAccessibleTable_isRowSelected (SpiAccessibleTable *obj,
-                               long row);
+SPIBoolean
+AccessibleTable_isRowSelected (AccessibleTable *obj,
+                               long int row);
 
-boolean
-SpiAccessibleTable_isColumnSelected (SpiAccessibleTable *obj,
-                                  long column);
+SPIBoolean
+AccessibleTable_isColumnSelected (AccessibleTable *obj,
+                                  long int column);
 
-boolean
-SpiAccessibleTable_isSelected (SpiAccessibleTable *obj,
-                            long row,
-                            long column);
+SPIBoolean
+AccessibleTable_isSelected (AccessibleTable *obj,
+                            long int row,
+                            long int column);
 
 /*
  *
- * SpiAccessibleText function prototypes
+ * AccessibleText function prototypes
  *
  */
 
 int
-SpiAccessibleText_ref (SpiAccessibleText *obj);
+AccessibleText_ref (AccessibleText *obj);
 
 int
-SpiAccessibleText_unref (SpiAccessibleText *obj);
+AccessibleText_unref (AccessibleText *obj);
 
 long
-SpiAccessibleText_getCharacterCount (SpiAccessibleText *obj);
+AccessibleText_getCharacterCount (AccessibleText *obj);
 
 char *
-SpiAccessibleText_getText (SpiAccessibleText *obj,
-                        long startOffset,
-                        long endOffset);
+AccessibleText_getText (AccessibleText *obj,
+                        long int startOffset,
+                        long int endOffset);
 
 long
-SpiAccessibleText_getCaretOffset (SpiAccessibleText *obj);
+AccessibleText_getCaretOffset (AccessibleText *obj);
 
 char *
-SpiAccessibleText_getAttributes (SpiAccessibleText *obj,
-                                long offset,
-                                long *startOffset,
-                                long *endOfset);
+AccessibleText_getAttributes (AccessibleText *obj,
+                                long int offset,
+                                long int *startOffset,
+                                long int *endOffset);
 
 
-boolean
-SpiAccessibleText_setCaretOffset (SpiAccessibleText *obj,
-                               long newOffset);
+SPIBoolean
+AccessibleText_setCaretOffset (AccessibleText *obj,
+                               long int newOffset);
 
 char *
-SpiAccessibleText_getTextBeforeOffset (SpiAccessibleText *obj,
-                                    long offset,
-                                    SPI_TEXT_BOUNDARY_TYPE type,
-                                   long *startOffset, long *endOffset);
+AccessibleText_getTextBeforeOffset (AccessibleText *obj,
+                                    long int offset,
+                                    AccessibleTextBoundaryType type,
+                                   long int *startOffset,
+                                   long int *endOffset);
 
 char *
-SpiAccessibleText_getTextAtOffset (SpiAccessibleText *obj,
-                                    long offset,
-                                    SPI_TEXT_BOUNDARY_TYPE type,
-                               long *startOffset, long *endOffset);
+AccessibleText_getTextAtOffset (AccessibleText *obj,
+                               long int offset,
+                               AccessibleTextBoundaryType type,
+                               long int *startOffset,
+                               long int *endOffset);
 
 char *
-SpiAccessibleText_getTextAfterOffset (SpiAccessibleText *obj,
-                                    long offset,
-                                    SPI_TEXT_BOUNDARY_TYPE type,
-                                  long *startOffset, long *endOffset);
+AccessibleText_getTextAfterOffset (AccessibleText *obj,
+                                  long int offset,
+                                  AccessibleTextBoundaryType type,
+                                  long int *startOffset,
+                                  long int *endOffset);
+
 unsigned long
-SpiAccessibleText_getCharacterAtOffset (SpiAccessibleText *obj,
-                                     long offset);
+AccessibleText_getCharacterAtOffset (AccessibleText *obj,
+                                     long int offset);
 
 void
-SpiAccessibleText_getCharacterExtents (SpiAccessibleText *obj,
-                                    long offset,
-                                    long *x,
-                                    long *y,
-                                    long *width,
-                                    long *height, SpiAccessibleCoordType type);
+AccessibleText_getCharacterExtents (AccessibleText *obj,
+                                    long int offset,
+                                    long int *x,
+                                    long int *y,
+                                    long int *width,
+                                    long int *height,
+                                   AccessibleCoordType type);
 
 long
-SpiAccessibleText_getOffsetAtPoint (SpiAccessibleText *obj,
-                                 long x,
-                                 long y, SpiAccessibleCoordType type);
+AccessibleText_getOffsetAtPoint (AccessibleText *obj,
+                                 long int x,
+                                 long int y,
+                                AccessibleCoordType type);
 
 long
-SpiAccessibleText_getNSelections (SpiAccessibleText *obj);
+AccessibleText_getNSelections (AccessibleText *obj);
 
 void
-SpiAccessibleText_getSelection (SpiAccessibleText *obj,
-                            long selectionNum, long *startOffset,
-                            long *endOffset);
+AccessibleText_getSelection (AccessibleText *obj,
+                            long int selectionNum,
+                            long int *startOffset,
+                            long int *endOffset);
 
 
-boolean
-SpiAccessibleText_addSelection (SpiAccessibleText *obj,
-                            long startOffset, long endOffset);
+SPIBoolean
+AccessibleText_addSelection (AccessibleText *obj,
+                            long int startOffset,
+                            long int endOffset);
 
-boolean
-SpiAccessibleText_removeSelection (SpiAccessibleText *obj,
-                               long selectionNum);
+SPIBoolean
+AccessibleText_removeSelection (AccessibleText *obj,
+                               long int selectionNum);
 
-boolean
-SpiAccessibleText_setSelection (SpiAccessibleText *obj,
-                            long selectionNum,
-                            long startOffset,
-                            long endOffset);
+SPIBoolean
+AccessibleText_setSelection (AccessibleText *obj,
+                            long int selectionNum,
+                            long int startOffset,
+                            long int endOffset);
 
 /*
  *
- * SpiAccessibleValue Function Prototypes:
+ * AccessibleValue Function Prototypes:
  *
  */
 
+int
+AccessibleValue_ref (AccessibleValue *obj);
+
+int
+AccessibleValue_unref (AccessibleValue *obj);
+
 float
-SpiAccessibleValue_getMinimumValue (SpiAccessibleValue *value);
+AccessibleValue_getMinimumValue (AccessibleValue *obj);
 
 float
-SpiAccessibleValue_getCurrentValue (SpiAccessibleValue *value);
+AccessibleValue_getCurrentValue (AccessibleValue *obj);
 
 float
-SpiAccessibleValue_getMaximumValue (SpiAccessibleValue *value);
+AccessibleValue_getMaximumValue (AccessibleValue *obj);
 
-boolean
-SpiAccessibleValue_setCurrentValue (SpiAccessibleValue *value,
+SPIBoolean
+AccessibleValue_setCurrentValue (AccessibleValue *obj,
                                  float newValue);
 
 void
-spi_freeString (char *s);
+SPI_freeString (char *s);
+
+G_END_DECLS
 
 #endif