* cspi/accessible.c:
(cpi_initial_relation_type_table): New function which initializes
mapping between Accessibility_RelationType and AccessibleRelationType.
(cspi_relation_type_from_spi_relation_type): New function which
translates an Accessibility_RelationType into an AccessibleRelationType.
(AccessibleRelation_getRelationType): Use
cpi_relation_type_get_spi_relation_type to return correct value.
(spi_state_to_corba): Return correct type for default case.
* cspi/spi_registry.c (SPI_registerAccessibleKeyStrokeListener):
Use Accessibility_EventType instead of Accessibility_KeyEventType.
* cspi/cspi-bonobo-listener.c:
Remove semicolon after BONOBO_TYPE_FUNC. Add casts to avoid compiler
warnings.
* libspi/accessible.c, libspi/action.c, libspi/application.c,
libspi/base.c, libspi/component.c, libspi.devicelistener.c,
libspi/editabletable.c, libspi/hyperlink.c, libspi/hypertext.c,
libspi/image.c, libspi/listener.c, libspi/selection.c,
libspi/stateset.c, libspi/table, libspi/text.c, libspi/value.c,
registryd/desktop.c, registryd/registry.c:
Remove semicolon after BONOBO_TYPE_FUNC_FULL.
* libspi/eventlistener.c
Remove semicolon after BONOBO_TYPE_FUNC.
* libspi/relation.c:
Remove semicolon after BONOBO_TYPE_FUNC_FULL.
(spi_init_relation_type_table): Initialize using correct type.
* registryd/desktop.c:
Remove semicolon after BONOBO_TYPE_FUNC_FULL.
(spi_keystroke_from_x_key_event): Use Accessibility_EventType instead
of Accessibility_KeyEventType.
* test/key-listener-test.c (report_tab_key_event): Use fprintf
instead of g_print.
* tests/simple-at.c, tests/screen-review-test.c:
Add include for <strings.h>.
* tests.stress-test.c:
Add includes for <unistd.h> and <bonobo/bonobo-main.h>
These changes fix compiler warnings when using FORTE compiler on
Solaris; fixes bug #107479.
git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@419
e2bd861d-eb25-0410-b326-
f6ed22b6b98c
+2003-04-14 Padraig O'Briain <padraig.obriain@sun.com>
+
+ * cspi/accessible.c:
+ (cpi_initial_relation_type_table): New function which initializes
+ mapping between Accessibility_RelationType and AccessibleRelationType.
+ (cspi_relation_type_from_spi_relation_type): New function which
+ translates an Accessibility_RelationType into an AccessibleRelationType.
+ (AccessibleRelation_getRelationType): Use
+ cpi_relation_type_get_spi_relation_type to return correct value.
+ (spi_state_to_corba): Return correct type for default case.
+
+ * cspi/spi_registry.c (SPI_registerAccessibleKeyStrokeListener):
+ Use Accessibility_EventType instead of Accessibility_KeyEventType.
+
+ * cspi/cspi-bonobo-listener.c:
+ Remove semicolon after BONOBO_TYPE_FUNC. Add casts to avoid compiler
+ warnings.
+
+ * libspi/accessible.c, libspi/action.c, libspi/application.c,
+ libspi/base.c, libspi/component.c, libspi.devicelistener.c,
+ libspi/editabletable.c, libspi/hyperlink.c, libspi/hypertext.c,
+ libspi/image.c, libspi/listener.c, libspi/selection.c,
+ libspi/stateset.c, libspi/table, libspi/text.c, libspi/value.c,
+ registryd/desktop.c, registryd/registry.c:
+ Remove semicolon after BONOBO_TYPE_FUNC_FULL.
+
+ * libspi/eventlistener.c
+ Remove semicolon after BONOBO_TYPE_FUNC.
+
+ * libspi/relation.c:
+ Remove semicolon after BONOBO_TYPE_FUNC_FULL.
+ (spi_init_relation_type_table): Initialize using correct type.
+
+ * registryd/desktop.c:
+ Remove semicolon after BONOBO_TYPE_FUNC_FULL.
+ (spi_keystroke_from_x_key_event): Use Accessibility_EventType instead
+ of Accessibility_KeyEventType.
+
+ * test/key-listener-test.c (report_tab_key_event): Use fprintf
+ instead of g_print.
+
+ * tests/simple-at.c, tests/screen-review-test.c:
+ Add include for <strings.h>.
+
+ * tests.stress-test.c:
+ Add includes for <unistd.h> and <bonobo/bonobo-main.h>
+
+ These changes fix compiler warnings when using FORTE compiler on
+ Solaris; fixes bug #107479.
+
+
2003-04-10 Bill Haneman <bill.haneman@sun.com>
g_return_if_fail (CSPI_IS_EVENT_LISTENER (listener));
listener->callbacks = g_list_prepend (listener->callbacks,
- cspi_event_handler_new (callback, user_data));
+ cspi_event_handler_new ((void *) callback, user_data));
}
void
g_return_if_fail (CSPI_IS_EVENT_LISTENER (listener));
- listener->callbacks = cspi_event_list_remove_by_cb (listener->callbacks, callback);
+ listener->callbacks = cspi_event_list_remove_by_cb (listener->callbacks, (void *) callback);
}
/*
BONOBO_TYPE_FUNC (CSpiDeviceListener,
spi_device_listener_get_type (),
- cspi_device_listener);
+ cspi_device_listener)
gpointer
cspi_device_listener_new (void)
g_return_if_fail (CSPI_IS_DEVICE_LISTENER (listener));
listener->callbacks = g_list_prepend (listener->callbacks,
- cspi_event_handler_new (callback, user_data));
+ cspi_event_handler_new ((void *)callback, user_data));
}
void
g_return_if_fail (CSPI_IS_DEVICE_LISTENER (listener));
- listener->callbacks = cspi_event_list_remove_by_cb (listener->callbacks, callback);
+ listener->callbacks = cspi_event_list_remove_by_cb (listener->callbacks, (void *) callback);
}
void
cspi_object_unref (obj);
}
+static SPIBoolean
+cspi_init_relation_type_table (AccessibleRelationType *relation_type_table)
+{
+ int i;
+ for (i = 0; i < Accessibility_RELATION_LAST_DEFINED; ++i)
+ {
+ relation_type_table [i] = SPI_RELATION_NULL;
+ }
+ relation_type_table [Accessibility_RELATION_NULL] = SPI_RELATION_NULL;
+ relation_type_table [Accessibility_RELATION_LABEL_FOR] = SPI_RELATION_LABEL_FOR;
+ relation_type_table [Accessibility_RELATION_LABELLED_BY] = SPI_RELATION_LABELED_BY;
+ relation_type_table [Accessibility_RELATION_CONTROLLER_FOR] = SPI_RELATION_CONTROLLER_FOR;
+ relation_type_table [Accessibility_RELATION_CONTROLLED_BY] = SPI_RELATION_CONTROLLED_BY;
+ relation_type_table [Accessibility_RELATION_MEMBER_OF] = SPI_RELATION_MEMBER_OF;
+ relation_type_table [Accessibility_RELATION_TOOLTIP_FOR] = SPI_RELATION_NULL;
+ relation_type_table [Accessibility_RELATION_NODE_CHILD_OF] = SPI_RELATION_NODE_CHILD_OF;
+ relation_type_table [Accessibility_RELATION_EXTENDED] = SPI_RELATION_EXTENDED;
+ relation_type_table [Accessibility_RELATION_FLOWS_TO] = SPI_RELATION_FLOWS_TO;
+ relation_type_table [Accessibility_RELATION_FLOWS_FROM] = SPI_RELATION_FLOWS_FROM;
+ relation_type_table [Accessibility_RELATION_SUBWINDOW_OF] = SPI_RELATION_SUBWINDOW_OF;
+ relation_type_table [Accessibility_RELATION_EMBEDS] = SPI_RELATION_EMBEDS;
+ relation_type_table [Accessibility_RELATION_EMBEDDED_BY] = SPI_RELATION_EMBEDDED_BY;
+ relation_type_table [Accessibility_RELATION_LAST_DEFINED] = SPI_RELATION_LAST_DEFINED;
+}
+
+static AccessibleRelationType
+cspi_relation_type_from_spi_relation_type (Accessibility_RelationType type)
+{
+ /* array is sized according to IDL RelationType because IDL RelationTypes are the index */
+ static AccessibleRelationType cspi_relation_type_table [Accessibility_RELATION_LAST_DEFINED];
+ static SPIBoolean is_initialized = FALSE;
+ AccessibleRelationType cspi_type;
+ if (!is_initialized)
+ {
+ is_initialized = cspi_init_relation_type_table (cspi_relation_type_table);
+ }
+ if (type >= 0 && type < Accessibility_RELATION_LAST_DEFINED)
+ {
+ cspi_type = cspi_relation_type_table [type];
+ }
+ else
+ {
+ cspi_type = SPI_RELATION_NULL;
+ }
+ return cspi_type;
+}
/**
* AccessibleRelation_getRelationType:
* @obj: a pointer to the #AccessibleRelation object to query.
AccessibleRelationType
AccessibleRelation_getRelationType (AccessibleRelation *obj)
{
- AccessibleRelationType retval;
+ Accessibility_RelationType retval;
cspi_return_val_if_fail (obj, SPI_RELATION_NULL);
retval =
Accessibility_Relation_getRelationType (CSPI_OBJREF (obj), cspi_ev());
cspi_return_val_if_ev ("getRelationType", SPI_RELATION_NULL);
- return retval;
+ return cspi_relation_type_from_spi_relation_type (retval);
}
/**
MAP_STATE (VISIBLE);
MAP_STATE (MANAGES_DESCENDANTS);
default:
- return ATK_STATE_INVALID;
+ return Accessibility_STATE_INVALID;
}
#undef MAP_STATE
}
Accessibility_ControllerEventMask controller_event_mask;
Accessibility_DeviceEventController device_event_controller;
Accessibility_EventListenerMode listener_mode;
- Accessibility_KeyEventType key_event_types [2];
+ Accessibility_EventType key_event_types [2];
SPIBoolean retval = FALSE;
if (!listener)
key_events._buffer = key_event_types;
if (eventmask & SPI_KEY_PRESSED)
{
- key_events._buffer[i++] = Accessibility_KEY_PRESSED;
+ key_events._buffer[i++] = Accessibility_KEY_PRESSED_EVENT;
}
if (eventmask & SPI_KEY_RELEASED)
{
- key_events._buffer[i++] = Accessibility_KEY_RELEASED;
+ key_events._buffer[i++] = Accessibility_KEY_RELEASED_EVENT;
}
key_events._length = i;
BONOBO_TYPE_FUNC_FULL (SpiAccessible,
Accessibility_Accessible,
PARENT_TYPE,
- spi_accessible);
+ spi_accessible)
static GHashTable *public_corba_refs = NULL;
BONOBO_TYPE_FUNC_FULL (SpiAction,
Accessibility_Action,
SPI_TYPE_BASE,
- spi_action);
+ spi_action)
static void
spi_action_class_init (SpiActionClass *klass)
BONOBO_TYPE_FUNC_FULL (SpiApplication,
Accessibility_Application,
- PARENT_TYPE, spi_application);
+ PARENT_TYPE, spi_application)
SpiApplication *
spi_application_new (AtkObject *app_root)
object->gobj = NULL;
}
-BONOBO_TYPE_FUNC (SpiBase, PARENT_TYPE, spi_base);
+BONOBO_TYPE_FUNC (SpiBase, PARENT_TYPE, spi_base)
void
spi_base_construct (SpiBase *object, GObject *gobject)
BONOBO_TYPE_FUNC_FULL (SpiComponent,
Accessibility_Component,
PARENT_TYPE,
- spi_component);
+ spi_component)
SpiComponent *
spi_component_interface_new (AtkObject *o)
BONOBO_TYPE_FUNC_FULL (SpiDeviceListener,
Accessibility_DeviceEventListener,
BONOBO_TYPE_OBJECT,
- spi_device_listener);
+ spi_device_listener)
SpiDeviceListener *
spi_device_listener_new (void)
BONOBO_TYPE_FUNC_FULL (SpiEditableText,
Accessibility_EditableText,
SPI_TEXT_TYPE,
- spi_editable_text);
+ spi_editable_text)
static void
spi_editable_text_class_init (SpiEditableTextClass *klass)
BONOBO_TYPE_FUNC (SpiEventListener,
PARENT_TYPE,
- spi_event_listener);
+ spi_event_listener)
SpiEventListener *
spi_event_listener_new ()
BONOBO_TYPE_FUNC_FULL (SpiHyperlink,
Accessibility_Hyperlink,
SPI_TYPE_BASE,
- spi_hyperlink);
+ spi_hyperlink)
static void
BONOBO_TYPE_FUNC_FULL (SpiHypertext,
Accessibility_Hypertext,
PARENT_TYPE,
- spi_hypertext);
+ spi_hypertext)
BONOBO_TYPE_FUNC_FULL (SpiImage,
Accessibility_Image,
SPI_TYPE_BASE,
- spi_image);
+ spi_image)
BONOBO_TYPE_FUNC_FULL (SpiListener,
Accessibility_EventListener,
PARENT_TYPE,
- spi_listener);
+ spi_listener)
SpiListener *
spi_listener_new (void)
gint i;
for (i = 0; i < ATK_RELATION_LAST_DEFINED; i++)
- types[i] = ATK_RELATION_NULL;
+ types[i] = Accessibility_RELATION_NULL;
types[ATK_RELATION_CONTROLLED_BY] = Accessibility_RELATION_CONTROLLED_BY;
types[ATK_RELATION_CONTROLLER_FOR] = Accessibility_RELATION_CONTROLLER_FOR;
BONOBO_TYPE_FUNC_FULL (SpiRelation,
Accessibility_Relation,
SPI_TYPE_BASE,
- spi_relation);
+ spi_relation)
BONOBO_TYPE_FUNC_FULL (SpiSelection,
Accessibility_Selection,
SPI_TYPE_BASE,
- spi_selection);
+ spi_selection)
BONOBO_TYPE_FUNC_FULL (SpiStateSet,
Accessibility_StateSet,
SPI_TYPE_BASE,
- spi_state_set);
+ spi_state_set)
BONOBO_TYPE_FUNC_FULL (SpiTable,
Accessibility_Table,
SPI_TYPE_BASE,
- spi_table);
+ spi_table)
BONOBO_TYPE_FUNC_FULL (SpiText,
Accessibility_Text,
PARENT_TYPE,
- spi_text);
+ spi_text)
void
spi_text_construct (SpiText *text, AtkObject *obj)
BONOBO_TYPE_FUNC_FULL (SpiValue,
Accessibility_Value,
PARENT_TYPE,
- spi_value);
+ spi_value)
static void
BONOBO_TYPE_FUNC_FULL (SpiDesktop,
Accessibility_Desktop,
PARENT_TYPE,
- spi_desktop);
+ spi_desktop)
SpiDesktop *
spi_desktop_new (void)
key_event.hw_code = (CORBA_short) x_key_event->keycode;
if (((XEvent *) x_key_event)->type == KeyPress)
{
- key_event.type = Accessibility_KEY_PRESSED;
+ key_event.type = Accessibility_KEY_PRESSED_EVENT;
}
else
{
- key_event.type = Accessibility_KEY_RELEASED;
+ key_event.type = Accessibility_KEY_RELEASED_EVENT;
}
key_event.modifiers = (CORBA_unsigned_short)(x_key_event->state);
key_event.is_text = CORBA_FALSE;
BONOBO_TYPE_FUNC_FULL (SpiDEController,
Accessibility_DeviceEventController,
PARENT_TYPE,
- spi_device_event_controller);
+ spi_device_event_controller)
BONOBO_TYPE_FUNC_FULL (SpiRegistry,
Accessibility_Registry,
PARENT_TYPE,
- spi_registry);
+ spi_registry)
SpiRegistry *
spi_registry_new (void)
static SPIBoolean
report_all_key_event (const AccessibleKeystroke *key, void *user_data)
{
- g_print("(%d)", key->keyID);
+ fprintf(stdout, "(%d)", key->keyID);
return FALSE;
}
* Boston, MA 02111-1307, USA.
*/
+#include <strings.h>
#include <stdlib.h>
#include "../cspi/spi-private.h"
* Boston, MA 02111-1307, USA.
*/
+#include <strings.h>
#include <stdlib.h>
#include <ctype.h>
#include <unistd.h>
* Boston, MA 02111-1307, USA.
*/
+#include <unistd.h>
#include <stdlib.h>
#include "../cspi/spi-private.h" /* A hack for now */
#include <glib-object.h>
#include <atk/atk.h>
#include <atk/atknoopobject.h>
#include <bonobo-activation/bonobo-activation-register.h>
+#include <bonobo/bonobo-main.h>
#include <libspi.h>
int