From 66c4375c7cd9a0a01e79f562e1bb0326fc4dcd21 Mon Sep 17 00:00:00 2001 From: michael Date: Tue, 13 Nov 2001 01:21:15 +0000 Subject: [PATCH] 2001-11-13 Michael Meeks * *.[ch] fix bits I screwed up: s/([^ \tb(\*\&\?\",])spi_/\1/g; s/([^ \tb(\*\&\?\",])Spi/\1/g; git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@88 e2bd861d-eb25-0410-b326-f6ed22b6b98c --- ChangeLog | 7 + at-bridge/bridge.c | 18 +-- atk-bridge/bridge.c | 18 +-- cspi/spi-impl.h | 2 +- cspi/spi.c | 2 +- cspi/spi.h | 238 ++++++++++++++++----------------- cspi/spi_accessible.c | 272 +++++++++++++++++++------------------- cspi/spi_action.c | 22 +-- cspi/spi_application.c | 32 ++--- cspi/spi_component.c | 44 +++--- cspi/spi_editabletext.c | 20 +-- cspi/spi_event.c | 30 ++--- cspi/spi_hyperlink.c | 16 +-- cspi/spi_hypertext.c | 20 +-- cspi/spi_image.c | 10 +- cspi/spi_main.c | 6 +- cspi/spi_registry.c | 40 +++--- cspi/spi_selection.c | 22 +-- cspi/spi_table.c | 46 +++---- cspi/spi_text.c | 40 +++--- cspi/spi_value.c | 20 +-- libspi/accessible.c | 36 ++--- libspi/accessible.h | 2 +- libspi/accessibleeventlistener.c | 32 ++--- libspi/accessibleeventlistener.h | 10 +- libspi/action.c | 18 +-- libspi/action.h | 10 +- libspi/application.c | 32 ++--- libspi/application.h | 2 +- libspi/component.c | 58 ++++---- libspi/component.h | 6 +- libspi/desktop.c | 18 +-- libspi/desktop.h | 2 +- libspi/deviceeventcontroller.c | 14 +- libspi/deviceeventcontroller.h | 2 +- libspi/editabletext.c | 12 +- libspi/editabletext.h | 10 +- libspi/eventlistener.c | 32 ++--- libspi/eventlistener.h | 10 +- libspi/hyperlink.c | 12 +- libspi/hyperlink.h | 10 +- libspi/hypertext.c | 16 +-- libspi/hypertext.h | 10 +- libspi/image.c | 6 +- libspi/image.h | 10 +- libspi/keystrokelistener.c | 32 ++--- libspi/keystrokelistener.h | 10 +- libspi/listener.c | 10 +- libspi/registry.c | 144 ++++++++++---------- libspi/registry.h | 2 +- libspi/selection.c | 18 +-- libspi/selection.h | 10 +- libspi/table.c | 36 ++--- libspi/table.h | 10 +- libspi/text.c | 18 +-- libspi/text.h | 10 +- libspi/value.c | 18 +-- libspi/value.h | 10 +- registryd/desktop.c | 18 +-- registryd/desktop.h | 2 +- registryd/deviceeventcontroller.c | 14 +- registryd/deviceeventcontroller.h | 2 +- registryd/registry-main.c | 4 +- registryd/registry.c | 144 ++++++++++---------- registryd/registry.h | 2 +- registryd/registryd.c | 4 +- test/app.c | 12 +- test/at.c | 26 ++-- test/simple-at.c | 8 +- 69 files changed, 933 insertions(+), 926 deletions(-) diff --git a/ChangeLog b/ChangeLog index dc742e2..b640d70 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2001-11-13 Michael Meeks + * *.[ch] fix bits I screwed up: + + s/([^ \tb(\*\&\?\",])spi_/\1/g; + s/([^ \tb(\*\&\?\",])Spi/\1/g; + +2001-11-13 Michael Meeks + * *.[ch] Namespace libspi into spi_ and Spi. 2001-11-13 Michael Meeks diff --git a/at-bridge/bridge.c b/at-bridge/bridge.c index 6e08153..ba4f06a 100644 --- a/at-bridge/bridge.c +++ b/at-bridge/bridge.c @@ -40,7 +40,7 @@ struct _ArgStruct { }; static CORBA_Environment ev; -static Accessibility_SpiRegistry registry; +static Accessibility_Registry registry; static SpiApplication *this_app; static gboolean bridge_register_app (gpointer p); @@ -85,7 +85,7 @@ bridge_register_app (gpointer gp) /* Create the accesssible application server object */ this_app = spi_application_new(atk_get_root ()); - obj_id = "OAFIID:Accessibility_SpiRegistry:proto0.1"; + obj_id = "OAFIID:Accessibility_Registry:proto0.1"; oclient = bonobo_activation_activate_from_id (obj_id, 0, NULL, &ev); if (ev._major != CORBA_NO_EXCEPTION) { @@ -101,13 +101,13 @@ bridge_register_app (gpointer gp) g_error ("Could not locate registry"); } - registry = (Accessibility_SpiRegistry) oclient; + registry = (Accessibility_Registry) oclient; fprintf(stderr, "About to register application\n"); bonobo_activate (); - Accessibility_SpiRegistry_registerSpiApplication (registry, + Accessibility_Registry_registerApplication (registry, CORBA_Object_duplicate (BONOBO_OBJREF (this_app), &ev), &ev); @@ -136,7 +136,7 @@ register_atk_event_listeners () static void bridge_exit_func() { fprintf (stderr, "exiting bridge\n"); - Accessibility_SpiRegistry_deregisterSpiApplication (registry, + Accessibility_Registry_deregisterApplication (registry, CORBA_Object_duplicate (BONOBO_OBJREF (this_app), &ev), &ev); fprintf (stderr, "bridge exit func complete.\n"); @@ -149,7 +149,7 @@ static void bridge_focus_tracker (AtkObject *object) e->source = CORBA_Object_duplicate (BONOBO_OBJREF (spi_accessible_new (object)), &ev); e->detail1 = 0; e->detail2 = 0; - Accessibility_SpiRegistry_notifyEvent (registry, e, &ev); + Accessibility_Registry_notifyEvent (registry, e, &ev); } static gboolean @@ -199,7 +199,7 @@ bridge_property_event_listener (GSignalInvocationHint *signal_hint, e->detail1 = 0; e->detail2 = 0; if (source) - Accessibility_SpiRegistry_notifyEvent (registry, e, &ev); + Accessibility_Registry_notifyEvent (registry, e, &ev); return TRUE; } @@ -247,12 +247,12 @@ bridge_signal_listener (GSignalInvocationHint *signal_hint, e->source = source; e->detail1 = 0; e->detail2 = 0; - Accessibility_SpiRegistry_notifyEvent (registry, e, &ev); + Accessibility_Registry_notifyEvent (registry, e, &ev); g_object_unref (aobject); return TRUE; } -static Accessibility_SpiRegistry bridge_get_registry () +static Accessibility_Registry bridge_get_registry () { return registry; } diff --git a/atk-bridge/bridge.c b/atk-bridge/bridge.c index 6e08153..ba4f06a 100644 --- a/atk-bridge/bridge.c +++ b/atk-bridge/bridge.c @@ -40,7 +40,7 @@ struct _ArgStruct { }; static CORBA_Environment ev; -static Accessibility_SpiRegistry registry; +static Accessibility_Registry registry; static SpiApplication *this_app; static gboolean bridge_register_app (gpointer p); @@ -85,7 +85,7 @@ bridge_register_app (gpointer gp) /* Create the accesssible application server object */ this_app = spi_application_new(atk_get_root ()); - obj_id = "OAFIID:Accessibility_SpiRegistry:proto0.1"; + obj_id = "OAFIID:Accessibility_Registry:proto0.1"; oclient = bonobo_activation_activate_from_id (obj_id, 0, NULL, &ev); if (ev._major != CORBA_NO_EXCEPTION) { @@ -101,13 +101,13 @@ bridge_register_app (gpointer gp) g_error ("Could not locate registry"); } - registry = (Accessibility_SpiRegistry) oclient; + registry = (Accessibility_Registry) oclient; fprintf(stderr, "About to register application\n"); bonobo_activate (); - Accessibility_SpiRegistry_registerSpiApplication (registry, + Accessibility_Registry_registerApplication (registry, CORBA_Object_duplicate (BONOBO_OBJREF (this_app), &ev), &ev); @@ -136,7 +136,7 @@ register_atk_event_listeners () static void bridge_exit_func() { fprintf (stderr, "exiting bridge\n"); - Accessibility_SpiRegistry_deregisterSpiApplication (registry, + Accessibility_Registry_deregisterApplication (registry, CORBA_Object_duplicate (BONOBO_OBJREF (this_app), &ev), &ev); fprintf (stderr, "bridge exit func complete.\n"); @@ -149,7 +149,7 @@ static void bridge_focus_tracker (AtkObject *object) e->source = CORBA_Object_duplicate (BONOBO_OBJREF (spi_accessible_new (object)), &ev); e->detail1 = 0; e->detail2 = 0; - Accessibility_SpiRegistry_notifyEvent (registry, e, &ev); + Accessibility_Registry_notifyEvent (registry, e, &ev); } static gboolean @@ -199,7 +199,7 @@ bridge_property_event_listener (GSignalInvocationHint *signal_hint, e->detail1 = 0; e->detail2 = 0; if (source) - Accessibility_SpiRegistry_notifyEvent (registry, e, &ev); + Accessibility_Registry_notifyEvent (registry, e, &ev); return TRUE; } @@ -247,12 +247,12 @@ bridge_signal_listener (GSignalInvocationHint *signal_hint, e->source = source; e->detail1 = 0; e->detail2 = 0; - Accessibility_SpiRegistry_notifyEvent (registry, e, &ev); + Accessibility_Registry_notifyEvent (registry, e, &ev); g_object_unref (aobject); return TRUE; } -static Accessibility_SpiRegistry bridge_get_registry () +static Accessibility_Registry bridge_get_registry () { return registry; } diff --git a/cspi/spi-impl.h b/cspi/spi-impl.h index 2c09606..2953e1e 100644 --- a/cspi/spi-impl.h +++ b/cspi/spi-impl.h @@ -30,7 +30,7 @@ typedef CORBA_Object SpiAccessibleStateSet; typedef CORBA_Object SpiAccessibleTable; typedef CORBA_Object SpiAccessibleText; typedef CORBA_Object SpiAccessibleValue; -typedef CORBA_Object AccessibilitySpiRegistry; +typedef CORBA_Object AccessibilityRegistry; typedef CORBA_Object GenericInterface; #endif diff --git a/cspi/spi.c b/cspi/spi.c index 71631a6..87e945b 100644 --- a/cspi/spi.c +++ b/cspi/spi.c @@ -3,7 +3,7 @@ #include "spi.h" static CORBA_Environment ev; -static AccessibilitySpiRegistry registry; +static AccessibilityRegistry registry; static SpiAccessible * Obj_Add (SpiAccessible object) diff --git a/cspi/spi.h b/cspi/spi.h index cec91f8..de73082 100644 --- a/cspi/spi.h +++ b/cspi/spi.h @@ -52,7 +52,7 @@ typedef enum /* don't change the order of these ! */ -typedef enum _SpiAccessibleCoordType { +typedef enum _AccessibleCoordType { COORD_TYPE_SCREEN, COORD_TYPE_WINDOW } SpiAccessibleCoordType; @@ -69,11 +69,11 @@ typedef enum _KeySynthType { KEY_SYM } KeySynthType; -typedef enum _KeySpiListenerSyncType { +typedef enum _KeyListenerSyncType { KEYSPI_LISTENER_SYNCHRONOUS = 1, KEYSPI_LISTENER_CANCONSUME = 2, KEYSPI_LISTENER_ALLWINDOWS = 4 -} KeySpiListenerSyncType; +} KeyListenerSyncType; typedef unsigned long KeyEventMask; @@ -145,7 +145,7 @@ SPI_eventIsReady (); * Used by clients that don't wish to use SPI_event_main(). * Not Yet Implemented. * - * Returns: the next #SpiAccessibleEvent in the SPI event queue. + * Returns: the next #AccessibleEvent in the SPI event queue. * **/ SpiAccessibleEvent * @@ -167,11 +167,11 @@ SPI_exit (void); /** * createEventListener: - * @callback : an #SpiAccessibleEventListenerCB callback function, or NULL. + * @callback : an #AccessibleEventListenerCB callback function, or NULL. * - * Create a new #SpiAccessibleEventListener with a specified callback function. + * Create a new #AccessibleEventListener with a specified callback function. * - * Returns: a pointer to a newly-created #SpiAccessibleEventListener. + * Returns: a pointer to a newly-created #AccessibleEventListener. * **/ SpiAccessibleEventListener * @@ -179,8 +179,8 @@ createEventListener (SpiAccessibleEventListenerCB callback); /** * EventListener_addCallback: - * @listener: the #SpiAccessibleEventListener instance to modify. - * @callback: an #SpiAccessibleEventListenerCB function pointer. + * @listener: the #AccessibleEventListener instance to modify. + * @callback: an #AccessibleEventListenerCB function pointer. * * Add an in-process callback function to an existing SpiAccessibleEventListener. * @@ -193,8 +193,8 @@ EventListener_addCallback (SpiAccessibleEventListener *listener, /** * EventListener_removeCallback: - * @listener: the #SpiAccessibleEventListener instance to modify. - * @callback: an #SpiAccessibleEventListenerCB function pointer. + * @listener: the #AccessibleEventListener instance to modify. + * @callback: an #AccessibleEventListenerCB function pointer. * * Remove an in-process callback function from an existing SpiAccessibleEventListener. * @@ -206,7 +206,7 @@ EventListener_removeCallback (SpiAccessibleEventListener *listener, SpiAccessibleEventListenerCB callback); /** - * createKeySpiListener: + * createKeyListener: * @callback : an #KeystrokeListenerCB callback function, or NULL. * * Create a new #KeystrokeListener with a specified callback function. @@ -253,7 +253,7 @@ KeystrokeListener_removeCallback (KeystrokeListener *listener, /** * registerGlobalEventListener: - * @listener: the #SpiAccessibleEventListener to be registered against an event type. + * @listener: the #AccessibleEventListener to be registered against an event type. * @callback: a character string indicating the type of events for which * notification is requested. Format is * EventClass:major_type:minor_type:detail @@ -297,7 +297,7 @@ getDesktopCount (); * NOTE: currently multiple virtual desktops are not implemented, this * function always returns '1'. * - * Returns: a pointer to the 'i-th' virtual desktop's #SpiAccessible representation. + * Returns: a pointer to the 'i-th' virtual desktop's #Accessible representation. * **/ SpiAccessible* @@ -305,7 +305,7 @@ getDesktop (int n); /** * getDesktopList: - * @list: a pointer to an array of #SpiAccessible objects. + * @list: a pointer to an array of #Accessible objects. * * Get the list of virtual desktops. On return, @list will point * to a newly-created array of virtual desktop pointers. @@ -333,7 +333,7 @@ registerKeystrokeListener (KeystrokeListener *listener, KeySet *keys, KeyMaskType modmask, KeyEventMask eventmask, - KeySpiListenerSyncType sync_type); + KeyListenerSyncType sync_type); /** * generateKeyEvent: @@ -372,9 +372,9 @@ generateMouseEvent (long x, long y, char *name); /** * SpiAccessible_ref: - * @obj: a pointer to the #SpiAccessible object on which to operate. + * @obj: a pointer to the #Accessible object on which to operate. * - * Increment the reference count for an #SpiAccessible object. + * Increment the reference count for an #Accessible object. * * Returns: (no return code implemented yet). * @@ -384,9 +384,9 @@ SpiAccessible_ref (SpiAccessible *obj); /** * SpiAccessible_unref: - * @obj: a pointer to the #SpiAccessible object on which to operate. + * @obj: a pointer to the #Accessible object on which to operate. * - * Decrement the reference count for an #SpiAccessible object. + * Decrement the reference count for an #Accessible object. * * Returns: (no return code implemented yet). * @@ -396,11 +396,11 @@ SpiAccessible_unref (SpiAccessible *obj); /** * SpiAccessible_getName: - * @obj: a pointer to the #SpiAccessible object on which to operate. + * @obj: a pointer to the #Accessible object on which to operate. * - * Get the name of an #SpiAccessible object. + * Get the name of an #Accessible object. * - * Returns: a UTF-8 string indicating the name of the #SpiAccessible object. + * Returns: a UTF-8 string indicating the name of the #Accessible object. * **/ char * @@ -408,11 +408,11 @@ SpiAccessible_getName (SpiAccessible *obj); /** * SpiAccessible_getDescription: - * @obj: a pointer to the #SpiAccessible object on which to operate. + * @obj: a pointer to the #Accessible object on which to operate. * - * Get the description of an #SpiAccessible object. + * Get the description of an #Accessible object. * - * Returns: a UTF-8 string describing the #SpiAccessible object. + * Returns: a UTF-8 string describing the #Accessible object. * **/ char * @@ -420,12 +420,12 @@ SpiAccessible_getDescription (SpiAccessible *obj); /** * SpiAccessible_getParent: - * @obj: a pointer to the #SpiAccessible object to query. + * @obj: a pointer to the #Accessible object to query. * - * Get an #SpiAccessible object's parent container. + * Get an #Accessible object's parent container. * - * Returns: a pointer to the #SpiAccessible object which contains the given - * #SpiAccessible instance, or NULL if the @obj has no parent container. + * Returns: a pointer to the #Accessible object which contains the given + * #Accessible instance, or NULL if the @obj has no parent container. * **/ SpiAccessible * @@ -434,12 +434,12 @@ SpiAccessible_getParent (SpiAccessible *obj); /** * SpiAccessible_getChildCount: * - * @obj: a pointer to the #SpiAccessible object on which to operate. + * @obj: a pointer to the #Accessible object on which to operate. * - * Get the number of children contained by an #SpiAccessible object. + * Get the number of children contained by an #Accessible object. * - * Returns: a #long indicating the number of #SpiAccessible children - * contained by an #SpiAccessible object. + * Returns: a #long indicating the number of #Accessible children + * contained by an #Accessible object. * **/ long @@ -448,12 +448,12 @@ SpiAccessible_getChildCount (SpiAccessible *obj); /** * SpiAccessible_getChildAtIndex: * - * @obj: a pointer to the #SpiAccessible object on which to operate. + * @obj: a pointer to the #Accessible object on which to operate. * @childIndex: a #long indicating which child is specified. * - * Get the #SpiAccessible child of an #SpiAccessible object at a given index. + * Get the #Accessible child of an #Accessible object at a given index. * - * Returns: a pointer to the #SpiAccessible child object at index + * Returns: a pointer to the #Accessible child object at index * @childIndex. * **/ @@ -464,12 +464,12 @@ SpiAccessible_getChildAtIndex (SpiAccessible *obj, /** * SpiAccessible_getIndexInParent: * - * @obj: a pointer to the #SpiAccessible object on which to operate. + * @obj: a pointer to the #Accessible object on which to operate. * - * Get the index of an #SpiAccessible object in its containing #SpiAccessible. + * Get the index of an #Accessible object in its containing #Accessible. * - * Returns: a #long indicating the index of the #SpiAccessible object - * in its parent (i.e. containing) #SpiAccessible instance, + * Returns: a #long indicating the index of the #Accessible object + * in its parent (i.e. containing) #Accessible instance, * or -1 if @obj has no containing parent. * **/ @@ -487,11 +487,11 @@ SpiAccessible_getRelationSet (SpiAccessible *obj); /** * SpiAccessible_getRole: - * @obj: a pointer to the #SpiAccessible object on which to operate. + * @obj: a pointer to the #Accessible object on which to operate. * - * Get the UI role of an #SpiAccessible object. + * Get the UI role of an #Accessible object. * - * Returns: a UTF-8 string indicating the UI role of the #SpiAccessible object. + * Returns: a UTF-8 string indicating the UI role of the #Accessible object. * **/ char * @@ -509,107 +509,107 @@ SpiAccessible_getStateSet (SpiAccessible *obj); /* Interface query methods */ /** - * SpiAccessible_isSpiAction: - * @obj: a pointer to the #SpiAccessible instance to query. + * SpiAccessible_isAction: + * @obj: a pointer to the #Accessible instance to query. * - * Query whether the specified #SpiAccessible implements #SpiAccessibleAction. + * Query whether the specified #Accessible implements #AccessibleAction. * Not Yet Implemented. * - * Returns: #TRUE if @obj implements the #SpiAccessibleAction interface, + * Returns: #TRUE if @obj implements the #AccessibleAction interface, * #FALSE otherwise. **/ boolean -SpiAccessible_isSpiAction (SpiAccessible *obj); +SpiAccessible_isAction (SpiAccessible *obj); /** - * SpiAccessible_isSpiComponent: - * @obj: a pointer to the #SpiAccessible instance to query. + * SpiAccessible_isComponent: + * @obj: a pointer to the #Accessible instance to query. * - * Query whether the specified #SpiAccessible implements #SpiAccessibleComponent. + * Query whether the specified #Accessible implements #AccessibleComponent. * - * Returns: #TRUE if @obj implements the #SpiAccessibleComponent interface, + * Returns: #TRUE if @obj implements the #AccessibleComponent interface, * #FALSE otherwise. **/ boolean -SpiAccessible_isSpiComponent (SpiAccessible *obj); +SpiAccessible_isComponent (SpiAccessible *obj); /** - * SpiAccessible_isSpiEditableText: - * @obj: a pointer to the #SpiAccessible instance to query. + * SpiAccessible_isEditableText: + * @obj: a pointer to the #Accessible instance to query. * - * Query whether the specified #SpiAccessible implements #SpiAccessibleEditableText. + * Query whether the specified #Accessible implements #AccessibleEditableText. * Not Yet Implemented. * - * Returns: #TRUE if @obj implements the #SpiAccessibleEditableText interface, + * Returns: #TRUE if @obj implements the #AccessibleEditableText interface, * #FALSE otherwise. **/ boolean -SpiAccessible_isSpiEditableText (SpiAccessible *obj); +SpiAccessible_isEditableText (SpiAccessible *obj); /** - * SpiAccessible_isSpiHypertext: - * @obj: a pointer to the #SpiAccessible instance to query. + * SpiAccessible_isHypertext: + * @obj: a pointer to the #Accessible instance to query. * - * Query whether the specified #SpiAccessible implements #SpiAccessibleHypertext. + * Query whether the specified #Accessible implements #AccessibleHypertext. * Not Yet Implemented. * - * Returns: #TRUE if @obj implements the #SpiAccessibleHypertext interface, + * Returns: #TRUE if @obj implements the #AccessibleHypertext interface, * #FALSE otherwise. **/ boolean -SpiAccessible_isSpiHypertext (SpiAccessible *obj); +SpiAccessible_isHypertext (SpiAccessible *obj); /** - * SpiAccessible_isSpiImage: - * @obj: a pointer to the #SpiAccessible instance to query. + * SpiAccessible_isImage: + * @obj: a pointer to the #Accessible instance to query. * - * Query whether the specified #SpiAccessible implements #SpiAccessibleImage. + * Query whether the specified #Accessible implements #AccessibleImage. * Not Yet Implemented. * - * Returns: #TRUE if @obj implements the #SpiAccessibleImage interface, + * Returns: #TRUE if @obj implements the #AccessibleImage interface, * #FALSE otherwise. **/ boolean -SpiAccessible_isSpiImage (SpiAccessible *obj); +SpiAccessible_isImage (SpiAccessible *obj); /** - * SpiAccessible_isSpiSelection: - * @obj: a pointer to the #SpiAccessible instance to query. + * SpiAccessible_isSelection: + * @obj: a pointer to the #Accessible instance to query. * - * Query whether the specified #SpiAccessible implements #SpiAccessibleSelection. + * Query whether the specified #Accessible implements #AccessibleSelection. * Not Yet Implemented. * - * Returns: #TRUE if @obj implements the #SpiAccessibleSelection interface, + * Returns: #TRUE if @obj implements the #AccessibleSelection interface, * #FALSE otherwise. **/ boolean -SpiAccessible_isSpiSelection (SpiAccessible *obj); +SpiAccessible_isSelection (SpiAccessible *obj); /** - * SpiAccessible_isSpiTable: - * @obj: a pointer to the #SpiAccessible instance to query. + * SpiAccessible_isTable: + * @obj: a pointer to the #Accessible instance to query. * - * Query whether the specified #SpiAccessible implements #SpiAccessibleTable. + * Query whether the specified #Accessible implements #AccessibleTable. * Not Yet Implemented. * - * Returns: #TRUE if @obj implements the #SpiAccessibleTable interface, + * Returns: #TRUE if @obj implements the #AccessibleTable interface, * #FALSE otherwise. **/ boolean -SpiAccessible_isSpiTable (SpiAccessible *obj); +SpiAccessible_isTable (SpiAccessible *obj); /** - * SpiAccessible_isSpiText: - * @obj: a pointer to the #SpiAccessible instance to query. + * SpiAccessible_isText: + * @obj: a pointer to the #Accessible instance to query. * - * Query whether the specified #SpiAccessible implements #SpiAccessibleText. + * Query whether the specified #Accessible implements #AccessibleText. * Not Yet Implemented. * - * Returns: #TRUE if @obj implements the #SpiAccessibleText interface, + * Returns: #TRUE if @obj implements the #AccessibleText interface, * #FALSE otherwise. **/ boolean -SpiAccessible_isSpiText (SpiAccessible *obj); +SpiAccessible_isText (SpiAccessible *obj); /** * SpiAccessible_getAction: @@ -622,12 +622,12 @@ SpiAccessible_getAction (SpiAccessible *obj); /** * SpiAccessible_getComponent: - * @obj: a pointer to the #SpiAccessible instance to query. + * @obj: a pointer to the #Accessible instance to query. * - * Get the #SpiAccessibleComponent interface for an #SpiAccessible. + * Get the #AccessibleComponent interface for an #Accessible. * - * Returns: a pointer to an #SpiAccessibleComponent interface instance, or - * NULL if @obj does not implement #SpiAccessibleComponent. + * Returns: a pointer to an #AccessibleComponent interface instance, or + * NULL if @obj does not implement #AccessibleComponent. **/ SpiAccessibleComponent * SpiAccessible_getComponent (SpiAccessible *obj); @@ -688,10 +688,10 @@ SpiAccessible_getText (SpiAccessible *obj); /** * SpiAccessible_queryInterface: - * @obj: a pointer to the #SpiAccessible instance to query. + * @obj: a pointer to the #Accessible instance to query. * @interface_name: a UTF-8 character string specifiying the requested interface. * - * Query an #SpiAccessible object to for a named interface. + * Query an #Accessible object to for a named interface. * * Returns: an instance of the named interface object, if it is implemented * by @obj, or NULL otherwise. @@ -714,14 +714,14 @@ int SpiAccessibleAction_unref (SpiAccessibleAction *obj); long -SpiAccessibleAction_getNSpiActions (SpiAccessibleAction *obj); +SpiAccessibleAction_getNActions (SpiAccessibleAction *obj); /** * SpiAccessibleAction_getDescription: - * @obj: a pointer to the #SpiAccessibleAction to query. + * @obj: a pointer to the #AccessibleAction to query. * * Get the description of 'i-th' action invokable on an - * object implementing #SpiAccessibleAction. + * object implementing #AccessibleAction. * * Not Yet Implemented. * @@ -733,7 +733,7 @@ SpiAccessibleAction_getDescription (SpiAccessibleAction *obj, long index); boolean -SpiAccessibleAction_doSpiAction (SpiAccessibleAction *obj, +SpiAccessibleAction_doAction (SpiAccessibleAction *obj, long index); char * @@ -748,9 +748,9 @@ SpiAccessibleAction_getKeyBinding (SpiAccessibleAction *obj, /** * SpiAccessibleApplication_unref: - * @obj: a pointer to the #SpiAccessibleApplication on which to operate. + * @obj: a pointer to the #AccessibleApplication on which to operate. * - * Decrement the reference count for an #SpiAccessibleApplication. + * Decrement the reference count for an #AccessibleApplication. * * Returns: (no return code implemented yet). * @@ -760,9 +760,9 @@ SpiAccessibleApplication_ref (SpiAccessibleApplication *obj); /** * SpiAccessibleApplication_unref: - * @obj: a pointer to the #SpiAccessibleApplication object on which to operate. + * @obj: a pointer to the #AccessibleApplication object on which to operate. * - * Decrement the reference count for an #SpiAccessibleApplication. + * Decrement the reference count for an #AccessibleApplication. * * Returns: (no return code implemented yet). * @@ -772,9 +772,9 @@ SpiAccessibleApplication_unref (SpiAccessibleApplication *obj); /** * SpiAccessibleApplication_getToolkitName: - * @obj: a pointer to the #SpiAccessibleApplication to query. + * @obj: a pointer to the #AccessibleApplication to query. * - * Get the name of the UI toolkit used by an #SpiAccessibleApplication. + * Get the name of the UI toolkit used by an #AccessibleApplication. * * Returns: a UTF-8 string indicating which UI toolkit is * used by an application. @@ -785,10 +785,10 @@ SpiAccessibleApplication_getToolkitName (SpiAccessibleApplication *obj); /** * SpiAccessibleApplication_getVersion: - * @obj: a pointer to the #SpiAccessibleApplication being queried. + * @obj: a pointer to the #AccessibleApplication being queried. * * Get the version of the at-spi bridge exported by an - * #SpiAccessibleApplication instance. + * #AccessibleApplication instance. * * Returns: a UTF-8 string indicating the application's * at-spi version. @@ -799,10 +799,10 @@ SpiAccessibleApplication_getVersion (SpiAccessibleApplication *obj); /** * SpiAccessibleApplication_getID: - * @obj: a pointer to the #SpiAccessibleApplication being queried. + * @obj: a pointer to the #AccessibleApplication being queried. * * Get the unique ID assigned by the SpiRegistry to an - * #SpiAccessibleApplication instance. + * #AccessibleApplication instance. * (Not Yet Implemented by the registry). * * Returns: a unique #long integer associated with the application @@ -827,7 +827,7 @@ SpiAccessibleApplication_pause (SpiAccessibleApplication *obj); /** * SpiAccessibleApplication_pause: * - * Attempt to resume the application (used after #SpiAccessibleApplication_pause). + * Attempt to resume the application (used after #AccessibleApplication_pause). * Not Yet Implemented. * * Returns: #TRUE if application processing resumed successfully, #FALSE otherwise. @@ -862,7 +862,7 @@ SpiAccessibleComponent_getAccessibleAtPoint (SpiAccessibleComponent *obj, /** * SpiAccessibleComponent_getExtents: - * @obj: a pointer to the #SpiAccessibleComponent to query. + * @obj: a pointer to the #AccessibleComponent to query. * @x: a pointer to a #long into which the minimum x coordinate will be returned. * @y: a pointer to a #long into which the minimum y coordinate will be returned. * @width: a pointer to a #long into which the x extents (width) will be returned. @@ -870,7 +870,7 @@ SpiAccessibleComponent_getAccessibleAtPoint (SpiAccessibleComponent *obj, * @ctype: the desired coordinate system into which to return the results, * (e.g. COORD_TYPE_WINDOW, COORD_TYPE_SCREEN). * - * Get the bounding box of the specified #SpiAccessibleComponent. + * Get the bounding box of the specified #AccessibleComponent. * **/ void @@ -923,7 +923,7 @@ SpiAccessibleEditableText_insertText (SpiAccessibleEditableText *obj, long length); void -SpiAccessibleEditableText_copySpiText (SpiAccessibleText *obj, +SpiAccessibleEditableText_copyText (SpiAccessibleText *obj, long startPos, long endPos); @@ -979,20 +979,20 @@ SpiAccessibleHyperlink_isValid (SpiAccessibleHyperlink *obj); */ int -SpiAccessibleHyperspi_text_ref (SpiAccessibleHypertext *obj); +SpiAccessibleHypertext_ref (SpiAccessibleHypertext *obj); int -SpiAccessibleHyperspi_text_unref (SpiAccessibleHypertext *obj); +SpiAccessibleHypertext_unref (SpiAccessibleHypertext *obj); long -SpiAccessibleHyperspi_text_getNLinks (SpiAccessibleHypertext *obj); +SpiAccessibleHypertext_getNLinks (SpiAccessibleHypertext *obj); SpiAccessibleHyperlink * -SpiAccessibleHyperSpiText_getLink (SpiAccessibleHypertext *obj, +SpiAccessibleHyperText_getLink (SpiAccessibleHypertext *obj, long linkIndex); long -SpiAccessibleHyperspi_text_getLinkIndex (SpiAccessibleHypertext *obj, +SpiAccessibleHypertext_getLinkIndex (SpiAccessibleHypertext *obj, long characterIndex); /* @@ -1076,7 +1076,7 @@ void SpiAccessibleSelection_selectAll (SpiAccessibleSelection *obj); void -SpiAccessibleSelection_clearSpiSelection (SpiAccessibleSelection *obj); +SpiAccessibleSelection_clearSelection (SpiAccessibleSelection *obj); /* @@ -1280,7 +1280,7 @@ SpiAccessibleText_getOffsetAtPoint (SpiAccessibleText *obj, long y, SpiAccessibleCoordType type); long -SpiAccessibleText_getNSpiSelections (SpiAccessibleText *obj); +SpiAccessibleText_getNSelections (SpiAccessibleText *obj); void SpiAccessibleText_getSelection (SpiAccessibleText *obj, @@ -1289,7 +1289,7 @@ SpiAccessibleText_getSelection (SpiAccessibleText *obj, boolean -SpiAccessibleText_addSpiSelection (SpiAccessibleText *obj, +SpiAccessibleText_addSelection (SpiAccessibleText *obj, long startOffset, long endOffset); boolean @@ -1309,17 +1309,17 @@ SpiAccessibleText_setSelection (SpiAccessibleText *obj, */ float -SpiAccessibleValue_getMinimumSpiValue (SpiAccessibleValue *value); +SpiAccessibleValue_getMinimumValue (SpiAccessibleValue *value); float SpiAccessibleValue_getCurrentValue (SpiAccessibleValue *value); float -SpiAccessibleValue_getMaximumSpiValue (SpiAccessibleValue *value); +SpiAccessibleValue_getMaximumValue (SpiAccessibleValue *value); boolean SpiAccessibleValue_setCurrentValue (SpiAccessibleValue *value, - float newSpiValue); + float newValue); void spi_freeString (char *s); diff --git a/cspi/spi_accessible.c b/cspi/spi_accessible.c index ca47d9d..7bf75dd 100644 --- a/cspi/spi_accessible.c +++ b/cspi/spi_accessible.c @@ -85,9 +85,9 @@ SpiAccessible_Role_getName (Accessibility_Role role) /** * SpiAccessible_ref: - * @obj: a pointer to the #SpiAccessible object on which to operate. + * @obj: a pointer to the #Accessible object on which to operate. * - * Increment the reference count for an #SpiAccessible object. + * Increment the reference count for an #Accessible object. * * Returns: (no return code implemented yet). * @@ -95,7 +95,7 @@ SpiAccessible_Role_getName (Accessibility_Role role) int SpiAccessible_ref (SpiAccessible *obj) { - Accessibility_SpiAccessible_ref (*obj, &ev); + Accessibility_Accessible_ref (*obj, &ev); spi_check_ev (&ev, "ref"); return 0; } @@ -103,9 +103,9 @@ SpiAccessible_ref (SpiAccessible *obj) /** * SpiAccessible_unref: - * @obj: a pointer to the #SpiAccessible object on which to operate. + * @obj: a pointer to the #Accessible object on which to operate. * - * Decrement the reference count for an #SpiAccessible object. + * Decrement the reference count for an #Accessible object. * * Returns: (no return code implemented yet). * @@ -113,18 +113,18 @@ SpiAccessible_ref (SpiAccessible *obj) int SpiAccessible_unref (SpiAccessible *obj) { - Accessibility_SpiAccessible_unref (*obj, &ev); + Accessibility_Accessible_unref (*obj, &ev); spi_check_ev (&ev, "unref"); return 0; } /** * SpiAccessible_getName: - * @obj: a pointer to the #SpiAccessible object on which to operate. + * @obj: a pointer to the #Accessible object on which to operate. * - * Get the name of an #SpiAccessible object. + * Get the name of an #Accessible object. * - * Returns: a UTF-8 string indicating the name of the #SpiAccessible object. + * Returns: a UTF-8 string indicating the name of the #Accessible object. * **/ char * @@ -132,44 +132,44 @@ SpiAccessible_getName (SpiAccessible *obj) { char *retval = (char *) - Accessibility_SpiAccessible__get_name (*obj, &ev); + Accessibility_Accessible__get_name (*obj, &ev); spi_check_ev (&ev, "getName"); return retval; } /** * SpiAccessible_getDescription: - * @obj: a pointer to the #SpiAccessible object on which to operate. + * @obj: a pointer to the #Accessible object on which to operate. * - * Get the description of an #SpiAccessible object. + * Get the description of an #Accessible object. * - * Returns: a UTF-8 string describing the #SpiAccessible object. + * Returns: a UTF-8 string describing the #Accessible object. * **/ char * SpiAccessible_getDescription (SpiAccessible *obj) { char *retval = (char *) - Accessibility_SpiAccessible__get_description (*obj, &ev); + Accessibility_Accessible__get_description (*obj, &ev); spi_check_ev (&ev, "getDescription"); return retval; } /** * SpiAccessible_getParent: - * @obj: a pointer to the #SpiAccessible object to query. + * @obj: a pointer to the #Accessible object to query. * - * Get an #SpiAccessible object's parent container. + * Get an #Accessible object's parent container. * - * Returns: a pointer tothe #SpiAccessible object which contains the given - * #SpiAccessible instance, or NULL if the @obj has no parent container. + * Returns: a pointer tothe #Accessible object which contains the given + * #Accessible instance, or NULL if the @obj has no parent container. * **/ SpiAccessible * SpiAccessible_getParent (SpiAccessible *obj) { SpiAccessible *retval = - Obj_Add (Accessibility_SpiAccessible__get_parent (*obj, &ev)); + Obj_Add (Accessibility_Accessible__get_parent (*obj, &ev)); spi_check_ev (&ev, "getParent"); return retval; } @@ -177,18 +177,18 @@ SpiAccessible_getParent (SpiAccessible *obj) /** * SpiAccessible_getChildCount: * - * @obj: a pointer to the #SpiAccessible object on which to operate. + * @obj: a pointer to the #Accessible object on which to operate. * - * Get the number of children contained by an #SpiAccessible object. + * Get the number of children contained by an #Accessible object. * - * Returns: a #long indicating the number of #SpiAccessible children - * contained by an #SpiAccessible object. + * Returns: a #long indicating the number of #Accessible children + * contained by an #Accessible object. * **/ long SpiAccessible_getChildCount (SpiAccessible *obj) { - long retval = (long) Accessibility_SpiAccessible__get_childCount (*obj, &ev); + long retval = (long) Accessibility_Accessible__get_childCount (*obj, &ev); spi_check_ev (&ev, "getChildCount"); return retval; } @@ -196,12 +196,12 @@ SpiAccessible_getChildCount (SpiAccessible *obj) /** * SpiAccessible_getChildAtIndex: * - * @obj: a pointer to the #SpiAccessible object on which to operate. + * @obj: a pointer to the #Accessible object on which to operate. * @childIndex: a #long indicating which child is specified. * - * Get the #SpiAccessible child of an #SpiAccessible object at a given index. + * Get the #Accessible child of an #Accessible object at a given index. * - * Returns: a pointer to the #SpiAccessible child object at index + * Returns: a pointer to the #Accessible child object at index * @childIndex. * **/ @@ -209,7 +209,7 @@ SpiAccessible * SpiAccessible_getChildAtIndex (SpiAccessible *obj, long childIndex) { - SpiAccessible *retval = Obj_Add (Accessibility_SpiAccessible_getChildAtIndex (*obj, childIndex, &ev)); + SpiAccessible *retval = Obj_Add (Accessibility_Accessible_getChildAtIndex (*obj, childIndex, &ev)); spi_check_ev (&ev, "getChildAtIndex"); return retval; } @@ -217,19 +217,19 @@ SpiAccessible_getChildAtIndex (SpiAccessible *obj, /** * SpiAccessible_getIndexInParent: * - * @obj: a pointer to the #SpiAccessible object on which to operate. + * @obj: a pointer to the #Accessible object on which to operate. * - * Get the index of an #SpiAccessible object in its containing #SpiAccessible. + * Get the index of an #Accessible object in its containing #Accessible. * - * Returns: a #long indicating the index of the #SpiAccessible object - * in its parent (i.e. containing) #SpiAccessible instance, + * Returns: a #long indicating the index of the #Accessible object + * in its parent (i.e. containing) #Accessible instance, * or -1 if @obj has no containing parent. * **/ long SpiAccessible_getIndexInParent (SpiAccessible *obj) { - long retval = (long) Accessibility_SpiAccessible_getIndexInParent (*obj, &ev); + long retval = (long) Accessibility_Accessible_getIndexInParent (*obj, &ev); spi_check_ev (&ev, "getIndexInParent"); return retval; } @@ -239,7 +239,7 @@ SpiAccessible_getIndexInParent (SpiAccessible *obj) * * Not Yet Implemented. * - * Returns: a pointer to an array of #SpiAccessibleRelations. + * Returns: a pointer to an array of #AccessibleRelations. * **/ SpiAccessibleRelation ** @@ -250,18 +250,18 @@ SpiAccessible_getRelationSet (SpiAccessible *obj) /** * SpiAccessible_getRole: - * @obj: a pointer to the #SpiAccessible object on which to operate. + * @obj: a pointer to the #Accessible object on which to operate. * - * Get the UI role of an #SpiAccessible object. + * Get the UI role of an #Accessible object. * - * Returns: a UTF-8 string indicating the UI role of the #SpiAccessible object. + * Returns: a UTF-8 string indicating the UI role of the #Accessible object. * **/ char * SpiAccessible_getRole (SpiAccessible *obj) { char *retval = SpiAccessible_Role_getName ( - Accessibility_SpiAccessible_getRole (*obj, &ev)); + Accessibility_Accessible_getRole (*obj, &ev)); spi_check_ev (&ev, "getRole"); return retval; } @@ -271,7 +271,7 @@ SpiAccessible_getRole (SpiAccessible *obj) * * Not Yet Implemented. * - * Returns: a pointer to an #SpiAccessibleStateSet representing the object's current state. + * Returns: a pointer to an #AccessibleStateSet representing the object's current state. **/ SpiAccessibleStateSet * SpiAccessible_getStateSet (SpiAccessible *obj) @@ -282,201 +282,201 @@ SpiAccessible_getStateSet (SpiAccessible *obj) /* Interface query methods */ /** - * SpiAccessible_isSpiAction: - * @obj: a pointer to the #SpiAccessible instance to query. + * SpiAccessible_isAction: + * @obj: a pointer to the #Accessible instance to query. * - * Query whether the specified #SpiAccessible implements #SpiAccessibleAction. + * Query whether the specified #Accessible implements #AccessibleAction. * Not Yet Implemented. * - * Returns: #TRUE if @obj implements the #SpiAccessibleAction interface, + * Returns: #TRUE if @obj implements the #AccessibleAction interface, * #FALSE otherwise. **/ boolean -SpiAccessible_isSpiAction (SpiAccessible *obj) +SpiAccessible_isAction (SpiAccessible *obj) { Bonobo_Unknown iface = - Accessibility_SpiAccessible_queryInterface (*obj, - "IDL:Accessibility/SpiAction:1.0", + Accessibility_Accessible_queryInterface (*obj, + "IDL:Accessibility/Action:1.0", &ev); - spi_warn_ev (&ev, "isSpiAction"); + spi_warn_ev (&ev, "isAction"); return (CORBA_Object_is_nil (iface, &ev)) ? FALSE : TRUE; } /** - * SpiAccessible_isSpiComponent: - * @obj: a pointer to the #SpiAccessible instance to query. + * SpiAccessible_isComponent: + * @obj: a pointer to the #Accessible instance to query. * - * Query whether the specified #SpiAccessible implements #SpiAccessibleComponent. + * Query whether the specified #Accessible implements #AccessibleComponent. * - * Returns: #TRUE if @obj implements the #SpiAccessibleComponent interface, + * Returns: #TRUE if @obj implements the #AccessibleComponent interface, * #FALSE otherwise. **/ boolean -SpiAccessible_isSpiComponent (SpiAccessible *obj) +SpiAccessible_isComponent (SpiAccessible *obj) { Bonobo_Unknown iface = - Accessibility_SpiAccessible_queryInterface (*obj, - "IDL:Accessibility/SpiComponent:1.0", + Accessibility_Accessible_queryInterface (*obj, + "IDL:Accessibility/Component:1.0", &ev); - spi_warn_ev (&ev, "isSpiComponent"); + spi_warn_ev (&ev, "isComponent"); return (CORBA_Object_is_nil (iface, &ev)) ? FALSE : TRUE; } /** - * SpiAccessible_isSpiEditableText: - * @obj: a pointer to the #SpiAccessible instance to query. + * SpiAccessible_isEditableText: + * @obj: a pointer to the #Accessible instance to query. * - * Query whether the specified #SpiAccessible implements #SpiAccessibleEditableText. + * Query whether the specified #Accessible implements #AccessibleEditableText. * Not Yet Implemented. * - * Returns: #TRUE if @obj implements the #SpiAccessibleEditableText interface, + * Returns: #TRUE if @obj implements the #AccessibleEditableText interface, * #FALSE otherwise. **/ boolean -SpiAccessible_isSpiEditableText (SpiAccessible *obj) +SpiAccessible_isEditableText (SpiAccessible *obj) { Bonobo_Unknown iface = - Accessibility_SpiAccessible_queryInterface (*obj, - "IDL:Accessibility/SpiEditableText:1.0", + Accessibility_Accessible_queryInterface (*obj, + "IDL:Accessibility/EditableText:1.0", &ev); - spi_check_ev (&ev, "isSpiEditableText"); + spi_check_ev (&ev, "isEditableText"); return (CORBA_Object_is_nil (iface, &ev)) ? FALSE : TRUE; } /** - * SpiAccessible_isSpiHypertext: - * @obj: a pointer to the #SpiAccessible instance to query. + * SpiAccessible_isHypertext: + * @obj: a pointer to the #Accessible instance to query. * - * Query whether the specified #SpiAccessible implements #SpiAccessibleHypertext. + * Query whether the specified #Accessible implements #AccessibleHypertext. * Not Yet Implemented. * - * Returns: #TRUE if @obj implements the #SpiAccessibleHypertext interface, + * Returns: #TRUE if @obj implements the #AccessibleHypertext interface, * #FALSE otherwise. **/ boolean -SpiAccessible_isSpiHypertext (SpiAccessible *obj) +SpiAccessible_isHypertext (SpiAccessible *obj) { Bonobo_Unknown iface = - Accessibility_SpiAccessible_queryInterface (*obj, - "IDL:Accessibility/SpiHypertext:1.0", + Accessibility_Accessible_queryInterface (*obj, + "IDL:Accessibility/Hypertext:1.0", &ev); - spi_check_ev (&ev, "isSpiHypertext"); + spi_check_ev (&ev, "isHypertext"); return (CORBA_Object_is_nil (iface, &ev)) ? FALSE : TRUE; } /** - * SpiAccessible_isSpiImage: - * @obj: a pointer to the #SpiAccessible instance to query. + * SpiAccessible_isImage: + * @obj: a pointer to the #Accessible instance to query. * - * Query whether the specified #SpiAccessible implements #SpiAccessibleImage. + * Query whether the specified #Accessible implements #AccessibleImage. * Not Yet Implemented. * - * Returns: #TRUE if @obj implements the #SpiAccessibleImage interface, + * Returns: #TRUE if @obj implements the #AccessibleImage interface, * #FALSE otherwise. **/ boolean -SpiAccessible_isSpiImage (SpiAccessible *obj) +SpiAccessible_isImage (SpiAccessible *obj) { Bonobo_Unknown iface = - Accessibility_SpiAccessible_queryInterface (*obj, - "IDL:Accessibility/SpiImage:1.0", + Accessibility_Accessible_queryInterface (*obj, + "IDL:Accessibility/Image:1.0", &ev); - spi_check_ev (&ev, "isSpiImage"); + spi_check_ev (&ev, "isImage"); return (CORBA_Object_is_nil (iface, &ev)) ? FALSE : TRUE; } /** - * SpiAccessible_isSpiSelection: - * @obj: a pointer to the #SpiAccessible instance to query. + * SpiAccessible_isSelection: + * @obj: a pointer to the #Accessible instance to query. * - * Query whether the specified #SpiAccessible implements #SpiAccessibleSelection. + * Query whether the specified #Accessible implements #AccessibleSelection. * Not Yet Implemented. * - * Returns: #TRUE if @obj implements the #SpiAccessibleSelection interface, + * Returns: #TRUE if @obj implements the #AccessibleSelection interface, * #FALSE otherwise. **/ boolean -SpiAccessible_isSpiSelection (SpiAccessible *obj) +SpiAccessible_isSelection (SpiAccessible *obj) { Bonobo_Unknown iface = - Accessibility_SpiAccessible_queryInterface (*obj, - "IDL:Accessibility/SpiSelection:1.0", + Accessibility_Accessible_queryInterface (*obj, + "IDL:Accessibility/Selection:1.0", &ev); - spi_warn_ev (&ev, "isSpiSelection"); + spi_warn_ev (&ev, "isSelection"); return (CORBA_Object_is_nil (iface, &ev)) ? FALSE : TRUE; } /** - * SpiAccessible_isSpiTable: - * @obj: a pointer to the #SpiAccessible instance to query. + * SpiAccessible_isTable: + * @obj: a pointer to the #Accessible instance to query. * - * Query whether the specified #SpiAccessible implements #SpiAccessibleTable. + * Query whether the specified #Accessible implements #AccessibleTable. * Not Yet Implemented. * - * Returns: #TRUE if @obj implements the #SpiAccessibleTable interface, + * Returns: #TRUE if @obj implements the #AccessibleTable interface, * #FALSE otherwise. **/ boolean -SpiAccessible_isSpiTable (SpiAccessible *obj) +SpiAccessible_isTable (SpiAccessible *obj) { Bonobo_Unknown iface = - Accessibility_SpiAccessible_queryInterface (*obj, - "IDL:Accessibility/SpiTable:1.0", + Accessibility_Accessible_queryInterface (*obj, + "IDL:Accessibility/Table:1.0", &ev); - spi_check_ev (&ev, "isSpiTable"); + spi_check_ev (&ev, "isTable"); return (CORBA_Object_is_nil (iface, &ev)) ? FALSE : TRUE; } /** - * SpiAccessible_isSpiText: - * @obj: a pointer to the #SpiAccessible instance to query. + * SpiAccessible_isText: + * @obj: a pointer to the #Accessible instance to query. * - * Query whether the specified #SpiAccessible implements #SpiAccessibleText. + * Query whether the specified #Accessible implements #AccessibleText. * Not Yet Implemented. * - * Returns: #TRUE if @obj implements the #SpiAccessibleText interface, + * Returns: #TRUE if @obj implements the #AccessibleText interface, * #FALSE otherwise. **/ boolean -SpiAccessible_isSpiText (SpiAccessible *obj) +SpiAccessible_isText (SpiAccessible *obj) { Bonobo_Unknown iface = - Accessibility_SpiAccessible_queryInterface (*obj, - "IDL:Accessibility/SpiText:1.0", + Accessibility_Accessible_queryInterface (*obj, + "IDL:Accessibility/Text:1.0", &ev); - spi_warn_ev (&ev, "isSpiText"); + spi_warn_ev (&ev, "isText"); return (CORBA_Object_is_nil (iface, &ev)) ? FALSE : TRUE; } /** - * SpiAccessible_isSpiValue: - * @obj: a pointer to the #SpiAccessible instance to query. + * SpiAccessible_isValue: + * @obj: a pointer to the #Accessible instance to query. * - * Query whether the specified #SpiAccessible implements #SpiAccessibleValue. + * Query whether the specified #Accessible implements #AccessibleValue. * Not Yet Implemented. * - * Returns: #TRUE if @obj implements the #SpiAccessibleValue interface, + * Returns: #TRUE if @obj implements the #AccessibleValue interface, * #FALSE otherwise. **/ boolean -SpiAccessible_isSpiValue (SpiAccessible *obj) +SpiAccessible_isValue (SpiAccessible *obj) { Bonobo_Unknown iface = - Accessibility_SpiAccessible_queryInterface (*obj, - "IDL:Accessibility/SpiValue:1.0", + Accessibility_Accessible_queryInterface (*obj, + "IDL:Accessibility/Value:1.0", &ev); - spi_check_ev (&ev, "isSpiValue"); + spi_check_ev (&ev, "isValue"); return (CORBA_Object_is_nil (iface, &ev)) ? FALSE : TRUE; } @@ -491,8 +491,8 @@ SpiAccessibleAction * SpiAccessible_getAction (SpiAccessible *obj) { Bonobo_Unknown iface = - Accessibility_SpiAccessible_queryInterface (*obj, - "IDL:Accessibility/SpiAction:1.0", + Accessibility_Accessible_queryInterface (*obj, + "IDL:Accessibility/Action:1.0", &ev); spi_check_ev (&ev, "getAction"); @@ -502,19 +502,19 @@ SpiAccessible_getAction (SpiAccessible *obj) /** * SpiAccessible_getComponent: - * @obj: a pointer to the #SpiAccessible instance to query. + * @obj: a pointer to the #Accessible instance to query. * - * Get the #SpiAccessibleComponent interface for an #SpiAccessible. + * Get the #AccessibleComponent interface for an #Accessible. * - * Returns: a pointer to an #SpiAccessibleComponent interface instance, or - * NULL if @obj does not implement #SpiAccessibleComponent. + * Returns: a pointer to an #AccessibleComponent interface instance, or + * NULL if @obj does not implement #AccessibleComponent. **/ SpiAccessibleComponent * SpiAccessible_getComponent (SpiAccessible *obj) { Bonobo_Unknown iface = - Accessibility_SpiAccessible_queryInterface (*obj, - "IDL:Accessibility/SpiComponent:1.0", + Accessibility_Accessible_queryInterface (*obj, + "IDL:Accessibility/Component:1.0", &ev); spi_check_ev (&ev, "getComponent"); @@ -525,8 +525,8 @@ SpiAccessibleEditableText * SpiAccessible_getEditableText (SpiAccessible *obj) { Bonobo_Unknown iface = - Accessibility_SpiAccessible_queryInterface (*obj, - "IDL:Accessibility/SpiEditableText:1.0", + Accessibility_Accessible_queryInterface (*obj, + "IDL:Accessibility/EditableText:1.0", &ev); spi_check_ev (&ev, "getEditableText"); @@ -540,8 +540,8 @@ SpiAccessibleHypertext * SpiAccessible_getHypertext (SpiAccessible *obj) { Bonobo_Unknown iface = - Accessibility_SpiAccessible_queryInterface (*obj, - "IDL:Accessibility/SpiHypertext:1.0", + Accessibility_Accessible_queryInterface (*obj, + "IDL:Accessibility/Hypertext:1.0", &ev); spi_check_ev (&ev, "getHypertext"); @@ -555,8 +555,8 @@ SpiAccessibleImage * SpiAccessible_getImage (SpiAccessible *obj) { Bonobo_Unknown iface = - Accessibility_SpiAccessible_queryInterface (*obj, - "IDL:Accessibility/SpiImage:1.0", + Accessibility_Accessible_queryInterface (*obj, + "IDL:Accessibility/Image:1.0", &ev); spi_check_ev (&ev, "getImage"); @@ -570,8 +570,8 @@ SpiAccessibleSelection * SpiAccessible_getSelection (SpiAccessible *obj) { Bonobo_Unknown iface = - Accessibility_SpiAccessible_queryInterface (*obj, - "IDL:Accessibility/SpiSelection:1.0", + Accessibility_Accessible_queryInterface (*obj, + "IDL:Accessibility/Selection:1.0", &ev); spi_warn_ev (&ev, "getSelection"); @@ -585,8 +585,8 @@ SpiAccessibleTable * SpiAccessible_getTable (SpiAccessible *obj) { Bonobo_Unknown iface = - Accessibility_SpiAccessible_queryInterface (*obj, - "IDL:Accessibility/SpiTable:1.0", + Accessibility_Accessible_queryInterface (*obj, + "IDL:Accessibility/Table:1.0", &ev); spi_check_ev (&ev, "getTable"); @@ -598,8 +598,8 @@ SpiAccessibleText * SpiAccessible_getText (SpiAccessible *obj) { Bonobo_Unknown iface = - Accessibility_SpiAccessible_queryInterface (*obj, - "IDL:Accessibility/SpiText:1.0", + Accessibility_Accessible_queryInterface (*obj, + "IDL:Accessibility/Text:1.0", &ev); spi_check_ev (&ev, "getText"); @@ -614,8 +614,8 @@ SpiAccessibleValue * SpiAccessible_getValue (SpiAccessible *obj) { Bonobo_Unknown iface = - Accessibility_SpiAccessible_queryInterface (*obj, - "IDL:Accessibility/SpiValue:1.0", + Accessibility_Accessible_queryInterface (*obj, + "IDL:Accessibility/Value:1.0", &ev); return (SpiAccessibleValue *) ((CORBA_Object_is_nil (iface, &ev)) ? 0 : Obj_Add (iface)); @@ -625,10 +625,10 @@ SpiAccessible_getValue (SpiAccessible *obj) /** * SpiAccessible_queryInterface: - * @obj: a pointer to the #SpiAccessible instance to query. + * @obj: a pointer to the #Accessible instance to query. * @interface_name: a UTF-8 character string specifiying the requested interface. * - * Query an #SpiAccessible object to for a named interface. + * Query an #Accessible object to for a named interface. * * Returns: an instance of the named interface object, if it is implemented * by @obj, or NULL otherwise. @@ -638,7 +638,7 @@ GenericInterface * SpiAccessible_queryInterface (SpiAccessible *obj, char *interface_name) { GenericInterface iface; - iface = Accessibility_SpiAccessible_queryInterface (*obj, + iface = Accessibility_Accessible_queryInterface (*obj, interface_name, &ev); return (iface != NULL) ? Obj_Add (iface) : NULL; diff --git a/cspi/spi_action.c b/cspi/spi_action.c index 37c50a1..2846e72 100644 --- a/cspi/spi_action.c +++ b/cspi/spi_action.c @@ -2,33 +2,33 @@ int SpiAccessibleAction_ref ( SpiAccessibleAction *obj) { - Accessibility_SpiAction_ref (*obj, &ev); + Accessibility_Action_ref (*obj, &ev); return 0; } int SpiAccessibleAction_unref (SpiAccessibleAction *obj) { - Accessibility_SpiAction_unref (*obj, &ev); + Accessibility_Action_unref (*obj, &ev); return 0; } long -SpiAccessibleAction_getNSpiActions (SpiAccessibleAction *obj) +SpiAccessibleAction_getNActions (SpiAccessibleAction *obj) { return (long) - Accessibility_SpiAction__get_nSpiActions (*obj, &ev); + Accessibility_Action__get_nActions (*obj, &ev); } /** * SpiAccessibleAction_getDescription: - * @obj: a pointer to the #SpiAccessibleAction to query. + * @obj: a pointer to the #AccessibleAction to query. * * Get the description of 'i-th' action invokable on an - * object implementing #SpiAccessibleAction. + * object implementing #AccessibleAction. * * Not Yet Implemented. * @@ -40,7 +40,7 @@ SpiAccessibleAction_getDescription (SpiAccessibleAction *obj, long index) { return (char *) - Accessibility_SpiAction_getDescription (*obj, + Accessibility_Action_getDescription (*obj, (CORBA_long) index, &ev); } @@ -52,7 +52,7 @@ SpiAccessibleAction_getKeyBinding (SpiAccessibleAction *obj, long index) { return (char *) - Accessibility_SpiAction_getKeyBinding (*obj, + Accessibility_Action_getKeyBinding (*obj, (CORBA_long) index, &ev); } @@ -64,18 +64,18 @@ SpiAccessibleAction_getName (SpiAccessibleAction *obj, long index) { return (char *) - Accessibility_SpiAction_getName (*obj, + Accessibility_Action_getName (*obj, (CORBA_long) index, &ev); } boolean -SpiAccessibleAction_doSpiAction (SpiAccessibleAction *obj, +SpiAccessibleAction_doAction (SpiAccessibleAction *obj, long index) { return (boolean) - Accessibility_SpiAction_doSpiAction (*obj, + Accessibility_Action_doAction (*obj, (CORBA_long) index, &ev); } diff --git a/cspi/spi_application.c b/cspi/spi_application.c index f008ea3..e821b98 100644 --- a/cspi/spi_application.c +++ b/cspi/spi_application.c @@ -7,9 +7,9 @@ /** * SpiAccessibleApplication_ref: - * @obj: a pointer to the #SpiAccessibleApplication on which to operate. + * @obj: a pointer to the #AccessibleApplication on which to operate. * - * Increment the reference count for an #SpiAccessibleApplication. + * Increment the reference count for an #AccessibleApplication. * * Returns: (no return code implemented yet). * @@ -17,15 +17,15 @@ int SpiAccessibleApplication_ref (SpiAccessibleApplication *obj) { - Accessibility_SpiApplication_ref (*obj, &ev); + Accessibility_Application_ref (*obj, &ev); return 0; } /** * SpiAccessibleApplication_unref: - * @obj: a pointer to the #SpiAccessibleApplication object on which to operate. + * @obj: a pointer to the #AccessibleApplication object on which to operate. * - * Decrement the reference count for an #SpiAccessibleApplication. + * Decrement the reference count for an #AccessibleApplication. * * Returns: (no return code implemented yet). * @@ -33,15 +33,15 @@ SpiAccessibleApplication_ref (SpiAccessibleApplication *obj) int SpiAccessibleApplication_unref (SpiAccessibleApplication *obj) { - Accessibility_SpiApplication_unref (*obj, &ev); + Accessibility_Application_unref (*obj, &ev); return 0; } /** * SpiAccessibleApplication_getToolkitName: - * @obj: a pointer to the #SpiAccessibleApplication to query. + * @obj: a pointer to the #AccessibleApplication to query. * - * Get the name of the UI toolkit used by an #SpiAccessibleApplication. + * Get the name of the UI toolkit used by an #AccessibleApplication. * * Returns: a UTF-8 string indicating which UI toolkit is * used by an application. @@ -50,15 +50,15 @@ SpiAccessibleApplication_unref (SpiAccessibleApplication *obj) char * SpiAccessibleApplication_getToolkitName (SpiAccessibleApplication *obj) { - return Accessibility_SpiApplication__get_toolkitName (*obj, &ev); + return Accessibility_Application__get_toolkitName (*obj, &ev); } /** * SpiAccessibleApplication_getVersion: - * @obj: a pointer to the #SpiAccessibleApplication being queried. + * @obj: a pointer to the #AccessibleApplication being queried. * * Get the version of the at-spi bridge exported by an - * #SpiAccessibleApplication instance. + * #AccessibleApplication instance. * * Returns: a UTF-8 string indicating the application's * at-spi version. @@ -67,15 +67,15 @@ SpiAccessibleApplication_getToolkitName (SpiAccessibleApplication *obj) char * SpiAccessibleApplication_getVersion (SpiAccessibleApplication *obj) { - return Accessibility_SpiApplication__get_version (*obj, &ev); + return Accessibility_Application__get_version (*obj, &ev); } /** * SpiAccessibleApplication_getID: - * @obj: a pointer to the #SpiAccessibleApplication being queried. + * @obj: a pointer to the #AccessibleApplication being queried. * * Get the unique ID assigned by the SpiRegistry to an - * #SpiAccessibleApplication instance. + * #AccessibleApplication instance. * (Not Yet Implemented by the registry). * * Returns: a unique #long integer associated with the application @@ -83,7 +83,7 @@ SpiAccessibleApplication_getVersion (SpiAccessibleApplication *obj) long SpiAccessibleApplication_getID (SpiAccessibleApplication *obj) { - return Accessibility_SpiApplication__get_id (*obj, &ev); + return Accessibility_Application__get_id (*obj, &ev); } /** @@ -105,7 +105,7 @@ SpiAccessibleApplication_pause (SpiAccessibleApplication *obj) /** * SpiAccessibleApplication_resume: * - * Attempt to resume the application (used after #SpiAccessibleApplication_pause). + * Attempt to resume the application (used after #AccessibleApplication_pause). * Not Yet Implemented. * * Returns: #TRUE if application processing resumed successfully, #FALSE otherwise. diff --git a/cspi/spi_component.c b/cspi/spi_component.c index c5f0aab..a5fdc07 100644 --- a/cspi/spi_component.c +++ b/cspi/spi_component.c @@ -6,9 +6,9 @@ /** * SpiAccessibleComponent_ref: - * @obj: a pointer to an object implementing #SpiAccessibleComponent on which to operate. + * @obj: a pointer to an object implementing #AccessibleComponent on which to operate. * - * Increment the reference count for an #SpiAccessibleComponent. + * Increment the reference count for an #AccessibleComponent. * * Returns: (no return code implemented yet). * @@ -16,15 +16,15 @@ int SpiAccessibleComponent_ref (SpiAccessibleComponent *obj) { - Accessibility_SpiComponent_ref (*obj, &ev); + Accessibility_Component_ref (*obj, &ev); return 0; } /** * SpiAccessibleComponent_unref: - * @obj: a pointer to the object implementing #SpiAccessibleComponent on which to operate. + * @obj: a pointer to the object implementing #AccessibleComponent on which to operate. * - * Decrement the reference count for an #SpiAccessibleComponent. + * Decrement the reference count for an #AccessibleComponent. * * Returns: (no return code implemented yet). * @@ -32,19 +32,19 @@ SpiAccessibleComponent_ref (SpiAccessibleComponent *obj) int SpiAccessibleComponent_unref (SpiAccessibleComponent *obj) { - Accessibility_SpiComponent_unref (*obj, &ev); + Accessibility_Component_unref (*obj, &ev); return 0; } /** * SpiAccessibleComponent_contains: - * @obj: a pointer to the #SpiAccessibleComponent to query. + * @obj: a pointer to the #AccessibleComponent to query. * @x: a #long specifying the x coordinate in question. * @y: a #long specifying the y coordinate in question. * @ctype: the desired coordinate system of the point (@x, @y) * (e.g. COORD_TYPE_WINDOW, COORD_TYPE_SCREEN). * - * Query whether a given #SpiAccessibleComponent contains a particular point. + * Query whether a given #AccessibleComponent contains a particular point. * **/ boolean @@ -53,7 +53,7 @@ SpiAccessibleComponent_contains (SpiAccessibleComponent *obj, long y, SpiAccessibleCoordType ctype) { - return Accessibility_SpiComponent_contains (*obj, + return Accessibility_Component_contains (*obj, (CORBA_long) x, (CORBA_long) y, ctype, @@ -62,15 +62,15 @@ SpiAccessibleComponent_contains (SpiAccessibleComponent *obj, /** * SpiAccessibleComponent_getAccessibleAtPoint: - * @obj: a pointer to the #SpiAccessibleComponent to query. + * @obj: a pointer to the #AccessibleComponent to query. * @x: a #long specifying the x coordinate of the point in question. * @y: a #long specifying the y coordinate of the point in question. * @ctype: the coordinate system of the point (@x, @y) * (e.g. COORD_TYPE_WINDOW, COORD_TYPE_SCREEN). * - * Get the accessible child at a given coordinate within an #SpiAccessibleComponent. + * Get the accessible child at a given coordinate within an #AccessibleComponent. * - * Returns: a pointer to an #SpiAccessible child of the specified component which + * Returns: a pointer to an #Accessible child of the specified component which * contains the point (@x, @y), or NULL of no child contains the point. **/ SpiAccessible * @@ -80,7 +80,7 @@ SpiAccessibleComponent_getAccessibleAtPoint (SpiAccessibleComponent *obj, SpiAccessibleCoordType ctype) { SpiAccessible child; - child = Accessibility_SpiComponent_getAccessibleAtPoint(*obj, + child = Accessibility_Component_getAccessibleAtPoint(*obj, (CORBA_long) x, (CORBA_long) y, ctype, @@ -90,7 +90,7 @@ SpiAccessibleComponent_getAccessibleAtPoint (SpiAccessibleComponent *obj, /** * SpiAccessibleComponent_getExtents: - * @obj: a pointer to the #SpiAccessibleComponent to query. + * @obj: a pointer to the #AccessibleComponent to query. * @x: a pointer to a #long into which the minimum x coordinate will be returned. * @y: a pointer to a #long into which the minimum y coordinate will be returned. * @width: a pointer to a #long into which the x extents (width) will be returned. @@ -98,7 +98,7 @@ SpiAccessibleComponent_getAccessibleAtPoint (SpiAccessibleComponent *obj, * @ctype: the desired coordinate system into which to return the results, * (e.g. COORD_TYPE_WINDOW, COORD_TYPE_SCREEN). * - * Get the bounding box of the specified #SpiAccessibleComponent. + * Get the bounding box of the specified #AccessibleComponent. * **/ void @@ -110,7 +110,7 @@ SpiAccessibleComponent_getExtents (SpiAccessibleComponent *obj, SpiAccessibleCoordType ctype) { CORBA_long cx, cy, cw, ch; - Accessibility_SpiComponent_getExtents (*obj, + Accessibility_Component_getExtents (*obj, &cx, &cy, &cw, @@ -126,13 +126,13 @@ SpiAccessibleComponent_getExtents (SpiAccessibleComponent *obj, /** * SpiAccessibleComponent_getPosition: - * @obj: a pointer to the #SpiAccessibleComponent to query. + * @obj: a pointer to the #AccessibleComponent to query. * @x: a pointer to a #long into which the minimum x coordinate will be returned. * @y: a pointer to a #long into which the minimum y coordinate will be returned. * @ctype: the desired coordinate system into which to return the results, * (e.g. COORD_TYPE_WINDOW, COORD_TYPE_SCREEN). * - * Get the minimum x and y coordinates of the specified #SpiAccessibleComponent. + * Get the minimum x and y coordinates of the specified #AccessibleComponent. * **/ void @@ -141,7 +141,7 @@ SpiAccessibleComponent_getPosition (SpiAccessibleComponent *obj, long *y, SpiAccessibleCoordType ctype) { - Accessibility_SpiComponent_getPosition (*obj, + Accessibility_Component_getPosition (*obj, (CORBA_long *) x, (CORBA_long *) y, ctype, @@ -150,11 +150,11 @@ SpiAccessibleComponent_getPosition (SpiAccessibleComponent *obj, /** * SpiAccessibleComponent_getSize: - * @obj: a pointer to the #SpiAccessibleComponent to query. + * @obj: a pointer to the #AccessibleComponent to query. * @width: a pointer to a #long into which the x extents (width) will be returned. * @height: a pointer to a #long into which the y extents (height) will be returned. * - * Get the size of the specified #SpiAccessibleComponent. + * Get the size of the specified #AccessibleComponent. * **/ void @@ -162,7 +162,7 @@ SpiAccessibleComponent_getSize (SpiAccessibleComponent *obj, long *width, long *height) { - Accessibility_SpiComponent_getSize (*obj, + Accessibility_Component_getSize (*obj, (CORBA_long *) width, (CORBA_long *) height, &ev); diff --git a/cspi/spi_editabletext.c b/cspi/spi_editabletext.c index fdf8f25..df1b8f1 100644 --- a/cspi/spi_editabletext.c +++ b/cspi/spi_editabletext.c @@ -1,7 +1,7 @@ int SpiAccessibleEditableText_ref (SpiAccessibleEditableText *obj) { - Accessibility_SpiEditableText_ref (*obj, &ev); + Accessibility_EditableText_ref (*obj, &ev); return 0; } @@ -10,7 +10,7 @@ SpiAccessibleEditableText_ref (SpiAccessibleEditableText *obj) int SpiAccessibleEditableText_unref (SpiAccessibleEditableText *obj) { - Accessibility_SpiEditableText_unref (*obj, &ev); + Accessibility_EditableText_unref (*obj, &ev); return 0; } @@ -22,7 +22,7 @@ SpiAccessibleEditableText_setAttributes (SpiAccessibleEditableText *obj, long startPos, long endPos) { return (boolean) - Accessibility_SpiEditableText_setAttributes (*obj, + Accessibility_EditableText_setAttributes (*obj, (CORBA_char *) attributes, (CORBA_long) startPos, (CORBA_long) endPos, &ev); } @@ -33,7 +33,7 @@ void SpiAccessibleEditableText_setTextContents (SpiAccessibleEditableText *obj, const char *newContents) { - Accessibility_SpiEditableText_setTextContents (*obj, + Accessibility_EditableText_setTextContents (*obj, (CORBA_char *) newContents, &ev); } @@ -45,7 +45,7 @@ SpiAccessibleEditableText_insertText (SpiAccessibleEditableText *obj, char *text, long length) { - Accessibility_SpiEditableText_insertText (*obj, + Accessibility_EditableText_insertText (*obj, (CORBA_long) position, (CORBA_char *) text, (CORBA_long) length, &ev); } @@ -53,11 +53,11 @@ SpiAccessibleEditableText_insertText (SpiAccessibleEditableText *obj, void -SpiAccessibleEditableText_copySpiText (SpiAccessibleText *obj, +SpiAccessibleEditableText_copyText (SpiAccessibleText *obj, long startPos, long endPos) { - Accessibility_SpiEditableText_copySpiText (*obj, + Accessibility_EditableText_copyText (*obj, (CORBA_long) startPos, (CORBA_long) endPos, &ev); } @@ -68,7 +68,7 @@ SpiAccessibleEditableText_cutText (SpiAccessibleEditableText *obj, long startPos, long endPos) { - Accessibility_SpiEditableText_cutText (*obj, + Accessibility_EditableText_cutText (*obj, (CORBA_long) startPos, (CORBA_long) endPos, &ev); } @@ -79,7 +79,7 @@ SpiAccessibleEditableText_deleteText (SpiAccessibleEditableText *obj, long startPos, long endPos) { - Accessibility_SpiEditableText_deleteText (*obj, + Accessibility_EditableText_deleteText (*obj, (CORBA_long) startPos, (CORBA_long) endPos, &ev); } @@ -89,7 +89,7 @@ void SpiAccessibleEditableText_pasteText (SpiAccessibleEditableText *obj, long position) { - Accessibility_SpiEditableText_pasteText (*obj, + Accessibility_EditableText_pasteText (*obj, (CORBA_long) position, &ev); } diff --git a/cspi/spi_event.c b/cspi/spi_event.c index 8d5278f..3c2778d 100644 --- a/cspi/spi_event.c +++ b/cspi/spi_event.c @@ -1,28 +1,28 @@ /** * createEventListener: - * @callback : an #SpiAccessibleEventListenerCB callback function, or NULL. + * @callback : an #AccessibleEventListenerCB callback function, or NULL. * - * Create a new #SpiAccessibleEventListener with a specified callback function. + * Create a new #AccessibleEventListener with a specified callback function. * - * Returns: a pointer to a newly-created #SpiAccessibleEventListener. + * Returns: a pointer to a newly-created #AccessibleEventListener. * **/ SpiAccessibleEventListener * createEventListener (SpiAccessibleEventListenerCB callback) { - SpiAccessibleEventListener *listener = spi_accessible_event_spi_listener_new (); + SpiAccessibleEventListener *listener = spi_accessible_event_listener_new (); if (callback) { - spi_accessible_event_spi_listener_add_callback (listener, callback); + spi_accessible_event_listener_add_callback (listener, callback); } return listener; } /** * EventListener_addCallback: - * @listener: the #SpiAccessibleEventListener instance to modify. - * @callback: an #SpiAccessibleEventListenerCB function pointer. + * @listener: the #AccessibleEventListener instance to modify. + * @callback: an #AccessibleEventListenerCB function pointer. * * Add an in-process callback function to an existing SpiAccessibleEventListener. * @@ -33,14 +33,14 @@ boolean EventListener_addCallback (SpiAccessibleEventListener *listener, SpiAccessibleEventListenerCB callback) { - spi_accessible_event_spi_listener_add_callback (listener, callback); + spi_accessible_event_listener_add_callback (listener, callback); return TRUE; } /** * EventListener_removeCallback: - * @listener: the #SpiAccessibleEventListener instance to modify. - * @callback: an #SpiAccessibleEventListenerCB function pointer. + * @listener: the #AccessibleEventListener instance to modify. + * @callback: an #AccessibleEventListenerCB function pointer. * * Remove an in-process callback function from an existing SpiAccessibleEventListener. * @@ -51,7 +51,7 @@ boolean EventListener_removeCallback (SpiAccessibleEventListener *listener, SpiAccessibleEventListenerCB callback) { - spi_accessible_event_spi_listener_remove_callback (listener, callback); + spi_accessible_event_listener_remove_callback (listener, callback); return TRUE; } @@ -67,10 +67,10 @@ EventListener_removeCallback (SpiAccessibleEventListener *listener, KeystrokeListener * createKeystrokeListener (KeystrokeListenerCB callback) { - KeystrokeListener *listener = keystroke_spi_listener_new (); + KeystrokeListener *listener = keystroke_listener_new (); if (callback) { - keystroke_spi_listener_add_callback (listener, callback); + keystroke_listener_add_callback (listener, callback); } return listener; } @@ -89,7 +89,7 @@ boolean KeystrokeListener_addCallback (KeystrokeListener *listener, KeystrokeListenerCB callback) { - keystroke_spi_listener_add_callback (listener, callback); + keystroke_listener_add_callback (listener, callback); return TRUE; } @@ -107,7 +107,7 @@ boolean KeystrokeListener_removeCallback (KeystrokeListener *listener, KeystrokeListenerCB callback) { - keystroke_spi_listener_remove_callback (listener, callback); + keystroke_listener_remove_callback (listener, callback); return TRUE; } diff --git a/cspi/spi_hyperlink.c b/cspi/spi_hyperlink.c index 5538c34..6d4d005 100644 --- a/cspi/spi_hyperlink.c +++ b/cspi/spi_hyperlink.c @@ -1,7 +1,7 @@ int SpiAccessibleHyperlink_ref (SpiAccessibleHyperlink *obj) { - Accessibility_SpiHyperlink_ref (*obj, &ev); + Accessibility_Hyperlink_ref (*obj, &ev); return 0; } @@ -10,7 +10,7 @@ SpiAccessibleHyperlink_ref (SpiAccessibleHyperlink *obj) int SpiAccessibleHyperlink_unref (SpiAccessibleHyperlink *obj) { - Accessibility_SpiHyperlink_unref (*obj, &ev); + Accessibility_Hyperlink_unref (*obj, &ev); return 0; } @@ -20,7 +20,7 @@ long SpiAccessibleHyperlink_getNAnchors (SpiAccessibleHyperlink *obj) { return (long) - Accessibility_SpiHyperlink__get_nAnchors (*obj, &ev); + Accessibility_Hyperlink__get_nAnchors (*obj, &ev); } @@ -30,7 +30,7 @@ SpiAccessibleHyperlink_getURI (SpiAccessibleHyperlink *obj, long i) { return (char *) - Accessibility_SpiHyperlink_getURI (*obj, + Accessibility_Hyperlink_getURI (*obj, (CORBA_long) i, &ev); } @@ -41,7 +41,7 @@ SpiAccessibleHyperlink_getObject (SpiAccessibleHyperlink *obj, long i) { return (SpiAccessible) - Accessibility_SpiHyperlink_getObject (*obj, + Accessibility_Hyperlink_getObject (*obj, (CORBA_long) i, &ev); } @@ -53,9 +53,9 @@ SpiAccessibleHyperlink_getIndexRange (SpiAccessibleHyperlink *obj, long *endIndex) { *startIndex = (long) - Accessibility_SpiHyperlink__get_startIndex (*obj, &ev); + Accessibility_Hyperlink__get_startIndex (*obj, &ev); *endIndex = (long) - Accessibility_SpiHyperlink__get_endIndex (*obj, &ev); + Accessibility_Hyperlink__get_endIndex (*obj, &ev); } @@ -64,7 +64,7 @@ boolean SpiAccessibleHyperlink_isValid (SpiAccessibleHyperlink *obj) { return (boolean) - Accessibility_SpiHyperlink_isValid (*obj, &ev); + Accessibility_Hyperlink_isValid (*obj, &ev); } diff --git a/cspi/spi_hypertext.c b/cspi/spi_hypertext.c index 4db6950..8877051 100644 --- a/cspi/spi_hypertext.c +++ b/cspi/spi_hypertext.c @@ -1,46 +1,46 @@ int -SpiAccessibleHyperspi_text_ref (SpiAccessibleHypertext *obj) +SpiAccessibleHypertext_ref (SpiAccessibleHypertext *obj) { - Accessibility_SpiHyperspi_text_ref (*obj, &ev); + Accessibility_Hypertext_ref (*obj, &ev); return 0; } int -SpiAccessibleHyperspi_text_unref (SpiAccessibleHypertext *obj) +SpiAccessibleHypertext_unref (SpiAccessibleHypertext *obj) { - Accessibility_SpiHyperspi_text_unref (*obj, &ev); + Accessibility_Hypertext_unref (*obj, &ev); return 0; } long -SpiAccessibleHyperspi_text_getNLinks (SpiAccessibleHypertext *obj) +SpiAccessibleHypertext_getNLinks (SpiAccessibleHypertext *obj) { return (long) - Accessibility_SpiHyperspi_text_getNLinks (*obj, &ev); + Accessibility_Hypertext_getNLinks (*obj, &ev); } SpiAccessibleHyperlink * -SpiAccessibleHyperSpiText_getLink (SpiAccessibleHypertext *obj, +SpiAccessibleHyperText_getLink (SpiAccessibleHypertext *obj, long linkIndex) { return (SpiAccessibleHyperlink *) - Accessibility_SpiHyperspi_text_getLink (*obj, + Accessibility_Hypertext_getLink (*obj, (CORBA_long) linkIndex, &ev); } long -SpiAccessibleHyperspi_text_getLinkIndex (SpiAccessibleHypertext *obj, +SpiAccessibleHypertext_getLinkIndex (SpiAccessibleHypertext *obj, long characterIndex) { return (long) - Accessibility_SpiHyperspi_text_getLinkIndex (*obj, + Accessibility_Hypertext_getLinkIndex (*obj, (CORBA_long) characterIndex, &ev); } diff --git a/cspi/spi_image.c b/cspi/spi_image.c index 506edac..e6113e4 100644 --- a/cspi/spi_image.c +++ b/cspi/spi_image.c @@ -1,7 +1,7 @@ int SpiAccessibleImage_ref (SpiAccessibleImage *obj) { - Accessibility_SpiImage_ref (*obj, &ev); + Accessibility_Image_ref (*obj, &ev); return 0; } @@ -10,7 +10,7 @@ SpiAccessibleImage_ref (SpiAccessibleImage *obj) int SpiAccessibleImage_unref (SpiAccessibleImage *obj) { - Accessibility_SpiImage_unref (*obj, &ev); + Accessibility_Image_unref (*obj, &ev); return 0; } @@ -20,7 +20,7 @@ char * SpiAccessibleImage_getImageDescription (SpiAccessibleImage *obj) { return (char *) - Accessibility_SpiImage__get_imageDescription (*obj, &ev); + Accessibility_Image__get_imageDescription (*obj, &ev); } @@ -30,7 +30,7 @@ SpiAccessibleImage_getImageSize (SpiAccessibleImage *obj, long *width, long *height) { - Accessibility_SpiImage_getImageSize (*obj, + Accessibility_Image_getImageSize (*obj, (CORBA_long *) width, (CORBA_long *) height, &ev); } @@ -42,7 +42,7 @@ SpiAccessibleImage_getImagePosition (SpiAccessibleImage *obj, long *y, SpiAccessibleCoordType ctype) { - Accessibility_SpiImage_getImagePosition (*obj, + Accessibility_Image_getImagePosition (*obj, (CORBA_long *) x, (CORBA_long *) y, (CORBA_short) ctype, &ev); } diff --git a/cspi/spi_main.c b/cspi/spi_main.c index 08a145f..faa8245 100644 --- a/cspi/spi_main.c +++ b/cspi/spi_main.c @@ -26,7 +26,7 @@ SPI_init (void) g_error ("Could not initialize Bonobo"); } - obj_id = "OAFIID:Accessibility_SpiRegistry:proto0.1"; + obj_id = "OAFIID:Accessibility_Registry:proto0.1"; oclient = bonobo_activation_activate_from_id (obj_id, 0, NULL, &ev); if (ev._major != CORBA_NO_EXCEPTION) { @@ -43,7 +43,7 @@ SPI_init (void) exit(-1); } - registry = (Accessibility_SpiRegistry) oclient; + registry = (Accessibility_Registry) oclient; bonobo_activate (); @@ -99,7 +99,7 @@ SPI_eventIsReady () * Used by clients that don't wish to use SPI_event_main(). * Not Yet Implemented. * - * Returns: the next #SpiAccessibleEvent in the SPI event queue. + * Returns: the next #AccessibleEvent in the SPI event queue. * **/ SpiAccessibleEvent * diff --git a/cspi/spi_registry.c b/cspi/spi_registry.c index e41bbeb..ef3df5f 100644 --- a/cspi/spi_registry.c +++ b/cspi/spi_registry.c @@ -11,7 +11,7 @@ static Display *display = NULL; /** * registerGlobalEventListener: - * @listener: the #SpiAccessibleEventListener to be registered against an event type. + * @listener: the #AccessibleEventListener to be registered against an event type. * @callback: a character string indicating the type of events for which * notification is requested. Format is * EventClass:major_type:minor_type:detail @@ -34,7 +34,7 @@ boolean registerGlobalEventListener (SpiAccessibleEventListener *listener, char *eventType) { - Accessibility_SpiRegistry_registerGlobalEventListener ( + Accessibility_Registry_registerGlobalEventListener ( registry, (Accessibility_EventListener) bonobo_object_corba_objref (bonobo_object (listener)), @@ -53,7 +53,7 @@ registerGlobalEventListener (SpiAccessibleEventListener *listener, /** * deregisterGlobalEventListener: - * @listener: the #SpiAccessibleEventListener to be registered against an event type. + * @listener: the #AccessibleEventListener to be registered against an event type. * * deregisters an SpiAccessibleEventListener from the registry, for all event types it may be listening to. * @@ -63,7 +63,7 @@ registerGlobalEventListener (SpiAccessibleEventListener *listener, boolean deregisterGlobalEventListenerAll (SpiAccessibleEventListener *listener) { - Accessibility_SpiRegistry_deregisterGlobalEventListenerAll ( + Accessibility_Registry_deregisterGlobalEventListenerAll ( registry, (Accessibility_EventListener) CORBA_Object_duplicate (bonobo_object_corba_objref (bonobo_object (listener)), &ev), @@ -92,7 +92,7 @@ deregisterGlobalEventListenerAll (SpiAccessibleEventListener *listener) int getDesktopCount () { - return Accessibility_SpiRegistry_getDesktopCount (registry, &ev); + return Accessibility_Registry_getDesktopCount (registry, &ev); } /** @@ -103,18 +103,18 @@ getDesktopCount () * NOTE: currently multiple virtual desktops are not implemented, this * function always returns '1'. * - * Returns: a pointer to the 'i-th' virtual desktop's #SpiAccessible representation. + * Returns: a pointer to the 'i-th' virtual desktop's #Accessible representation. * **/ SpiAccessible* getDesktop (int n) { - return Obj_Add (Accessibility_SpiRegistry_getDesktop (registry, (CORBA_short) n, &ev)); + return Obj_Add (Accessibility_Registry_getDesktop (registry, (CORBA_short) n, &ev)); } /** * getDesktopList: - * @list: a pointer to an array of #SpiAccessible objects. + * @list: a pointer to an array of #Accessible objects. * * Get the list of virtual desktops. On return, @list will point * to a newly-created array of virtual desktop pointers. @@ -194,23 +194,23 @@ registerKeystrokeListener (KeystrokeListener *listener, KeySet *keys, KeyMaskType modmask, KeyEventMask eventmask, - KeySpiListenerSyncType sync_type) + KeyListenerSyncType sync_type) { Accessibility_ControllerEventMask *controller_event_mask = Accessibility_ControllerEventMask__alloc(); - Accessibility_SpiDeviceEventController device_event_controller = - Accessibility_SpiRegistry_getDeviceEventController (registry, &ev); + Accessibility_DeviceEventController device_event_controller = + Accessibility_Registry_getDeviceEventController (registry, &ev); Accessibility_KeySet *all_keys = Accessibility_KeySet__alloc(); Accessibility_KeyEventTypeSeq *key_events = Accessibility_KeyEventTypeSeq__alloc(); Accessibility_KeystrokeListener spi_listener_corba_ref; - Accessibility_SpiDeviceEventController_ref (device_event_controller, &ev); + Accessibility_DeviceEventController_ref (device_event_controller, &ev); controller_event_mask->value = (CORBA_unsigned_long) modmask; controller_event_mask->refcount = (CORBA_unsigned_short) 1; spi_listener_corba_ref = (Accessibility_KeystrokeListener) CORBA_Object_duplicate (bonobo_object_corba_objref (bonobo_object (listener)), &ev); - Accessibility_SpiDeviceEventController_registerKeystrokeListener ( + Accessibility_DeviceEventController_registerKeystrokeListener ( device_event_controller, spi_listener_corba_ref, all_keys, @@ -231,19 +231,19 @@ deregisterKeystrokeListener (KeystrokeListener *listener, KeyMaskType keymask) { Accessibility_ControllerEventMask *controller_event_mask = Accessibility_ControllerEventMask__alloc(); - Accessibility_SpiDeviceEventController device_event_controller = - Accessibility_SpiRegistry_getDeviceEventController (registry, &ev); + Accessibility_DeviceEventController device_event_controller = + Accessibility_Registry_getDeviceEventController (registry, &ev); Accessibility_KeySet *all_keys = Accessibility_KeySet__alloc(); Accessibility_KeyEventTypeSeq *key_events = Accessibility_KeyEventTypeSeq__alloc(); Accessibility_KeystrokeListener spi_listener_corba_ref; - Accessibility_SpiDeviceEventController_unref (device_event_controller, &ev); + Accessibility_DeviceEventController_unref (device_event_controller, &ev); controller_event_mask->value = (CORBA_unsigned_long) keymask; controller_event_mask->refcount = (CORBA_unsigned_short) 1; spi_listener_corba_ref = (Accessibility_KeystrokeListener) CORBA_Object_duplicate (bonobo_object_corba_objref (bonobo_object (listener)), &ev); - Accessibility_SpiDeviceEventController_deregisterKeystrokeListener ( + Accessibility_DeviceEventController_deregisterKeystrokeListener ( device_event_controller, spi_listener_corba_ref, all_keys, @@ -271,9 +271,9 @@ generateKeyEvent (long keyval, KeySynthType type) /* TODO: check current modifier status and * send keycode to alter, if necessary */ - Accessibility_SpiDeviceEventController device_event_controller = - Accessibility_SpiRegistry_getDeviceEventController (registry, &ev); - Accessibility_SpiDeviceEventController_generateKeyEvent (device_event_controller, + Accessibility_DeviceEventController device_event_controller = + Accessibility_Registry_getDeviceEventController (registry, &ev); + Accessibility_DeviceEventController_generateKeyEvent (device_event_controller, keyval, (unsigned long) type, &ev); diff --git a/cspi/spi_selection.c b/cspi/spi_selection.c index 8ee238b..548d361 100644 --- a/cspi/spi_selection.c +++ b/cspi/spi_selection.c @@ -1,7 +1,7 @@ int SpiAccessibleSelection_ref (SpiAccessibleSelection *obj) { - Accessibility_SpiSelection_ref (*obj, &ev); + Accessibility_Selection_ref (*obj, &ev); return 0; } @@ -10,7 +10,7 @@ SpiAccessibleSelection_ref (SpiAccessibleSelection *obj) int SpiAccessibleSelection_unref (SpiAccessibleSelection *obj) { - Accessibility_SpiSelection_unref (*obj, &ev); + Accessibility_Selection_unref (*obj, &ev); return 0; } @@ -20,7 +20,7 @@ long SpiAccessibleSelection_getNSelectedChildren (SpiAccessibleSelection *obj) { return (long) - Accessibility_SpiSelection__get_nSelectedChildren (*obj, &ev); + Accessibility_Selection__get_nSelectedChildren (*obj, &ev); } @@ -29,8 +29,8 @@ SpiAccessible * SpiAccessibleSelection_getSelectedChild (SpiAccessibleSelection *obj, long selectedChildIndex) { - Accessibility_SpiAccessible child = - Accessibility_SpiSelection_getSelectedChild (*obj, + Accessibility_Accessible child = + Accessibility_Selection_getSelectedChild (*obj, (CORBA_long) selectedChildIndex, &ev); spi_warn_ev (&ev, "getSelectedChild"); @@ -42,7 +42,7 @@ SpiAccessibleSelection_selectChild (SpiAccessibleSelection *obj, long childIndex) { return (boolean) - Accessibility_SpiSelection_selectChild (*obj, + Accessibility_Selection_selectChild (*obj, (CORBA_long) childIndex, &ev); } @@ -52,7 +52,7 @@ boolean SpiAccessibleSelection_deselectSelectedChild (SpiAccessibleSelection *obj, long selectedChildIndex) { - Accessibility_SpiSelection_deselectSelectedChild (*obj, + Accessibility_Selection_deselectSelectedChild (*obj, (CORBA_long) selectedChildIndex, &ev); } @@ -63,7 +63,7 @@ SpiAccessibleSelection_isChildSelected (SpiAccessibleSelection *obj, long childIndex) { return (boolean) - Accessibility_SpiSelection_isChildSelected (*obj, + Accessibility_Selection_isChildSelected (*obj, (CORBA_long) childIndex, &ev); } @@ -72,15 +72,15 @@ SpiAccessibleSelection_isChildSelected (SpiAccessibleSelection *obj, void SpiAccessibleSelection_selectAll (SpiAccessibleSelection *obj) { - Accessibility_SpiSelection_selectAll (*obj, &ev); + Accessibility_Selection_selectAll (*obj, &ev); } void -SpiAccessibleSelection_clearSpiSelection (SpiAccessibleSelection *obj) +SpiAccessibleSelection_clearSelection (SpiAccessibleSelection *obj) { - Accessibility_SpiSelection_clearSpiSelection (*obj, &ev); + Accessibility_Selection_clearSelection (*obj, &ev); } diff --git a/cspi/spi_table.c b/cspi/spi_table.c index 306e8ac..ff8754a 100644 --- a/cspi/spi_table.c +++ b/cspi/spi_table.c @@ -1,7 +1,7 @@ int SpiAccessibleTable_ref (SpiAccessibleTable *obj) { - Accessibility_SpiTable_ref (*obj, &ev); + Accessibility_Table_ref (*obj, &ev); return 0; } @@ -10,7 +10,7 @@ SpiAccessibleTable_ref (SpiAccessibleTable *obj) int SpiAccessibleTable_unref (SpiAccessibleTable *obj) { - Accessibility_SpiTable_unref (*obj, &ev); + Accessibility_Table_unref (*obj, &ev); return 0; } @@ -20,7 +20,7 @@ SpiAccessible * SpiAccessibleTable_getCaption (SpiAccessibleTable *obj) { return (SpiAccessible *) - Accessibility_SpiTable__get_caption (*obj, &ev); + Accessibility_Table__get_caption (*obj, &ev); } @@ -29,7 +29,7 @@ SpiAccessible * SpiAccessibleTable_getSummary (SpiAccessibleTable *obj) { return (SpiAccessible *) - Accessibility_SpiTable__get_summary (*obj, &ev); + Accessibility_Table__get_summary (*obj, &ev); } @@ -38,7 +38,7 @@ long SpiAccessibleTable_getNRows (SpiAccessibleTable *obj) { return (long) - Accessibility_SpiTable__get_nRows (*obj, &ev); + Accessibility_Table__get_nRows (*obj, &ev); } @@ -47,7 +47,7 @@ long SpiAccessibleTable_getNColumns (SpiAccessibleTable *obj) { return (long) - Accessibility_SpiTable__get_nColumns (*obj, &ev); + Accessibility_Table__get_nColumns (*obj, &ev); } @@ -57,7 +57,7 @@ SpiAccessibleTable_getAccessibleAt (SpiAccessibleTable *obj, long column) { return (SpiAccessible *) - Accessibility_SpiTable_getAccessibleAt (*obj, + Accessibility_Table_getAccessibleAt (*obj, (CORBA_long) row, (CORBA_long) column, &ev); } @@ -68,7 +68,7 @@ SpiAccessibleTable_getIndexAt (SpiAccessibleTable *obj, long column) { return (long) - Accessibility_SpiTable_getIndexAt (*obj, + Accessibility_Table_getIndexAt (*obj, (CORBA_long) row, (CORBA_long) column, &ev); } @@ -79,7 +79,7 @@ SpiAccessibleTable_getRowAtIndex (SpiAccessibleTable *obj, long index) { return (long) - Accessibility_SpiTable_getRowAtIndex (*obj, + Accessibility_Table_getRowAtIndex (*obj, (CORBA_long) index, &ev); } @@ -90,7 +90,7 @@ SpiAccessibleTable_getColumnAtIndex (SpiAccessibleTable *obj, long index) { return (long) - Accessibility_SpiTable_getColumnAtIndex (*obj, + Accessibility_Table_getColumnAtIndex (*obj, (CORBA_long) index, &ev); } @@ -101,7 +101,7 @@ SpiAccessibleTable_getRowDescription (SpiAccessibleTable *obj, long row) { return (char *) - Accessibility_SpiTable_getRowDescription (*obj, + Accessibility_Table_getRowDescription (*obj, (CORBA_long) row, &ev); } @@ -112,7 +112,7 @@ SpiAccessibleTable_getColumnDescription (SpiAccessibleTable *obj, long column) { return (char *) - Accessibility_SpiTable_getColumnDescription (*obj, + Accessibility_Table_getColumnDescription (*obj, (CORBA_long) column, &ev); } @@ -124,7 +124,7 @@ SpiAccessibleTable_getRowExtentAt (SpiAccessibleTable *obj, long column) { return (long) - Accessibility_SpiTable_getRowExtentAt (*obj, + Accessibility_Table_getRowExtentAt (*obj, (CORBA_long) row, (CORBA_long) column, &ev); } @@ -136,7 +136,7 @@ SpiAccessibleTable_getColumnExtentAt (SpiAccessibleTable *obj, long column) { return (long) - Accessibility_SpiTable_getColumnExtentAt (*obj, + Accessibility_Table_getColumnExtentAt (*obj, (CORBA_long) row, (CORBA_long) column, &ev); } @@ -147,7 +147,7 @@ SpiAccessibleTable_getRowHeader (SpiAccessibleTable *obj, long row) { return (SpiAccessible *) - Accessibility_SpiTable_getRowHeader (*obj, + Accessibility_Table_getRowHeader (*obj, (CORBA_long) row, &ev); } @@ -158,7 +158,7 @@ SpiAccessibleTable_getColumnHeader (SpiAccessibleTable *obj, long column) { return (SpiAccessible *) - Accessibility_SpiTable_getColumnHeader (*obj, + Accessibility_Table_getColumnHeader (*obj, (CORBA_long) column, &ev); } @@ -168,7 +168,7 @@ long SpiAccessibleTable_getNSelectedRows (SpiAccessibleTable *obj) { return (long) - Accessibility_SpiTable__get_nSelectedRows (*obj, &ev); + Accessibility_Table__get_nSelectedRows (*obj, &ev); } @@ -177,7 +177,7 @@ long SpiAccessibleTable_getSelectedRows (SpiAccessibleTable *obj, long **selectedRows) { - Accessibility_LongSeq *rows = Accessibility_SpiTable_getSelectedRows (*obj, &ev); + Accessibility_LongSeq *rows = Accessibility_Table_getSelectedRows (*obj, &ev); CORBA_long *i; long *j; long length; @@ -200,7 +200,7 @@ long SpiAccessibleTable_getNSelectedColumns (SpiAccessibleTable *obj) { return (long) - Accessibility_SpiTable__get_nSelectedColumns (*obj, &ev); + Accessibility_Table__get_nSelectedColumns (*obj, &ev); } @@ -208,7 +208,7 @@ long SpiAccessibleTable_getSelectedColumns (SpiAccessibleTable *obj, long **selectedColumns) { - Accessibility_LongSeq *columns = Accessibility_SpiTable_getSelectedColumns (*obj, &ev); + Accessibility_LongSeq *columns = Accessibility_Table_getSelectedColumns (*obj, &ev); CORBA_long *i; long *j; long length; @@ -231,7 +231,7 @@ SpiAccessibleTable_isRowSelected (SpiAccessibleTable *obj, long row) { return (boolean) - Accessibility_SpiTable_isRowSelected (*obj, + Accessibility_Table_isRowSelected (*obj, (CORBA_long) row, &ev); } @@ -242,7 +242,7 @@ SpiAccessibleTable_isColumnSelected (SpiAccessibleTable *obj, long column) { return (boolean) - Accessibility_SpiTable_isColumnSelected (*obj, + Accessibility_Table_isColumnSelected (*obj, (CORBA_long) column, &ev); } @@ -254,7 +254,7 @@ SpiAccessibleTable_isSelected (SpiAccessibleTable *obj, long column) { return (boolean) - Accessibility_SpiTable_isSelected (*obj, + Accessibility_Table_isSelected (*obj, (CORBA_long) row, (CORBA_long) column, &ev); } diff --git a/cspi/spi_text.c b/cspi/spi_text.c index 2922abb..f1f083f 100644 --- a/cspi/spi_text.c +++ b/cspi/spi_text.c @@ -1,7 +1,7 @@ int SpiAccessibleText_ref (SpiAccessibleText *obj) { - Accessibility_SpiText_ref (*obj, &ev); + Accessibility_Text_ref (*obj, &ev); return 0; } @@ -10,7 +10,7 @@ SpiAccessibleText_ref (SpiAccessibleText *obj) int SpiAccessibleText_unref (SpiAccessibleText *obj) { - Accessibility_SpiText_unref (*obj, &ev); + Accessibility_Text_unref (*obj, &ev); return 0; } @@ -23,7 +23,7 @@ SpiAccessibleText_getCharacterCount (SpiAccessibleText *obj) CORBA_exception_init (&ev); retval = (long) - Accessibility_SpiText__get_characterCount (*obj, &ev); + Accessibility_Text__get_characterCount (*obj, &ev); spi_check_ev (&ev, "SpiAccessibleText_getCharacterCount"); @@ -38,7 +38,7 @@ SpiAccessibleText_getText (SpiAccessibleText *obj, long endOffset) { return (char *) - Accessibility_SpiText_getText (*obj, + Accessibility_Text_getText (*obj, (CORBA_long) startOffset, (CORBA_long) endOffset, &ev); } @@ -49,7 +49,7 @@ long SpiAccessibleText_getCaretOffset (SpiAccessibleText *obj) { return (long) - Accessibility_SpiText__get_caretOffset (*obj, &ev); + Accessibility_Text__get_caretOffset (*obj, &ev); } @@ -63,7 +63,7 @@ SpiAccessibleText_getAttributes (SpiAccessibleText *obj, CORBA_long retStartOffset, retEndOffset; char *retval; retval = (char *) - Accessibility_SpiText_getAttributes (*obj, + Accessibility_Text_getAttributes (*obj, (CORBA_long) offset, &retStartOffset, &retEndOffset, @@ -80,7 +80,7 @@ SpiAccessibleText_setCaretOffset (SpiAccessibleText *obj, long newOffset) { return (boolean) - Accessibility_SpiText_setCaretOffset (*obj, + Accessibility_Text_setCaretOffset (*obj, (CORBA_long) newOffset, &ev); } @@ -95,7 +95,7 @@ SpiAccessibleText_getTextBeforeOffset (SpiAccessibleText *obj, char *retval; CORBA_long retStartOffset, retEndOffset; retval = (char *) - Accessibility_SpiText_getTextBeforeOffset (*obj, + Accessibility_Text_getTextBeforeOffset (*obj, (CORBA_long) offset, (Accessibility_TEXT_BOUNDARY_TYPE) type, &retStartOffset, &retEndOffset, &ev); @@ -115,7 +115,7 @@ SpiAccessibleText_getTextAtOffset (SpiAccessibleText *obj, CORBA_long corbaStartOffset; CORBA_long corbaEndOffset; char *retval = ""; - retval = Accessibility_SpiText_getTextAtOffset (*obj, + retval = Accessibility_Text_getTextAtOffset (*obj, (CORBA_long) offset, (Accessibility_TEXT_BOUNDARY_TYPE) type, &corbaStartOffset, @@ -140,7 +140,7 @@ SpiAccessibleText_getTextAfterOffset (SpiAccessibleText *obj, char *retval; CORBA_long retStartOffset, retEndOffset; retval = (char *) - Accessibility_SpiText_getTextAfterOffset (*obj, + Accessibility_Text_getTextAfterOffset (*obj, (CORBA_long) offset, (Accessibility_TEXT_BOUNDARY_TYPE) type, &retStartOffset, &retEndOffset, &ev); @@ -156,7 +156,7 @@ SpiAccessibleText_getCharacterAtOffset (SpiAccessibleText *obj, long offset) { return (unsigned long) - Accessibility_SpiText_getCharacterAtOffset (*obj, + Accessibility_Text_getCharacterAtOffset (*obj, (CORBA_long) offset, &ev); } @@ -172,7 +172,7 @@ SpiAccessibleText_getCharacterExtents (SpiAccessibleText *obj, SpiAccessibleCoordType type) { CORBA_long retX, retY, retWidth, retHeight; - Accessibility_SpiText_getCharacterExtents (*obj, + Accessibility_Text_getCharacterExtents (*obj, (CORBA_long) offset, &retX, &retY, @@ -194,17 +194,17 @@ SpiAccessibleText_getOffsetAtPoint (SpiAccessibleText *obj, SpiAccessibleCoordType type) { return (long) - Accessibility_SpiText_getOffsetAtPoint (*obj, + Accessibility_Text_getOffsetAtPoint (*obj, (CORBA_long) x, (CORBA_long) y, (CORBA_short) type, &ev); } long -SpiAccessibleText_getNSpiSelections (SpiAccessibleText *obj) +SpiAccessibleText_getNSelections (SpiAccessibleText *obj) { return (long) - Accessibility_SpiText_getNSpiSelections (*obj, &ev); + Accessibility_Text_getNSelections (*obj, &ev); } @@ -215,7 +215,7 @@ SpiAccessibleText_getSelection (SpiAccessibleText *obj, long *endOffset) { CORBA_long retStartOffset, retEndOffset; - Accessibility_SpiText_getSelection (*obj, + Accessibility_Text_getSelection (*obj, (CORBA_long) selectionNum, &retStartOffset, &retEndOffset, &ev); @@ -226,11 +226,11 @@ SpiAccessibleText_getSelection (SpiAccessibleText *obj, boolean -SpiAccessibleText_addSpiSelection (SpiAccessibleText *obj, +SpiAccessibleText_addSelection (SpiAccessibleText *obj, long startOffset, long endOffset) { return (boolean) - Accessibility_SpiText_addSpiSelection (*obj, + Accessibility_Text_addSelection (*obj, (CORBA_long) startOffset, (CORBA_long) endOffset, &ev); } @@ -242,7 +242,7 @@ SpiAccessibleText_removeSelection (SpiAccessibleText *obj, long selectionNum) { return (boolean) - Accessibility_SpiText_removeSelection (*obj, + Accessibility_Text_removeSelection (*obj, (CORBA_long) selectionNum, &ev); } @@ -255,7 +255,7 @@ SpiAccessibleText_setSelection (SpiAccessibleText *obj, long endOffset) { return (boolean) - Accessibility_SpiText_setSelection (*obj, + Accessibility_Text_setSelection (*obj, (CORBA_long) selectionNum, (CORBA_long) startOffset, (CORBA_long) endOffset, &ev); diff --git a/cspi/spi_value.c b/cspi/spi_value.c index bca1357..f285e9f 100644 --- a/cspi/spi_value.c +++ b/cspi/spi_value.c @@ -1,7 +1,7 @@ int SpiAccessibleValue_ref (SpiAccessibleValue *obj) { - Accessibility_SpiValue_ref (*obj, &ev); + Accessibility_Value_ref (*obj, &ev); return 0; } @@ -10,17 +10,17 @@ SpiAccessibleValue_ref (SpiAccessibleValue *obj) int SpiAccessibleValue_unref (SpiAccessibleValue *obj) { - Accessibility_SpiValue_unref (*obj, &ev); + Accessibility_Value_unref (*obj, &ev); return 0; } float -SpiAccessibleValue_getMinimumSpiValue (SpiAccessibleValue *obj) +SpiAccessibleValue_getMinimumValue (SpiAccessibleValue *obj) { return (float) - Accessibility_SpiValue__get_minimumSpiValue (*obj, &ev); + Accessibility_Value__get_minimumValue (*obj, &ev); } @@ -29,26 +29,26 @@ float SpiAccessibleValue_getCurrentValue (SpiAccessibleValue *obj) { return (float) - Accessibility_SpiValue__get_currentValue (*obj, &ev); + Accessibility_Value__get_currentValue (*obj, &ev); } float -SpiAccessibleValue_getMaximumSpiValue (SpiAccessibleValue *obj) +SpiAccessibleValue_getMaximumValue (SpiAccessibleValue *obj) { return (float) - Accessibility_SpiValue__get_maximumSpiValue (*obj, &ev); + Accessibility_Value__get_maximumValue (*obj, &ev); } boolean SpiAccessibleValue_setCurrentValue (SpiAccessibleValue *obj, - float newSpiValue) + float newValue) { - Accessibility_SpiValue__set_currentValue (*obj, - (CORBA_float) newSpiValue, &ev); + Accessibility_Value__set_currentValue (*obj, + (CORBA_float) newValue, &ev); return TRUE; } diff --git a/libspi/accessible.c b/libspi/accessible.c index 4209185..3f32112 100644 --- a/libspi/accessible.c +++ b/libspi/accessible.c @@ -30,7 +30,7 @@ #include /* - * This pulls the CORBA definitions for the "Accessibility::SpiAccessible" server + * This pulls the CORBA definitions for the "Accessibility::Accessible" server */ #include @@ -76,7 +76,7 @@ spi_accessible_object_finalize (GObject *object) } /* - * CORBA Accessibility::SpiAccessible::get_name method implementation + * CORBA Accessibility::Accessible::get_name method implementation */ static CORBA_char * impl_accessibility_accessible_get_name (PortableServer_Servant servant, @@ -94,7 +94,7 @@ impl_accessibility_accessible_get_name (PortableServer_Servant servant, } /* - * CORBA Accessibility::SpiAccessible::set_name method implementation + * CORBA Accessibility::Accessible::set_name method implementation */ static void impl_accessibility_accessible_set_name (PortableServer_Servant servant, @@ -107,7 +107,7 @@ impl_accessibility_accessible_set_name (PortableServer_Servant servant, } /* - * CORBA Accessibility::SpiAccessible::get_description method implementation + * CORBA Accessibility::Accessible::get_description method implementation */ static CORBA_char * impl_accessibility_accessible_get_description (PortableServer_Servant servant, @@ -121,7 +121,7 @@ impl_accessibility_accessible_get_description (PortableServer_Servant servant, } /* - * CORBA Accessibility::SpiAccessible::set_description method implementation + * CORBA Accessibility::Accessible::set_description method implementation */ static void impl_accessibility_accessible_set_description (PortableServer_Servant servant, @@ -134,13 +134,13 @@ impl_accessibility_accessible_set_description (PortableServer_Servant servant, } /* - * CORBA Accessibility::SpiAccessible::get_parent method implementation + * CORBA Accessibility::Accessible::get_parent method implementation */ -static Accessibility_SpiAccessible +static Accessibility_Accessible impl_accessibility_accessible_get_parent (PortableServer_Servant servant, CORBA_Environment *ev) { - Accessibility_SpiAccessible retval; + Accessibility_Accessible retval; SpiAccessible *accessible = SPI_ACCESSIBLE (bonobo_object_from_servant (servant)); AtkObject *parent; parent = atk_object_get_parent (accessible->atko); @@ -150,7 +150,7 @@ impl_accessibility_accessible_get_parent (PortableServer_Servant servant, } /* - * CORBA Accessibility::SpiAccessible::get_IndexInParent method implementation + * CORBA Accessibility::Accessible::get_IndexInParent method implementation */ static CORBA_long impl_accessibility_accessible_get_index_in_parent (PortableServer_Servant servant, @@ -164,7 +164,7 @@ impl_accessibility_accessible_get_index_in_parent (PortableServer_Servant servan } /* - * CORBA Accessibility::SpiAccessible::get_childCount method implementation + * CORBA Accessibility::Accessible::get_childCount method implementation */ static CORBA_long impl_accessibility_accessible_get_child_count (PortableServer_Servant servant, @@ -178,14 +178,14 @@ impl_accessibility_accessible_get_child_count (PortableServer_Servant servant, } /* - * CORBA Accessibility::SpiAccessible::getChildAtIndex method implementation + * CORBA Accessibility::Accessible::getChildAtIndex method implementation */ -static Accessibility_SpiAccessible +static Accessibility_Accessible impl_accessibility_accessible_get_child_at_index (PortableServer_Servant servant, const CORBA_long index, CORBA_Environment *ev) { - Accessibility_SpiAccessible retval; + Accessibility_Accessible retval; SpiAccessible *accessible = SPI_ACCESSIBLE (bonobo_object_from_servant (servant)); AtkObject *child = atk_object_ref_accessible_child (accessible->atko, (gint) index); retval = BONOBO_OBJREF (spi_accessible_new (child)); @@ -194,7 +194,7 @@ impl_accessibility_accessible_get_child_at_index (PortableServer_Servant servant } /* - * CORBA Accessibility::SpiAccessible::getState method implementation + * CORBA Accessibility::Accessible::getState method implementation */ static Accessibility_StateSet impl_accessibility_accessible_get_state (PortableServer_Servant servant, @@ -210,7 +210,7 @@ impl_accessibility_accessible_get_state (PortableServer_Servant servant, } /* - * CORBA Accessibility::SpiAccessible::getRelationSet method implementation + * CORBA Accessibility::Accessible::getRelationSet method implementation */ static Accessibility_RelationSet * impl_accessibility_accessible_get_relation_set (PortableServer_Servant servant, @@ -229,7 +229,7 @@ impl_accessibility_accessible_get_relation_set (PortableServer_Servant servant, } /* - * CORBA Accessibility::SpiAccessible::getRole method implementation + * CORBA Accessibility::Accessible::getRole method implementation */ static Accessibility_Role impl_accessibility_accessible_get_role (PortableServer_Servant servant, @@ -247,7 +247,7 @@ static void spi_accessible_class_init (SpiAccessibleClass *klass) { GObjectClass * object_class = (GObjectClass *) klass; - POA_Accessibility_SpiAccessible__epv *epv = &klass->epv; + POA_Accessibility_Accessible__epv *epv = &klass->epv; spi_accessible_parent_class = g_type_class_peek_parent (klass); object_class->finalize = spi_accessible_object_finalize; @@ -297,7 +297,7 @@ spi_accessible_get_type (void) */ type = bonobo_type_unique ( PARENT_TYPE, - POA_Accessibility_SpiAccessible__init, + POA_Accessibility_Accessible__init, NULL, G_STRUCT_OFFSET (SpiAccessibleClass, epv), &tinfo, diff --git a/libspi/accessible.h b/libspi/accessible.h index bc63201..4050eb6 100644 --- a/libspi/accessible.h +++ b/libspi/accessible.h @@ -42,7 +42,7 @@ typedef struct { typedef struct { BonoboObjectClass parent_class; - POA_Accessibility_SpiAccessible__epv epv; + POA_Accessibility_Accessible__epv epv; } SpiAccessibleClass; GType spi_accessible_get_type (void); diff --git a/libspi/accessibleeventlistener.c b/libspi/accessibleeventlistener.c index c682be9..ebe28e9 100644 --- a/libspi/accessibleeventlistener.c +++ b/libspi/accessibleeventlistener.c @@ -47,22 +47,22 @@ /* * A pointer to our parent object class */ -static SpiListenerClass *spi_accessible_event_spi_listener_parent_class; +static SpiListenerClass *spi_accessible_event_listener_parent_class; /* * Implemented GObject::finalize */ static void -spi_accessible_event_spi_listener_object_finalize (GObject *object) +spi_accessible_event_listener_object_finalize (GObject *object) { #ifdef SPI_DEBUG fprintf(stderr, "spi_listener_object_finalize called\n"); #endif - ((GObjectClass *) spi_accessible_event_spi_listener_parent_class)->finalize (object); + ((GObjectClass *) spi_accessible_event_listener_parent_class)->finalize (object); } /* - * CORBA Accessibility::SpiListener::notifyEvent method implementation + * CORBA Accessibility::Listener::notifyEvent method implementation */ static void @@ -85,30 +85,30 @@ impl_accessible_event_notify_event (PortableServer_Servant servant, (*cb) (e); } } - /* Accessibility_SpiAccessible_unref (e->source, ev); */ + /* Accessibility_Accessible_unref (e->source, ev); */ } static void -spi_accessible_event_spi_listener_class_init (SpiAccessibleEventListenerClass *klass) +spi_accessible_event_listener_class_init (SpiAccessibleEventListenerClass *klass) { GObjectClass * object_class = (GObjectClass *) klass; SpiListenerClass * spi_listener_class = (SpiListenerClass *) klass; POA_Accessibility_EventListener__epv *epv = &spi_listener_class->epv; - spi_accessible_event_spi_listener_parent_class = g_type_class_ref (SPI_LISTENER_TYPE); + spi_accessible_event_listener_parent_class = g_type_class_ref (SPI_LISTENER_TYPE); - object_class->finalize = spi_accessible_event_spi_listener_object_finalize; + object_class->finalize = spi_accessible_event_listener_object_finalize; epv->notifyEvent = impl_accessible_event_notify_event; } static void -spi_accessible_event_spi_listener_init (SpiAccessibleEventListener *listener) +spi_accessible_event_listener_init (SpiAccessibleEventListener *listener) { listener->callbacks = NULL; } GType -spi_accessible_event_spi_listener_get_type (void) +spi_accessible_event_listener_get_type (void) { static GType type = 0; @@ -117,12 +117,12 @@ spi_accessible_event_spi_listener_get_type (void) sizeof (SpiAccessibleEventListenerClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, - (GClassInitFunc) spi_accessible_event_spi_listener_class_init, + (GClassInitFunc) spi_accessible_event_listener_class_init, (GClassFinalizeFunc) NULL, NULL, /* class data */ sizeof (SpiListener), 0, /* n preallocs */ - (GInstanceInitFunc) spi_accessible_event_spi_listener_init, + (GInstanceInitFunc) spi_accessible_event_listener_init, NULL /* value table */ }; /* @@ -144,20 +144,20 @@ spi_accessible_event_spi_listener_get_type (void) } SpiAccessibleEventListener * -spi_accessible_event_spi_listener_new () +spi_accessible_event_listener_new () { SpiAccessibleEventListener *retval = - SPI_ACCESSIBLE_EVENT_SPI_LISTENER (g_object_new (spi_accessible_event_spi_listener_get_type (), NULL)); + SPI_ACCESSIBLE_EVENT_SPI_LISTENER (g_object_new (spi_accessible_event_listener_get_type (), NULL)); return retval; } -void spi_accessible_event_spi_listener_add_callback (SpiAccessibleEventListener *listener, +void spi_accessible_event_listener_add_callback (SpiAccessibleEventListener *listener, VoidEventListenerCB callback) { listener->callbacks = g_list_append (listener->callbacks, callback); } -void spi_accessible_event_spi_listener_remove_callback (SpiAccessibleEventListener *listener, +void spi_accessible_event_listener_remove_callback (SpiAccessibleEventListener *listener, VoidEventListenerCB callback) { listener->callbacks = g_list_remove (listener->callbacks, callback); diff --git a/libspi/accessibleeventlistener.h b/libspi/accessibleeventlistener.h index 68d36ee..128b279 100644 --- a/libspi/accessibleeventlistener.h +++ b/libspi/accessibleeventlistener.h @@ -29,7 +29,7 @@ extern "C" { #include "listener.h" -#define SPI_ACCESSIBLE_EVENT_SPI_LISTENER_TYPE (spi_accessible_event_spi_listener_get_type ()) +#define SPI_ACCESSIBLE_EVENT_SPI_LISTENER_TYPE (spi_accessible_event_listener_get_type ()) #define SPI_ACCESSIBLE_EVENT_SPI_LISTENER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), SPI_ACCESSIBLE_EVENT_SPI_LISTENER_TYPE, SpiAccessibleEventListener)) #define SPI_ACCESSIBLE_EVENT_SPI_LISTENER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), SPI_ACCESSIBLE_EVENT_SPI_LISTENER_TYPE, SpiAccessibleEventListenerClass)) #define IS_SPI_ACCESSIBLE_EVENT_SPI_LISTENER(o) (G_TYPE_CHECK__INSTANCE_TYPE ((o), SPI_ACCESSIBLE_EVENT_SPI_LISTENER_TYPE)) @@ -46,11 +46,11 @@ typedef struct { SpiListenerClass parent_class; } SpiAccessibleEventListenerClass; -GType spi_accessible_event_spi_listener_get_type (void); -SpiAccessibleEventListener *spi_accessible_event_spi_listener_new (void); -void spi_accessible_event_spi_listener_add_callback (SpiAccessibleEventListener *listener, +GType spi_accessible_event_listener_get_type (void); +SpiAccessibleEventListener *spi_accessible_event_listener_new (void); +void spi_accessible_event_listener_add_callback (SpiAccessibleEventListener *listener, VoidEventListenerCB callback); -void spi_accessible_event_spi_listener_remove_callback (SpiAccessibleEventListener *listener, +void spi_accessible_event_listener_remove_callback (SpiAccessibleEventListener *listener, VoidEventListenerCB callback); #ifdef __cplusplus diff --git a/libspi/action.c b/libspi/action.c index 26440d3..1c05d7e 100644 --- a/libspi/action.c +++ b/libspi/action.c @@ -30,7 +30,7 @@ #include /* - * This pulls the CORBA definitions for the "Accessibility::SpiAccessible" server + * This pulls the CORBA definitions for the "Accessibility::Accessible" server */ #include @@ -50,14 +50,14 @@ spi_action_init (SpiAction *action); static void spi_action_finalize (GObject *obj); static CORBA_long -impl__get_nSpiActions(PortableServer_Servant servant, +impl__get_nActions(PortableServer_Servant servant, CORBA_Environment * ev); static CORBA_string impl_getDescription (PortableServer_Servant servant, const CORBA_long index, CORBA_Environment * ev); static CORBA_boolean -impl_doSpiAction (PortableServer_Servant servant, +impl_doAction (PortableServer_Servant servant, const CORBA_long index, CORBA_Environment * ev); static CORBA_string impl_getName (PortableServer_Servant servant, @@ -96,7 +96,7 @@ spi_action_get_type (void) */ type = bonobo_type_unique ( BONOBO_OBJECT_TYPE, - POA_Accessibility_SpiAction__init, + POA_Accessibility_Action__init, NULL, G_STRUCT_OFFSET (SpiActionClass, epv), &tinfo, @@ -110,7 +110,7 @@ static void spi_action_class_init (SpiActionClass *klass) { GObjectClass * object_class = (GObjectClass *) klass; - POA_Accessibility_SpiAction__epv *epv = &klass->epv; + POA_Accessibility_Action__epv *epv = &klass->epv; parent_class = g_type_class_peek_parent (klass); object_class->finalize = spi_action_finalize; @@ -118,8 +118,8 @@ spi_action_class_init (SpiActionClass *klass) /* Initialize epv table */ - epv->_get_nSpiActions = impl__get_nSpiActions; - epv->doSpiAction = impl_doSpiAction; + epv->_get_nActions = impl__get_nActions; + epv->doAction = impl_doAction; epv->getDescription = impl_getDescription; epv->getName = impl_getName; epv->getKeyBinding = impl_getKeyBinding; @@ -150,7 +150,7 @@ spi_action_interface_new (AtkObject *obj) } static CORBA_long -impl__get_nSpiActions(PortableServer_Servant servant, +impl__get_nActions(PortableServer_Servant servant, CORBA_Environment * ev) { SpiAction *action = SPI_ACTION (bonobo_object_from_servant(servant)); @@ -158,7 +158,7 @@ impl__get_nSpiActions(PortableServer_Servant servant, } static CORBA_boolean -impl_doSpiAction (PortableServer_Servant servant, +impl_doAction (PortableServer_Servant servant, const CORBA_long index, CORBA_Environment * ev) { SpiAction *action = SPI_ACTION (bonobo_object_from_servant (servant)); diff --git a/libspi/action.h b/libspi/action.h index 88faf1c..58ebfe7 100644 --- a/libspi/action.h +++ b/libspi/action.h @@ -35,17 +35,17 @@ extern "C" { #define SPI_IS_ACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SPI_ACTION_TYPE)) #define SPI_IS_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SPI_ACTION_TYPE)) -typedef struct _SpiAction SpiAction; -typedef struct _SpiActionClass SpiActionClass; +typedef struct _Action SpiAction; +typedef struct _ActionClass SpiActionClass; -struct _SpiAction { +struct _Action { BonoboObject parent; AtkObject *atko; }; -struct _SpiActionClass { +struct _ActionClass { BonoboObjectClass parent_class; - POA_Accessibility_SpiAction__epv epv; + POA_Accessibility_Action__epv epv; }; GType diff --git a/libspi/application.c b/libspi/application.c index 1ece4c1..2a1fcde 100644 --- a/libspi/application.c +++ b/libspi/application.c @@ -30,7 +30,7 @@ #include /* - * This pulls the CORBA definitions for the "Accessibility::SpiAccessible" server + * This pulls the CORBA definitions for the "Accessibility::Accessible" server */ #include @@ -65,14 +65,14 @@ static char* reverse_lookup_name_for_toolkit_event (char *toolkit_name); * Implemented GObject::finalize */ static void -spi_accessible_spi_application_finalize (GObject *object) +spi_accessible_application_finalize (GObject *object) { /* TODO: any necessary cleanup */ (G_OBJECT_CLASS (spi_application_parent_class))->finalize (object); } static CORBA_string -impl_accessibility_spi_application_get_toolkit_name (PortableServer_Servant servant, +impl_accessibility_application_get_toolkit_name (PortableServer_Servant servant, CORBA_Environment *ev) { CORBA_char *retval; @@ -82,7 +82,7 @@ impl_accessibility_spi_application_get_toolkit_name (PortableServer_Servant serv } static CORBA_string -impl_accessibility_spi_application_get_version (PortableServer_Servant servant, +impl_accessibility_application_get_version (PortableServer_Servant servant, CORBA_Environment *ev) { CORBA_char *retval; @@ -92,7 +92,7 @@ impl_accessibility_spi_application_get_version (PortableServer_Servant servant, } static CORBA_long -impl_accessibility_spi_application_get_id (PortableServer_Servant servant, +impl_accessibility_application_get_id (PortableServer_Servant servant, CORBA_Environment *ev) { CORBA_long retval; @@ -102,7 +102,7 @@ impl_accessibility_spi_application_get_id (PortableServer_Servant servant, } static void -impl_accessibility_spi_application_set_id (PortableServer_Servant servant, +impl_accessibility_application_set_id (PortableServer_Servant servant, const CORBA_long id, CORBA_Environment *ev) { @@ -218,7 +218,7 @@ spi_application_toolkit_event_listener (GSignalInvocationHint *signal_hint, } static void -impl_accessibility_spi_application_register_toolkit_event_listener (PortableServer_Servant servant, +impl_accessibility_application_register_toolkit_event_listener (PortableServer_Servant servant, Accessibility_EventListener listener, const CORBA_char *event_name, CORBA_Environment *ev) @@ -236,7 +236,7 @@ impl_accessibility_spi_application_register_toolkit_event_listener (PortableServ } static void -impl_accessibility_spi_application_register_object_event_listener (PortableServer_Servant servant, +impl_accessibility_application_register_object_event_listener (PortableServer_Servant servant, Accessibility_EventListener listener, const CORBA_char *event_name, CORBA_Environment *ev) @@ -329,17 +329,17 @@ static void spi_application_class_init (SpiApplicationClass *klass) { GObjectClass * object_class = (GObjectClass *) klass; - POA_Accessibility_SpiApplication__epv *epv = &klass->epv; + POA_Accessibility_Application__epv *epv = &klass->epv; spi_application_parent_class = g_type_class_ref (SPI_ACCESSIBLE_TYPE); - object_class->finalize = spi_accessible_spi_application_finalize; + object_class->finalize = spi_accessible_application_finalize; - epv->_get_toolkitName = impl_accessibility_spi_application_get_toolkit_name; - epv->_get_version = impl_accessibility_spi_application_get_version; - epv->_get_id = impl_accessibility_spi_application_get_id; - epv->_set_id = impl_accessibility_spi_application_set_id; - epv->registerToolkitEventListener = impl_accessibility_spi_application_register_toolkit_event_listener; + epv->_get_toolkitName = impl_accessibility_application_get_toolkit_name; + epv->_get_version = impl_accessibility_application_get_version; + epv->_get_id = impl_accessibility_application_get_id; + epv->_set_id = impl_accessibility_application_set_id; + epv->registerToolkitEventListener = impl_accessibility_application_register_toolkit_event_listener; init_toolkit_names (&klass->generic_event_names, &klass->toolkit_event_names); } @@ -376,7 +376,7 @@ spi_application_get_type (void) */ type = bonobo_type_unique ( PARENT_TYPE, - POA_Accessibility_SpiApplication__init, + POA_Accessibility_Application__init, NULL, G_STRUCT_OFFSET (SpiApplicationClass, epv), &tinfo, diff --git a/libspi/application.h b/libspi/application.h index ddbb81b..5cef788 100644 --- a/libspi/application.h +++ b/libspi/application.h @@ -46,7 +46,7 @@ typedef struct { typedef struct { SpiAccessibleClass parent_class; - POA_Accessibility_SpiApplication__epv epv; + POA_Accessibility_Application__epv epv; GHashTable *toolkit_event_names; GHashTable *generic_event_names; } SpiApplicationClass; diff --git a/libspi/component.c b/libspi/component.c index b6d1df9..6c0f780 100644 --- a/libspi/component.c +++ b/libspi/component.c @@ -30,7 +30,7 @@ #include /* - * This pulls the CORBA definitions for the "Accessibility::SpiAccessible" server + * This pulls the CORBA definitions for the "Accessibility::Accessible" server */ #include @@ -54,11 +54,11 @@ static GObjectClass *spi_component_parent_class; * Implemented GObject::finalize */ static void -accessibility_spi_component_object_finalize (GObject *object) +accessibility_component_object_finalize (GObject *object) { SpiComponent *component = SPI_COMPONENT (object); - printf("spi_accessible_spi_component_object_finalize called\n"); + printf("spi_accessible_component_object_finalize called\n"); g_object_unref (component->atko); component->atko = NULL; @@ -67,10 +67,10 @@ accessibility_spi_component_object_finalize (GObject *object) } /* - * CORBA Accessibility::SpiComponent::contains method implementation + * CORBA Accessibility::Component::contains method implementation */ static CORBA_boolean -impl_accessibility_spi_component_contains (PortableServer_Servant servant, +impl_accessibility_component_contains (PortableServer_Servant servant, const CORBA_long x, const CORBA_long y, CORBA_short coord_type, @@ -90,10 +90,10 @@ impl_accessibility_spi_component_contains (PortableServer_Servant servant, } /* - * CORBA Accessibility::SpiComponent::getAccessibleAtPoint method implementation + * CORBA Accessibility::Component::getAccessibleAtPoint method implementation */ -static Accessibility_SpiAccessible -impl_accessibility_spi_component_get_accessible_at_point (PortableServer_Servant servant, +static Accessibility_Accessible +impl_accessibility_component_get_accessible_at_point (PortableServer_Servant servant, const CORBA_long x, const CORBA_long y, CORBA_short coord_type, @@ -101,7 +101,7 @@ impl_accessibility_spi_component_get_accessible_at_point (PortableServer_Servant { BonoboObject *obj; SpiComponent *component; - Accessibility_SpiAccessible retval; + Accessibility_Accessible retval; AtkObject *child; obj = bonobo_object_from_servant (servant); @@ -117,10 +117,10 @@ impl_accessibility_spi_component_get_accessible_at_point (PortableServer_Servant } /* - * CORBA Accessibility::SpiComponent::getExtents method implementation + * CORBA Accessibility::Component::getExtents method implementation */ static void -impl_accessibility_spi_component_get_extents (PortableServer_Servant servant, +impl_accessibility_component_get_extents (PortableServer_Servant servant, CORBA_long * x, CORBA_long * y, CORBA_long * width, @@ -146,10 +146,10 @@ impl_accessibility_spi_component_get_extents (PortableServer_Servant servant, } /* - * CORBA Accessibility::SpiComponent::getPosition method implementation + * CORBA Accessibility::Component::getPosition method implementation */ static void -impl_accessibility_spi_component_get_position (PortableServer_Servant servant, +impl_accessibility_component_get_position (PortableServer_Servant servant, CORBA_long * x, CORBA_long * y, const CORBA_short coord_type, @@ -170,10 +170,10 @@ impl_accessibility_spi_component_get_position (PortableServer_Servant servant, } /* - * CORBA Accessibility::SpiComponent::getSize method implementation + * CORBA Accessibility::Component::getSize method implementation */ static void -impl_accessibility_spi_component_get_size (PortableServer_Servant servant, +impl_accessibility_component_get_size (PortableServer_Servant servant, CORBA_long * width, CORBA_long * height, CORBA_Environment *ev) @@ -191,28 +191,28 @@ impl_accessibility_spi_component_get_size (PortableServer_Servant servant, } static void -accessibility_spi_component_class_init (SpiComponentClass *klass) +accessibility_component_class_init (SpiComponentClass *klass) { GObjectClass * object_class = (GObjectClass *) klass; - POA_Accessibility_SpiComponent__epv *epv = &klass->epv; + POA_Accessibility_Component__epv *epv = &klass->epv; spi_component_parent_class = g_type_class_peek_parent (klass); - object_class->finalize = accessibility_spi_component_object_finalize; + object_class->finalize = accessibility_component_object_finalize; - epv->contains = impl_accessibility_spi_component_contains; - epv->getAccessibleAtPoint = impl_accessibility_spi_component_get_accessible_at_point; - epv->getExtents = impl_accessibility_spi_component_get_extents; - epv->getPosition = impl_accessibility_spi_component_get_position; - epv->getSize = impl_accessibility_spi_component_get_size; + epv->contains = impl_accessibility_component_contains; + epv->getAccessibleAtPoint = impl_accessibility_component_get_accessible_at_point; + epv->getExtents = impl_accessibility_component_get_extents; + epv->getPosition = impl_accessibility_component_get_position; + epv->getSize = impl_accessibility_component_get_size; } static void -accessibility_spi_component_init (SpiComponent *component) +accessibility_component_init (SpiComponent *component) { } GType -accessibility_spi_component_get_type (void) +accessibility_component_get_type (void) { static GType type = 0; @@ -221,12 +221,12 @@ accessibility_spi_component_get_type (void) sizeof (SpiComponentClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, - (GClassInitFunc) accessibility_spi_component_class_init, + (GClassInitFunc) accessibility_component_class_init, (GClassFinalizeFunc) NULL, NULL, /* class data */ sizeof (SpiComponent), 0, /* n preallocs */ - (GInstanceInitFunc) accessibility_spi_component_init, + (GInstanceInitFunc) accessibility_component_init, NULL /* value table */ }; /* @@ -236,7 +236,7 @@ accessibility_spi_component_get_type (void) */ type = bonobo_type_unique ( PARENT_TYPE, - POA_Accessibility_SpiComponent__init, + POA_Accessibility_Component__init, NULL, G_STRUCT_OFFSET (SpiComponentClass, epv), &tinfo, @@ -250,7 +250,7 @@ SpiComponent * spi_component_interface_new (AtkObject *o) { SpiComponent *retval = - SPI_COMPONENT (g_object_new (accessibility_spi_component_get_type (), NULL)); + SPI_COMPONENT (g_object_new (accessibility_component_get_type (), NULL)); retval->atko = o; g_object_ref (o); return retval; diff --git a/libspi/component.h b/libspi/component.h index 1ec686d..a942fb3 100644 --- a/libspi/component.h +++ b/libspi/component.h @@ -29,7 +29,7 @@ extern "C" { #include #include -#define SPI_COMPONENT_TYPE (accessibility_spi_component_get_type ()) +#define SPI_COMPONENT_TYPE (accessibility_component_get_type ()) #define SPI_COMPONENT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), SPI_COMPONENT_TYPE, SpiComponent)) #define SPI_COMPONENT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), SPI_COMPONENT_TYPE, SpiComponentClass)) #define IS_SPI_COMPONENT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), SPI_COMPONENT_TYPE)) @@ -42,10 +42,10 @@ typedef struct { typedef struct { BonoboObjectClass parent_class; - POA_Accessibility_SpiComponent__epv epv; + POA_Accessibility_Component__epv epv; } SpiComponentClass; -GType accessibility_spi_component_get_type (void); +GType accessibility_component_get_type (void); SpiComponent *spi_component_interface_new (AtkObject *o); #ifdef __cplusplus diff --git a/libspi/desktop.c b/libspi/desktop.c index 82acb44..86cb45b 100644 --- a/libspi/desktop.c +++ b/libspi/desktop.c @@ -31,7 +31,7 @@ #include /* - * This pulls the CORBA definitions for the "Accessibility::SpiAccessible" server + * This pulls the CORBA definitions for the "Accessibility::Accessible" server */ #include @@ -59,7 +59,7 @@ spi_desktop_init (SpiDesktop *desktop) } static CORBA_long -impl_spi_desktop_get_child_count (PortableServer_Servant servant, +impl_desktop_get_child_count (PortableServer_Servant servant, CORBA_Environment * ev) { SpiDesktop *desktop = SPI_DESKTOP (bonobo_object_from_servant (servant)); @@ -73,8 +73,8 @@ impl_spi_desktop_get_child_count (PortableServer_Servant servant, } } -static Accessibility_SpiAccessible -impl_spi_desktop_get_child_at_index (PortableServer_Servant servant, +static Accessibility_Accessible +impl_desktop_get_child_at_index (PortableServer_Servant servant, const CORBA_long index, CORBA_Environment * ev) { @@ -94,19 +94,19 @@ impl_spi_desktop_get_child_at_index (PortableServer_Servant servant, fprintf (stderr, "no %ldth child\n", (long) index); retval = CORBA_OBJECT_NIL; } - return (Accessibility_SpiAccessible) retval; + return (Accessibility_Accessible) retval; } static void spi_desktop_class_init (SpiDesktopClass *klass) { SpiAccessibleClass * spi_accessible_class = (SpiAccessibleClass *) klass; - POA_Accessibility_SpiAccessible__epv *epv = &spi_accessible_class->epv; + POA_Accessibility_Accessible__epv *epv = &spi_accessible_class->epv; parent_class = g_type_class_ref (SPI_ACCESSIBLE_TYPE); - epv->_get_childCount = impl_spi_desktop_get_child_count; - epv->getChildAtIndex = impl_spi_desktop_get_child_at_index; + epv->_get_childCount = impl_desktop_get_child_count; + epv->getChildAtIndex = impl_desktop_get_child_at_index; } GType @@ -135,7 +135,7 @@ spi_desktop_get_type (void) */ type = bonobo_type_unique ( PARENT_TYPE, - POA_Accessibility_SpiDesktop__init, + POA_Accessibility_Desktop__init, NULL, G_STRUCT_OFFSET (SpiDesktopClass, epv), &tinfo, diff --git a/libspi/desktop.h b/libspi/desktop.h index d3430f6..fd94c28 100644 --- a/libspi/desktop.h +++ b/libspi/desktop.h @@ -46,7 +46,7 @@ typedef struct { typedef struct { SpiAccessibleClass parent_class; - POA_Accessibility_SpiDesktop__epv epv; + POA_Accessibility_Desktop__epv epv; } SpiDesktopClass; GType spi_desktop_get_type (void); diff --git a/libspi/deviceeventcontroller.c b/libspi/deviceeventcontroller.c index 6098395..17bbb3b 100644 --- a/libspi/deviceeventcontroller.c +++ b/libspi/deviceeventcontroller.c @@ -346,7 +346,7 @@ spi_device_event_controller_object_finalize (GObject *object) } /* - * CORBA Accessibility::SpiDeviceEventController::registerKeystrokeListener + * CORBA Accessibility::DeviceEventController::registerKeystrokeListener * method implementation */ static void @@ -371,7 +371,7 @@ impl_register_keystroke_listener (PortableServer_Servant servant, ; /* register with toolkit instead */ } /* - * CORBA Accessibility::SpiDeviceEventController::deregisterKeystrokeListener + * CORBA Accessibility::DeviceEventController::deregisterKeystrokeListener * method implementation */ static void @@ -393,7 +393,7 @@ impl_deregister_keystroke_listener (PortableServer_Servant servant, } /* - * CORBA Accessibility::SpiDeviceEventController::registerMouseListener + * CORBA Accessibility::DeviceEventController::registerMouseListener * method implementation */ /* @@ -418,7 +418,7 @@ keycode_for_keysym (long keysym) } /* - * CORBA Accessibility::SpiDeviceEventController::registerKeystrokeListener + * CORBA Accessibility::DeviceEventController::registerKeystrokeListener * method implementation */ static void @@ -459,7 +459,7 @@ impl_generate_key_event (PortableServer_Servant servant, } /* - * CORBA Accessibility::SpiDeviceEventController::generateMouseEvent + * CORBA Accessibility::DeviceEventController::generateMouseEvent * method implementation */ static void @@ -478,7 +478,7 @@ static void spi_device_event_controller_class_init (SpiDeviceEventControllerClass *klass) { GObjectClass * object_class = (GObjectClass *) klass; - POA_Accessibility_SpiDeviceEventController__epv *epv = &klass->epv; + POA_Accessibility_DeviceEventController__epv *epv = &klass->epv; spi_device_event_controller_parent_class = g_type_class_ref (BONOBO_OBJECT_TYPE); object_class->finalize = spi_device_event_controller_object_finalize; @@ -533,7 +533,7 @@ spi_device_event_controller_get_type (void) */ type = bonobo_type_unique ( PARENT_TYPE, - POA_Accessibility_SpiDeviceEventController__init, + POA_Accessibility_DeviceEventController__init, NULL, G_STRUCT_OFFSET (SpiDeviceEventControllerClass, epv), &tinfo, diff --git a/libspi/deviceeventcontroller.h b/libspi/deviceeventcontroller.h index 985a36e..b9e91f5 100644 --- a/libspi/deviceeventcontroller.h +++ b/libspi/deviceeventcontroller.h @@ -47,7 +47,7 @@ typedef struct { typedef struct { BonoboObjectClass parent_class; - POA_Accessibility_SpiDeviceEventController__epv epv; + POA_Accessibility_DeviceEventController__epv epv; gboolean (*check_key_event) (SpiDeviceEventController *controller); } SpiDeviceEventControllerClass; diff --git a/libspi/editabletext.c b/libspi/editabletext.c index f5244a4..601abb6 100644 --- a/libspi/editabletext.c +++ b/libspi/editabletext.c @@ -30,7 +30,7 @@ #include /* - * This pulls the CORBA definitions for the "Accessibility::SpiAccessible" server + * This pulls the CORBA definitions for the "Accessibility::Accessible" server */ #include @@ -66,7 +66,7 @@ impl_insertText (PortableServer_Servant _servant, const CORBA_long length, CORBA_Environment * ev); static void -impl_copySpiText (PortableServer_Servant _servant, +impl_copyText (PortableServer_Servant _servant, const CORBA_long startPos, const CORBA_long endPos, CORBA_Environment * ev); static void @@ -109,7 +109,7 @@ spi_editable_text_get_type (void) */ type = bonobo_type_unique ( SPI_TEXT_TYPE, - POA_Accessibility_SpiEditableText__init, + POA_Accessibility_EditableText__init, NULL, G_STRUCT_OFFSET (SpiEditableTextClass, epv), &tinfo, @@ -123,7 +123,7 @@ static void spi_editable_text_class_init (SpiEditableTextClass *klass) { GObjectClass * object_class = (GObjectClass *) klass; - POA_Accessibility_SpiEditableText__epv *epv = &klass->epv; + POA_Accessibility_EditableText__epv *epv = &klass->epv; parent_class = g_type_interface_peek_parent (klass); object_class->finalize = spi_editable_text_finalize; @@ -133,7 +133,7 @@ spi_editable_text_class_init (SpiEditableTextClass *klass) epv->setAttributes = impl_setAttributes; epv->setTextContents = impl_setTextContents; epv->insertText = impl_insertText; - epv->copySpiText = impl_copySpiText; + epv->copyText = impl_copyText; epv->cutText = impl_cutText; epv->deleteText = impl_deleteText; epv->pasteText = impl_pasteText; @@ -219,7 +219,7 @@ impl_insertText (PortableServer_Servant _servant, static void -impl_copySpiText (PortableServer_Servant _servant, +impl_copyText (PortableServer_Servant _servant, const CORBA_long startPos, const CORBA_long endPos, CORBA_Environment * ev) { diff --git a/libspi/editabletext.h b/libspi/editabletext.h index 0686c6e..889b668 100644 --- a/libspi/editabletext.h +++ b/libspi/editabletext.h @@ -36,16 +36,16 @@ extern "C" { #define IS_SPI_EDITABLE_TEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SPI_EDITABLE_TEXT_TYPE)) #define IS_SPI_EDITABLE_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SPI_EDITABLE_TEXT_TYPE)) -typedef struct _SpiEditableText SpiEditableText; -typedef struct _SpiEditableTextClass SpiEditableTextClass; +typedef struct _EditableText SpiEditableText; +typedef struct _EditableTextClass SpiEditableTextClass; -struct _SpiEditableText { +struct _EditableText { SpiText parent; }; -struct _SpiEditableTextClass { +struct _EditableTextClass { SpiTextClass parent_class; - POA_Accessibility_SpiEditableText__epv epv; + POA_Accessibility_EditableText__epv epv; }; GType diff --git a/libspi/eventlistener.c b/libspi/eventlistener.c index c682be9..ebe28e9 100644 --- a/libspi/eventlistener.c +++ b/libspi/eventlistener.c @@ -47,22 +47,22 @@ /* * A pointer to our parent object class */ -static SpiListenerClass *spi_accessible_event_spi_listener_parent_class; +static SpiListenerClass *spi_accessible_event_listener_parent_class; /* * Implemented GObject::finalize */ static void -spi_accessible_event_spi_listener_object_finalize (GObject *object) +spi_accessible_event_listener_object_finalize (GObject *object) { #ifdef SPI_DEBUG fprintf(stderr, "spi_listener_object_finalize called\n"); #endif - ((GObjectClass *) spi_accessible_event_spi_listener_parent_class)->finalize (object); + ((GObjectClass *) spi_accessible_event_listener_parent_class)->finalize (object); } /* - * CORBA Accessibility::SpiListener::notifyEvent method implementation + * CORBA Accessibility::Listener::notifyEvent method implementation */ static void @@ -85,30 +85,30 @@ impl_accessible_event_notify_event (PortableServer_Servant servant, (*cb) (e); } } - /* Accessibility_SpiAccessible_unref (e->source, ev); */ + /* Accessibility_Accessible_unref (e->source, ev); */ } static void -spi_accessible_event_spi_listener_class_init (SpiAccessibleEventListenerClass *klass) +spi_accessible_event_listener_class_init (SpiAccessibleEventListenerClass *klass) { GObjectClass * object_class = (GObjectClass *) klass; SpiListenerClass * spi_listener_class = (SpiListenerClass *) klass; POA_Accessibility_EventListener__epv *epv = &spi_listener_class->epv; - spi_accessible_event_spi_listener_parent_class = g_type_class_ref (SPI_LISTENER_TYPE); + spi_accessible_event_listener_parent_class = g_type_class_ref (SPI_LISTENER_TYPE); - object_class->finalize = spi_accessible_event_spi_listener_object_finalize; + object_class->finalize = spi_accessible_event_listener_object_finalize; epv->notifyEvent = impl_accessible_event_notify_event; } static void -spi_accessible_event_spi_listener_init (SpiAccessibleEventListener *listener) +spi_accessible_event_listener_init (SpiAccessibleEventListener *listener) { listener->callbacks = NULL; } GType -spi_accessible_event_spi_listener_get_type (void) +spi_accessible_event_listener_get_type (void) { static GType type = 0; @@ -117,12 +117,12 @@ spi_accessible_event_spi_listener_get_type (void) sizeof (SpiAccessibleEventListenerClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, - (GClassInitFunc) spi_accessible_event_spi_listener_class_init, + (GClassInitFunc) spi_accessible_event_listener_class_init, (GClassFinalizeFunc) NULL, NULL, /* class data */ sizeof (SpiListener), 0, /* n preallocs */ - (GInstanceInitFunc) spi_accessible_event_spi_listener_init, + (GInstanceInitFunc) spi_accessible_event_listener_init, NULL /* value table */ }; /* @@ -144,20 +144,20 @@ spi_accessible_event_spi_listener_get_type (void) } SpiAccessibleEventListener * -spi_accessible_event_spi_listener_new () +spi_accessible_event_listener_new () { SpiAccessibleEventListener *retval = - SPI_ACCESSIBLE_EVENT_SPI_LISTENER (g_object_new (spi_accessible_event_spi_listener_get_type (), NULL)); + SPI_ACCESSIBLE_EVENT_SPI_LISTENER (g_object_new (spi_accessible_event_listener_get_type (), NULL)); return retval; } -void spi_accessible_event_spi_listener_add_callback (SpiAccessibleEventListener *listener, +void spi_accessible_event_listener_add_callback (SpiAccessibleEventListener *listener, VoidEventListenerCB callback) { listener->callbacks = g_list_append (listener->callbacks, callback); } -void spi_accessible_event_spi_listener_remove_callback (SpiAccessibleEventListener *listener, +void spi_accessible_event_listener_remove_callback (SpiAccessibleEventListener *listener, VoidEventListenerCB callback) { listener->callbacks = g_list_remove (listener->callbacks, callback); diff --git a/libspi/eventlistener.h b/libspi/eventlistener.h index 68d36ee..128b279 100644 --- a/libspi/eventlistener.h +++ b/libspi/eventlistener.h @@ -29,7 +29,7 @@ extern "C" { #include "listener.h" -#define SPI_ACCESSIBLE_EVENT_SPI_LISTENER_TYPE (spi_accessible_event_spi_listener_get_type ()) +#define SPI_ACCESSIBLE_EVENT_SPI_LISTENER_TYPE (spi_accessible_event_listener_get_type ()) #define SPI_ACCESSIBLE_EVENT_SPI_LISTENER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), SPI_ACCESSIBLE_EVENT_SPI_LISTENER_TYPE, SpiAccessibleEventListener)) #define SPI_ACCESSIBLE_EVENT_SPI_LISTENER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), SPI_ACCESSIBLE_EVENT_SPI_LISTENER_TYPE, SpiAccessibleEventListenerClass)) #define IS_SPI_ACCESSIBLE_EVENT_SPI_LISTENER(o) (G_TYPE_CHECK__INSTANCE_TYPE ((o), SPI_ACCESSIBLE_EVENT_SPI_LISTENER_TYPE)) @@ -46,11 +46,11 @@ typedef struct { SpiListenerClass parent_class; } SpiAccessibleEventListenerClass; -GType spi_accessible_event_spi_listener_get_type (void); -SpiAccessibleEventListener *spi_accessible_event_spi_listener_new (void); -void spi_accessible_event_spi_listener_add_callback (SpiAccessibleEventListener *listener, +GType spi_accessible_event_listener_get_type (void); +SpiAccessibleEventListener *spi_accessible_event_listener_new (void); +void spi_accessible_event_listener_add_callback (SpiAccessibleEventListener *listener, VoidEventListenerCB callback); -void spi_accessible_event_spi_listener_remove_callback (SpiAccessibleEventListener *listener, +void spi_accessible_event_listener_remove_callback (SpiAccessibleEventListener *listener, VoidEventListenerCB callback); #ifdef __cplusplus diff --git a/libspi/hyperlink.c b/libspi/hyperlink.c index e24a6ba..a858742 100644 --- a/libspi/hyperlink.c +++ b/libspi/hyperlink.c @@ -30,7 +30,7 @@ #include /* - * This pulls the CORBA definitions for the "Accessibility::SpiAccessible" server + * This pulls the CORBA definitions for the "Accessibility::Accessible" server */ #include @@ -61,7 +61,7 @@ impl__get_startIndex (PortableServer_Servant _servant, static CORBA_long impl__get_endIndex (PortableServer_Servant _servant, CORBA_Environment * ev); -static Accessibility_SpiAccessible +static Accessibility_Accessible impl_getObject (PortableServer_Servant _servant, const CORBA_long i, CORBA_Environment * ev); @@ -97,7 +97,7 @@ spi_hyperlink_get_type (void) */ type = bonobo_type_unique ( BONOBO_OBJECT_TYPE, - POA_Accessibility_SpiHyperlink__init, + POA_Accessibility_Hyperlink__init, NULL, G_STRUCT_OFFSET (SpiHyperlinkClass, epv), &tinfo, @@ -111,7 +111,7 @@ static void spi_hyperlink_class_init (SpiHyperlinkClass *klass) { GObjectClass * object_class = (GObjectClass *) klass; - POA_Accessibility_SpiHyperlink__epv *epv = &klass->epv; + POA_Accessibility_Hyperlink__epv *epv = &klass->epv; parent_class = g_type_class_peek_parent (klass); object_class->finalize = spi_hyperlink_finalize; @@ -202,14 +202,14 @@ impl_getURI (PortableServer_Servant _servant, -static Accessibility_SpiAccessible +static Accessibility_Accessible impl_getObject (PortableServer_Servant _servant, const CORBA_long i, CORBA_Environment * ev) { SpiHyperlink *link = SPI_HYPERLINK(bonobo_object_from_servant(_servant)); AtkObject *atk_object; - Accessibility_SpiAccessible rv; + Accessibility_Accessible rv; atk_object = atk_hyperlink_get_object (ATK_HYPERLINK(link->atko), (gint) i); rv = bonobo_object_corba_objref (BONOBO_OBJECT(spi_accessible_new(atk_object))); return rv; diff --git a/libspi/hyperlink.h b/libspi/hyperlink.h index 91186e9..4537828 100644 --- a/libspi/hyperlink.h +++ b/libspi/hyperlink.h @@ -35,17 +35,17 @@ extern "C" { #define IS_SPI_HYPERLINK(obj) (G_TYPE_CHECK__INSTANCE_TYPE ((obj), SPI_HYPERLINK_TYPE)) #define IS_SPI_HYPERLINK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SPI_HYPERLINK_TYPE)) -typedef struct _SpiHyperlink SpiHyperlink; -typedef struct _SpiHyperlinkClass SpiHyperlinkClass; +typedef struct _Hyperlink SpiHyperlink; +typedef struct _HyperlinkClass SpiHyperlinkClass; -struct _SpiHyperlink { +struct _Hyperlink { BonoboObject parent; AtkObject *atko; }; -struct _SpiHyperlinkClass { +struct _HyperlinkClass { BonoboObjectClass parent_class; - POA_Accessibility_SpiHyperlink__epv epv; + POA_Accessibility_Hyperlink__epv epv; }; GType diff --git a/libspi/hypertext.c b/libspi/hypertext.c index 8e5e039..cce53e1 100644 --- a/libspi/hypertext.c +++ b/libspi/hypertext.c @@ -30,7 +30,7 @@ #include /* - * This pulls the CORBA definitions for the "Accessibility::SpiAccessible" server + * This pulls the CORBA definitions for the "Accessibility::Accessible" server */ #include @@ -61,18 +61,18 @@ impl__get_startIndex (PortableServer_Servant _servant, static CORBA_long impl__get_endIndex (PortableServer_Servant _servant, CORBA_Environment * ev); -static Accessibility_SpiAccessible +static Accessibility_Accessible impl_getAnchor (PortableServer_Servant _servant, const CORBA_long i, CORBA_Environment * ev); -static Accessibility_SpiAccessible +static Accessibility_Accessible impl_getObject (PortableServer_Servant _servant, const CORBA_long i, CORBA_Environment * ev); static CORBA_long impl_getNLinks (PortableServer_Servant _servant, CORBA_Environment * ev); -static Accessibility_SpiHyperlink +static Accessibility_Hyperlink impl_getLink (PortableServer_Servant _servant, const CORBA_long linkIndex, CORBA_Environment * ev); @@ -109,7 +109,7 @@ spi_hypertext_get_type (void) */ type = bonobo_type_unique ( BONOBO_OBJECT_TYPE, - POA_Accessibility_SpiHyperspi_text__init, + POA_Accessibility_Hypertext__init, NULL, G_STRUCT_OFFSET (SpiHypertextClass, epv), &tinfo, @@ -123,7 +123,7 @@ static void spi_hypertext_class_init (SpiHypertextClass *klass) { GObjectClass * object_class = (GObjectClass *) klass; - POA_Accessibility_SpiHyperspi_text__epv *epv = &klass->epv; + POA_Accessibility_Hypertext__epv *epv = &klass->epv; parent_class = g_type_class_peek_parent (klass); object_class->finalize = spi_hypertext_finalize; @@ -172,14 +172,14 @@ impl_getNLinks (PortableServer_Servant _servant, -static Accessibility_SpiHyperlink +static Accessibility_Hyperlink impl_getLink (PortableServer_Servant _servant, const CORBA_long linkIndex, CORBA_Environment * ev) { AtkHyperlink *link; SpiHypertext *hypertext = SPI_HYPERTEXT(bonobo_object_from_servant(_servant)); - Accessibility_SpiHyperlink rv; + Accessibility_Hyperlink rv; link = atk_hypertext_get_link (ATK_HYPERTEXT(hypertext->atko), (gint) linkIndex); diff --git a/libspi/hypertext.h b/libspi/hypertext.h index 6837770..e4a1ec5 100644 --- a/libspi/hypertext.h +++ b/libspi/hypertext.h @@ -35,17 +35,17 @@ extern "C" { #define IS_SPI_HYPERTEXT(obj) (G_TYPE_CHECK__INSTANCE_TYPE ((obj), SPI_HYPERTEXT_TYPE)) #define IS_HYPESPI_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SPI_HYPERTEXT_TYPE)) -typedef struct _SpiHypertext SpiHypertext; -typedef struct _SpiHypertextClass SpiHypertextClass; +typedef struct _Hypertext SpiHypertext; +typedef struct _HypertextClass SpiHypertextClass; -struct _SpiHypertext { +struct _Hypertext { BonoboObject parent; AtkObject *atko; }; -struct _SpiHypertextClass { +struct _HypertextClass { BonoboObjectClass parent_class; - POA_Accessibility_SpiHyperspi_text__epv epv; + POA_Accessibility_Hypertext__epv epv; }; GType diff --git a/libspi/image.c b/libspi/image.c index be9deb3..794f1e7 100644 --- a/libspi/image.c +++ b/libspi/image.c @@ -30,7 +30,7 @@ #include /* - * This pulls the CORBA definitions for the "Accessibility::SpiAccessible" server + * This pulls the CORBA definitions for the "Accessibility::Accessible" server */ #include @@ -91,7 +91,7 @@ spi_image_get_type (void) */ type = bonobo_type_unique ( BONOBO_OBJECT_TYPE, - POA_Accessibility_SpiImage__init, + POA_Accessibility_Image__init, NULL, G_STRUCT_OFFSET (SpiImageClass, epv), &tinfo, @@ -105,7 +105,7 @@ static void spi_image_class_init (SpiImageClass *klass) { GObjectClass * object_class = (GObjectClass *) klass; - POA_Accessibility_SpiImage__epv *epv = &klass->epv; + POA_Accessibility_Image__epv *epv = &klass->epv; parent_class = g_type_class_peek_parent (klass); object_class->finalize = spi_image_finalize; diff --git a/libspi/image.h b/libspi/image.h index e3eae30..eece399 100644 --- a/libspi/image.h +++ b/libspi/image.h @@ -35,17 +35,17 @@ extern "C" { #define IS_SPI_IMAGE(obj) (G_TYPE_CHECK__INSTANCE_TYPE ((obj), SPI_IMAGE_TYPE)) #define IS_SPI_IMAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SPI_IMAGE_TYPE)) -typedef struct _SpiImage SpiImage; -typedef struct _SpiImageClass SpiImageClass; +typedef struct _Image SpiImage; +typedef struct _ImageClass SpiImageClass; -struct _SpiImage { +struct _Image { BonoboObject parent; AtkObject *atko; }; -struct _SpiImageClass { +struct _ImageClass { BonoboObjectClass parent_class; - POA_Accessibility_SpiImage__epv epv; + POA_Accessibility_Image__epv epv; }; GType diff --git a/libspi/keystrokelistener.c b/libspi/keystrokelistener.c index 3d8893b..f59b00b 100644 --- a/libspi/keystrokelistener.c +++ b/libspi/keystrokelistener.c @@ -46,33 +46,33 @@ /* * A pointer to our parent object class */ -static GObjectClass *keystroke_spi_listener_parent_class; +static GObjectClass *keystroke_listener_parent_class; /* * Implemented GObject::finalize */ static void -keystroke_spi_listener_object_finalize (GObject *object) +keystroke_listener_object_finalize (GObject *object) { /* KeystrokeListener *keystroke_listener = KEYSTROKE_SPI_LISTENER (object); */ #ifdef SPI_DEBUG - fprintf(stderr, "keystroke_spi_listener_object_finalize called\n"); + fprintf(stderr, "keystroke_listener_object_finalize called\n"); #endif - keystroke_spi_listener_parent_class->finalize (object); + keystroke_listener_parent_class->finalize (object); } -void keystroke_spi_listener_add_callback (KeystrokeListener *listener, +void keystroke_listener_add_callback (KeystrokeListener *listener, BooleanKeystrokeListenerCB callback) { listener->callbacks = g_list_append (listener->callbacks, callback); #ifdef SPI_DEBUG - fprintf(stderr, "keystroke_spi_listener_add_callback (%p) called\n", + fprintf(stderr, "keystroke_listener_add_callback (%p) called\n", (gpointer) callback); #endif } -void keystroke_spi_listener_remove_callback (KeystrokeListener *listener, +void keystroke_listener_remove_callback (KeystrokeListener *listener, BooleanKeystrokeListenerCB callback) { listener->callbacks = g_list_remove (listener->callbacks, callback); @@ -113,25 +113,25 @@ impl_key_event (PortableServer_Servant servant, } static void -keystroke_spi_listener_class_init (KeystrokeListenerClass *klass) +keystroke_listener_class_init (KeystrokeListenerClass *klass) { GObjectClass * object_class = (GObjectClass *) klass; POA_Accessibility_KeystrokeListener__epv *epv = &klass->epv; - keystroke_spi_listener_parent_class = g_type_class_ref (BONOBO_OBJECT_TYPE); + keystroke_listener_parent_class = g_type_class_ref (BONOBO_OBJECT_TYPE); - object_class->finalize = keystroke_spi_listener_object_finalize; + object_class->finalize = keystroke_listener_object_finalize; epv->keyEvent = impl_key_event; } static void -keystroke_spi_listener_init (KeystrokeListener *keystroke_listener) +keystroke_listener_init (KeystrokeListener *keystroke_listener) { keystroke_listener->callbacks = NULL; } GType -keystroke_spi_listener_get_type (void) +keystroke_listener_get_type (void) { static GType type = 0; @@ -140,12 +140,12 @@ keystroke_spi_listener_get_type (void) sizeof (KeystrokeListenerClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, - (GClassInitFunc) keystroke_spi_listener_class_init, + (GClassInitFunc) keystroke_listener_class_init, (GClassFinalizeFunc) NULL, NULL, /* class data */ sizeof (KeystrokeListener), 0, /* n preallocs */ - (GInstanceInitFunc) keystroke_spi_listener_init, + (GInstanceInitFunc) keystroke_listener_init, NULL /* value table */ }; /* @@ -167,9 +167,9 @@ keystroke_spi_listener_get_type (void) } KeystrokeListener * -keystroke_spi_listener_new (void) +keystroke_listener_new (void) { KeystrokeListener *retval = - KEYSTROKE_SPI_LISTENER (g_object_new (keystroke_spi_listener_get_type (), NULL)); + KEYSTROKE_SPI_LISTENER (g_object_new (keystroke_listener_get_type (), NULL)); return retval; } diff --git a/libspi/keystrokelistener.h b/libspi/keystrokelistener.h index 8208451..20c4472 100644 --- a/libspi/keystrokelistener.h +++ b/libspi/keystrokelistener.h @@ -32,7 +32,7 @@ extern "C" { #include #include "keymasks.h" -#define KEYSTROKE_SPI_LISTENER_TYPE (keystroke_spi_listener_get_type ()) +#define KEYSTROKE_SPI_LISTENER_TYPE (keystroke_listener_get_type ()) #define KEYSTROKE_SPI_LISTENER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), KEYSTROKE_SPI_LISTENER_TYPE, KeystrokeListener)) #define KEYSTROKE_SPI_LISTENER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), KEYSTROKE_SPI_LISTENER_TYPE, KeystrokeListenerClass)) #define IS_KEYSTROKE_SPI_LISTENER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), KEYSTROKE_SPI_LISTENER_TYPE)) @@ -50,11 +50,11 @@ typedef struct { POA_Accessibility_KeystrokeListener__epv epv; } KeystrokeListenerClass; -GType keystroke_spi_listener_get_type (void); -KeystrokeListener *keystroke_spi_listener_new (void); -void keystroke_spi_listener_add_callback (KeystrokeListener *listener, +GType keystroke_listener_get_type (void); +KeystrokeListener *keystroke_listener_new (void); +void keystroke_listener_add_callback (KeystrokeListener *listener, BooleanKeystrokeListenerCB callback); -void keystroke_spi_listener_remove_callback (KeystrokeListener *listener, +void keystroke_listener_remove_callback (KeystrokeListener *listener, BooleanKeystrokeListenerCB callback); diff --git a/libspi/listener.c b/libspi/listener.c index 0d5c4a0..372e865 100644 --- a/libspi/listener.c +++ b/libspi/listener.c @@ -63,7 +63,7 @@ spi_listener_object_finalize (GObject *object) } /* - * CORBA Accessibility::SpiListener::notifyEvent method implementation + * CORBA Accessibility::Listener::notifyEvent method implementation */ static void @@ -74,7 +74,7 @@ impl_notify_event (PortableServer_Servant servant, #ifdef SPI_DEBUG fprintf (stderr, "notify %s...\n", e->type); fprintf (stderr, "source name: '%s'\n", - Accessibility_SpiAccessible__get_name(e->source, ev)); + Accessibility_Accessible__get_name(e->source, ev)); if (ev->_major != CORBA_NO_EXCEPTION) { fprintf(stderr, ("Accessibility app error: exception during event notification: %s\n"), @@ -83,13 +83,13 @@ impl_notify_event (PortableServer_Servant servant, } /* fprintf (stderr, "source is component ? : %s\n", - Accessibility_SpiAccessible_queryInterface (e->source, - "IDL:Accessibility/SpiComponent:1.0", + Accessibility_Accessible_queryInterface (e->source, + "IDL:Accessibility/Component:1.0", ev) ? "yes" : "no"); */ #endif - Accessibility_SpiAccessible_unref (e->source, ev); + Accessibility_Accessible_unref (e->source, ev); } static void diff --git a/libspi/registry.c b/libspi/registry.c index 782beaa..957be22 100644 --- a/libspi/registry.c +++ b/libspi/registry.c @@ -31,7 +31,7 @@ #include /* - * This pulls the CORBA definitions for the "Accessibility::SpiRegistry" server + * This pulls the CORBA definitions for the "Accessibility::Registry" server */ #include @@ -83,13 +83,13 @@ typedef struct { } SpiListenerStruct; /* static function prototypes */ -static void _spi_registry_notify_listeners ( GList *listeners, +static void _registry_notify_listeners ( GList *listeners, const Accessibility_Event *e, CORBA_Environment *ev); static long _get_unique_id(); -static gboolean _spi_device_event_controller_hook (gpointer source); +static gboolean _device_event_controller_hook (gpointer source); /* * Implemented GObject::finalize @@ -106,16 +106,16 @@ spi_registry_object_finalize (GObject *object) } /** - * registerSpiApplication: - * @application: a reference to the requesting @SpiApplication + * registerApplication: + * @application: a reference to the requesting @Application * return values: void * * Register a new application with the accessibility broker. * **/ static void -impl_accessibility_spi_registry_register_application (PortableServer_Servant servant, - const Accessibility_SpiApplication application, +impl_accessibility_registry_register_application (PortableServer_Servant servant, + const Accessibility_Application application, CORBA_Environment * ev) { SpiRegistry *registry = SPI_REGISTRY (bonobo_object_from_servant (servant)); @@ -127,7 +127,7 @@ impl_accessibility_spi_registry_register_application (PortableServer_Servant ser bonobo_object_dup_ref (application, ev)); /* TODO: create unique string here (with libuuid call ?) and hash ? */ - Accessibility_SpiApplication__set_id (application, _get_unique_id(), ev); + Accessibility_Application__set_id (application, _get_unique_id(), ev); /* * TODO: change the implementation below to a WM-aware one; @@ -156,25 +156,25 @@ register_with_toolkits (SpiRegistry *spi_registry_bonobo_object, EventTypeStruct gint n_desktops; gint n_apps; gint i, j; - Accessibility_SpiDesktop desktop; - Accessibility_SpiApplication app; - Accessibility_SpiRegistry registry; + Accessibility_Desktop desktop; + Accessibility_Application app; + Accessibility_Registry registry; registry = BONOBO_OBJREF (spi_registry_bonobo_object); - /* for each app in each desktop, call ...SpiApplication_registerToolkitEventListener */ + /* for each app in each desktop, call ...Application_registerToolkitEventListener */ - n_desktops = Accessibility_SpiRegistry_getDesktopCount (registry, ev); + n_desktops = Accessibility_Registry_getDesktopCount (registry, ev); for (i=0; ievent_name), @@ -184,13 +184,13 @@ register_with_toolkits (SpiRegistry *spi_registry_bonobo_object, EventTypeStruct } static gint -compare_spi_listener_hash (gconstpointer p1, gconstpointer p2) +compare_listener_hash (gconstpointer p1, gconstpointer p2) { return (((SpiListenerStruct *)p2)->event_type_hash - ((SpiListenerStruct *)p1)->event_type_hash); } static gint -compare_spi_listener_corbaref (gconstpointer p1, gconstpointer p2) +compare_listener_corbaref (gconstpointer p1, gconstpointer p2) { return compare_corba_objects (((SpiListenerStruct *)p2)->listener, ((SpiListenerStruct *)p1)->listener); @@ -257,8 +257,8 @@ parse_event_type (EventTypeStruct *etype, char *event_name) } /** - * deregisterSpiApplication: - * @application: a reference to the @SpiApplication + * deregisterApplication: + * @application: a reference to the @Application * to be deregistered. * return values: void * @@ -266,8 +266,8 @@ parse_event_type (EventTypeStruct *etype, char *event_name) * **/ static void -impl_accessibility_spi_registry_deregister_application (PortableServer_Servant servant, - const Accessibility_SpiApplication application, +impl_accessibility_registry_deregister_application (PortableServer_Servant servant, + const Accessibility_Application application, CORBA_Environment * ev) { SpiRegistry *registry = SPI_REGISTRY (bonobo_object_from_servant (servant)); @@ -297,10 +297,10 @@ impl_accessibility_spi_registry_deregister_application (PortableServer_Servant s } /* - * CORBA Accessibility::SpiRegistry::registerGlobalEventListener method implementation + * CORBA Accessibility::Registry::registerGlobalEventListener method implementation */ static void -impl_accessibility_spi_registry_register_global_event_listener ( +impl_accessibility_registry_register_global_event_listener ( PortableServer_Servant servant, Accessibility_EventListener listener, const CORBA_char *event_name, @@ -342,10 +342,10 @@ impl_accessibility_spi_registry_register_global_event_listener ( } /* - * CORBA Accessibility::SpiRegistry::deregisterGlobalEventListenerAll method implementation + * CORBA Accessibility::Registry::deregisterGlobalEventListenerAll method implementation */ static void -impl_accessibility_spi_registry_deregister_global_event_spi_listener_all ( +impl_accessibility_registry_deregister_global_event_listener_all ( PortableServer_Servant servant, Accessibility_EventListener listener, CORBA_Environment *ev) @@ -355,7 +355,7 @@ impl_accessibility_spi_registry_deregister_global_event_spi_listener_all ( GList *list; ls->listener = listener; list = g_list_find_custom (registry->object_listeners, ls, - compare_spi_listener_corbaref); + compare_listener_corbaref); /* * TODO : de-register with toolkit if the last instance of a listener @@ -366,22 +366,22 @@ impl_accessibility_spi_registry_deregister_global_event_spi_listener_all ( { fprintf (stderr, "deregistering listener\n"); registry->object_listeners = g_list_delete_link (registry->object_listeners, list); - list = g_list_find_custom (registry->object_listeners, ls, compare_spi_listener_corbaref); + list = g_list_find_custom (registry->object_listeners, ls, compare_listener_corbaref); } - list = g_list_find_custom (registry->toolkit_listeners, ls, compare_spi_listener_corbaref); + list = g_list_find_custom (registry->toolkit_listeners, ls, compare_listener_corbaref); while (list) { fprintf (stderr, "deregistering listener\n"); registry->toolkit_listeners = g_list_delete_link (registry->toolkit_listeners, list); - list = g_list_find_custom (registry->toolkit_listeners, ls, compare_spi_listener_corbaref); + list = g_list_find_custom (registry->toolkit_listeners, ls, compare_listener_corbaref); } } /* - * CORBA Accessibility::SpiRegistry::deregisterGlobalEventListener method implementation + * CORBA Accessibility::Registry::deregisterGlobalEventListener method implementation */ static void -impl_accessibility_spi_registry_deregister_global_event_listener ( +impl_accessibility_registry_deregister_global_event_listener ( PortableServer_Servant servant, Accessibility_EventListener listener, const CORBA_char * event_name, @@ -412,13 +412,13 @@ impl_accessibility_spi_registry_deregister_global_event_listener ( } ls.event_type_hash = etype.hash; - list = g_list_find_custom (*listeners, &ls, compare_spi_listener_hash); + list = g_list_find_custom (*listeners, &ls, compare_listener_hash); while (list) { fprintf (stderr, "deregistering listener\n"); *listeners = g_list_delete_link (*listeners, list); - list = g_list_find_custom (*listeners, &ls, compare_spi_listener_hash); + list = g_list_find_custom (*listeners, &ls, compare_listener_hash); } } @@ -426,13 +426,13 @@ impl_accessibility_spi_registry_deregister_global_event_listener ( /** * getDesktopCount: * return values: a short integer indicating the current number of - * @SpiDesktops. + * @Desktops. * * Get the current number of desktops. * **/ static short -impl_accessibility_spi_registry_get_spi_desktop_count (PortableServer_Servant servant, +impl_accessibility_registry_get_desktop_count (PortableServer_Servant servant, CORBA_Environment * ev) { /* TODO: implement support for multiple virtual desktops */ @@ -443,14 +443,14 @@ impl_accessibility_spi_registry_get_spi_desktop_count (PortableServer_Servant se /** * getDesktop: - * @n: the index of the requested @SpiDesktop. - * return values: a reference to the requested @SpiDesktop. + * @n: the index of the requested @Desktop. + * return values: a reference to the requested @Desktop. * * Get the nth accessible desktop. * **/ -static Accessibility_SpiDesktop -impl_accessibility_spi_registry_get_desktop (PortableServer_Servant servant, +static Accessibility_Desktop +impl_accessibility_registry_get_desktop (PortableServer_Servant servant, const CORBA_short n, CORBA_Environment * ev) { @@ -459,33 +459,33 @@ impl_accessibility_spi_registry_get_desktop (PortableServer_Servant servant, /* TODO: implement support for multiple virtual desktops */ if (n == 0) { - return (Accessibility_SpiDesktop) + return (Accessibility_Desktop) CORBA_Object_duplicate (BONOBO_OBJREF (registry->desktop), ev); } else { - return (Accessibility_SpiDesktop) CORBA_OBJECT_NIL; + return (Accessibility_Desktop) CORBA_OBJECT_NIL; } } /** * getDesktopList: * return values: a sequence containing references to - * the @SpiDesktops. + * the @Desktops. * * Get a list of accessible desktops. * **/ -static Accessibility_SpiDesktopSeq * -impl_accessibility_spi_registry_get_spi_desktop_list (PortableServer_Servant servant, +static Accessibility_DesktopSeq * +impl_accessibility_registry_get_desktop_list (PortableServer_Servant servant, CORBA_Environment * ev) { /* TODO: implement support for multiple virtual desktops */ - return (Accessibility_SpiDesktopSeq *) NULL; + return (Accessibility_DesktopSeq *) NULL; } -static Accessibility_SpiDeviceEventController -impl_accessibility_spi_registry_get_device_event_controller (PortableServer_Servant servant, +static Accessibility_DeviceEventController +impl_accessibility_registry_get_device_event_controller (PortableServer_Servant servant, CORBA_Environment * ev) { SpiRegistry *registry = SPI_REGISTRY (bonobo_object_from_servant (servant)); @@ -495,7 +495,7 @@ impl_accessibility_spi_registry_get_device_event_controller (PortableServer_Serv } static void -impl_spi_registry_notify_event (PortableServer_Servant servant, +impl_registry_notify_event (PortableServer_Servant servant, const Accessibility_Event *e, CORBA_Environment *ev) { @@ -509,18 +509,18 @@ impl_spi_registry_notify_event (PortableServer_Servant servant, case (ETYPE_OBJECT) : case (ETYPE_PROPERTY) : case (ETYPE_FOCUS) : - _spi_registry_notify_listeners (registry->object_listeners, e, ev); + _registry_notify_listeners (registry->object_listeners, e, ev); break; case (ETYPE_WINDOW) : - _spi_registry_notify_listeners (registry->window_listeners, e, ev); + _registry_notify_listeners (registry->window_listeners, e, ev); break; case (ETYPE_TOOLKIT) : - _spi_registry_notify_listeners (registry->toolkit_listeners, e, ev); + _registry_notify_listeners (registry->toolkit_listeners, e, ev); break; default: break; } - /* Accessibility_SpiAccessible_unref (e->source, ev);*/ /* This should be here! */ + /* Accessibility_Accessible_unref (e->source, ev);*/ /* This should be here! */ } static long @@ -531,7 +531,7 @@ _get_unique_id () } static void -_spi_registry_notify_listeners ( GList *listeners, +_registry_notify_listeners ( GList *listeners, const Accessibility_Event *e, CORBA_Environment *ev) { @@ -555,10 +555,10 @@ _spi_registry_notify_listeners ( GList *listeners, { #ifdef SPI_DEBUG fprintf(stderr, "notifying listener #%d\n", n); - fprintf(stderr, "event source name %s\n", Accessibility_SpiAccessible__get_name(e->source, ev)); + fprintf(stderr, "event source name %s\n", Accessibility_Accessible__get_name(e->source, ev)); #endif e->source = CORBA_Object_duplicate (e->source, ev); - Accessibility_SpiAccessible_ref ( e->source, ev); + Accessibility_Accessible_ref ( e->source, ev); Accessibility_EventListener_notifyEvent ((Accessibility_EventListener) ls->listener, e, ev); @@ -572,7 +572,7 @@ _spi_registry_notify_listeners ( GList *listeners, } } -static gboolean _spi_device_event_controller_hook (gpointer p) +static gboolean _device_event_controller_hook (gpointer p) { SpiRegistry *registry = (SpiRegistry *)p; SpiDeviceEventController *controller = registry->device_event_controller; @@ -585,23 +585,23 @@ static void spi_registry_class_init (SpiRegistryClass *klass) { GObjectClass * object_class = (GObjectClass *) klass; - POA_Accessibility_SpiRegistry__epv *epv = &klass->epv; + POA_Accessibility_Registry__epv *epv = &klass->epv; spi_registry_parent_class = g_type_class_ref (SPI_LISTENER_TYPE); object_class->finalize = spi_registry_object_finalize; - epv->registerSpiApplication = impl_accessibility_spi_registry_register_application; - epv->deregisterSpiApplication = impl_accessibility_spi_registry_deregister_application; - epv->registerGlobalEventListener = impl_accessibility_spi_registry_register_global_event_listener; - epv->deregisterGlobalEventListener = impl_accessibility_spi_registry_deregister_global_event_listener; - epv->deregisterGlobalEventListenerAll = impl_accessibility_spi_registry_deregister_global_event_spi_listener_all; - epv->getDeviceEventController = impl_accessibility_spi_registry_get_device_event_controller; - epv->getDesktopCount = impl_accessibility_spi_registry_get_spi_desktop_count; - epv->getDesktop = impl_accessibility_spi_registry_get_desktop; - epv->getDesktopList = impl_accessibility_spi_registry_get_spi_desktop_list; - - ((SpiListenerClass *) klass)->epv.notifyEvent = impl_spi_registry_notify_event; + epv->registerApplication = impl_accessibility_registry_register_application; + epv->deregisterApplication = impl_accessibility_registry_deregister_application; + epv->registerGlobalEventListener = impl_accessibility_registry_register_global_event_listener; + epv->deregisterGlobalEventListener = impl_accessibility_registry_deregister_global_event_listener; + epv->deregisterGlobalEventListenerAll = impl_accessibility_registry_deregister_global_event_listener_all; + epv->getDeviceEventController = impl_accessibility_registry_get_device_event_controller; + epv->getDesktopCount = impl_accessibility_registry_get_desktop_count; + epv->getDesktop = impl_accessibility_registry_get_desktop; + epv->getDesktopList = impl_accessibility_registry_get_desktop_list; + + ((SpiListenerClass *) klass)->epv.notifyEvent = impl_registry_notify_event; } static void @@ -613,7 +613,7 @@ spi_registry_init (SpiRegistry *registry) registry->applications = NULL; registry->desktop = spi_desktop_new(); registry->device_event_controller = NULL; - registry->kbd_event_hook = _spi_device_event_controller_hook; + registry->kbd_event_hook = _device_event_controller_hook; } GType @@ -642,7 +642,7 @@ spi_registry_get_type (void) */ type = bonobo_type_unique ( PARENT_TYPE, - POA_Accessibility_SpiRegistry__init, + POA_Accessibility_Registry__init, NULL, G_STRUCT_OFFSET (SpiRegistryClass, epv), &tinfo, diff --git a/libspi/registry.h b/libspi/registry.h index 334b71c..74c52cd 100644 --- a/libspi/registry.h +++ b/libspi/registry.h @@ -52,7 +52,7 @@ typedef struct { typedef struct { SpiListenerClass parent_class; - POA_Accessibility_SpiRegistry__epv epv; + POA_Accessibility_Registry__epv epv; } SpiRegistryClass; GType spi_registry_get_type (void); diff --git a/libspi/selection.c b/libspi/selection.c index 9298078..9ab0b0e 100644 --- a/libspi/selection.c +++ b/libspi/selection.c @@ -30,7 +30,7 @@ #include /* - * This pulls the CORBA definitions for the "Accessibility::SpiAccessible" server + * This pulls the CORBA definitions for the "Accessibility::Accessible" server */ #include #include "accessible.h" @@ -53,7 +53,7 @@ spi_selection_finalize (GObject *obj); static CORBA_long impl__get_nSelectedChildren (PortableServer_Servant _servant, CORBA_Environment * ev); -static Accessibility_SpiAccessible +static Accessibility_Accessible impl_getSelectedChild (PortableServer_Servant _servant, const CORBA_long selectedChildIndex, CORBA_Environment * ev); @@ -73,7 +73,7 @@ static void impl_selectAll (PortableServer_Servant _servant, CORBA_Environment * ev); static void -impl_clearSpiSelection (PortableServer_Servant _servant, +impl_clearSelection (PortableServer_Servant _servant, CORBA_Environment * ev); @@ -105,7 +105,7 @@ spi_selection_get_type (void) */ type = bonobo_type_unique ( BONOBO_OBJECT_TYPE, - POA_Accessibility_SpiSelection__init, + POA_Accessibility_Selection__init, NULL, G_STRUCT_OFFSET (SpiSelectionClass, epv), &tinfo, @@ -119,7 +119,7 @@ static void spi_selection_class_init (SpiSelectionClass *klass) { GObjectClass * object_class = (GObjectClass *) klass; - POA_Accessibility_SpiSelection__epv *epv = &klass->epv; + POA_Accessibility_Selection__epv *epv = &klass->epv; parent_class = g_type_class_peek_parent (klass); object_class->finalize = spi_selection_finalize; @@ -133,7 +133,7 @@ spi_selection_class_init (SpiSelectionClass *klass) epv->deselectSelectedChild = impl_deselectSelectedChild; epv->isChildSelected = impl_isChildSelected; epv->selectAll = impl_selectAll; - epv->clearSpiSelection = impl_clearSpiSelection; + epv->clearSelection = impl_clearSelection; } static void @@ -179,7 +179,7 @@ impl__get_nSelectedChildren (PortableServer_Servant _servant, } -static Accessibility_SpiAccessible +static Accessibility_Accessible impl_getSelectedChild (PortableServer_Servant _servant, const CORBA_long selectedChildIndex, CORBA_Environment * ev) @@ -188,7 +188,7 @@ impl_getSelectedChild (PortableServer_Servant _servant, SpiSelection *selection; AtkObject *atk_object; - Accessibility_SpiAccessible rv; + Accessibility_Accessible rv; #ifdef SPI_DEBUG fprintf (stderr, "calling impl_getSelectedChild\n"); #endif @@ -257,7 +257,7 @@ impl_selectAll (PortableServer_Servant _servant, static void -impl_clearSpiSelection (PortableServer_Servant _servant, +impl_clearSelection (PortableServer_Servant _servant, CORBA_Environment * ev) { SpiSelection *selection = SPI_SELECTION (bonobo_object_from_servant (_servant)); diff --git a/libspi/selection.h b/libspi/selection.h index 877f220..89b644b 100644 --- a/libspi/selection.h +++ b/libspi/selection.h @@ -35,17 +35,17 @@ extern "C" { #define IS_SPI_SELECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SPI_SELECTION_TYPE)) #define IS_SPI_SELECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SPI_SELECTION_TYPE)) -typedef struct _SpiSelection SpiSelection; -typedef struct _SpiSelectionClass SpiSelectionClass; +typedef struct _Selection SpiSelection; +typedef struct _SelectionClass SpiSelectionClass; -struct _SpiSelection { +struct _Selection { BonoboObject parent; AtkObject *atko; }; -struct _SpiSelectionClass { +struct _SelectionClass { BonoboObjectClass parent_class; - POA_Accessibility_SpiSelection__epv epv; + POA_Accessibility_Selection__epv epv; }; GType diff --git a/libspi/table.c b/libspi/table.c index 46c1dec..772a634 100644 --- a/libspi/table.c +++ b/libspi/table.c @@ -30,7 +30,7 @@ #include /* - * This pulls the CORBA definitions for the "Accessibility::SpiAccessible" server + * This pulls the CORBA definitions for the "Accessibility::Accessible" server */ #include @@ -49,10 +49,10 @@ static void spi_table_init (SpiTable *table); static void spi_table_finalize (GObject *obj); -static Accessibility_SpiAccessible +static Accessibility_Accessible impl__get_caption (PortableServer_Servant _servant, CORBA_Environment * ev); -static Accessibility_SpiAccessible +static Accessibility_Accessible impl__get_summary (PortableServer_Servant _servant, CORBA_Environment * ev); static CORBA_long @@ -64,7 +64,7 @@ impl__get_nRows (PortableServer_Servant _servant, static CORBA_long impl__get_nColumns (PortableServer_Servant _servant, CORBA_Environment * ev); -static Accessibility_SpiAccessible +static Accessibility_Accessible impl_getAccessibleAt (PortableServer_Servant _servant, const CORBA_long row, const CORBA_long column, @@ -99,11 +99,11 @@ impl_getColumnExtentAt (PortableServer_Servant _servant, const CORBA_long row, const CORBA_long column, CORBA_Environment * ev); -static Accessibility_SpiTable +static Accessibility_Table impl_getRowHeader (PortableServer_Servant _servant, const CORBA_long row, CORBA_Environment * ev); -static Accessibility_SpiTable +static Accessibility_Table impl_getColumnHeader (PortableServer_Servant _servant, const CORBA_long column, CORBA_Environment * ev); @@ -156,7 +156,7 @@ spi_table_get_type (void) */ type = bonobo_type_unique ( BONOBO_OBJECT_TYPE, - POA_Accessibility_SpiTable__init, + POA_Accessibility_Table__init, NULL, G_STRUCT_OFFSET (SpiTableClass, epv), &tinfo, @@ -170,7 +170,7 @@ static void spi_table_class_init (SpiTableClass *klass) { GObjectClass * object_class = (GObjectClass *) klass; - POA_Accessibility_SpiTable__epv *epv = &klass->epv; + POA_Accessibility_Table__epv *epv = &klass->epv; parent_class = g_type_class_peek_parent (klass); object_class->finalize = spi_table_finalize; @@ -225,13 +225,13 @@ spi_table_interface_new (AtkObject *obj) -static Accessibility_SpiAccessible +static Accessibility_Accessible impl__get_caption (PortableServer_Servant _servant, CORBA_Environment * ev) { SpiTable *table = SPI_TABLE (bonobo_object_from_servant (_servant)); AtkObject *atk_object; - Accessibility_SpiAccessible rv; + Accessibility_Accessible rv; atk_object = atk_table_get_caption (ATK_TABLE(table-> atko)); rv = bonobo_object_corba_objref (BONOBO_OBJECT(spi_accessible_new(atk_object))); @@ -240,13 +240,13 @@ impl__get_caption (PortableServer_Servant _servant, -static Accessibility_SpiAccessible +static Accessibility_Accessible impl__get_summary (PortableServer_Servant _servant, CORBA_Environment * ev) { SpiTable *table = SPI_TABLE (bonobo_object_from_servant (_servant)); AtkObject *atk_object; - Accessibility_SpiAccessible rv; + Accessibility_Accessible rv; atk_object = atk_table_get_summary (ATK_TABLE(table->atko)); rv = bonobo_object_corba_objref (BONOBO_OBJECT(spi_accessible_new(atk_object))); @@ -277,7 +277,7 @@ impl__get_nColumns (PortableServer_Servant _servant, -static Accessibility_SpiAccessible +static Accessibility_Accessible impl_getAccessibleAt (PortableServer_Servant _servant, const CORBA_long row, const CORBA_long column, @@ -285,7 +285,7 @@ impl_getAccessibleAt (PortableServer_Servant _servant, { SpiTable *table = SPI_TABLE (bonobo_object_from_servant (_servant)); AtkObject *atk_object; - Accessibility_SpiAccessible rv; + Accessibility_Accessible rv; atk_object = atk_table_ref_at (ATK_TABLE(table->atko), (gint) row, (gint) column); @@ -394,14 +394,14 @@ impl_getColumnExtentAt (PortableServer_Servant _servant, -static Accessibility_SpiTable +static Accessibility_Table impl_getRowHeader (PortableServer_Servant _servant, const CORBA_long row, CORBA_Environment * ev) { SpiTable *table = SPI_TABLE (bonobo_object_from_servant (_servant)); AtkObject *header; - Accessibility_SpiTable rv; + Accessibility_Table rv; header = atk_table_get_row_header (ATK_TABLE(table->atko), (gint) row); rv = bonobo_object_corba_objref (BONOBO_OBJECT(spi_accessible_new(header))); @@ -410,14 +410,14 @@ impl_getRowHeader (PortableServer_Servant _servant, -static Accessibility_SpiTable +static Accessibility_Table impl_getColumnHeader (PortableServer_Servant _servant, const CORBA_long column, CORBA_Environment * ev) { SpiTable *table = SPI_TABLE (bonobo_object_from_servant (_servant)); AtkObject *header; - Accessibility_SpiTable rv; + Accessibility_Table rv; header = atk_table_get_column_header (ATK_TABLE(table->atko), (gint) column); rv = bonobo_object_corba_objref (BONOBO_OBJECT(spi_accessible_new(header))); diff --git a/libspi/table.h b/libspi/table.h index de2fade..e8acfa4 100644 --- a/libspi/table.h +++ b/libspi/table.h @@ -35,17 +35,17 @@ extern "C" { #define IS_TABLE(obj) (G_TYPE_CHECK__INSTANCE_TYPE ((obj), SPI_TABLE_TYPE)) #define IS_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SPI_TABLE_TYPE)) -typedef struct _SpiTable SpiTable; -typedef struct _SpiTableClass SpiTableClass; +typedef struct _Table SpiTable; +typedef struct _TableClass SpiTableClass; -struct _SpiTable { +struct _Table { BonoboObject parent; AtkObject *atko; }; -struct _SpiTableClass { +struct _TableClass { BonoboObjectClass parent_class; - POA_Accessibility_SpiTable__epv epv; + POA_Accessibility_Table__epv epv; }; GType diff --git a/libspi/text.c b/libspi/text.c index e85a326..f7f5ddb 100644 --- a/libspi/text.c +++ b/libspi/text.c @@ -31,7 +31,7 @@ #include /* - * This pulls the CORBA definitions for the "Accessibility::SpiAccessible" server + * This pulls the CORBA definitions for the "Accessibility::Accessible" server */ #include @@ -130,7 +130,7 @@ impl_getOffsetAtPoint (PortableServer_Servant _servant, CORBA_Environment * ev); static CORBA_long -impl_getNSpiSelections (PortableServer_Servant _servant, +impl_getNSelections (PortableServer_Servant _servant, CORBA_Environment * ev); static void @@ -140,7 +140,7 @@ impl_getSelection (PortableServer_Servant _servant, CORBA_Environment * ev); static CORBA_boolean -impl_addSpiSelection (PortableServer_Servant _servant, +impl_addSelection (PortableServer_Servant _servant, const CORBA_long startOffset, const CORBA_long endOffset, CORBA_Environment * ev); @@ -188,7 +188,7 @@ accessibility_text_get_type (void) */ type = bonobo_type_unique ( PARENT_TYPE, - POA_Accessibility_SpiText__init, + POA_Accessibility_Text__init, NULL, G_STRUCT_OFFSET (SpiTextClass, epv), &tinfo, @@ -202,7 +202,7 @@ static void accessibility_text_class_init (SpiTextClass *klass) { GObjectClass * object_class = (GObjectClass *) klass; - POA_Accessibility_SpiText__epv *epv = &klass->epv; + POA_Accessibility_Text__epv *epv = &klass->epv; spi_text_parent_class = g_type_class_peek_parent (klass); object_class->finalize = accessibility_text_object_finalize; @@ -219,9 +219,9 @@ accessibility_text_class_init (SpiTextClass *klass) epv->getCharacterExtents = impl_getCharacterExtents; epv->_get_characterCount = impl__get_characterCount; epv->getOffsetAtPoint = impl_getOffsetAtPoint; - epv->getNSpiSelections = impl_getNSpiSelections; + epv->getNSelections = impl_getNSelections; epv->getSelection = impl_getSelection; - epv->addSpiSelection = impl_addSpiSelection; + epv->addSelection = impl_addSelection; epv->removeSelection = impl_removeSelection; epv->setSelection = impl_setSelection; epv->setCaretOffset = impl_setCaretOffset; @@ -513,7 +513,7 @@ impl_getOffsetAtPoint (PortableServer_Servant _servant, static CORBA_long -impl_getNSpiSelections (PortableServer_Servant _servant, +impl_getNSelections (PortableServer_Servant _servant, CORBA_Environment * ev) { SpiText *text; @@ -549,7 +549,7 @@ impl_getSelection (PortableServer_Servant _servant, static CORBA_boolean -impl_addSpiSelection (PortableServer_Servant _servant, +impl_addSelection (PortableServer_Servant _servant, const CORBA_long startOffset, const CORBA_long endOffset, CORBA_Environment * ev) diff --git a/libspi/text.h b/libspi/text.h index 9ff1388..7818d75 100644 --- a/libspi/text.h +++ b/libspi/text.h @@ -36,17 +36,17 @@ extern "C" { #define IS_TEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SPI_TEXT_TYPE)) #define IS_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SPI_TEXT_TYPE)) -typedef struct _SpiText SpiText; -typedef struct _SpiTextClass SpiTextClass; +typedef struct _Text SpiText; +typedef struct _TextClass SpiTextClass; -struct _SpiText { +struct _Text { BonoboObject parent; AtkObject *atko; }; -struct _SpiTextClass { +struct _TextClass { BonoboObjectClass parent_class; - POA_Accessibility_SpiText__epv epv; + POA_Accessibility_Text__epv epv; }; GType diff --git a/libspi/value.c b/libspi/value.c index 38d9866..9610701 100644 --- a/libspi/value.c +++ b/libspi/value.c @@ -30,7 +30,7 @@ #include /* - * This pulls the CORBA definitions for the "Accessibility::SpiAccessible" server + * This pulls the CORBA definitions for the "Accessibility::Accessible" server */ #include @@ -50,10 +50,10 @@ spi_value_init (SpiValue *value); static void spi_value_finalize (GObject *obj); static CORBA_float -impl__get_minimumSpiValue (PortableServer_Servant _servant, +impl__get_minimumValue (PortableServer_Servant _servant, CORBA_Environment * ev); static CORBA_float -impl__get_maximumSpiValue (PortableServer_Servant _servant, +impl__get_maximumValue (PortableServer_Servant _servant, CORBA_Environment * ev); static CORBA_float impl__get_currentValue (PortableServer_Servant _servant, @@ -94,7 +94,7 @@ spi_value_get_type (void) */ type = bonobo_type_unique ( BONOBO_OBJECT_TYPE, - POA_Accessibility_SpiValue__init, + POA_Accessibility_Value__init, NULL, G_STRUCT_OFFSET (SpiValueClass, epv), &tinfo, @@ -108,7 +108,7 @@ static void spi_value_class_init (SpiValueClass *klass) { GObjectClass * object_class = (GObjectClass *) klass; - POA_Accessibility_SpiValue__epv *epv = &klass->epv; + POA_Accessibility_Value__epv *epv = &klass->epv; parent_class = g_type_class_peek_parent (klass); object_class->finalize = spi_value_finalize; @@ -116,8 +116,8 @@ spi_value_class_init (SpiValueClass *klass) /* Initialize epv table */ - epv->_get_minimumSpiValue = impl__get_minimumSpiValue; - epv->_get_maximumSpiValue = impl__get_maximumSpiValue; + epv->_get_minimumValue = impl__get_minimumValue; + epv->_get_maximumValue = impl__get_maximumValue; epv->_get_currentValue = impl__get_currentValue; epv->_set_currentValue = impl__set_currentValue; } @@ -149,7 +149,7 @@ spi_value_interface_new (AtkObject *obj) static CORBA_float -impl__get_minimumSpiValue (PortableServer_Servant _servant, +impl__get_minimumValue (PortableServer_Servant _servant, CORBA_Environment * ev) { SpiValue *value = SPI_VALUE (bonobo_object_from_servant (_servant)); @@ -163,7 +163,7 @@ impl__get_minimumSpiValue (PortableServer_Servant _servant, static CORBA_float -impl__get_maximumSpiValue (PortableServer_Servant _servant, +impl__get_maximumValue (PortableServer_Servant _servant, CORBA_Environment * ev) { SpiValue *value = SPI_VALUE (bonobo_object_from_servant (_servant)); diff --git a/libspi/value.h b/libspi/value.h index 1893c3c..9c63c5d 100644 --- a/libspi/value.h +++ b/libspi/value.h @@ -35,17 +35,17 @@ extern "C" { #define IS_SPI_VALUE(obj) (G_TYPE_CHECK__INSTANCE_TYPE ((obj), SPI_VALUE_TYPE)) #define IS_SPI_VALUE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SPI_VALUE_TYPE)) -typedef struct _SpiValue SpiValue; -typedef struct _SpiValueClass SpiValueClass; +typedef struct _Value SpiValue; +typedef struct _ValueClass SpiValueClass; -struct _SpiValue { +struct _Value { BonoboObject parent; AtkObject *atko; }; -struct _SpiValueClass { +struct _ValueClass { BonoboObjectClass parent_class; - POA_Accessibility_SpiValue__epv epv; + POA_Accessibility_Value__epv epv; }; GType diff --git a/registryd/desktop.c b/registryd/desktop.c index 82acb44..86cb45b 100644 --- a/registryd/desktop.c +++ b/registryd/desktop.c @@ -31,7 +31,7 @@ #include /* - * This pulls the CORBA definitions for the "Accessibility::SpiAccessible" server + * This pulls the CORBA definitions for the "Accessibility::Accessible" server */ #include @@ -59,7 +59,7 @@ spi_desktop_init (SpiDesktop *desktop) } static CORBA_long -impl_spi_desktop_get_child_count (PortableServer_Servant servant, +impl_desktop_get_child_count (PortableServer_Servant servant, CORBA_Environment * ev) { SpiDesktop *desktop = SPI_DESKTOP (bonobo_object_from_servant (servant)); @@ -73,8 +73,8 @@ impl_spi_desktop_get_child_count (PortableServer_Servant servant, } } -static Accessibility_SpiAccessible -impl_spi_desktop_get_child_at_index (PortableServer_Servant servant, +static Accessibility_Accessible +impl_desktop_get_child_at_index (PortableServer_Servant servant, const CORBA_long index, CORBA_Environment * ev) { @@ -94,19 +94,19 @@ impl_spi_desktop_get_child_at_index (PortableServer_Servant servant, fprintf (stderr, "no %ldth child\n", (long) index); retval = CORBA_OBJECT_NIL; } - return (Accessibility_SpiAccessible) retval; + return (Accessibility_Accessible) retval; } static void spi_desktop_class_init (SpiDesktopClass *klass) { SpiAccessibleClass * spi_accessible_class = (SpiAccessibleClass *) klass; - POA_Accessibility_SpiAccessible__epv *epv = &spi_accessible_class->epv; + POA_Accessibility_Accessible__epv *epv = &spi_accessible_class->epv; parent_class = g_type_class_ref (SPI_ACCESSIBLE_TYPE); - epv->_get_childCount = impl_spi_desktop_get_child_count; - epv->getChildAtIndex = impl_spi_desktop_get_child_at_index; + epv->_get_childCount = impl_desktop_get_child_count; + epv->getChildAtIndex = impl_desktop_get_child_at_index; } GType @@ -135,7 +135,7 @@ spi_desktop_get_type (void) */ type = bonobo_type_unique ( PARENT_TYPE, - POA_Accessibility_SpiDesktop__init, + POA_Accessibility_Desktop__init, NULL, G_STRUCT_OFFSET (SpiDesktopClass, epv), &tinfo, diff --git a/registryd/desktop.h b/registryd/desktop.h index d3430f6..fd94c28 100644 --- a/registryd/desktop.h +++ b/registryd/desktop.h @@ -46,7 +46,7 @@ typedef struct { typedef struct { SpiAccessibleClass parent_class; - POA_Accessibility_SpiDesktop__epv epv; + POA_Accessibility_Desktop__epv epv; } SpiDesktopClass; GType spi_desktop_get_type (void); diff --git a/registryd/deviceeventcontroller.c b/registryd/deviceeventcontroller.c index 6098395..17bbb3b 100644 --- a/registryd/deviceeventcontroller.c +++ b/registryd/deviceeventcontroller.c @@ -346,7 +346,7 @@ spi_device_event_controller_object_finalize (GObject *object) } /* - * CORBA Accessibility::SpiDeviceEventController::registerKeystrokeListener + * CORBA Accessibility::DeviceEventController::registerKeystrokeListener * method implementation */ static void @@ -371,7 +371,7 @@ impl_register_keystroke_listener (PortableServer_Servant servant, ; /* register with toolkit instead */ } /* - * CORBA Accessibility::SpiDeviceEventController::deregisterKeystrokeListener + * CORBA Accessibility::DeviceEventController::deregisterKeystrokeListener * method implementation */ static void @@ -393,7 +393,7 @@ impl_deregister_keystroke_listener (PortableServer_Servant servant, } /* - * CORBA Accessibility::SpiDeviceEventController::registerMouseListener + * CORBA Accessibility::DeviceEventController::registerMouseListener * method implementation */ /* @@ -418,7 +418,7 @@ keycode_for_keysym (long keysym) } /* - * CORBA Accessibility::SpiDeviceEventController::registerKeystrokeListener + * CORBA Accessibility::DeviceEventController::registerKeystrokeListener * method implementation */ static void @@ -459,7 +459,7 @@ impl_generate_key_event (PortableServer_Servant servant, } /* - * CORBA Accessibility::SpiDeviceEventController::generateMouseEvent + * CORBA Accessibility::DeviceEventController::generateMouseEvent * method implementation */ static void @@ -478,7 +478,7 @@ static void spi_device_event_controller_class_init (SpiDeviceEventControllerClass *klass) { GObjectClass * object_class = (GObjectClass *) klass; - POA_Accessibility_SpiDeviceEventController__epv *epv = &klass->epv; + POA_Accessibility_DeviceEventController__epv *epv = &klass->epv; spi_device_event_controller_parent_class = g_type_class_ref (BONOBO_OBJECT_TYPE); object_class->finalize = spi_device_event_controller_object_finalize; @@ -533,7 +533,7 @@ spi_device_event_controller_get_type (void) */ type = bonobo_type_unique ( PARENT_TYPE, - POA_Accessibility_SpiDeviceEventController__init, + POA_Accessibility_DeviceEventController__init, NULL, G_STRUCT_OFFSET (SpiDeviceEventControllerClass, epv), &tinfo, diff --git a/registryd/deviceeventcontroller.h b/registryd/deviceeventcontroller.h index 985a36e..b9e91f5 100644 --- a/registryd/deviceeventcontroller.h +++ b/registryd/deviceeventcontroller.h @@ -47,7 +47,7 @@ typedef struct { typedef struct { BonoboObjectClass parent_class; - POA_Accessibility_SpiDeviceEventController__epv epv; + POA_Accessibility_DeviceEventController__epv epv; gboolean (*check_key_event) (SpiDeviceEventController *controller); } SpiDeviceEventControllerClass; diff --git a/registryd/registry-main.c b/registryd/registry-main.c index 509e2aa..5c92be2 100644 --- a/registryd/registry-main.c +++ b/registryd/registry-main.c @@ -41,7 +41,7 @@ main (int argc, g_error ("Could not initialize oaf / Bonobo"); } - obj_id = "OAFIID:Accessibility_SpiRegistry:proto0.1"; + obj_id = "OAFIID:Accessibility_Registry:proto0.1"; registry = spi_registry_new (); @@ -57,7 +57,7 @@ main (int argc, g_timeout_add_full (G_PRIORITY_HIGH_IDLE, 200, registry->kbd_event_hook, registry, NULL); /* keyevent_source = g_source_new (registry->kbd_event_hook, sizeof (GSourceFunc)); - g_source_attach (keyevent_source, g_main_conspi_text_default());*/ + g_source_attach (keyevent_source, g_main_context_default());*/ bonobo_main (); return 0; diff --git a/registryd/registry.c b/registryd/registry.c index 782beaa..957be22 100644 --- a/registryd/registry.c +++ b/registryd/registry.c @@ -31,7 +31,7 @@ #include /* - * This pulls the CORBA definitions for the "Accessibility::SpiRegistry" server + * This pulls the CORBA definitions for the "Accessibility::Registry" server */ #include @@ -83,13 +83,13 @@ typedef struct { } SpiListenerStruct; /* static function prototypes */ -static void _spi_registry_notify_listeners ( GList *listeners, +static void _registry_notify_listeners ( GList *listeners, const Accessibility_Event *e, CORBA_Environment *ev); static long _get_unique_id(); -static gboolean _spi_device_event_controller_hook (gpointer source); +static gboolean _device_event_controller_hook (gpointer source); /* * Implemented GObject::finalize @@ -106,16 +106,16 @@ spi_registry_object_finalize (GObject *object) } /** - * registerSpiApplication: - * @application: a reference to the requesting @SpiApplication + * registerApplication: + * @application: a reference to the requesting @Application * return values: void * * Register a new application with the accessibility broker. * **/ static void -impl_accessibility_spi_registry_register_application (PortableServer_Servant servant, - const Accessibility_SpiApplication application, +impl_accessibility_registry_register_application (PortableServer_Servant servant, + const Accessibility_Application application, CORBA_Environment * ev) { SpiRegistry *registry = SPI_REGISTRY (bonobo_object_from_servant (servant)); @@ -127,7 +127,7 @@ impl_accessibility_spi_registry_register_application (PortableServer_Servant ser bonobo_object_dup_ref (application, ev)); /* TODO: create unique string here (with libuuid call ?) and hash ? */ - Accessibility_SpiApplication__set_id (application, _get_unique_id(), ev); + Accessibility_Application__set_id (application, _get_unique_id(), ev); /* * TODO: change the implementation below to a WM-aware one; @@ -156,25 +156,25 @@ register_with_toolkits (SpiRegistry *spi_registry_bonobo_object, EventTypeStruct gint n_desktops; gint n_apps; gint i, j; - Accessibility_SpiDesktop desktop; - Accessibility_SpiApplication app; - Accessibility_SpiRegistry registry; + Accessibility_Desktop desktop; + Accessibility_Application app; + Accessibility_Registry registry; registry = BONOBO_OBJREF (spi_registry_bonobo_object); - /* for each app in each desktop, call ...SpiApplication_registerToolkitEventListener */ + /* for each app in each desktop, call ...Application_registerToolkitEventListener */ - n_desktops = Accessibility_SpiRegistry_getDesktopCount (registry, ev); + n_desktops = Accessibility_Registry_getDesktopCount (registry, ev); for (i=0; ievent_name), @@ -184,13 +184,13 @@ register_with_toolkits (SpiRegistry *spi_registry_bonobo_object, EventTypeStruct } static gint -compare_spi_listener_hash (gconstpointer p1, gconstpointer p2) +compare_listener_hash (gconstpointer p1, gconstpointer p2) { return (((SpiListenerStruct *)p2)->event_type_hash - ((SpiListenerStruct *)p1)->event_type_hash); } static gint -compare_spi_listener_corbaref (gconstpointer p1, gconstpointer p2) +compare_listener_corbaref (gconstpointer p1, gconstpointer p2) { return compare_corba_objects (((SpiListenerStruct *)p2)->listener, ((SpiListenerStruct *)p1)->listener); @@ -257,8 +257,8 @@ parse_event_type (EventTypeStruct *etype, char *event_name) } /** - * deregisterSpiApplication: - * @application: a reference to the @SpiApplication + * deregisterApplication: + * @application: a reference to the @Application * to be deregistered. * return values: void * @@ -266,8 +266,8 @@ parse_event_type (EventTypeStruct *etype, char *event_name) * **/ static void -impl_accessibility_spi_registry_deregister_application (PortableServer_Servant servant, - const Accessibility_SpiApplication application, +impl_accessibility_registry_deregister_application (PortableServer_Servant servant, + const Accessibility_Application application, CORBA_Environment * ev) { SpiRegistry *registry = SPI_REGISTRY (bonobo_object_from_servant (servant)); @@ -297,10 +297,10 @@ impl_accessibility_spi_registry_deregister_application (PortableServer_Servant s } /* - * CORBA Accessibility::SpiRegistry::registerGlobalEventListener method implementation + * CORBA Accessibility::Registry::registerGlobalEventListener method implementation */ static void -impl_accessibility_spi_registry_register_global_event_listener ( +impl_accessibility_registry_register_global_event_listener ( PortableServer_Servant servant, Accessibility_EventListener listener, const CORBA_char *event_name, @@ -342,10 +342,10 @@ impl_accessibility_spi_registry_register_global_event_listener ( } /* - * CORBA Accessibility::SpiRegistry::deregisterGlobalEventListenerAll method implementation + * CORBA Accessibility::Registry::deregisterGlobalEventListenerAll method implementation */ static void -impl_accessibility_spi_registry_deregister_global_event_spi_listener_all ( +impl_accessibility_registry_deregister_global_event_listener_all ( PortableServer_Servant servant, Accessibility_EventListener listener, CORBA_Environment *ev) @@ -355,7 +355,7 @@ impl_accessibility_spi_registry_deregister_global_event_spi_listener_all ( GList *list; ls->listener = listener; list = g_list_find_custom (registry->object_listeners, ls, - compare_spi_listener_corbaref); + compare_listener_corbaref); /* * TODO : de-register with toolkit if the last instance of a listener @@ -366,22 +366,22 @@ impl_accessibility_spi_registry_deregister_global_event_spi_listener_all ( { fprintf (stderr, "deregistering listener\n"); registry->object_listeners = g_list_delete_link (registry->object_listeners, list); - list = g_list_find_custom (registry->object_listeners, ls, compare_spi_listener_corbaref); + list = g_list_find_custom (registry->object_listeners, ls, compare_listener_corbaref); } - list = g_list_find_custom (registry->toolkit_listeners, ls, compare_spi_listener_corbaref); + list = g_list_find_custom (registry->toolkit_listeners, ls, compare_listener_corbaref); while (list) { fprintf (stderr, "deregistering listener\n"); registry->toolkit_listeners = g_list_delete_link (registry->toolkit_listeners, list); - list = g_list_find_custom (registry->toolkit_listeners, ls, compare_spi_listener_corbaref); + list = g_list_find_custom (registry->toolkit_listeners, ls, compare_listener_corbaref); } } /* - * CORBA Accessibility::SpiRegistry::deregisterGlobalEventListener method implementation + * CORBA Accessibility::Registry::deregisterGlobalEventListener method implementation */ static void -impl_accessibility_spi_registry_deregister_global_event_listener ( +impl_accessibility_registry_deregister_global_event_listener ( PortableServer_Servant servant, Accessibility_EventListener listener, const CORBA_char * event_name, @@ -412,13 +412,13 @@ impl_accessibility_spi_registry_deregister_global_event_listener ( } ls.event_type_hash = etype.hash; - list = g_list_find_custom (*listeners, &ls, compare_spi_listener_hash); + list = g_list_find_custom (*listeners, &ls, compare_listener_hash); while (list) { fprintf (stderr, "deregistering listener\n"); *listeners = g_list_delete_link (*listeners, list); - list = g_list_find_custom (*listeners, &ls, compare_spi_listener_hash); + list = g_list_find_custom (*listeners, &ls, compare_listener_hash); } } @@ -426,13 +426,13 @@ impl_accessibility_spi_registry_deregister_global_event_listener ( /** * getDesktopCount: * return values: a short integer indicating the current number of - * @SpiDesktops. + * @Desktops. * * Get the current number of desktops. * **/ static short -impl_accessibility_spi_registry_get_spi_desktop_count (PortableServer_Servant servant, +impl_accessibility_registry_get_desktop_count (PortableServer_Servant servant, CORBA_Environment * ev) { /* TODO: implement support for multiple virtual desktops */ @@ -443,14 +443,14 @@ impl_accessibility_spi_registry_get_spi_desktop_count (PortableServer_Servant se /** * getDesktop: - * @n: the index of the requested @SpiDesktop. - * return values: a reference to the requested @SpiDesktop. + * @n: the index of the requested @Desktop. + * return values: a reference to the requested @Desktop. * * Get the nth accessible desktop. * **/ -static Accessibility_SpiDesktop -impl_accessibility_spi_registry_get_desktop (PortableServer_Servant servant, +static Accessibility_Desktop +impl_accessibility_registry_get_desktop (PortableServer_Servant servant, const CORBA_short n, CORBA_Environment * ev) { @@ -459,33 +459,33 @@ impl_accessibility_spi_registry_get_desktop (PortableServer_Servant servant, /* TODO: implement support for multiple virtual desktops */ if (n == 0) { - return (Accessibility_SpiDesktop) + return (Accessibility_Desktop) CORBA_Object_duplicate (BONOBO_OBJREF (registry->desktop), ev); } else { - return (Accessibility_SpiDesktop) CORBA_OBJECT_NIL; + return (Accessibility_Desktop) CORBA_OBJECT_NIL; } } /** * getDesktopList: * return values: a sequence containing references to - * the @SpiDesktops. + * the @Desktops. * * Get a list of accessible desktops. * **/ -static Accessibility_SpiDesktopSeq * -impl_accessibility_spi_registry_get_spi_desktop_list (PortableServer_Servant servant, +static Accessibility_DesktopSeq * +impl_accessibility_registry_get_desktop_list (PortableServer_Servant servant, CORBA_Environment * ev) { /* TODO: implement support for multiple virtual desktops */ - return (Accessibility_SpiDesktopSeq *) NULL; + return (Accessibility_DesktopSeq *) NULL; } -static Accessibility_SpiDeviceEventController -impl_accessibility_spi_registry_get_device_event_controller (PortableServer_Servant servant, +static Accessibility_DeviceEventController +impl_accessibility_registry_get_device_event_controller (PortableServer_Servant servant, CORBA_Environment * ev) { SpiRegistry *registry = SPI_REGISTRY (bonobo_object_from_servant (servant)); @@ -495,7 +495,7 @@ impl_accessibility_spi_registry_get_device_event_controller (PortableServer_Serv } static void -impl_spi_registry_notify_event (PortableServer_Servant servant, +impl_registry_notify_event (PortableServer_Servant servant, const Accessibility_Event *e, CORBA_Environment *ev) { @@ -509,18 +509,18 @@ impl_spi_registry_notify_event (PortableServer_Servant servant, case (ETYPE_OBJECT) : case (ETYPE_PROPERTY) : case (ETYPE_FOCUS) : - _spi_registry_notify_listeners (registry->object_listeners, e, ev); + _registry_notify_listeners (registry->object_listeners, e, ev); break; case (ETYPE_WINDOW) : - _spi_registry_notify_listeners (registry->window_listeners, e, ev); + _registry_notify_listeners (registry->window_listeners, e, ev); break; case (ETYPE_TOOLKIT) : - _spi_registry_notify_listeners (registry->toolkit_listeners, e, ev); + _registry_notify_listeners (registry->toolkit_listeners, e, ev); break; default: break; } - /* Accessibility_SpiAccessible_unref (e->source, ev);*/ /* This should be here! */ + /* Accessibility_Accessible_unref (e->source, ev);*/ /* This should be here! */ } static long @@ -531,7 +531,7 @@ _get_unique_id () } static void -_spi_registry_notify_listeners ( GList *listeners, +_registry_notify_listeners ( GList *listeners, const Accessibility_Event *e, CORBA_Environment *ev) { @@ -555,10 +555,10 @@ _spi_registry_notify_listeners ( GList *listeners, { #ifdef SPI_DEBUG fprintf(stderr, "notifying listener #%d\n", n); - fprintf(stderr, "event source name %s\n", Accessibility_SpiAccessible__get_name(e->source, ev)); + fprintf(stderr, "event source name %s\n", Accessibility_Accessible__get_name(e->source, ev)); #endif e->source = CORBA_Object_duplicate (e->source, ev); - Accessibility_SpiAccessible_ref ( e->source, ev); + Accessibility_Accessible_ref ( e->source, ev); Accessibility_EventListener_notifyEvent ((Accessibility_EventListener) ls->listener, e, ev); @@ -572,7 +572,7 @@ _spi_registry_notify_listeners ( GList *listeners, } } -static gboolean _spi_device_event_controller_hook (gpointer p) +static gboolean _device_event_controller_hook (gpointer p) { SpiRegistry *registry = (SpiRegistry *)p; SpiDeviceEventController *controller = registry->device_event_controller; @@ -585,23 +585,23 @@ static void spi_registry_class_init (SpiRegistryClass *klass) { GObjectClass * object_class = (GObjectClass *) klass; - POA_Accessibility_SpiRegistry__epv *epv = &klass->epv; + POA_Accessibility_Registry__epv *epv = &klass->epv; spi_registry_parent_class = g_type_class_ref (SPI_LISTENER_TYPE); object_class->finalize = spi_registry_object_finalize; - epv->registerSpiApplication = impl_accessibility_spi_registry_register_application; - epv->deregisterSpiApplication = impl_accessibility_spi_registry_deregister_application; - epv->registerGlobalEventListener = impl_accessibility_spi_registry_register_global_event_listener; - epv->deregisterGlobalEventListener = impl_accessibility_spi_registry_deregister_global_event_listener; - epv->deregisterGlobalEventListenerAll = impl_accessibility_spi_registry_deregister_global_event_spi_listener_all; - epv->getDeviceEventController = impl_accessibility_spi_registry_get_device_event_controller; - epv->getDesktopCount = impl_accessibility_spi_registry_get_spi_desktop_count; - epv->getDesktop = impl_accessibility_spi_registry_get_desktop; - epv->getDesktopList = impl_accessibility_spi_registry_get_spi_desktop_list; - - ((SpiListenerClass *) klass)->epv.notifyEvent = impl_spi_registry_notify_event; + epv->registerApplication = impl_accessibility_registry_register_application; + epv->deregisterApplication = impl_accessibility_registry_deregister_application; + epv->registerGlobalEventListener = impl_accessibility_registry_register_global_event_listener; + epv->deregisterGlobalEventListener = impl_accessibility_registry_deregister_global_event_listener; + epv->deregisterGlobalEventListenerAll = impl_accessibility_registry_deregister_global_event_listener_all; + epv->getDeviceEventController = impl_accessibility_registry_get_device_event_controller; + epv->getDesktopCount = impl_accessibility_registry_get_desktop_count; + epv->getDesktop = impl_accessibility_registry_get_desktop; + epv->getDesktopList = impl_accessibility_registry_get_desktop_list; + + ((SpiListenerClass *) klass)->epv.notifyEvent = impl_registry_notify_event; } static void @@ -613,7 +613,7 @@ spi_registry_init (SpiRegistry *registry) registry->applications = NULL; registry->desktop = spi_desktop_new(); registry->device_event_controller = NULL; - registry->kbd_event_hook = _spi_device_event_controller_hook; + registry->kbd_event_hook = _device_event_controller_hook; } GType @@ -642,7 +642,7 @@ spi_registry_get_type (void) */ type = bonobo_type_unique ( PARENT_TYPE, - POA_Accessibility_SpiRegistry__init, + POA_Accessibility_Registry__init, NULL, G_STRUCT_OFFSET (SpiRegistryClass, epv), &tinfo, diff --git a/registryd/registry.h b/registryd/registry.h index 334b71c..74c52cd 100644 --- a/registryd/registry.h +++ b/registryd/registry.h @@ -52,7 +52,7 @@ typedef struct { typedef struct { SpiListenerClass parent_class; - POA_Accessibility_SpiRegistry__epv epv; + POA_Accessibility_Registry__epv epv; } SpiRegistryClass; GType spi_registry_get_type (void); diff --git a/registryd/registryd.c b/registryd/registryd.c index 509e2aa..5c92be2 100644 --- a/registryd/registryd.c +++ b/registryd/registryd.c @@ -41,7 +41,7 @@ main (int argc, g_error ("Could not initialize oaf / Bonobo"); } - obj_id = "OAFIID:Accessibility_SpiRegistry:proto0.1"; + obj_id = "OAFIID:Accessibility_Registry:proto0.1"; registry = spi_registry_new (); @@ -57,7 +57,7 @@ main (int argc, g_timeout_add_full (G_PRIORITY_HIGH_IDLE, 200, registry->kbd_event_hook, registry, NULL); /* keyevent_source = g_source_new (registry->kbd_event_hook, sizeof (GSourceFunc)); - g_source_attach (keyevent_source, g_main_conspi_text_default());*/ + g_source_attach (keyevent_source, g_main_context_default());*/ bonobo_main (); return 0; diff --git a/test/app.c b/test/app.c index 8d1ecb7..dc676d3 100644 --- a/test/app.c +++ b/test/app.c @@ -40,7 +40,7 @@ main(int argc, char **argv) char *obj_id; char sbuf[APP_STATIC_BUFF_SZ]; - Accessibility_SpiRegistry registry; + Accessibility_Registry registry; Accessibility_Event e; SpiAccessible *accessible; SpiApplication *app; @@ -67,7 +67,7 @@ main(int argc, char **argv) e.source = bonobo_object_corba_objref ( bonobo_object (accessible)); e.type = CORBA_string_dup ("focus:"); - obj_id = "OAFIID:Accessibility_SpiRegistry:proto0.1"; + obj_id = "OAFIID:Accessibility_Registry:proto0.1"; oclient = bonobo_activation_activate_from_id (obj_id, 0, NULL, &ev); if (ev._major != CORBA_NO_EXCEPTION) { @@ -83,14 +83,14 @@ main(int argc, char **argv) g_error ("Could not locate registry"); } - registry = (Accessibility_SpiRegistry) oclient; + registry = (Accessibility_Registry) oclient; - Accessibility_SpiRegistry_registerSpiApplication (registry, + Accessibility_Registry_registerApplication (registry, bonobo_object_corba_objref (bonobo_object (app)), &ev); - fprintf(stderr, "registerSpiApplication has been called.\n"); + fprintf(stderr, "registerApplication has been called.\n"); - Accessibility_SpiRegistry_notifyEvent (registry, &e, &ev); + Accessibility_Registry_notifyEvent (registry, &e, &ev); fprintf (stderr, "notify event has been called.\n"); bonobo_main (); /* needed when app becomes a server ? */ diff --git a/test/at.c b/test/at.c index 2e9a6fd..40a4938 100644 --- a/test/at.c +++ b/test/at.c @@ -50,10 +50,10 @@ main(int argc, char **argv) CORBA_short n_desktops; CORBA_long j; CORBA_long n_apps; - Accessibility_SpiDesktop desktop; - Accessibility_SpiApplication app; + Accessibility_Desktop desktop; + Accessibility_Application app; - Accessibility_SpiRegistry registry; + Accessibility_Registry registry; SpiListener *listener; CORBA_exception_init(&ev); @@ -63,7 +63,7 @@ main(int argc, char **argv) g_error ("Could not initialize Bonobo"); } - obj_id = "OAFIID:Accessibility_SpiRegistry:proto0.1"; + obj_id = "OAFIID:Accessibility_Registry:proto0.1"; oclient = bonobo_activation_activate_from_id (obj_id, 0, NULL, &ev); if (ev._major != CORBA_NO_EXCEPTION) { @@ -83,16 +83,16 @@ main(int argc, char **argv) listener = spi_listener_new (); - registry = (Accessibility_SpiRegistry) oclient; + registry = (Accessibility_Registry) oclient; - Accessibility_SpiRegistry_registerGlobalEventListener + Accessibility_Registry_registerGlobalEventListener (registry, (Accessibility_EventListener) bonobo_object_corba_objref (bonobo_object (listener)), "focus:", &ev); check_ev (&ev, "register:focus"); - Accessibility_SpiRegistry_registerGlobalEventListener + Accessibility_Registry_registerGlobalEventListener (registry, (Accessibility_EventListener) bonobo_object_corba_objref (bonobo_object (listener)), @@ -101,23 +101,23 @@ main(int argc, char **argv) check_ev (&ev, "register:button_press"); fprintf (stderr, "AT callback registered.\n"); - n_desktops = Accessibility_SpiRegistry_getDesktopCount (registry, &ev); + n_desktops = Accessibility_Registry_getDesktopCount (registry, &ev); for (i=0; i