Add namespacing to un-namespaced methods in cspi.

Add documentation and revise to reflect the API change.
Expand the enumerations for AccessibleRole.

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

diff --git a/ChangeLog b/ChangeLog
index bee084c..97bc9da 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,21 @@
 2001-12-12  Bill Haneman <bill.haneman@sun.com>
 
 2001-12-12  Bill Haneman <bill.haneman@sun.com>
 

+       * cspi/spi.h:
+       * cspi/spi_registry.c:
+       * cspi/spi_event.c:
+       Namespaced all methods that did not begin with an "SPI_" or
+       "Accessible" prefix to "SPI_".  
+
+       * cspi/spi_main.c:
+       Homogenized internal function namespace to "cspi_" for statics.
+       
+       * test/*.c:
+       Patched tests to use the new CSPI API.
+
+       * docs/reference/cspi/at-spi-cspi-sections.txt:
+       Updated docs to reflect namespace changes, and added a number of
+       methods to the documentation.
+       

        * registryd/registry.c:
        Changed use of strings and string hashes in listener event
        matching and parse_event_string to use GQuark, which is guaranteed
        * registryd/registry.c:
        Changed use of strings and string hashes in listener event
        matching and parse_event_string to use GQuark, which is guaranteed

diff --git a/cspi/spi.h b/cspi/spi.h
index 20ca00d..82131bd 100644 (file)
--- a/cspi/spi.h
+++ b/cspi/spi.h
@@ -137,53 +137,61 @@ int              SPI_exit         (void);
 
 /* Event Listener creation and support.  */
 
 
 /* Event Listener creation and support.  */
 

-AccessibleEventListener *
-           createAccessibleEventListener          (AccessibleEventListenerCB callback,
+AccessibleEventListener * SPI_createAccessibleEventListener (
+                                                  AccessibleEventListenerCB callback,

                                                   void                     *user_data);
                                                   void                     *user_data);

-SPIBoolean AccessibleEventListener_addCallback    (AccessibleEventListener  *listener,
+SPIBoolean                AccessibleEventListener_addCallback (
+                                                  AccessibleEventListener  *listener,

                                                   AccessibleEventListenerCB callback,
                                                   void                     *user_data);
                                                   AccessibleEventListenerCB callback,
                                                   void                     *user_data);

-SPIBoolean AccessibleEventListener_removeCallback (AccessibleEventListener  *listener,
+SPIBoolean                AccessibleEventListener_removeCallback (
+                                                  AccessibleEventListener  *listener,

                                                   AccessibleEventListenerCB callback);
                                                   AccessibleEventListenerCB callback);

-void       AccessibleEventListener_unref          (AccessibleEventListener  *listener);
+void                      AccessibleEventListener_unref (
+                                                  AccessibleEventListener  *listener);

 
 /* Keystroke Listener creation and support.  */
 
 
 /* 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);
+AccessibleKeystrokeListener * SPI_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 */
 
 
 /* Global functions serviced by the registry */
 

-SPIBoolean  registerGlobalEventListener      (AccessibleEventListener *listener,
-                                             const char              *eventType);
-SPIBoolean  deregisterGlobalEventListener    (AccessibleEventListener *listener,
-                                             const char              *eventType);
-SPIBoolean  deregisterGlobalEventListenerAll (AccessibleEventListener *listener);
-
-SPIBoolean  registerAccessibleKeystrokeListener (
-                                              AccessibleKeystrokeListener *listener,
-                                             AccessibleKeySet             *keys,
-                                             AccessibleKeyMaskType         modmask,
-                                             AccessibleKeyEventMask        eventmask,
-                                             AccessibleKeyListenerSyncType sync_type);
-SPIBoolean  deregisterAccessibleKeystrokeListener (
-                                              AccessibleKeystrokeListener *listener,
-                                             AccessibleKeyMaskType        modmask);
-
-int         getDesktopCount                  (void);
-Accessible *getDesktop                       (int i);
-int         getDesktopList                   (Accessible **list);
-
-SPIBoolean  generateKeyEvent                 (long int                    keyval,
-                                             AccessibleKeySynthType      synth_type);
-SPIBoolean  generateMouseEvent               (long int x, long int y, char *name);
+SPIBoolean SPI_registerGlobalEventListener           (
+                                      AccessibleEventListener *listener,
+                                      const char              *eventType);
+SPIBoolean SPI_deregisterGlobalEventListener         (
+                                      AccessibleEventListener *listener,
+                                      const char              *eventType);
+SPIBoolean SPI_deregisterGlobalEventListenerAll      (
+                                      AccessibleEventListener *listener);
+SPIBoolean SPI_registerAccessibleKeystrokeListener   (
+                                       AccessibleKeystrokeListener *listener,
+                                      AccessibleKeySet             *keys,
+                                      AccessibleKeyMaskType         modmask,
+                                      AccessibleKeyEventMask        eventmask,
+                                      AccessibleKeyListenerSyncType sync_type);
+SPIBoolean SPI_deregisterAccessibleKeystrokeListener (
+                                      AccessibleKeystrokeListener *listener,
+                                      AccessibleKeyMaskType        modmask);
+
+int         SPI_getDesktopCount                  (void);
+Accessible *SPI_getDesktop                       (int i);
+int         SPI_getDesktopList                   (Accessible **list);
+
+SPIBoolean  SPI_generateKeyEvent                 (long int                    keyval,
+                                                 AccessibleKeySynthType      synth_type);
+SPIBoolean  SPI_generateMouseEvent               (long int x, long int y, char *name);

 
 /* Accessible function prototypes  */
 
 
 /* Accessible function prototypes  */
 

diff --git a/cspi/spi_event.c b/cspi/spi_event.c
index c1adea8..6fc82c6 100644 (file)
--- a/cspi/spi_event.c
+++ b/cspi/spi_event.c
@@ -23,7 +23,7 @@
 #include <cspi/spi-private.h>
 
 /**
 #include <cspi/spi-private.h>
 
 /**

- * createAccessibleEventListener:
+ * SPI_createAccessibleEventListener:

  * @callback : an #AccessibleEventListenerCB callback function, or NULL.
  * @user_data: a pointer to data which will be passed to the callback when invoked.
  *
  * @callback : an #AccessibleEventListenerCB callback function, or NULL.
  * @user_data: a pointer to data which will be passed to the callback when invoked.
  *


@@ -33,8 +33,8 @@
  *
  **/
 AccessibleEventListener *
  *
  **/
 AccessibleEventListener *

-createAccessibleEventListener (AccessibleEventListenerCB callback,
-                              void                     *user_data)
+SPI_createAccessibleEventListener (AccessibleEventListenerCB callback,
+                                  void                     *user_data)

 {
   AccessibleEventListener *listener = cspi_event_listener_new ();
   if (callback)
 {
   AccessibleEventListener *listener = cspi_event_listener_new ();
   if (callback)


@@ -110,8 +110,8 @@ AccessibleEventListener_removeCallback (AccessibleEventListener  *listener,
  *
  **/
 AccessibleKeystrokeListener *
  *
  **/
 AccessibleKeystrokeListener *

-createAccessibleKeystrokeListener (AccessibleKeystrokeListenerCB callback,
-                                  void                         *user_data)
+SPI_createAccessibleKeystrokeListener (AccessibleKeystrokeListenerCB callback,
+                                      void                         *user_data)

 {
   AccessibleKeystrokeListener *listener = cspi_keystroke_listener_new ();
   if (callback)
 {
   AccessibleKeystrokeListener *listener = cspi_keystroke_listener_new ();
   if (callback)

diff --git a/cspi/spi_main.c b/cspi/spi_main.c
index f5cde18..ad9bd7b 100644 (file)
--- a/cspi/spi_main.c
+++ b/cspi/spi_main.c
@@ -14,7 +14,7 @@ static Accessibility_Registry registry = CORBA_OBJECT_NIL;
 static GHashTable *live_refs = NULL;
 
 static guint
 static GHashTable *live_refs = NULL;
 
 static guint

-spi_object_hash (gconstpointer key)
+cspi_object_hash (gconstpointer key)

 {
   CORBA_Object object = (CORBA_Object) key;
   guint        retval;
 {
   CORBA_Object object = (CORBA_Object) key;
   guint        retval;


@@ -25,7 +25,7 @@ spi_object_hash (gconstpointer key)
 }
 
 static gboolean
 }
 
 static gboolean

-spi_object_equal (gconstpointer a, gconstpointer b)
+cspi_object_equal (gconstpointer a, gconstpointer b)

 {
   CORBA_Object objecta = (CORBA_Object) a;
   CORBA_Object objectb = (CORBA_Object) b;
 {
   CORBA_Object objecta = (CORBA_Object) a;
   CORBA_Object objectb = (CORBA_Object) b;


@@ -37,7 +37,7 @@ spi_object_equal (gconstpointer a, gconstpointer b)
 }
 
 static void
 }
 
 static void

-spi_object_release (gpointer  value)
+cspi_object_release (gpointer  value)

 {
   Accessible *a = (Accessible *) value;
 
 {
   Accessible *a = (Accessible *) value;
 


@@ -91,14 +91,14 @@ cspi_accessible_is_a (Accessible *obj,
 }
 
 static GHashTable *
 }
 
 static GHashTable *

-get_live_refs (void)
+cspi_get_live_refs (void)

 {
   if (!live_refs) 
     {
 {
   if (!live_refs) 
     {

-      live_refs = g_hash_table_new_full (spi_object_hash,
-                                        spi_object_equal,
+      live_refs = g_hash_table_new_full (cspi_object_hash,
+                                        cspi_object_equal,

                                         NULL,
                                         NULL,

-                                        spi_object_release);
+                                        cspi_object_release);

     }
   return live_refs;
 }
     }
   return live_refs;
 }


@@ -149,7 +149,7 @@ cspi_object_add (CORBA_Object corba_object)
     }
   else
     {
     }
   else
     {

-      if ((ref = g_hash_table_lookup (get_live_refs (), corba_object)))
+      if ((ref = g_hash_table_lookup (cspi_get_live_refs (), corba_object)))

         {
           g_assert (ref->ref_count > 0);
          ref->ref_count++;
         {
           g_assert (ref->ref_count > 0);
          ref->ref_count++;


@@ -169,7 +169,7 @@ cspi_object_add (CORBA_Object corba_object)
           ref->objref = corba_object;
           ref->ref_count = 1;
 
           ref->objref = corba_object;
           ref->ref_count = 1;
 

-          g_hash_table_insert (get_live_refs (), ref->objref, ref);
+          g_hash_table_insert (cspi_get_live_refs (), ref->objref, ref);

        }
     }
 
        }
     }
 


@@ -194,7 +194,7 @@ cspi_object_unref (Accessible *accessible)
 
   if (--accessible->ref_count == 0)
     {
 
   if (--accessible->ref_count == 0)
     {

-      g_hash_table_remove (get_live_refs (), accessible->objref);
+      g_hash_table_remove (cspi_get_live_refs (), accessible->objref);

     }
 }
 
     }
 }
 

diff --git a/cspi/spi_registry.c b/cspi/spi_registry.c
index 17b7b36..aae9358 100644 (file)
--- a/cspi/spi_registry.c
+++ b/cspi/spi_registry.c
@@ -25,7 +25,7 @@
 #include <cspi/spi-private.h>
 
 /**
 #include <cspi/spi-private.h>
 
 /**

- * registerGlobalEventListener:
+ * SPI_registerGlobalEventListener:

  * @listener: the #AccessibleEventListener to be registered against an
  *            event type.
  * @eventType: a character string indicating the type of events for which
  * @listener: the #AccessibleEventListener to be registered against an
  *            event type.
  * @eventType: a character string indicating the type of events for which


@@ -81,8 +81,8 @@
  * Returns: #TRUE if successful, otherwise #FALSE.
  **/
 SPIBoolean
  * Returns: #TRUE if successful, otherwise #FALSE.
  **/
 SPIBoolean

-registerGlobalEventListener (AccessibleEventListener *listener,
-                             const char              *eventType)
+SPI_registerGlobalEventListener (AccessibleEventListener *listener,
+                                const char              *eventType)

 {
   SPIBoolean retval;
 
 {
   SPIBoolean retval;
 


@@ -102,7 +102,7 @@ registerGlobalEventListener (AccessibleEventListener *listener,
 }
 
 /**
 }
 
 /**

- * deregisterGlobalEventListenerAll:
+ * SPI_deregisterGlobalEventListenerAll:

  * @listener: the #AccessibleEventListener to be registered against
  *            an event type.
  *
  * @listener: the #AccessibleEventListener to be registered against
  *            an event type.
  *


@@ -114,7 +114,7 @@ registerGlobalEventListener (AccessibleEventListener *listener,
  * Returns: #TRUE if successful, otherwise #FALSE.
  **/
 SPIBoolean
  * Returns: #TRUE if successful, otherwise #FALSE.
  **/
 SPIBoolean

-deregisterGlobalEventListenerAll (AccessibleEventListener *listener)
+SPI_deregisterGlobalEventListenerAll (AccessibleEventListener *listener)

 {
   if (!listener)
     {
 {
   if (!listener)
     {


@@ -130,7 +130,7 @@ deregisterGlobalEventListenerAll (AccessibleEventListener *listener)
 }
 
 /**
 }
 
 /**

- * deregisterGlobalEventListener:
+ * SPI_deregisterGlobalEventListener:

  * @listener: the #AccessibleEventListener registered against an event type.
  * @eventType: a string specifying the event type for which this
  *             listener is to be deregistered.
  * @listener: the #AccessibleEventListener registered against an event type.
  * @eventType: a string specifying the event type for which this
  *             listener is to be deregistered.


@@ -141,8 +141,8 @@ deregisterGlobalEventListenerAll (AccessibleEventListener *listener)
  * Returns: #TRUE if successful, otherwise #FALSE.
  **/
 SPIBoolean
  * Returns: #TRUE if successful, otherwise #FALSE.
  **/
 SPIBoolean

-deregisterGlobalEventListener (AccessibleEventListener *listener,
-                              const char              *eventType)
+SPI_deregisterGlobalEventListener (AccessibleEventListener *listener,
+                                  const char              *eventType)

 {
   if (!listener)
     {
 {
   if (!listener)
     {


@@ -158,7 +158,7 @@ deregisterGlobalEventListener (AccessibleEventListener *listener,
 }
 
 /**
 }
 
 /**

- * getDesktopCount:
+ * SPI_getDesktopCount:

  *
  * Get the number of virtual desktops.
  * NOTE: currently multiple virtual desktops are not implemented, this
  *
  * Get the number of virtual desktops.
  * NOTE: currently multiple virtual desktops are not implemented, this


@@ -167,7 +167,7 @@ deregisterGlobalEventListener (AccessibleEventListener *listener,
  * Returns: an integer indicating the number of active virtual desktops.
  **/
 int
  * Returns: an integer indicating the number of active virtual desktops.
  **/
 int

-getDesktopCount ()
+SPI_getDesktopCount ()

 {
   int retval;
 
 {
   int retval;
 


@@ -180,7 +180,7 @@ getDesktopCount ()
 }
 
 /**
 }
 
 /**

- * getDesktop:
+ * SPI_getDesktop:

  * @i: an integer indicating which of the accessible desktops is to be returned.
  *
  * Get the virtual desktop indicated by index @i.
  * @i: an integer indicating which of the accessible desktops is to be returned.
  *
  * Get the virtual desktop indicated by index @i.


@@ -190,7 +190,7 @@ getDesktopCount ()
  * Returns: a pointer to the 'i-th' virtual desktop's #Accessible representation.
  **/
 Accessible*
  * Returns: a pointer to the 'i-th' virtual desktop's #Accessible representation.
  **/
 Accessible*

-getDesktop (int i)
+SPI_getDesktop (int i)

 {
   return cspi_object_add (
     Accessibility_Registry_getDesktop (
 {
   return cspi_object_add (
     Accessibility_Registry_getDesktop (


@@ -198,7 +198,7 @@ getDesktop (int i)
 }
 
 /**
 }
 
 /**

- * getDesktopList:
+ * SPI_getDesktopList:

  * @list: a pointer to an array of #Accessible objects.
  *
  * Get the list of virtual desktops.  On return, @list will point
  * @list: a pointer to an array of #Accessible objects.
  *
  * Get the list of virtual desktops.  On return, @list will point


@@ -213,14 +213,14 @@ getDesktop (int i)
  *          placed in the list pointed to by parameter @list.
  **/
 int
  *          placed in the list pointed to by parameter @list.
  **/
 int

-getDesktopList (Accessible **list)
+SPI_getDesktopList (Accessible **list)

 {
   *list = NULL;
   return 0;
 }
 
 /**
 {
   *list = NULL;
   return 0;
 }
 
 /**

- * registerAccessibleKeystrokeListener:
+ * SPI_registerAccessibleKeystrokeListener:

  * @listener:  a pointer to the #AccessibleKeystrokeListener for which
  *             keystroke events are requested.
  * @keys:      a pointer to the #AccessibleKeySet indicating which
  * @listener:  a pointer to the #AccessibleKeystrokeListener for which
  *             keystroke events are requested.
  * @keys:      a pointer to the #AccessibleKeySet indicating which


@@ -244,11 +244,11 @@ getDesktopList (Accessible **list)
  * Returns: #TRUE if successful, otherwise #FALSE.
  **/
 SPIBoolean
  * Returns: #TRUE if successful, otherwise #FALSE.
  **/
 SPIBoolean

-registerAccessibleKeystrokeListener (AccessibleKeystrokeListener *listener,
-                                    AccessibleKeySet *keys,
-                                    AccessibleKeyMaskType modmask,
-                                    AccessibleKeyEventMask eventmask,
-                                    AccessibleKeyListenerSyncType sync_type)
+SPI_registerAccessibleKeystrokeListener (AccessibleKeystrokeListener *listener,
+                                        AccessibleKeySet *keys,
+                                        AccessibleKeyMaskType modmask,
+                                        AccessibleKeyEventMask eventmask,
+                                        AccessibleKeyListenerSyncType sync_type)

 {
   gint                                i, mask;
   Accessibility_KeySet                key_set;
 {
   gint                                i, mask;
   Accessibility_KeySet                key_set;


@@ -328,7 +328,7 @@ registerAccessibleKeystrokeListener (AccessibleKeystrokeListener *listener,
 }
 
 /**
 }
 
 /**

- * deregisterAccessibleKeystrokeListener:
+ * SPI_deregisterAccessibleKeystrokeListener:

  * @listener: a pointer to the #AccessibleKeystrokeListener for which
  *            keystroke events are requested.
  * @modmask:  the key modifier mask for which this listener is to be
  * @listener: a pointer to the #AccessibleKeystrokeListener for which
  *            keystroke events are requested.
  * @modmask:  the key modifier mask for which this listener is to be


@@ -340,8 +340,8 @@ registerAccessibleKeystrokeListener (AccessibleKeystrokeListener *listener,
  * Returns: #TRUE if successful, otherwise #FALSE.
  **/
 SPIBoolean
  * Returns: #TRUE if successful, otherwise #FALSE.
  **/
 SPIBoolean

-deregisterAccessibleKeystrokeListener (AccessibleKeystrokeListener *listener,
-                                      AccessibleKeyMaskType modmask)
+SPI_deregisterAccessibleKeystrokeListener (AccessibleKeystrokeListener *listener,
+                                          AccessibleKeyMaskType modmask)

 {
   Accessibility_ControllerEventMask   controller_event_mask;
   Accessibility_KeySet                key_set;
 {
   Accessibility_ControllerEventMask   controller_event_mask;
   Accessibility_KeySet                key_set;


@@ -382,7 +382,7 @@ deregisterAccessibleKeystrokeListener (AccessibleKeystrokeListener *listener,
 }
 
 /**
 }
 
 /**

- * generateKeyEvent:
+ * SPI_generateKeyEvent:

  * @keyval: a long integer indicating the keycode or keysym of the key event
  *           being synthesized.
  * @synth_type: a #AccessibleKeySynthType flag indicating whether @keyval
  * @keyval: a long integer indicating the keycode or keysym of the key event
  *           being synthesized.
  * @synth_type: a #AccessibleKeySynthType flag indicating whether @keyval


@@ -396,7 +396,7 @@ deregisterAccessibleKeystrokeListener (AccessibleKeystrokeListener *listener,
  * Returns: #TRUE if successful, otherwise #FALSE.
  **/
 SPIBoolean
  * Returns: #TRUE if successful, otherwise #FALSE.
  **/
 SPIBoolean

-generateKeyEvent (long int keyval, AccessibleKeySynthType synth_type)
+SPI_generateKeyEvent (long int keyval, AccessibleKeySynthType synth_type)

 {
 /* TODO: check current modifier status and
  *  send keycode to alter, if necessary
 {
 /* TODO: check current modifier status and
  *  send keycode to alter, if necessary


@@ -417,7 +417,7 @@ generateKeyEvent (long int keyval, AccessibleKeySynthType synth_type)
 }
 
 /**
 }
 
 /**

- * generateMouseEvent:
+ * SPI_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
  * @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


@@ -431,7 +431,7 @@ generateKeyEvent (long int keyval, AccessibleKeySynthType synth_type)
  * Returns: #TRUE if successful, otherwise #FALSE.
  **/
 SPIBoolean
  * Returns: #TRUE if successful, otherwise #FALSE.
  **/
 SPIBoolean

-generateMouseEvent (long x, long y, char *name)
+SPI_generateMouseEvent (long x, long y, char *name)

 {
   return FALSE;
 }
 {
   return FALSE;
 }

diff --git a/cspi/spi_table.c b/cspi/spi_table.c
index 62b4b53..da14c99 100644 (file)
--- a/cspi/spi_table.c
+++ b/cspi/spi_table.c
@@ -398,7 +398,7 @@ AccessibleTable_getNSelectedRows (AccessibleTable *obj)
 }
 
 static long
 }
 
 static long

-long_seq_to_array (Accessibility_LongSeq *seq, long int **array)
+cspi_long_seq_to_array (Accessibility_LongSeq *seq, long int **array)

 {
   long *j, length, i;
 
 {
   long *j, length, i;
 


@@ -444,7 +444,7 @@ AccessibleTable_getSelectedRows (AccessibleTable *obj,
 
   rows = Accessibility_Table_getSelectedRows (CSPI_OBJREF (obj), cspi_ev ());
 
 
   rows = Accessibility_Table_getSelectedRows (CSPI_OBJREF (obj), cspi_ev ());
 

-  return long_seq_to_array (rows, selectedRows);
+  return cspi_long_seq_to_array (rows, selectedRows);

 }
 
 /**
 }
 
 /**


@@ -494,7 +494,7 @@ AccessibleTable_getSelectedColumns (AccessibleTable *obj,
 
   columns = Accessibility_Table_getSelectedColumns (CSPI_OBJREF (obj), cspi_ev ());
 
 
   columns = Accessibility_Table_getSelectedColumns (CSPI_OBJREF (obj), cspi_ev ());
 

-  return long_seq_to_array (columns, selectedColumns);
+  return cspi_long_seq_to_array (columns, selectedColumns);

 }
 
 /**
 }
 
 /**

diff --git a/docs/reference/cspi/at-spi-cspi-sections.txt b/docs/reference/cspi/at-spi-cspi-sections.txt
index bac26c6..14300de 100644 (file)
--- a/docs/reference/cspi/at-spi-cspi-sections.txt
+++ b/docs/reference/cspi/at-spi-cspi-sections.txt
@@ -3,6 +3,7 @@
 <TITLE>SPI main loop and initialization</TITLE>
 SPI_init
 SPI_event_main
 <TITLE>SPI main loop and initialization</TITLE>
 SPI_init
 SPI_event_main

+SPI_event_quit

 SPI_eventIsReady
 SPI_nextEvent
 SPI_exit
 SPI_eventIsReady
 SPI_nextEvent
 SPI_exit


@@ -15,7 +16,9 @@ SPI_freeString
 <TITLE>Event Listener Support</TITLE>
 AccessibleEvent
 AccessibleEventListenerCB
 <TITLE>Event Listener Support</TITLE>
 AccessibleEvent
 AccessibleEventListenerCB

-createAccessibleEventListener
+SPI_createAccessibleEventListener
+AccessibleEventListener_ref
+AccessibleEventListener_unref

 AccessibleEventListener_addCallback
 AccessibleEventListener_removeCallback
 </SECTION>
 AccessibleEventListener_addCallback
 AccessibleEventListener_removeCallback
 </SECTION>


@@ -24,25 +27,28 @@ AccessibleEventListener_removeCallback
 <FILE>spi_registry</FILE>
 <TITLE>Registry queries</TITLE>
 AccessibleKeySynthType
 <FILE>spi_registry</FILE>
 <TITLE>Registry queries</TITLE>
 AccessibleKeySynthType

-getDesktopCount
-getDesktop
-getDesktopList
+SPI_getDesktopCount
+SPI_getDesktop
+SPI_getDesktopList

 <SUBSECTION Event Registration>
 AccessibleKeystrokeListenerCB
 AccessibleKeyEventMask
 AccessibleKeyMaskType
 AccessibleKeyEventType
 AccessibleKeyListenerSyncType
 <SUBSECTION Event Registration>
 AccessibleKeystrokeListenerCB
 AccessibleKeyEventMask
 AccessibleKeyMaskType
 AccessibleKeyEventType
 AccessibleKeyListenerSyncType

-createAccessibleKeystrokeListener
-registerGlobalEventListener
-deregisterGlobalEventListener
-deregisterGlobalEventListenerAll
-registerAccessibleKeystrokeListener
-deregisterAccessibleKeystrokeListener
+AccessibleKeystroke
+SPI_createAccessibleKeystrokeListener
+SPI_registerGlobalEventListener
+SPI_deregisterGlobalEventListener
+SPI_deregisterGlobalEventListenerAll
+SPI_registerAccessibleKeystrokeListener
+SPI_deregisterAccessibleKeystrokeListener
+AccessibleKeystrokeListener_ref
+AccessibleKeystrokeListener_unref

 AccessibleKeystrokeListener_removeCallback
 AccessibleKeystrokeListener_addCallback
 AccessibleKeystrokeListener_removeCallback
 AccessibleKeystrokeListener_addCallback

-generateKeyEvent
-generateMouseEvent
+SPI_generateKeyEvent
+SPI_generateMouseEvent

 </SECTION>
 
 <SECTION>
 </SECTION>
 
 <SECTION>


@@ -58,9 +64,11 @@ Accessible_getChildAtIndex
 Accessible_getIndexInParent
 Accessible_getRelationSet
 Accessible_getRole
 Accessible_getIndexInParent
 Accessible_getRelationSet
 Accessible_getRole

+Accessible_getRoleName

 Accessible_getStateSet
 <SUBSECTION Interface Queries>
 Accessible_isAction
 Accessible_getStateSet
 <SUBSECTION Interface Queries>
 Accessible_isAction

+Accessible_isApplication

 Accessible_isComponent
 Accessible_isEditableText
 Accessible_isHypertext
 Accessible_isComponent
 Accessible_isEditableText
 Accessible_isHypertext


@@ -68,7 +76,9 @@ Accessible_isImage
 Accessible_isSelection
 Accessible_isTable
 Accessible_isText
 Accessible_isSelection
 Accessible_isTable
 Accessible_isText

+Accessible_isValue

 Accessible_getAction
 Accessible_getAction

+Accessible_getApplication

 Accessible_getComponent
 Accessible_getEditableText
 Accessible_getHypertext
 Accessible_getComponent
 Accessible_getEditableText
 Accessible_getHypertext


@@ -76,6 +86,7 @@ Accessible_getImage
 Accessible_getSelection
 Accessible_getTable
 Accessible_getText
 Accessible_getSelection
 Accessible_getTable
 Accessible_getText

+Accessible_getValue

 Accessible_queryInterface
 <SUBSECTION Auxiliary types>
 AccessibleRole
 Accessible_queryInterface
 <SUBSECTION Auxiliary types>
 AccessibleRole


@@ -110,6 +121,7 @@ AccessibleAction_getDescription
 <FILE>spi_component</FILE>
 <TITLE>AccessibleComponent Interface</TITLE>
 AccessibleCoordType
 <FILE>spi_component</FILE>
 <TITLE>AccessibleComponent Interface</TITLE>
 AccessibleCoordType

+AccessibleComponentLayer

 AccessibleComponent_ref
 AccessibleComponent_unref
 AccessibleComponent_contains
 AccessibleComponent_ref
 AccessibleComponent_unref
 AccessibleComponent_contains


@@ -236,6 +248,8 @@ AccessibleValue_setCurrentValue
 <SECTION>
 <FILE>spi_hyperlink</FILE>
 <TITLE>AccessibleHyperlink Interface</TITLE>
 <SECTION>
 <FILE>spi_hyperlink</FILE>
 <TITLE>AccessibleHyperlink Interface</TITLE>

+AccessibleHyperlink_ref
+AccessibleHyperlink_unref

 AccessibleHyperlink_getNAnchors
 AccessibleHyperlink_getIndexRange
 AccessibleHyperlink_getObject
 AccessibleHyperlink_getNAnchors
 AccessibleHyperlink_getIndexRange
 AccessibleHyperlink_getObject


@@ -263,6 +277,7 @@ AccessibleStateSet_remove
 AccessibleRelationType
 AccessibleRelation_ref
 AccessibleRelation_unref
 AccessibleRelationType
 AccessibleRelation_ref
 AccessibleRelation_unref

+AccessibleRelation_getNTargets

 AccessibleRelation_getTarget
 AccessibleRelation_getRelationType
 </SECTION>
 AccessibleRelation_getTarget
 AccessibleRelation_getRelationType
 </SECTION>

diff --git a/docs/reference/cspi/tmpl/spi_accessible.sgml b/docs/reference/cspi/tmpl/spi_accessible.sgml
index ad381a3..1fc69f3 100644 (file)
--- a/docs/reference/cspi/tmpl/spi_accessible.sgml
+++ b/docs/reference/cspi/tmpl/spi_accessible.sgml
@@ -107,6 +107,15 @@ Accessible Objects
 @Returns: 
 
 
 @Returns: 
 
 

+<!-- ##### FUNCTION Accessible_getRoleName ##### -->
+<para>
+
+</para>
+
+@obj: 
+@Returns: 
+
+

 <!-- ##### FUNCTION Accessible_getStateSet ##### -->
 <para>
 
 <!-- ##### FUNCTION Accessible_getStateSet ##### -->
 <para>
 


@@ -125,6 +134,15 @@ Accessible Objects
 @Returns: 
 
 
 @Returns: 
 
 

+<!-- ##### FUNCTION Accessible_isApplication ##### -->
+<para>
+
+</para>
+
+@obj: 
+@Returns: 
+
+

 <!-- ##### FUNCTION Accessible_isComponent ##### -->
 <para>
 
 <!-- ##### FUNCTION Accessible_isComponent ##### -->
 <para>
 


@@ -188,6 +206,15 @@ Accessible Objects
 @Returns: 
 
 
 @Returns: 
 
 

+<!-- ##### FUNCTION Accessible_isValue ##### -->
+<para>
+
+</para>
+
+@obj: 
+@Returns: 
+
+

 <!-- ##### FUNCTION Accessible_getAction ##### -->
 <para>
 
 <!-- ##### FUNCTION Accessible_getAction ##### -->
 <para>
 


@@ -197,6 +224,15 @@ Accessible Objects
 @Returns: 
 
 
 @Returns: 
 
 

+<!-- ##### FUNCTION Accessible_getApplication ##### -->
+<para>
+
+</para>
+
+@obj: 
+@Returns: 
+
+

 <!-- ##### FUNCTION Accessible_getComponent ##### -->
 <para>
 
 <!-- ##### FUNCTION Accessible_getComponent ##### -->
 <para>
 


@@ -260,6 +296,15 @@ Accessible Objects
 @Returns: 
 
 
 @Returns: 
 
 

+<!-- ##### FUNCTION Accessible_getValue ##### -->
+<para>
+
+</para>
+
+@obj: 
+@Returns: 
+
+

 <!-- ##### FUNCTION Accessible_queryInterface ##### -->
 <para>
 
 <!-- ##### FUNCTION Accessible_queryInterface ##### -->
 <para>
 

diff --git a/docs/reference/cspi/tmpl/spi_component.sgml b/docs/reference/cspi/tmpl/spi_component.sgml
index a8a87fb..b6a1372 100644 (file)
--- a/docs/reference/cspi/tmpl/spi_component.sgml
+++ b/docs/reference/cspi/tmpl/spi_component.sgml
@@ -22,6 +22,20 @@ AccessibleComponent Interface
 @SPI_COORD_TYPE_SCREEN: 
 @SPI_COORD_TYPE_WINDOW: 
 
 @SPI_COORD_TYPE_SCREEN: 
 @SPI_COORD_TYPE_WINDOW: 
 

+<!-- ##### ENUM AccessibleComponentLayer ##### -->
+<para>
+
+</para>
+
+@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: 
+

 <!-- ##### FUNCTION AccessibleComponent_ref ##### -->
 <para>
 
 <!-- ##### FUNCTION AccessibleComponent_ref ##### -->
 <para>
 

diff --git a/docs/reference/cspi/tmpl/spi_event.sgml b/docs/reference/cspi/tmpl/spi_event.sgml
index 530b357..e412be5 100644 (file)
--- a/docs/reference/cspi/tmpl/spi_event.sgml
+++ b/docs/reference/cspi/tmpl/spi_event.sgml
@@ -29,7 +29,7 @@ Event Listener Support
 @user_data: 
 
 
 @user_data: 
 
 

-<!-- ##### FUNCTION createAccessibleEventListener ##### -->
+<!-- ##### FUNCTION SPI_createAccessibleEventListener ##### -->

 <para>
 
 </para>
 <para>
 
 </para>


@@ -39,6 +39,14 @@ Event Listener Support
 @Returns: 
 
 
 @Returns: 
 
 

+<!-- ##### FUNCTION AccessibleEventListener_unref ##### -->
+<para>
+
+</para>
+
+@listener: 
+
+

 <!-- ##### FUNCTION AccessibleEventListener_addCallback ##### -->
 <para>
 
 <!-- ##### FUNCTION AccessibleEventListener_addCallback ##### -->
 <para>
 

diff --git a/docs/reference/cspi/tmpl/spi_hyperlink.sgml b/docs/reference/cspi/tmpl/spi_hyperlink.sgml
index bb2ef9f..8d03b55 100644 (file)
--- a/docs/reference/cspi/tmpl/spi_hyperlink.sgml
+++ b/docs/reference/cspi/tmpl/spi_hyperlink.sgml
@@ -14,6 +14,22 @@ AccessibleHyperlink Interface
 
 </para>
 
 
 </para>
 

+<!-- ##### FUNCTION AccessibleHyperlink_ref ##### -->
+<para>
+
+</para>
+
+@obj: 
+
+
+<!-- ##### FUNCTION AccessibleHyperlink_unref ##### -->
+<para>
+
+</para>
+
+@obj: 
+
+

 <!-- ##### FUNCTION AccessibleHyperlink_getNAnchors ##### -->
 <para>
 
 <!-- ##### FUNCTION AccessibleHyperlink_getNAnchors ##### -->
 <para>
 

diff --git a/docs/reference/cspi/tmpl/spi_main.sgml b/docs/reference/cspi/tmpl/spi_main.sgml
index 60dadac..f3b7253 100644 (file)
--- a/docs/reference/cspi/tmpl/spi_main.sgml
+++ b/docs/reference/cspi/tmpl/spi_main.sgml
@@ -33,6 +33,13 @@ SPI main loop and initialization
 @isGNOMEApp: 
 
 
 @isGNOMEApp: 
 
 

+<!-- ##### FUNCTION SPI_event_quit ##### -->
+<para>
+
+</para>
+
+
+

 <!-- ##### FUNCTION SPI_eventIsReady ##### -->
 <para>
 
 <!-- ##### FUNCTION SPI_eventIsReady ##### -->
 <para>
 

diff --git a/docs/reference/cspi/tmpl/spi_registry.sgml b/docs/reference/cspi/tmpl/spi_registry.sgml
index 4daa02e..3b68712 100644 (file)
--- a/docs/reference/cspi/tmpl/spi_registry.sgml
+++ b/docs/reference/cspi/tmpl/spi_registry.sgml
@@ -24,7 +24,7 @@ Registry queries
 @SPI_KEY_PRESSRELEASE: 
 @SPI_KEY_SYM: 
 
 @SPI_KEY_PRESSRELEASE: 
 @SPI_KEY_SYM: 
 

-<!-- ##### FUNCTION getDesktopCount ##### -->
+<!-- ##### FUNCTION SPI_getDesktopCount ##### -->

 <para>
 
 </para>
 <para>
 
 </para>


@@ -32,7 +32,7 @@ Registry queries
 @Returns: 
 
 
 @Returns: 
 
 

-<!-- ##### FUNCTION getDesktop ##### -->
+<!-- ##### FUNCTION SPI_getDesktop ##### -->

 <para>
 
 </para>
 <para>
 
 </para>


@@ -41,7 +41,7 @@ Registry queries
 @Returns: 
 
 
 @Returns: 
 
 

-<!-- ##### FUNCTION getDesktopList ##### -->
+<!-- ##### FUNCTION SPI_getDesktopList ##### -->

 <para>
 
 </para>
 <para>
 
 </para>


@@ -90,7 +90,13 @@ Registry queries
 @SPI_KEYLISTENER_CANCONSUME: 
 @SPI_KEYLISTENER_ALL_WINDOWS: 
 
 @SPI_KEYLISTENER_CANCONSUME: 
 @SPI_KEYLISTENER_ALL_WINDOWS: 
 

-<!-- ##### FUNCTION createAccessibleKeystrokeListener ##### -->
+<!-- ##### TYPEDEF AccessibleKeystroke ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### FUNCTION SPI_createAccessibleKeystrokeListener ##### -->

 <para>
 
 </para>
 <para>
 
 </para>


@@ -100,7 +106,7 @@ Registry queries
 @Returns: 
 
 
 @Returns: 
 
 

-<!-- ##### FUNCTION registerGlobalEventListener ##### -->
+<!-- ##### FUNCTION SPI_registerGlobalEventListener ##### -->

 <para>
 
 </para>
 <para>
 
 </para>


@@ -110,7 +116,7 @@ Registry queries
 @Returns: 
 
 
 @Returns: 
 
 

-<!-- ##### FUNCTION deregisterGlobalEventListener ##### -->
+<!-- ##### FUNCTION SPI_deregisterGlobalEventListener ##### -->

 <para>
 
 </para>
 <para>
 
 </para>


@@ -120,7 +126,7 @@ Registry queries
 @Returns: 
 
 
 @Returns: 
 
 

-<!-- ##### FUNCTION deregisterGlobalEventListenerAll ##### -->
+<!-- ##### FUNCTION SPI_deregisterGlobalEventListenerAll ##### -->

 <para>
 
 </para>
 <para>
 
 </para>


@@ -129,7 +135,7 @@ Registry queries
 @Returns: 
 
 
 @Returns: 
 
 

-<!-- ##### FUNCTION registerAccessibleKeystrokeListener ##### -->
+<!-- ##### FUNCTION SPI_registerAccessibleKeystrokeListener ##### -->

 <para>
 
 </para>
 <para>
 
 </para>


@@ -142,7 +148,7 @@ Registry queries
 @Returns: 
 
 
 @Returns: 
 
 

-<!-- ##### FUNCTION deregisterAccessibleKeystrokeListener ##### -->
+<!-- ##### FUNCTION SPI_deregisterAccessibleKeystrokeListener ##### -->

 <para>
 
 </para>
 <para>
 
 </para>


@@ -152,6 +158,14 @@ Registry queries
 @Returns: 
 
 
 @Returns: 
 
 

+<!-- ##### FUNCTION AccessibleKeystrokeListener_unref ##### -->
+<para>
+
+</para>
+
+@listener: 
+
+

 <!-- ##### FUNCTION AccessibleKeystrokeListener_removeCallback ##### -->
 <para>
 
 <!-- ##### FUNCTION AccessibleKeystrokeListener_removeCallback ##### -->
 <para>
 


@@ -173,7 +187,7 @@ Registry queries
 @Returns: 
 
 
 @Returns: 
 
 

-<!-- ##### FUNCTION generateKeyEvent ##### -->
+<!-- ##### FUNCTION SPI_generateKeyEvent ##### -->

 <para>
 
 </para>
 <para>
 
 </para>


@@ -183,7 +197,7 @@ Registry queries
 @Returns: 
 
 
 @Returns: 
 
 

-<!-- ##### FUNCTION generateMouseEvent ##### -->
+<!-- ##### FUNCTION SPI_generateMouseEvent ##### -->

 <para>
 
 </para>
 <para>
 
 </para>

diff --git a/docs/reference/cspi/tmpl/spi_relation.sgml b/docs/reference/cspi/tmpl/spi_relation.sgml
index f7459e7..fcf6eff 100644 (file)
--- a/docs/reference/cspi/tmpl/spi_relation.sgml
+++ b/docs/reference/cspi/tmpl/spi_relation.sgml
@@ -45,6 +45,15 @@ AccessibleRelations and RelationSets
 @Returns: 
 
 
 @Returns: 
 
 

+<!-- ##### FUNCTION AccessibleRelation_getNTargets ##### -->
+<para>
+
+</para>
+
+@obj: 
+@Returns: 
+
+

 <!-- ##### FUNCTION AccessibleRelation_getTarget ##### -->
 <para>
 
 <!-- ##### FUNCTION AccessibleRelation_getTarget ##### -->
 <para>
 

diff --git a/test/keysynth-demo.c b/test/keysynth-demo.c
index c2df9ca..c6cb1ee 100644 (file)
--- a/test/keysynth-demo.c
+++ b/test/keysynth-demo.c
@@ -280,11 +280,11 @@ toggle_shift_latch (GtkButton *button)
 static void
 keysynth_exit (void)
 {
 static void
 keysynth_exit (void)
 {

-  deregisterAccessibleKeystrokeListener (key_listener, SPI_KEYMASK_ALT);
-  AccessibleKeystrokeListener_unref     (key_listener);
+  SPI_deregisterAccessibleKeystrokeListener (key_listener, SPI_KEYMASK_ALT);
+  AccessibleKeystrokeListener_unref         (key_listener);

 
 

-  deregisterAccessibleKeystrokeListener (switch_listener, SPI_KEYMASK_UNMODIFIED);
-  AccessibleKeystrokeListener_unref     (switch_listener);
+  SPI_deregisterAccessibleKeystrokeListener (switch_listener, SPI_KEYMASK_UNMODIFIED);
+  AccessibleKeystrokeListener_unref         (switch_listener);

 
   SPI_event_quit ();
 }
 
   SPI_event_quit ();
 }


@@ -367,13 +367,13 @@ synth_keycode (GtkButton *button, KeyCode *keycode)
           label_buttons (caps_lock || shift_latched);
         }
       if (shift_latched)
           label_buttons (caps_lock || shift_latched);
         }
       if (shift_latched)

-             generateKeyEvent (shift_keycode, SPI_KEY_PRESS);
+             SPI_generateKeyEvent (shift_keycode, SPI_KEY_PRESS);

       
       

-      generateKeyEvent ((long) *keycode, SPI_KEY_PRESSRELEASE);
+      SPI_generateKeyEvent ((long) *keycode, SPI_KEY_PRESSRELEASE);

 
       if (shift_latched)
         {
 
       if (shift_latched)
         {

-         generateKeyEvent (shift_keycode, SPI_KEY_RELEASE);
+         SPI_generateKeyEvent (shift_keycode, SPI_KEY_RELEASE);

          toggle_shift_latch (button);
        }
     }
          toggle_shift_latch (button);
        }
     }


@@ -474,13 +474,13 @@ main (int argc, char **argv)
 
   SPI_init ();
 
 
   SPI_init ();
 

-  key_listener = createAccessibleKeystrokeListener (is_command_key, NULL);
+  key_listener = SPI_createAccessibleKeystrokeListener (is_command_key, NULL);

   /* will listen only to Alt-key combinations */
   /* will listen only to Alt-key combinations */

-  registerAccessibleKeystrokeListener (key_listener,
-                                      (AccessibleKeySet *) SPI_KEYSET_ALL_KEYS,
-                                      SPI_KEYMASK_ALT,
-                                      (unsigned long) ( KeyPress | KeyRelease),
-                                      SPI_KEYLISTENER_CANCONSUME | SPI_KEYLISTENER_ALL_WINDOWS);
+  SPI_registerAccessibleKeystrokeListener (key_listener,
+                                          (AccessibleKeySet *) SPI_KEYSET_ALL_KEYS,
+                                          SPI_KEYMASK_ALT,
+                                          (unsigned long) ( KeyPress | KeyRelease),
+                                          SPI_KEYLISTENER_CANCONSUME | SPI_KEYLISTENER_ALL_WINDOWS);

   create_vkbd ();  
 
   /*
   create_vkbd ();  
 
   /*


@@ -494,12 +494,12 @@ main (int argc, char **argv)
   switch_set.len = 1;
   switch_set.keysyms[0] = (unsigned long) 0;
   switch_set.keycodes[0] = (unsigned short) 0;
   switch_set.len = 1;
   switch_set.keysyms[0] = (unsigned long) 0;
   switch_set.keycodes[0] = (unsigned short) 0;

-  switch_listener = createAccessibleKeystrokeListener (switch_callback, NULL);
-  registerAccessibleKeystrokeListener (switch_listener,
-                                      &switch_set,
-                                      SPI_KEYMASK_UNMODIFIED,
-                                      (unsigned long) ( KeyPress | KeyRelease),
-                                      SPI_KEYLISTENER_CANCONSUME);
+  switch_listener = SPI_createAccessibleKeystrokeListener (switch_callback, NULL);
+  SPI_registerAccessibleKeystrokeListener (switch_listener,
+                                          &switch_set,
+                                          SPI_KEYMASK_UNMODIFIED,
+                                          (unsigned long) ( KeyPress | KeyRelease),
+                                          SPI_KEYLISTENER_CANCONSUME);

   
   SPI_event_main ();
 
   
   SPI_event_main ();
 

diff --git a/test/simple-at.c b/test/simple-at.c
index 54ca155..1901e68 100644 (file)
--- a/test/simple-at.c
+++ b/test/simple-at.c
@@ -78,24 +78,24 @@ main (int argc, char **argv)
 
   SPI_init ();
 
 
   SPI_init ();
 

-  focus_listener = createAccessibleEventListener (report_focus_event, NULL);
-  property_listener = createAccessibleEventListener (check_property_change, NULL); 
-  generic_listener = createAccessibleEventListener (report_generic_event, NULL); 
-  button_listener = createAccessibleEventListener (report_button_press, NULL);
-  registerGlobalEventListener (focus_listener, "focus:");
-  registerGlobalEventListener (property_listener, "object:property-change:accessible-selection"); 
-  registerGlobalEventListener (generic_listener, "object:selection-changed"); 
-  registerGlobalEventListener (generic_listener, "object:children-changed"); 
-  registerGlobalEventListener (generic_listener, "object:visible-data-changed"); 
-  registerGlobalEventListener (generic_listener, "object:text-selection-changed"); 
-  registerGlobalEventListener (generic_listener, "object:text-caret-moved"); 
-  registerGlobalEventListener (generic_listener, "object:text-changed"); 
-  registerGlobalEventListener (button_listener, "Gtk:GtkWidget:button-press-event");
-  n_desktops = getDesktopCount ();
+  focus_listener = SPI_createAccessibleEventListener (report_focus_event, NULL);
+  property_listener = SPI_createAccessibleEventListener (check_property_change, NULL); 
+  generic_listener = SPI_createAccessibleEventListener (report_generic_event, NULL); 
+  button_listener = SPI_createAccessibleEventListener (report_button_press, NULL);
+  SPI_registerGlobalEventListener (focus_listener, "focus:");
+  SPI_registerGlobalEventListener (property_listener, "object:property-change:accessible-selection"); 
+  SPI_registerGlobalEventListener (generic_listener, "object:selection-changed"); 
+  SPI_registerGlobalEventListener (generic_listener, "object:children-changed"); 
+  SPI_registerGlobalEventListener (generic_listener, "object:visible-data-changed"); 
+  SPI_registerGlobalEventListener (generic_listener, "object:text-selection-changed"); 
+  SPI_registerGlobalEventListener (generic_listener, "object:text-caret-moved"); 
+  SPI_registerGlobalEventListener (generic_listener, "object:text-changed"); 
+  SPI_registerGlobalEventListener (button_listener, "Gtk:GtkWidget:button-press-event");
+  n_desktops = SPI_getDesktopCount ();

 
   for (i=0; i<n_desktops; ++i)
     {
 
   for (i=0; i<n_desktops; ++i)
     {

-      desktop = getDesktop (i);
+      desktop = SPI_getDesktop (i);

       s = Accessible_getName (desktop);
       fprintf (stderr, "desktop %d name: %s\n", i, s);
       SPI_freeString (s);
       s = Accessible_getName (desktop);
       fprintf (stderr, "desktop %d name: %s\n", i, s);
       SPI_freeString (s);


@@ -112,30 +112,30 @@ main (int argc, char **argv)
     }
 
   /* prepare the keyboard snoopers */
     }
 
   /* prepare the keyboard snoopers */

-  command_key_listener = createAccessibleKeystrokeListener (report_command_key_event, NULL);
-  ordinary_key_listener = createAccessibleKeystrokeListener (report_ordinary_key_event, NULL);
+  command_key_listener = SPI_createAccessibleKeystrokeListener (report_command_key_event, NULL);
+  ordinary_key_listener = SPI_createAccessibleKeystrokeListener (report_ordinary_key_event, NULL);

   
   /* will listen only to Alt-key combinations, and only to KeyPress events */
   
   /* will listen only to Alt-key combinations, and only to KeyPress events */

-  registerAccessibleKeystrokeListener(command_key_listener,
-                                     (AccessibleKeySet *) SPI_KEYSET_ALL_KEYS,
-                                     SPI_KEYMASK_ALT,
-                                     (unsigned long) ( KeyPress ),
-                                     SPI_KEYLISTENER_ALL_WINDOWS);
+  SPI_registerAccessibleKeystrokeListener(command_key_listener,
+                                         (AccessibleKeySet *) SPI_KEYSET_ALL_KEYS,
+                                         SPI_KEYMASK_ALT,
+                                         (unsigned long) ( KeyPress ),
+                                         SPI_KEYLISTENER_ALL_WINDOWS);

   
   /* will listen only to unshifted key events, both press and release */
   
   /* will listen only to unshifted key events, both press and release */

-  registerAccessibleKeystrokeListener(ordinary_key_listener,
-                                     (AccessibleKeySet *) SPI_KEYSET_ALL_KEYS,
-                                     SPI_KEYMASK_UNMODIFIED,
-                                     (unsigned long) ( KeyPress | KeyRelease),
-                                     SPI_KEYLISTENER_NOSYNC);
+  SPI_registerAccessibleKeystrokeListener(ordinary_key_listener,
+                                         (AccessibleKeySet *) SPI_KEYSET_ALL_KEYS,
+                                         SPI_KEYMASK_UNMODIFIED,
+                                         (unsigned long) ( KeyPress | KeyRelease),
+                                         SPI_KEYLISTENER_NOSYNC);

                                      
   /* will listen only to shifted key events, both press and release */
                                      
   /* will listen only to shifted key events, both press and release */

-  registerAccessibleKeystrokeListener(ordinary_key_listener,
-                                     (AccessibleKeySet *) SPI_KEYSET_ALL_KEYS,
-                                     SPI_KEYMASK_SHIFT,
-                                     (unsigned long) ( KeyPress | KeyRelease),
-                                     SPI_KEYLISTENER_NOSYNC);
-
+  SPI_registerAccessibleKeystrokeListener(ordinary_key_listener,
+                                         (AccessibleKeySet *) SPI_KEYSET_ALL_KEYS,
+                                         SPI_KEYMASK_SHIFT,
+                                         (unsigned long) ( KeyPress | KeyRelease),
+                                         SPI_KEYLISTENER_NOSYNC);
+  

   get_environment_vars ();
 
   SPI_event_main ();
   get_environment_vars ();
 
   SPI_event_main ();


@@ -306,24 +306,24 @@ check_property_change (AccessibleEvent *event, void *user_data)
 static void
 simple_at_exit ()
 {
 static void
 simple_at_exit ()
 {

-  deregisterGlobalEventListenerAll (focus_listener);
-  AccessibleEventListener_unref    (focus_listener);
+  SPI_deregisterGlobalEventListenerAll (focus_listener);
+  AccessibleEventListener_unref        (focus_listener);

 
 

-  deregisterGlobalEventListenerAll (property_listener);
-  AccessibleEventListener_unref    (property_listener);
+  SPI_deregisterGlobalEventListenerAll (property_listener);
+  AccessibleEventListener_unref        (property_listener);

 
 

-  deregisterGlobalEventListenerAll (generic_listener);
-  AccessibleEventListener_unref    (generic_listener);
+  SPI_deregisterGlobalEventListenerAll (generic_listener);
+  AccessibleEventListener_unref        (generic_listener);

 
 

-  deregisterGlobalEventListenerAll (button_listener);
-  AccessibleEventListener_unref    (button_listener);
+  SPI_deregisterGlobalEventListenerAll (button_listener);
+  AccessibleEventListener_unref        (button_listener);

 
 

-  deregisterAccessibleKeystrokeListener (command_key_listener, SPI_KEYMASK_ALT);
-  AccessibleKeystrokeListener_unref (command_key_listener);
+  SPI_deregisterAccessibleKeystrokeListener (command_key_listener, SPI_KEYMASK_ALT);
+  AccessibleKeystrokeListener_unref         (command_key_listener);

 
 

-  deregisterAccessibleKeystrokeListener (ordinary_key_listener, SPI_KEYMASK_UNMODIFIED);
-  deregisterAccessibleKeystrokeListener (ordinary_key_listener, SPI_KEYMASK_SHIFT);
-  AccessibleKeystrokeListener_unref (ordinary_key_listener);
+  SPI_deregisterAccessibleKeystrokeListener (ordinary_key_listener, SPI_KEYMASK_UNMODIFIED);
+  SPI_deregisterAccessibleKeystrokeListener (ordinary_key_listener, SPI_KEYMASK_SHIFT);
+  AccessibleKeystrokeListener_unref         (ordinary_key_listener);

   
   SPI_event_quit ();
 }
   
   SPI_event_quit ();
 }

diff --git a/test/test-simple.c b/test/test-simple.c
index eed9448..ea5a799 100644 (file)
--- a/test/test-simple.c
+++ b/test/test-simple.c
@@ -187,8 +187,8 @@ test_desktop (void)
 
        fprintf (stderr, "Testing desktop...\n");
 
 
        fprintf (stderr, "Testing desktop...\n");
 

-       g_assert (getDesktop (-1) == NULL);
-       desktop = getDesktop (0);
+       g_assert (SPI_getDesktop (-1) == NULL);
+       desktop = SPI_getDesktop (0);

        g_assert (desktop != NULL);
 
        validate_accessible (desktop, FALSE, FALSE);
        g_assert (desktop != NULL);
 
        validate_accessible (desktop, FALSE, FALSE);


@@ -620,7 +620,7 @@ global_listener_cb (AccessibleEvent     *event,
        fprintf (stderr, "Fielded focus event ...\n");
 
        if (!do_poke) {
        fprintf (stderr, "Fielded focus event ...\n");
 
        if (!do_poke) {

-               desktop = getDesktop (0);
+               desktop = SPI_getDesktop (0);

                application = Accessible_getChildAtIndex (desktop, 0);
                g_assert (application != NULL);
                Accessible_unref (desktop);
                application = Accessible_getChildAtIndex (desktop, 0);
                g_assert (application != NULL);
                Accessible_unref (desktop);


@@ -661,7 +661,7 @@ main (int argc, char **argv)
 
        g_assert (!SPI_init ());
        g_assert (SPI_init ());
 
        g_assert (!SPI_init ());
        g_assert (SPI_init ());

-       g_assert (getDesktopCount () == 1);
+       g_assert (SPI_getDesktopCount () == 1);

 
        test_roles ();
        test_misc ();
 
        test_roles ();
        test_misc ();


@@ -669,13 +669,13 @@ main (int argc, char **argv)
 
        win = create_test_window ();
 
 
        win = create_test_window ();
 

-       global_listener = createAccessibleEventListener (global_listener_cb, win);
-       g_assert (registerGlobalEventListener (global_listener, "focus:"));
+       global_listener = SPI_createAccessibleEventListener (global_listener_cb, win);
+       g_assert (SPI_registerGlobalEventListener (global_listener, "focus:"));

 
        fprintf (stderr, "Waiting for focus event ...\n");
        gtk_main ();
 
 
        fprintf (stderr, "Waiting for focus event ...\n");
        gtk_main ();
 

-       g_assert (deregisterGlobalEventListenerAll (global_listener));
+       g_assert (SPI_deregisterGlobalEventListenerAll (global_listener));

        AccessibleEventListener_unref (global_listener);
 
        test_window_destroy (win);
        AccessibleEventListener_unref (global_listener);
 
        test_window_destroy (win);