2001-12-10 Michael Meeks <michael@ximian.com>
[platform/core/uifw/at-spi2-atk.git] / cspi / spi.h
index 7fd1ec0..67dbaf4 100644 (file)
@@ -1,34 +1,39 @@
-
 #ifndef _SPI_H
 #define _SPI_H
 
-#include "spi-impl.h"
+#include <glib/gmacros.h>
 
-/* definitions for ACCESSIBLE_STATE */
-#include "spi-roletypes.h"
-#include "spi-statetypes.h"
-#include "spi-listener.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>
 
 /*
- *
- * Enumerated type for text boundary types
- *
+ * Auxiliary typedefs and mask definitions
  */
+#include <libspi/keymasks.h>
+
+G_BEGIN_DECLS
 
+/*
+ * Enumerated type for text boundary types
+ */
 typedef enum
 {
-  TEXT_BOUNDARY_CHAR,
-  TEXT_BOUNDARY_CURSOR_POS,
-  TEXT_BOUNDARY_WORD_START,
-  TEXT_BOUNDARY_WORD_END,
-  TEXT_BOUNDARY_SENTENCE_START,
-  TEXT_BOUNDARY_SENTENCE_END,
-  TEXT_BOUNDARY_LINE_START,
-  TEXT_BOUNDARY_LINE_END,
-  TEXT_BOUNDARY_ATTRIBUTE_RANGE
-} TEXT_BOUNDARY_TYPE;
-
-
+  SPI_TEXT_BOUNDARY_CHAR,
+  SPI_TEXT_BOUNDARY_CURSOR_POS,
+  SPI_TEXT_BOUNDARY_WORD_START,
+  SPI_TEXT_BOUNDARY_WORD_END,
+  SPI_TEXT_BOUNDARY_SENTENCE_START,
+  SPI_TEXT_BOUNDARY_SENTENCE_END,
+  SPI_TEXT_BOUNDARY_LINE_START,
+  SPI_TEXT_BOUNDARY_LINE_END,
+  SPI_TEXT_BOUNDARY_ATTRIBUTE_RANGE
+} AccessibleTextBoundaryType;
 
 /*
  *
@@ -38,153 +43,246 @@ typedef enum
 
 typedef enum
 {
-  RELATION_LABEL_FOR,
-  RELATION_LABELED_BY,
-  RELATION_CONTROLLER_FOR,
-  RELATION_CONTROLLED_BY,
-  RELATION_MEMBER_OF
-} RELATION_TYPE;
-
-
-
-typedef enum _AccessibleCoordType {
-  COORD_TYPE_WINDOW,
-  COORD_TYPE_SCREEN
+  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 {
+  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;
+} AccessibleKeySet;
 
-/*
- *
- * Basic SPI initialization and event loop function prototypes
- *
- */
+/**
+ * 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
 
-int
-SPI_init (void);
+typedef unsigned long AccessibleKeyMaskType;
 
-void
-SPI_event_main (boolean isGNOMEApp);
 
-boolean
-SPI_eventIsReady ();
+/* Basic SPI initialization and event loop function prototypes */
 
-AccessibleEvent *
-SPI_nextEvent (boolean waitForEvent);
+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);
 
-void
-SPI_exit (void);
-
-/*
- * Event Listener creation and support.
- */
+/* Event Listener creation and support.  */
 
 AccessibleEventListener *
-createEventListener (AccessibleEventListenerCB callback);
-
-boolean
-EventListener_addCallback (AccessibleEventListener *listener,
-                           AccessibleEventListenerCB callback);
-
-boolean
-EventListener_removeCallback (AccessibleEventListener *listener,
-                              AccessibleEventListenerCB callback);
+           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  */
+
+void                 Accessible_ref              (Accessible *obj);
+void                 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);
+
+/* Interface query methods */
+
+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);
 
 /*
- *
- * Global functions serviced by the registry
- *
+ * AccessibleAction function prototypes
  */
 
-boolean
-RegisterGlobalEventListener (AccessibleEventListener *listener,
-                             char *eventType);
-
-int
-GetDesktopCount ();
-
-Accessible
-*getDesktop (int n);
-
-int
-getDesktopList (Accessible **list);
-
-void
-registerKeystrokeListener (KeystrokeListener *listener);
-
-void
-generateKeyEvent (long keyCode, long meta);
-
-void
-generateMouseEvent (long x, long y, char *name);
+void AccessibleAction_ref    (AccessibleAction *obj);
+void AccessibleAction_unref  (AccessibleAction *obj);
+long
+AccessibleAction_getNActions (AccessibleAction *obj);
 
-/*
+/**
+ * AccessibleAction_getName:
+ * @obj: a pointer to the #AccessibleAction implementor to query.
+ * @i: a long integer indicating which action to query.
  *
- * Accessible function prototypes
+ * Get the name of the '@i-th' action invokable on an
+ *      object implementing #AccessibleAction.
  *
- */
-
-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 childIndex);
-
-long
-Accessible_getIndexInParent (Accessible *obj);
-
-AccessibleRelation **
-Accessible_getRelationSet (Accessible *obj);
-
+ * Returns: the 'event type' name of the action, as a UTF-8 string.
+ *
+ **/
 char *
-Accessible_getRole (Accessible *obj);
-
-AccessibleStateSet *
-Accessible_getStateSet (Accessible *obj);
-
+AccessibleAction_getName (AccessibleAction *obj, long int i);
 
-/*
+/**
+ * AccessibleAction_getDescription:
+ * @obj: a pointer to the #AccessibleAction to query.
+ * @i: a long integer indicating which action to query.
  *
- * AccessibleAction function prototypes
+ * Get the description of '@i-th' action invokable on an
+ *      object implementing #AccessibleAction.
  *
- */
-
-int
-AccessibleAction_ref (
-                      AccessibleAction *obj);
-
-int
-AccessibleAction_unref (AccessibleAction *obj);
-
-long
-AccessibleAction_getNActions (AccessibleAction *obj);
-
+ * Returns: a UTF-8 string describing the '@i-th' invokable action.
+ *
+ **/
 char *
 AccessibleAction_getDescription (AccessibleAction *obj,
-                                 long index);
+                                 long int i);
 
-void
+SPIBoolean
 AccessibleAction_doAction (AccessibleAction *obj,
-                           long index);
+                           long int i);
 
+/**
+ * AccessibleAction_getKeybinding:
+ * @obj: a pointer to the #AccessibleAction implementor to query.
+ * @i: a long integer indicating which action to query.
+ *
+ * Get the keybindings for the @i-th action invokable on an
+ *      object implementing #AccessibleAction, if any are defined.
+ *
+ * Returns: a UTF-8 string which can be parsed to determine the @i-th
+ * invokable action's keybindings.
+ *
+ **/
 char *
 AccessibleAction_getKeyBinding (AccessibleAction *obj,
-                                long index);
+                                long int i);
 
 /*
  *
@@ -192,25 +290,96 @@ AccessibleAction_getKeyBinding (AccessibleAction *obj,
  *
  */
 
-int
+/**
+ * AccessibleApplication_unref:
+ * @obj: a pointer to the #AccessibleApplication on which to operate.
+ *
+ * Decrement the reference count for an #AccessibleApplication.
+ *
+ * Returns: (no return code implemented yet).
+ *
+ **/
+void
 AccessibleApplication_ref (AccessibleApplication *obj);
 
-int
+/**
+ * AccessibleApplication_unref:
+ * @obj: a pointer to the #AccessibleApplication object on which to operate.
+ *
+ * Decrement the reference count for an #AccessibleApplication.
+ *
+ * Returns: (no return code implemented yet).
+ *
+ **/
+void
 AccessibleApplication_unref (AccessibleApplication *obj);
 
+/**
+ * AccessibleApplication_getToolkitName:
+ * @obj: a pointer to the #AccessibleApplication to query.
+ *
+ * Get the name of the UI toolkit used by an #AccessibleApplication.
+ *
+ * Returns: a UTF-8 string indicating which UI toolkit is
+ *          used by an application.
+ *
+ **/
 char *
 AccessibleApplication_getToolkitName (AccessibleApplication *obj);
 
+/**
+ * AccessibleApplication_getVersion:
+ * @obj: a pointer to the #AccessibleApplication being queried.
+ *
+ * Get the version of the at-spi bridge exported by an
+ *      #AccessibleApplication instance.
+ *
+ * Returns: a UTF-8 string indicating the application's
+ *          at-spi version.
+ *
+ **/
 char *
 AccessibleApplication_getVersion (AccessibleApplication *obj);
 
+/**
+ * AccessibleApplication_getID:
+ * @obj: a pointer to the #AccessibleApplication being queried.
+ *
+ * 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 Registry, or 0 if the application is not registered.
+ **/
 long
 AccessibleApplication_getID (AccessibleApplication *obj);
 
-boolean
+/**
+ * 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).
+ * Not Yet Implemented.
+ *
+ * Returns: #TRUE if the application was paused successfully, #FALSE otherwise.
+ *
+ **/
+SPIBoolean
 AccessibleApplication_pause (AccessibleApplication *obj);
 
-boolean
+/**
+ * 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.
+ *
+ * Returns: #TRUE if application processing resumed successfully, #FALSE otherwise.
+ *
+ **/
+SPIBoolean
 AccessibleApplication_resume (AccessibleApplication *obj);
 
 /*
@@ -219,42 +388,79 @@ AccessibleApplication_resume (AccessibleApplication *obj);
  *
  */
 
-int
+void
 AccessibleComponent_ref (AccessibleComponent *obj);
 
-int
+void
 AccessibleComponent_unref (AccessibleComponent *obj);
 
-boolean
+SPIBoolean
 AccessibleComponent_contains (AccessibleComponent *obj,
-                              long x,
-                              long y,
+                              long int x,
+                              long int y,
                               AccessibleCoordType ctype);
 
 Accessible *
 AccessibleComponent_getAccessibleAtPoint (AccessibleComponent *obj,
-                                          long x,
-                                          long y,
+                                          long int x,
+                                          long int y,
                                           AccessibleCoordType ctype);
 
+/**
+ * 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.
+ * @width: a pointer to a #long into which the x extents (width) will be returned.
+ * @height: a pointer to a #long into which the y extents (height) will be returned.
+ * @ctype: the desired coordinate system into which to return the results,
+ *         (e.g. COORD_TYPE_WINDOW, COORD_TYPE_SCREEN).
+ *
+ * Get the bounding box of the specified #AccessibleComponent.
+ *
+ **/
 void
 AccessibleComponent_getExtents (AccessibleComponent *obj,
-                                long *x,
-                                long *y,
-                                long *width,
-                                long *height,
+                                long int *x,
+                                long int *y,
+                                long int *width,
+                                long int *height,
                                 AccessibleCoordType ctype);
 
 void
 AccessibleComponent_getPosition (AccessibleComponent *obj,
-                                 long *x,
-                                 long *y,
+                                 long int *x,
+                                 long int *y,
                                  AccessibleCoordType ctype);
 
 void
 AccessibleComponent_getSize (AccessibleComponent *obj,
-                             long *width,
-                             long *height);
+                             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
 AccessibleComponent_grabFocus (AccessibleComponent *obj);
@@ -265,51 +471,46 @@ AccessibleComponent_grabFocus (AccessibleComponent *obj);
  *
  */
 
-int
+void
 AccessibleEditableText_ref (AccessibleEditableText *obj);
 
-int
+void
 AccessibleEditableText_unref (AccessibleEditableText *obj);
 
-void
+SPIBoolean
+AccessibleEditableText_setAttributes (AccessibleEditableText *obj,
+                                     const char *attributes,
+                                     long int startOffset,
+                                     long int endOffset);
+
+SPIBoolean
 AccessibleEditableText_setTextContents (AccessibleEditableText *obj,
-                                        char *newContents);
+                                        const char *newContents);
 
-void
+SPIBoolean
 AccessibleEditableText_insertText (AccessibleEditableText *obj,
-                                   long position,
-                                   char *text,
-                                   long length);
-
-boolean
-AccessibleEditableText_selectText (AccessibleEditableText *obj,
-                                   long startPos,
-                                   long endPos);
+                                   long int position,
+                                   const char *text,
+                                   long int length);
 
-boolean
-AccessibleEditableText_setAttributes (AccessibleEditableText *obj,
-                                      long startPos,
-                                      long endPos,
-                                      char *attributes);
-
-void
+SPIBoolean
 AccessibleEditableText_copyText (AccessibleText *obj,
-                                 long startPos,
-                                 long endPos);
+                                 long int startPos,
+                                 long int endPos);
 
-void
+SPIBoolean
 AccessibleEditableText_cutText (AccessibleEditableText *obj,
-                                long startPos,
-                                long endPos);
+                                long int startPos,
+                                long int endPos);
 
-void
+SPIBoolean
 AccessibleEditableText_deleteText (AccessibleEditableText *obj,
-                                   long startPos,
-                                   long endPos);
+                                   long int startPos,
+                                   long int endPos);
 
-void
+SPIBoolean
 AccessibleEditableText_pasteText (AccessibleEditableText *obj,
-                                  long position);
+                                  long int position);
 
 /*
  *
@@ -317,29 +518,23 @@ AccessibleEditableText_pasteText (AccessibleEditableText *obj,
  *
  */
 
-int
-AccessibleHyperlink_ref (AccessibleHyperlink *obj);
-
-int
-AccessibleHyperlink_unref (AccessibleHyperlink *obj);
-
 long
 AccessibleHyperlink_getNAnchors (AccessibleHyperlink *obj);
 
 char *
 AccessibleHyperlink_getURI (AccessibleHyperlink *obj,
-                            long i);
+                            long int i);
 
-Accessible
-AccessibleHyperlink_getAnchor (AccessibleHyperlink *obj,
-                               long i);
+Accessible *
+AccessibleHyperlink_getObject (AccessibleHyperlink *obj,
+                               long int i);
 
 void
 AccessibleHyperlink_getIndexRange (AccessibleHyperlink *obj,
-                                   long *startIndex,
-                                   long *endIndex);
+                                   long int *startIndex,
+                                   long int *endIndex);
 
-boolean
+SPIBoolean
 AccessibleHyperlink_isValid (AccessibleHyperlink *obj);
 
 /*
@@ -348,22 +543,22 @@ AccessibleHyperlink_isValid (AccessibleHyperlink *obj);
  *
  */
 
-int
+void
 AccessibleHypertext_ref (AccessibleHypertext *obj);
 
-int
+void
 AccessibleHypertext_unref (AccessibleHypertext *obj);
 
 long
 AccessibleHypertext_getNLinks (AccessibleHypertext *obj);
 
 AccessibleHyperlink *
-AccessibleHyperText_getLink (AccessibleHypertext *obj,
-                             long linkIndex);
+AccessibleHypertext_getLink (AccessibleHypertext *obj,
+                             long int linkIndex);
 
 long
 AccessibleHypertext_getLinkIndex (AccessibleHypertext *obj,
-                                  long characterIndex);
+                                  long int characterOffset);
 
 /*
  *
@@ -371,10 +566,10 @@ AccessibleHypertext_getLinkIndex (AccessibleHypertext *obj,
  *
  */
 
-int
+void
 AccessibleImage_ref (AccessibleImage *obj);
 
-int
+void
 AccessibleImage_unref (AccessibleImage *obj);
 
 char *
@@ -382,33 +577,39 @@ AccessibleImage_getImageDescription (AccessibleImage *obj);
 
 void
 AccessibleImage_getImageSize (AccessibleImage *obj,
-                              long *width,
-                              long *height,
-                              AccessibleCoordType ctype);
+                              long int *width,
+                              long int *height);
+
 void
 AccessibleImage_getImagePosition (AccessibleImage *obj,
-                                  long *x,
-                                  long *y,
+                                  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);
 /*
  *
  * AccessibleRelation function prototypes
  *
  */
 
-int
-AccessibleRelation_ref (AccessibleRelation *obj);
-
-int
-AccessibleRelation_unref (AccessibleRelation *obj);
+void AccessibleRelation_ref   (AccessibleRelation *obj);
+void AccessibleRelation_unref (AccessibleRelation *obj);
 
-RELATION_TYPE
+AccessibleRelationType
 AccessibleRelation_getRelationType (AccessibleRelation *obj);
 
-Accessible *
-AccessibleRelation_getTarget (AccessibleRelation *obj);
+int
+AccessibleRelation_getNTargets (AccessibleRelation *obj);
 
+Accessible *
+AccessibleRelation_getTarget (AccessibleRelation *obj, int i);
 
 
 /*
@@ -417,32 +618,29 @@ AccessibleRelation_getTarget (AccessibleRelation *obj);
  *
  */
 
-int
-AccessibleSelection_ref (AccessibleSelection *obj);
-
-int
-AccessibleSelection_unref (AccessibleSelection *obj);
+void AccessibleSelection_ref   (AccessibleSelection *obj);
+void AccessibleSelection_unref (AccessibleSelection *obj);
 
 long
-AccessibleSelwection_getNSelectedChildren (AccessibleSelection *obj);
+AccessibleSelection_getNSelectedChildren (AccessibleSelection *obj);
 
 Accessible *
 AccessibleSelection_getSelectedChild (AccessibleSelection *obj,
-                                      long selectedChildIndex);
+                                      long int selectedChildIndex);
 
-boolean
+SPIBoolean
 AccessibleSelection_selectChild (AccessibleSelection *obj,
-                                 long childIndex);
+                                 long int childIndex);
 
-boolean
+SPIBoolean
 AccessibleSelection_deselectSelectedChild (AccessibleSelection *obj,
-                                           long selectedChildIndex);
+                                           long int selectedChildIndex);
 
-boolean
+SPIBoolean
 AccessibleSelection_isChildSelected (AccessibleSelection *obj,
-                                     long childIndex);
+                                     long int childIndex);
 
-void
+SPIBoolean
 AccessibleSelection_selectAll (AccessibleSelection *obj);
 
 void
@@ -455,34 +653,30 @@ AccessibleSelection_clearSelection (AccessibleSelection *obj);
  *
  */
 
-int
-AccessibleStateSet_ref (AccessibleStateSet *obj);
-
-int
-AccessibleStateSet_unref (AccessibleStateSet *obj);
+void AccessibleStateSet_ref   (AccessibleStateSet *obj);
+void AccessibleStateSet_unref (AccessibleStateSet *obj);
 
-boolean
+SPIBoolean
 AccessibleStateSet_contains (AccessibleStateSet *obj,
-                             ACCESSIBLE_STATE state);
+                             AccessibleState state);
 
 void
 AccessibleStateSet_add (AccessibleStateSet *obj,
-                        ACCESSIBLE_STATE state);
+                        AccessibleState state);
 
 void
 AccessibleStateSet_remove (AccessibleStateSet *obj,
-                           ACCESSIBLE_STATE state);
+                           AccessibleState state);
 
-boolean
+SPIBoolean
 AccessibleStateSet_equals (AccessibleStateSet *obj,
                            AccessibleStateSet *obj2);
 
-void
+AccessibleStateSet *
 AccessibleStateSet_compare (AccessibleStateSet *obj,
-                            AccessibleStateSet *obj2,
-                            AccessibleStateSet **differenceSet);
+                            AccessibleStateSet *obj2);
 
-boolean
+SPIBoolean
 AccessibleStateSet_isEmpty (AccessibleStateSet *obj);
 
 
@@ -492,11 +686,8 @@ AccessibleStateSet_isEmpty (AccessibleStateSet *obj);
  *
  */
 
-int
-AccessibleTable_ref (AccessibleTable *obj);
-
-int
-AccessibleTable_unref (AccessibleTable *obj);
+void AccessibleTable_ref   (AccessibleTable *obj);
+void AccessibleTable_unref (AccessibleTable *obj);
 
 Accessible *
 AccessibleTable_getCaption (AccessibleTable *obj);
@@ -512,70 +703,74 @@ AccessibleTable_getNColumns (AccessibleTable *obj);
 
 Accessible *
 AccessibleTable_getAccessibleAt (AccessibleTable *obj,
-                                 long row,
-                                 long column);
+                                 long int row,
+                                 long int column);
 
 long
 AccessibleTable_getIndexAt (AccessibleTable *obj,
-                            long row,
-                            long column);
+                            long int row,
+                            long int column);
 
 long
 AccessibleTable_getRowAtIndex (AccessibleTable *obj,
-                               long index);
+                               long int index);
 
 long
 AccessibleTable_getColumnAtIndex (AccessibleTable *obj,
-                                  long index);
+                                  long int index);
 
 char *
-AccessibleTable_getRowDescription (AccessibleTable *obj);
+AccessibleTable_getRowDescription (AccessibleTable *obj,
+                                  long int row);
 
 char *
-AccessibleTable_getColumnDescription (AccessibleTable *obj);
+AccessibleTable_getColumnDescription (AccessibleTable *obj,
+                                     long int column);
 
 long
 AccessibleTable_getRowExtentAt (AccessibleTable *obj,
-                                long row,
-                                long column);
+                                long int row,
+                                long int column);
 
 long
 AccessibleTable_getColumnExtentAt (AccessibleTable *obj,
-                                   long row,
-                                   long column);
+                                   long int row,
+                                   long int column);
 
-AccessibleTable *
-AccessibleTable_getRowHeaders (AccessibleTable *obj);
+Accessible *
+AccessibleTable_getRowHeader (AccessibleTable *obj,
+                             long int row);
 
-AccessibleTable *
-AccessibleTable_getColumnHeaders (AccessibleTable *obj);
+Accessible *
+AccessibleTable_getColumnHeader (AccessibleTable *obj,
+                                long int column);
 
 long
 AccessibleTable_getNSelectedRows (AccessibleTable *obj);
 
-void
+long
 AccessibleTable_getSelectedRows (AccessibleTable *obj,
-                                 long **selectedRows);
+                                 long int **selectedRows);
 
 long
 AccessibleTable_getNSelectedColumns (AccessibleTable *obj);
 
-void
+long
 AccessibleTable_getSelectedColumns (AccessibleTable *obj,
-                                    long **selectedColumns);
+                                    long int **selectedColumns);
 
-boolean
+SPIBoolean
 AccessibleTable_isRowSelected (AccessibleTable *obj,
-                               long row);
+                               long int row);
 
-boolean
+SPIBoolean
 AccessibleTable_isColumnSelected (AccessibleTable *obj,
-                                  long column);
+                                  long int column);
 
-boolean
+SPIBoolean
 AccessibleTable_isSelected (AccessibleTable *obj,
-                            long row,
-                            long column);
+                            long int row,
+                            long int column);
 
 /*
  *
@@ -583,76 +778,95 @@ AccessibleTable_isSelected (AccessibleTable *obj,
  *
  */
 
-int
-AccessibleText_ref (AccessibleText *obj);
-
-int
-AccessibleText_unref (AccessibleText *obj);
+void AccessibleText_ref   (AccessibleText *obj);
+void AccessibleText_unref (AccessibleText *obj);
 
 long
 AccessibleText_getCharacterCount (AccessibleText *obj);
 
 char *
 AccessibleText_getText (AccessibleText *obj,
-                        long startOffset,
-                        long endOffset);
+                        long int startOffset,
+                        long int endOffset);
 
 long
 AccessibleText_getCaretOffset (AccessibleText *obj);
 
-boolean
+char *
+AccessibleText_getAttributes (AccessibleText *obj,
+                                long int offset,
+                                long int *startOffset,
+                                long int *endOffset);
+
+
+SPIBoolean
 AccessibleText_setCaretOffset (AccessibleText *obj,
-                               long newOffset);
+                               long int newOffset);
 
 char *
 AccessibleText_getTextBeforeOffset (AccessibleText *obj,
-                                    long offset,
-                                    TEXT_BOUNDARY_TYPE type);
+                                    long int offset,
+                                    AccessibleTextBoundaryType type,
+                                   long int *startOffset,
+                                   long int *endOffset);
 
 char *
-AccessibleText_getTextAtOffset (Accessible *obj,
-                                long offset,
-                                TEXT_BOUNDARY_TYPE type);
+AccessibleText_getTextAtOffset (AccessibleText *obj,
+                               long int offset,
+                               AccessibleTextBoundaryType type,
+                               long int *startOffset,
+                               long int *endOffset);
 
 char *
 AccessibleText_getTextAfterOffset (AccessibleText *obj,
-                                   long offset,
-                                   TEXT_BOUNDARY_TYPE type);
+                                  long int offset,
+                                  AccessibleTextBoundaryType type,
+                                  long int *startOffset,
+                                  long int *endOffset);
 
-char
+unsigned long
 AccessibleText_getCharacterAtOffset (AccessibleText *obj,
-                                     long offset);
-
-char *
-AccessibleText_getAttributes (AccessibleText *obj,
-                              long startOffset,
-                              long endOffset);
+                                     long int offset);
 
-boolean
+void
 AccessibleText_getCharacterExtents (AccessibleText *obj,
-                                    long offset,
-                                    long *x,
-                                    long *y,
-                                    long *width,
-                                    long *height);
+                                    long int offset,
+                                    long int *x,
+                                    long int *y,
+                                    long int *width,
+                                    long int *height,
+                                   AccessibleCoordType type);
 
 long
 AccessibleText_getOffsetAtPoint (AccessibleText *obj,
-                                 long x,
-                                 long y);
+                                 long int x,
+                                 long int y,
+                                AccessibleCoordType type);
 
-char *
-AccessibleText_getSelectedText (AccessibleText *obj);
+long
+AccessibleText_getNSelections (AccessibleText *obj);
 
 void
-AccessibleText_getSelectionBounds (AccessibleText *obj,
-                                   long *startOffset,
-                                   long *endOffset);
+AccessibleText_getSelection (AccessibleText *obj,
+                            long int selectionNum,
+                            long int *startOffset,
+                            long int *endOffset);
+
 
-boolean
-AccessibleText_setSelectionBounds (AccessibleText *obj,
-                                   long startOffset,
-                                   long endOffset);
+SPIBoolean
+AccessibleText_addSelection (AccessibleText *obj,
+                            long int startOffset,
+                            long int endOffset);
+
+SPIBoolean
+AccessibleText_removeSelection (AccessibleText *obj,
+                               long int selectionNum);
+
+SPIBoolean
+AccessibleText_setSelection (AccessibleText *obj,
+                            long int selectionNum,
+                            long int startOffset,
+                            long int endOffset);
 
 /*
  *
@@ -660,17 +874,25 @@ AccessibleText_setSelectionBounds (AccessibleText *obj,
  *
  */
 
+void AccessibleValue_ref   (AccessibleValue *obj);
+void AccessibleValue_unref (AccessibleValue *obj);
+
 float
-AccessibleValue_getMinimumValue (AccessibleValue *value);
+AccessibleValue_getMinimumValue (AccessibleValue *obj);
 
 float
-AccessibleValue_getCurrentValue (AccessibleValue *value);
+AccessibleValue_getCurrentValue (AccessibleValue *obj);
 
 float
-AccessibleValue_getMaximumValue (AccessibleValue *value);
+AccessibleValue_getMaximumValue (AccessibleValue *obj);
 
-boolean
-AccessibleValue_setCurrentValue (AccessibleValue *value,
+SPIBoolean
+AccessibleValue_setCurrentValue (AccessibleValue *obj,
                                  float newValue);
 
+void
+SPI_freeString (char *s);
+
+G_END_DECLS
+
 #endif