Re: [g-a-devel]patch to at-spi: NAMESPACE API CHANGES
- From: Bill Haneman <bill haneman sun com>
- To: Draghi Puterity <mp baum de>
- Cc: gnome-accessibility-devel gnome org
- Subject: Re: [g-a-devel]patch to at-spi: NAMESPACE API CHANGES
- Date: Thu, 13 Dec 2001 09:56:42 +0000
Draghi Puterity wrote:
>
> Is AT-SPI stable enough, so you can give us green light for a new CVS pull?
Yes, the reason I was waiting is because it depended on some other fixes
to the gnome-2 stack (linc, and perhaps ORBit2) to work properly. Laca
tells me that he uploaded new packages to you yesterday so it should be
OK.
-Bill
> Draghi
>
> ----- Original Message -----
> From: "Bill Haneman" <bill haneman sun com>
> To: "Draghi Puterity" <mp baum de>
> Cc: <gnome-accessibility-devel gnome org>
> Sent: Thursday, December 13, 2001 10:40 AM
> Subject: Re: [g-a-devel]patch to at-spi: NAMESPACE API CHANGES
>
> > Draghi Puterity wrote:
> > >
> > > Hi !
> > >
> > > we will apply the patch to our AT-SPI version, and if it works we will
> make
> > > the changes in the Gnopernicus.
> > >
> > > Best regards,
> > > Draghi
> >
> > I wouldn't recommend applying this patch unless you pulled from CVS HEAD
> > previously yesterday - and in that case it would be easier to do another
> > CVS pull. The patch is provided for reference/your reading pleasure :-)
> >
> > Best regards,
> >
> > Bill
> >
> >
> > ----- Original Message -----
> > > From: "Bill Haneman" <bill haneman sun com>
> > > To: <gnome-accessibility-devel gnome org>
> > > Sent: Wednesday, December 12, 2001 7:18 PM
> > > Subject: [g-a-devel]patch to at-spi: NAMESPACE API CHANGES
> > >
> > > > Hi:
> > > >
> > > > Attached is a patch to at-spi which properly namespaces the methods in
> > > > CSPI that do not begin with "SPI_" or "Accessible". This change is
> > > > necessary to avoid possible namespace conflicts and is considered good
> > > > practice when exporting library APIs, so I believe that it is
> necessary
> > > > despite some resistance to an earlier, similar suggestion.
> > > >
> > > > I apologize for any inconvenience that the Gnopernicus team may
> > > > experience as a result; would you like for me to prepare a patch for
> > > > Gnopernicus to reflect the API changes?
> > > >
> > > > Best regards,
> > > >
> > > > Bill
> > >
> >
> > --------------------------------------------------------------------------
> --
> > > ----
> > >
> > > > ? at-spi-1.0.pc
> > > > ? atspi-101201-1.diff
> > > > ? atspi-111101-1.diff
> > > > ? atspi-111201-1.diff
> > > > ? atspi-121201-2.diff
> > > > ? atspi-121201-1.diff
> > > > ? atspi-121201-3.diff
> > > > ? atspi-121201-4.diff
> > > > ? docs/reference/cspi/tmpl/at-spi-cspi-unused.sgml
> > > > Index: cspi/spi.h
> > > > ===================================================================
> > > > RCS file: /cvs/gnome/at-spi/cspi/spi.h,v
> > > > retrieving revision 1.39
> > > > diff -u -r1.39 spi.h
> > > > --- cspi/spi.h 2001/12/12 00:28:48 1.39
> > > > +++ cspi/spi.h 2001/12/12 18:13:03
> > > > @@ -137,53 +137,61 @@
> > > >
> > > > /* Event Listener creation and support. */
> > > >
> > > > -AccessibleEventListener *
> > > > - createAccessibleEventListener
> > > (AccessibleEventListenerCB callback,
> > > > +AccessibleEventListener * SPI_createAccessibleEventListener (
> > > > + AccessibleEventListenerCB
> > > callback,
> > > > void *user_data);
> > > > -SPIBoolean AccessibleEventListener_addCallback
> > > (AccessibleEventListener *listener,
> > > > +SPIBoolean AccessibleEventListener_addCallback (
> > > > + AccessibleEventListener
> > > *listener,
> > > > AccessibleEventListenerCB callback,
> > > > void *user_data);
> > > > -SPIBoolean AccessibleEventListener_removeCallback
> > > (AccessibleEventListener *listener,
> > > > +SPIBoolean AccessibleEventListener_removeCallback (
> > > > + AccessibleEventListener
> > > *listener,
> > > > AccessibleEventListenerCB callback);
> > > > -void AccessibleEventListener_unref
> > > (AccessibleEventListener *listener);
> > > > +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);
> > > > +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 */
> > > >
> > > > -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 */
> > > >
> > > > Index: cspi/spi_event.c
> > > > ===================================================================
> > > > RCS file: /cvs/gnome/at-spi/cspi/spi_event.c,v
> > > > retrieving revision 1.15
> > > > diff -u -r1.15 spi_event.c
> > > > --- cspi/spi_event.c 2001/12/11 14:55:28 1.15
> > > > +++ cspi/spi_event.c 2001/12/12 18:13:03
> > > > @@ -23,7 +23,7 @@
> > > > #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.
> > > > *
> > > > @@ -33,8 +33,8 @@
> > > > *
> > > > **/
> > > > AccessibleEventListener *
> > > > -createAccessibleEventListener (AccessibleEventListenerCB callback,
> > > > - void *user_data)
> > > > +SPI_createAccessibleEventListener (AccessibleEventListenerCB
> callback,
> > > > + void *user_data)
> > > > {
> > > > AccessibleEventListener *listener = cspi_event_listener_new ();
> > > > if (callback)
> > > > @@ -110,8 +110,8 @@
> > > > *
> > > > **/
> > > > AccessibleKeystrokeListener *
> > > > -createAccessibleKeystrokeListener (AccessibleKeystrokeListenerCB
> > > callback,
> > > > - void *user_data)
> > > > +SPI_createAccessibleKeystrokeListener (AccessibleKeystrokeListenerCB
> > > callback,
> > > > + void *user_data)
> > > > {
> > > > AccessibleKeystrokeListener *listener = cspi_keystroke_listener_new
> ();
> > > > if (callback)
> > > > Index: cspi/spi_main.c
> > > > ===================================================================
> > > > RCS file: /cvs/gnome/at-spi/cspi/spi_main.c,v
> > > > retrieving revision 1.20
> > > > diff -u -r1.20 spi_main.c
> > > > --- cspi/spi_main.c 2001/12/11 14:55:28 1.20
> > > > +++ cspi/spi_main.c 2001/12/12 18:13:03
> > > > @@ -14,7 +14,7 @@
> > > > 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;
> > > > @@ -25,7 +25,7 @@
> > > > }
> > > >
> > > > 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;
> > > > @@ -37,7 +37,7 @@
> > > > }
> > > >
> > > > static void
> > > > -spi_object_release (gpointer value)
> > > > +cspi_object_release (gpointer value)
> > > > {
> > > > Accessible *a = (Accessible *) value;
> > > >
> > > > @@ -91,14 +91,14 @@
> > > > }
> > > >
> > > > static GHashTable *
> > > > -get_live_refs (void)
> > > > +cspi_get_live_refs (void)
> > > > {
> > > > 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,
> > > > - spi_object_release);
> > > > + cspi_object_release);
> > > > }
> > > > return live_refs;
> > > > }
> > > > @@ -149,7 +149,7 @@
> > > > }
> > > > 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++;
> > > > @@ -169,7 +169,7 @@
> > > > 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 @@
> > > >
> > > > if (--accessible->ref_count == 0)
> > > > {
> > > > - g_hash_table_remove (get_live_refs (), accessible->objref);
> > > > + g_hash_table_remove (cspi_get_live_refs (),
> accessible->objref);
> > > > }
> > > > }
> > > >
> > > > Index: cspi/spi_registry.c
> > > > ===================================================================
> > > > RCS file: /cvs/gnome/at-spi/cspi/spi_registry.c,v
> > > > retrieving revision 1.23
> > > > diff -u -r1.23 spi_registry.c
> > > > --- cspi/spi_registry.c 2001/12/11 14:55:28 1.23
> > > > +++ cspi/spi_registry.c 2001/12/12 18:13:04
> > > > @@ -25,7 +25,7 @@
> > > > #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
> > > > @@ -81,8 +81,8 @@
> > > > * Returns: #TRUE if successful, otherwise #FALSE.
> > > > **/
> > > > SPIBoolean
> > > > -registerGlobalEventListener (AccessibleEventListener *listener,
> > > > - const char *eventType)
> > > > +SPI_registerGlobalEventListener (AccessibleEventListener *listener,
> > > > + const char *eventType)
> > > > {
> > > > SPIBoolean retval;
> > > >
> > > > @@ -102,7 +102,7 @@
> > > > }
> > > >
> > > > /**
> > > > - * deregisterGlobalEventListenerAll:
> > > > + * SPI_deregisterGlobalEventListenerAll:
> > > > * @listener: the #AccessibleEventListener to be registered against
> > > > * an event type.
> > > > *
> > > > @@ -114,7 +114,7 @@
> > > > * Returns: #TRUE if successful, otherwise #FALSE.
> > > > **/
> > > > SPIBoolean
> > > > -deregisterGlobalEventListenerAll (AccessibleEventListener *listener)
> > > > +SPI_deregisterGlobalEventListenerAll (AccessibleEventListener
> *listener)
> > > > {
> > > > if (!listener)
> > > > {
> > > > @@ -130,7 +130,7 @@
> > > > }
> > > >
> > > > /**
> > > > - * 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.
> > > > @@ -141,8 +141,8 @@
> > > > * Returns: #TRUE if successful, otherwise #FALSE.
> > > > **/
> > > > SPIBoolean
> > > > -deregisterGlobalEventListener (AccessibleEventListener *listener,
> > > > - const char *eventType)
> > > > +SPI_deregisterGlobalEventListener (AccessibleEventListener *listener,
> > > > + const char *eventType)
> > > > {
> > > > if (!listener)
> > > > {
> > > > @@ -158,7 +158,7 @@
> > > > }
> > > >
> > > > /**
> > > > - * getDesktopCount:
> > > > + * SPI_getDesktopCount:
> > > > *
> > > > * Get the number of virtual desktops.
> > > > * NOTE: currently multiple virtual desktops are not implemented,
> this
> > > > @@ -167,7 +167,7 @@
> > > > * Returns: an integer indicating the number of active virtual
> desktops.
> > > > **/
> > > > int
> > > > -getDesktopCount ()
> > > > +SPI_getDesktopCount ()
> > > > {
> > > > int retval;
> > > >
> > > > @@ -180,7 +180,7 @@
> > > > }
> > > >
> > > > /**
> > > > - * getDesktop:
> > > > + * SPI_getDesktop:
> > > > * @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 @@
> > > > * 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 (
> > > > @@ -198,7 +198,7 @@
> > > > }
> > > >
> > > > /**
> > > > - * getDesktopList:
> > > > + * SPI_getDesktopList:
> > > > * @list: a pointer to an array of #Accessible objects.
> > > > *
> > > > * Get the list of virtual desktops. On return, @list will point
> > > > @@ -213,14 +213,14 @@
> > > > * placed in the list pointed to by parameter @list.
> > > > **/
> > > > int
> > > > -getDesktopList (Accessible **list)
> > > > +SPI_getDesktopList (Accessible **list)
> > > > {
> > > > *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
> > > > @@ -244,11 +244,11 @@
> > > > * 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;
> > > > @@ -328,7 +328,7 @@
> > > > }
> > > >
> > > > /**
> > > > - * 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
> > > > @@ -340,8 +340,8 @@
> > > > * 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;
> > > > @@ -382,7 +382,7 @@
> > > > }
> > > >
> > > > /**
> > > > - * 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
> > > > @@ -396,7 +396,7 @@
> > > > * 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
> > > > @@ -417,7 +417,7 @@
> > > > }
> > > >
> > > > /**
> > > > - * 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
> > > > @@ -431,7 +431,7 @@
> > > > * Returns: #TRUE if successful, otherwise #FALSE.
> > > > **/
> > > > SPIBoolean
> > > > -generateMouseEvent (long x, long y, char *name)
> > > > +SPI_generateMouseEvent (long x, long y, char *name)
> > > > {
> > > > return FALSE;
> > > > }
> > > > Index: cspi/spi_table.c
> > > > ===================================================================
> > > > RCS file: /cvs/gnome/at-spi/cspi/spi_table.c,v
> > > > retrieving revision 1.15
> > > > diff -u -r1.15 spi_table.c
> > > > --- cspi/spi_table.c 2001/12/11 14:55:28 1.15
> > > > +++ cspi/spi_table.c 2001/12/12 18:13:04
> > > > @@ -398,7 +398,7 @@
> > > > }
> > > >
> > > > 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;
> > > >
> > > > @@ -444,7 +444,7 @@
> > > >
> > > > 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 @@
> > > >
> > > > columns = Accessibility_Table_getSelectedColumns (CSPI_OBJREF
> (obj),
> > > cspi_ev ());
> > > >
> > > > - return long_seq_to_array (columns, selectedColumns);
> > > > + return cspi_long_seq_to_array (columns, selectedColumns);
> > > > }
> > > >
> > > > /**
> > > > Index: docs/reference/cspi/at-spi-cspi-sections.txt
> > > > ===================================================================
> > > > RCS file:
> /cvs/gnome/at-spi/docs/reference/cspi/at-spi-cspi-sections.txt,v
> > > > retrieving revision 1.4
> > > > diff -u -r1.4 at-spi-cspi-sections.txt
> > > > --- docs/reference/cspi/at-spi-cspi-sections.txt 2001/12/04 22:51:33
> 1.4
> > > > +++ docs/reference/cspi/at-spi-cspi-sections.txt 2001/12/12 18:13:05
> > > > @@ -3,6 +3,7 @@
> > > > <TITLE>SPI main loop and initialization</TITLE>
> > > > SPI_init
> > > > SPI_event_main
> > > > +SPI_event_quit
> > > > SPI_eventIsReady
> > > > SPI_nextEvent
> > > > SPI_exit
> > > > @@ -15,7 +16,9 @@
> > > > <TITLE>Event Listener Support</TITLE>
> > > > AccessibleEvent
> > > > AccessibleEventListenerCB
> > > > -createAccessibleEventListener
> > > > +SPI_createAccessibleEventListener
> > > > +AccessibleEventListener_ref
> > > > +AccessibleEventListener_unref
> > > > AccessibleEventListener_addCallback
> > > > AccessibleEventListener_removeCallback
> > > > </SECTION>
> > > > @@ -24,25 +27,28 @@
> > > > <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
> > > > -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
> > > > -generateKeyEvent
> > > > -generateMouseEvent
> > > > +SPI_generateKeyEvent
> > > > +SPI_generateMouseEvent
> > > > </SECTION>
> > > >
> > > > <SECTION>
> > > > @@ -58,9 +64,11 @@
> > > > Accessible_getIndexInParent
> > > > Accessible_getRelationSet
> > > > Accessible_getRole
> > > > +Accessible_getRoleName
> > > > Accessible_getStateSet
> > > > <SUBSECTION Interface Queries>
> > > > Accessible_isAction
> > > > +Accessible_isApplication
> > > > Accessible_isComponent
> > > > Accessible_isEditableText
> > > > Accessible_isHypertext
> > > > @@ -68,7 +76,9 @@
> > > > Accessible_isSelection
> > > > Accessible_isTable
> > > > Accessible_isText
> > > > +Accessible_isValue
> > > > Accessible_getAction
> > > > +Accessible_getApplication
> > > > Accessible_getComponent
> > > > Accessible_getEditableText
> > > > Accessible_getHypertext
> > > > @@ -76,6 +86,7 @@
> > > > Accessible_getSelection
> > > > Accessible_getTable
> > > > Accessible_getText
> > > > +Accessible_getValue
> > > > Accessible_queryInterface
> > > > <SUBSECTION Auxiliary types>
> > > > AccessibleRole
> > > > @@ -110,6 +121,7 @@
> > > > <FILE>spi_component</FILE>
> > > > <TITLE>AccessibleComponent Interface</TITLE>
> > > > AccessibleCoordType
> > > > +AccessibleComponentLayer
> > > > AccessibleComponent_ref
> > > > AccessibleComponent_unref
> > > > AccessibleComponent_contains
> > > > @@ -236,6 +248,8 @@
> > > > <SECTION>
> > > > <FILE>spi_hyperlink</FILE>
> > > > <TITLE>AccessibleHyperlink Interface</TITLE>
> > > > +AccessibleHyperlink_ref
> > > > +AccessibleHyperlink_unref
> > > > AccessibleHyperlink_getNAnchors
> > > > AccessibleHyperlink_getIndexRange
> > > > AccessibleHyperlink_getObject
> > > > @@ -263,6 +277,7 @@
> > > > AccessibleRelationType
> > > > AccessibleRelation_ref
> > > > AccessibleRelation_unref
> > > > +AccessibleRelation_getNTargets
> > > > AccessibleRelation_getTarget
> > > > AccessibleRelation_getRelationType
> > > > </SECTION>
> > > > Index: docs/reference/cspi/tmpl/spi_accessible.sgml
> > > > ===================================================================
> > > > RCS file:
> /cvs/gnome/at-spi/docs/reference/cspi/tmpl/spi_accessible.sgml,v
> > > > retrieving revision 1.2
> > > > diff -u -r1.2 spi_accessible.sgml
> > > > --- docs/reference/cspi/tmpl/spi_accessible.sgml 2001/12/10 19:05:58
> 1.2
> > > > +++ docs/reference/cspi/tmpl/spi_accessible.sgml 2001/12/12 18:13:05
> > > > @@ -107,6 +107,15 @@
> > > > @Returns:
> > > >
> > > >
> > > > +<!-- ##### FUNCTION Accessible_getRoleName ##### -->
> > > > +<para>
> > > > +
> > > > +</para>
> > > > +
> > > > + obj:
> > > > + Returns:
> > > > +
> > > > +
> > > > <!-- ##### FUNCTION Accessible_getStateSet ##### -->
> > > > <para>
> > > >
> > > > @@ -125,6 +134,15 @@
> > > > @Returns:
> > > >
> > > >
> > > > +<!-- ##### FUNCTION Accessible_isApplication ##### -->
> > > > +<para>
> > > > +
> > > > +</para>
> > > > +
> > > > + obj:
> > > > + Returns:
> > > > +
> > > > +
> > > > <!-- ##### FUNCTION Accessible_isComponent ##### -->
> > > > <para>
> > > >
> > > > @@ -188,6 +206,15 @@
> > > > @Returns:
> > > >
> > > >
> > > > +<!-- ##### FUNCTION Accessible_isValue ##### -->
> > > > +<para>
> > > > +
> > > > +</para>
> > > > +
> > > > + obj:
> > > > + Returns:
> > > > +
> > > > +
> > > > <!-- ##### FUNCTION Accessible_getAction ##### -->
> > > > <para>
> > > >
> > > > @@ -197,6 +224,15 @@
> > > > @Returns:
> > > >
> > > >
> > > > +<!-- ##### FUNCTION Accessible_getApplication ##### -->
> > > > +<para>
> > > > +
> > > > +</para>
> > > > +
> > > > + obj:
> > > > + Returns:
> > > > +
> > > > +
> > > > <!-- ##### FUNCTION Accessible_getComponent ##### -->
> > > > <para>
> > > >
> > > > @@ -252,6 +288,15 @@
> > > >
> > > >
> > > > <!-- ##### FUNCTION Accessible_getText ##### -->
> > > > +<para>
> > > > +
> > > > +</para>
> > > > +
> > > > + obj:
> > > > + Returns:
> > > > +
> > > > +
> > > > +<!-- ##### FUNCTION Accessible_getValue ##### -->
> > > > <para>
> > > >
> > > > </para>
> > > > Index: docs/reference/cspi/tmpl/spi_component.sgml
> > > > ===================================================================
> > > > RCS file:
> /cvs/gnome/at-spi/docs/reference/cspi/tmpl/spi_component.sgml,v
> > > > retrieving revision 1.3
> > > > diff -u -r1.3 spi_component.sgml
> > > > --- docs/reference/cspi/tmpl/spi_component.sgml 2001/12/10 19:05:58
> 1.3
> > > > +++ docs/reference/cspi/tmpl/spi_component.sgml 2001/12/12 18:13:05
> > > > @@ -22,6 +22,20 @@
> > > > @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>
> > > >
> > > > Index: docs/reference/cspi/tmpl/spi_event.sgml
> > > > ===================================================================
> > > > RCS file: /cvs/gnome/at-spi/docs/reference/cspi/tmpl/spi_event.sgml,v
> > > > retrieving revision 1.3
> > > > diff -u -r1.3 spi_event.sgml
> > > > --- docs/reference/cspi/tmpl/spi_event.sgml 2001/12/07 16:43:08 1.3
> > > > +++ docs/reference/cspi/tmpl/spi_event.sgml 2001/12/12 18:13:05
> > > > @@ -29,7 +29,7 @@
> > > > @user_data:
> > > >
> > > >
> > > > -<!-- ##### FUNCTION createAccessibleEventListener ##### -->
> > > > +<!-- ##### FUNCTION SPI_createAccessibleEventListener ##### -->
> > > > <para>
> > > >
> > > > </para>
> > > > @@ -37,6 +37,14 @@
> > > > @callback:
> > > > @user_data:
> > > > @Returns:
> > > > +
> > > > +
> > > > +<!-- ##### FUNCTION AccessibleEventListener_unref ##### -->
> > > > +<para>
> > > > +
> > > > +</para>
> > > > +
> > > > + listener:
> > > >
> > > >
> > > > <!-- ##### FUNCTION AccessibleEventListener_addCallback ##### -->
> > > > Index: docs/reference/cspi/tmpl/spi_hyperlink.sgml
> > > > ===================================================================
> > > > RCS file:
> /cvs/gnome/at-spi/docs/reference/cspi/tmpl/spi_hyperlink.sgml,v
> > > > retrieving revision 1.1
> > > > diff -u -r1.1 spi_hyperlink.sgml
> > > > --- docs/reference/cspi/tmpl/spi_hyperlink.sgml 2001/11/21 17:16:56
> 1.1
> > > > +++ docs/reference/cspi/tmpl/spi_hyperlink.sgml 2001/12/12 18:13:05
> > > > @@ -14,6 +14,22 @@
> > > >
> > > > </para>
> > > >
> > > > +<!-- ##### FUNCTION AccessibleHyperlink_ref ##### -->
> > > > +<para>
> > > > +
> > > > +</para>
> > > > +
> > > > + obj:
> > > > +
> > > > +
> > > > +<!-- ##### FUNCTION AccessibleHyperlink_unref ##### -->
> > > > +<para>
> > > > +
> > > > +</para>
> > > > +
> > > > + obj:
> > > > +
> > > > +
> > > > <!-- ##### FUNCTION AccessibleHyperlink_getNAnchors ##### -->
> > > > <para>
> > > >
> > > > Index: docs/reference/cspi/tmpl/spi_main.sgml
> > > > ===================================================================
> > > > RCS file: /cvs/gnome/at-spi/docs/reference/cspi/tmpl/spi_main.sgml,v
> > > > retrieving revision 1.4
> > > > diff -u -r1.4 spi_main.sgml
> > > > --- docs/reference/cspi/tmpl/spi_main.sgml 2001/12/10 00:29:54 1.4
> > > > +++ docs/reference/cspi/tmpl/spi_main.sgml 2001/12/12 18:13:05
> > > > @@ -33,6 +33,13 @@
> > > > @isGNOMEApp:
> > > >
> > > >
> > > > +<!-- ##### FUNCTION SPI_event_quit ##### -->
> > > > +<para>
> > > > +
> > > > +</para>
> > > > +
> > > > +
> > > > +
> > > > <!-- ##### FUNCTION SPI_eventIsReady ##### -->
> > > > <para>
> > > >
> > > > Index: docs/reference/cspi/tmpl/spi_registry.sgml
> > > > ===================================================================
> > > > RCS file:
> /cvs/gnome/at-spi/docs/reference/cspi/tmpl/spi_registry.sgml,v
> > > > retrieving revision 1.4
> > > > diff -u -r1.4 spi_registry.sgml
> > > > --- docs/reference/cspi/tmpl/spi_registry.sgml 2001/12/12 00:28:50 1.4
> > > > +++ docs/reference/cspi/tmpl/spi_registry.sgml 2001/12/12 18:13:05
> > > > @@ -24,7 +24,7 @@
> > > > @SPI_KEY_PRESSRELEASE:
> > > > @SPI_KEY_SYM:
> > > >
> > > > -<!-- ##### FUNCTION getDesktopCount ##### -->
> > > > +<!-- ##### FUNCTION SPI_getDesktopCount ##### -->
> > > > <para>
> > > >
> > > > </para>
> > > > @@ -32,7 +32,7 @@
> > > > @Returns:
> > > >
> > > >
> > > > -<!-- ##### FUNCTION getDesktop ##### -->
> > > > +<!-- ##### FUNCTION SPI_getDesktop ##### -->
> > > > <para>
> > > >
> > > > </para>
> > > > @@ -41,7 +41,7 @@
> > > > @Returns:
> > > >
> > > >
> > > > -<!-- ##### FUNCTION getDesktopList ##### -->
> > > > +<!-- ##### FUNCTION SPI_getDesktopList ##### -->
> > > > <para>
> > > >
> > > > </para>
> > > > @@ -90,17 +90,23 @@
> > > > @SPI_KEYLISTENER_CANCONSUME:
> > > > @SPI_KEYLISTENER_ALL_WINDOWS:
> > > >
> > > > -<!-- ##### FUNCTION createAccessibleKeystrokeListener ##### -->
> > > > +<!-- ##### TYPEDEF AccessibleKeystroke ##### -->
> > > > <para>
> > > >
> > > > </para>
> > > >
> > > > +
> > > > +<!-- ##### FUNCTION SPI_createAccessibleKeystrokeListener ##### -->
> > > > +<para>
> > > > +
> > > > +</para>
> > > > +
> > > > @callback:
> > > > @user_data:
> > > > @Returns:
> > > >
> > > >
> > > > -<!-- ##### FUNCTION registerGlobalEventListener ##### -->
> > > > +<!-- ##### FUNCTION SPI_registerGlobalEventListener ##### -->
> > > > <para>
> > > >
> > > > </para>
> > > > @@ -110,7 +116,7 @@
> > > > @Returns:
> > > >
> > > >
> > > > -<!-- ##### FUNCTION deregisterGlobalEventListener ##### -->
> > > > +<!-- ##### FUNCTION SPI_deregisterGlobalEventListener ##### -->
> > > > <para>
> > > >
> > > > </para>
> > > > @@ -120,7 +126,7 @@
> > > > @Returns:
> > > >
> > > >
> > > > -<!-- ##### FUNCTION deregisterGlobalEventListenerAll ##### -->
> > > > +<!-- ##### FUNCTION SPI_deregisterGlobalEventListenerAll ##### -->
> > > > <para>
> > > >
> > > > </para>
> > > > @@ -129,7 +135,7 @@
> > > > @Returns:
> > > >
> > > >
> > > > -<!-- ##### FUNCTION registerAccessibleKeystrokeListener ##### -->
> > > > +<!-- ##### FUNCTION SPI_registerAccessibleKeystrokeListener ##### -->
> > > > <para>
> > > >
> > > > </para>
> > > > @@ -142,7 +148,7 @@
> > > > @Returns:
> > > >
> > > >
> > > > -<!-- ##### FUNCTION deregisterAccessibleKeystrokeListener ##### -->
> > > > +<!-- ##### FUNCTION SPI_deregisterAccessibleKeystrokeListener
> ##### -->
> > > > <para>
> > > >
> > > > </para>
> > > > @@ -152,6 +158,14 @@
> > > > @Returns:
> > > >
> > > >
> > > > +<!-- ##### FUNCTION AccessibleKeystrokeListener_unref ##### -->
> > > > +<para>
> > > > +
> > > > +</para>
> > > > +
> > > > + listener:
> > > > +
> > > > +
> > > > <!-- ##### FUNCTION AccessibleKeystrokeListener_removeCallback
> ##### -->
> > > > <para>
> > > >
> > > > @@ -173,7 +187,7 @@
> > > > @Returns:
> > > >
> > > >
> > > > -<!-- ##### FUNCTION generateKeyEvent ##### -->
> > > > +<!-- ##### FUNCTION SPI_generateKeyEvent ##### -->
> > > > <para>
> > > >
> > > > </para>
> > > > @@ -183,7 +197,7 @@
> > > > @Returns:
> > > >
> > > >
> > > > -<!-- ##### FUNCTION generateMouseEvent ##### -->
> > > > +<!-- ##### FUNCTION SPI_generateMouseEvent ##### -->
> > > > <para>
> > > >
> > > > </para>
> > > > Index: docs/reference/cspi/tmpl/spi_relation.sgml
> > > > ===================================================================
> > > > RCS file:
> /cvs/gnome/at-spi/docs/reference/cspi/tmpl/spi_relation.sgml,v
> > > > retrieving revision 1.2
> > > > diff -u -r1.2 spi_relation.sgml
> > > > --- docs/reference/cspi/tmpl/spi_relation.sgml 2001/12/10 19:05:58 1.2
> > > > +++ docs/reference/cspi/tmpl/spi_relation.sgml 2001/12/12 18:13:05
> > > > @@ -45,6 +45,15 @@
> > > > @Returns:
> > > >
> > > >
> > > > +<!-- ##### FUNCTION AccessibleRelation_getNTargets ##### -->
> > > > +<para>
> > > > +
> > > > +</para>
> > > > +
> > > > + obj:
> > > > + Returns:
> > > > +
> > > > +
> > > > <!-- ##### FUNCTION AccessibleRelation_getTarget ##### -->
> > > > <para>
> > > >
> > > > Index: test/keysynth-demo.c
> > > > ===================================================================
> > > > RCS file: /cvs/gnome/at-spi/test/keysynth-demo.c,v
> > > > retrieving revision 1.10
> > > > diff -u -r1.10 keysynth-demo.c
> > > > --- test/keysynth-demo.c 2001/12/08 19:17:14 1.10
> > > > +++ test/keysynth-demo.c 2001/12/12 18:13:06
> > > > @@ -280,11 +280,11 @@
> > > > 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 ();
> > > > }
> > > > @@ -367,13 +367,13 @@
> > > > 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)
> > > > {
> > > > - generateKeyEvent (shift_keycode, SPI_KEY_RELEASE);
> > > > + SPI_generateKeyEvent (shift_keycode, SPI_KEY_RELEASE);
> > > > toggle_shift_latch (button);
> > > > }
> > > > }
> > > > @@ -474,13 +474,13 @@
> > > >
> > > > SPI_init ();
> > > >
> > > > - key_listener = createAccessibleKeystrokeListener (is_command_key,
> > > NULL);
> > > > + key_listener = SPI_createAccessibleKeystrokeListener
> (is_command_key,
> > > NULL);
> > > > /* 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 ();
> > > >
> > > > /*
> > > > @@ -494,12 +494,12 @@
> > > > 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 ();
> > > >
> > > > Index: test/simple-at.c
> > > > ===================================================================
> > > > RCS file: /cvs/gnome/at-spi/test/simple-at.c,v
> > > > retrieving revision 1.26
> > > > diff -u -r1.26 simple-at.c
> > > > --- test/simple-at.c 2001/12/12 00:28:53 1.26
> > > > +++ test/simple-at.c 2001/12/12 18:13:07
> > > > @@ -78,24 +78,24 @@
> > > >
> > > > 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)
> > > > {
> > > > - desktop = getDesktop (i);
> > > > + desktop = SPI_getDesktop (i);
> > > > s = Accessible_getName (desktop);
> > > > fprintf (stderr, "desktop %d name: %s\n", i, s);
> > > > SPI_freeString (s);
> > > > @@ -112,30 +112,30 @@
> > > > }
> > > >
> > > > /* 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 */
> > > > - 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
> */
> > > > - 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
> */
> > > > - 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 ();
> > > > @@ -306,24 +306,24 @@
> > > > 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 ();
> > > > }
> > > > Index: test/test-simple.c
> > > > ===================================================================
> > > > RCS file: /cvs/gnome/at-spi/test/test-simple.c,v
> > > > retrieving revision 1.13
> > > > diff -u -r1.13 test-simple.c
> > > > --- test/test-simple.c 2001/12/12 00:28:53 1.13
> > > > +++ test/test-simple.c 2001/12/12 18:13:07
> > > > @@ -187,8 +187,8 @@
> > > >
> > > > 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);
> > > > @@ -620,7 +620,7 @@
> > > > 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);
> > > > @@ -661,7 +661,7 @@
> > > >
> > > > g_assert (!SPI_init ());
> > > > g_assert (SPI_init ());
> > > > - g_assert (getDesktopCount () == 1);
> > > > + g_assert (SPI_getDesktopCount () == 1);
> > > >
> > > > test_roles ();
> > > > test_misc ();
> > > > @@ -669,13 +669,13 @@
> > > >
> > > > 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 ();
> > > >
> > > > - g_assert (deregisterGlobalEventListenerAll (global_listener));
> > > > + g_assert (SPI_deregisterGlobalEventListenerAll (global_listener));
> > > > AccessibleEventListener_unref (global_listener);
> > > >
> > > > test_window_destroy (win);
> > > >
> > >
> > > _______________________________________________
> > > Gnome-accessibility-devel mailing list
> > > Gnome-accessibility-devel gnome org
> > > http://mail.gnome.org/mailman/listinfo/gnome-accessibility-devel
>
> _______________________________________________
> Gnome-accessibility-devel mailing list
> Gnome-accessibility-devel gnome org
> http://mail.gnome.org/mailman/listinfo/gnome-accessibility-devel
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
