+2001-11-23 Michael Meeks <michael@ximian.com>
+
+ * cspi/spi_event.c (AccessibleEventListener_removeCallback):
+ comment out non existant method invoke so we link.
+
+ * cspi/spi-util.c (spi_warn_ev): conform to gtk+ style,
+ use bonobo_exception_get_text for more friendly warnings.
+
+ * cspi/spi.c (Obj_Add): move into spi_main & rename
+ spi_object_add; kill spi.c
+
+ * cspi/spi_registry.c
+ (deregisterGlobalEventListener),
+ (deregisterGlobalEventListenerAll),
+ (registerGlobalEventListener): fix exception leaks.
+
+ * cspi/spi_main.c (spi_exception): impl. helper, so we
+ don't leak exceptions.
+
+ * cspi/spi_selection.c
+ (AccessibleSelection_deselectSelectedChild): return the
+ success state.
+
+ * cspi/spi_main.c (spi_ev): impl; hack - gack.
+ (spi_registry): ditto.
+ (SPI_init): guard against double inits.
+
+ * cspi/*.c: use spi_ev (), and spi_registry () where
+ appropriate - a temporary hack until we have something
+ better. Use spi_object_add
+
+2001-11-22 Michael Meeks <michael@ximian.com>
+
+ * cspi/Makefile.am: re organise, install the headers.
+
+ * cspi/*.h: add G_BEGIN/END_DECLS
+
2001-22-11 Bill Haneman <bill.haneman@sun.com>
* test/simple-at.c:
INCLUDES = -I $(top_srcdir) \
-I $(top_builddir) \
- -I $(top_srcdir)/libspi \
- -I $(top_builddir)/libspi \
$(LIBCSPI_CFLAGS)
-CFLAGS += $(LIBCSPI_CFLAGS)
-
LDFLAGS = $(LIBCSPI_LIBS) @LT_VERSION_INFO@
LDADD = ../libspi/libspi.la $(LIBCSPI_LIBS)
-libcspi_la_SOURCES = spi.c \
- spi.h \
- spi-impl.h \
- spi-listener.h \
- spi-statetypes.h \
- spi-roletypes.h
-
-SPICSOURCES = spi_main.c \
- spi_event.c \
- spi_registry.c \
- spi-util.c\
- spi_accessible.c \
- spi_action.c\
- spi_application.c \
- spi_component.c\
- spi_editabletext.c\
- spi_hyperlink.c\
- spi_hypertext.c\
- spi_image.c\
- spi_selection.c\
- spi_table.c\
- spi_text.c\
- spi_value.c
-
-EXTRA_DIST = $(SPICSOURCES)
-
-spi.c : $(SPICSOURCES) ../libspi/keymasks.h
+libcspidir = $(includedir)/at-spi-1.0/cspi
+libcspi_HEADERS = \
+ spi.h \
+ spi-impl.h \
+ spi-listener.h \
+ spi-roletypes.h \
+ spi-statetypes.h
+
+libcspi_la_SOURCES = \
+ spi_main.c \
+ spi_event.c \
+ spi_registry.c \
+ spi-util.c \
+ spi_accessible.c \
+ spi_action.c \
+ spi_application.c \
+ spi_component.c \
+ spi_editabletext.c \
+ spi_hyperlink.c \
+ spi_hypertext.c \
+ spi_image.c \
+ spi-private.h \
+ spi_selection.c \
+ spi_table.c \
+ spi_text.c \
+ spi_value.c
#ifndef _SPI_IMPL_H_
#define _SPI_IMPL_H_
-#include <stdlib.h>
-#include <orbit/orbit.h>
-#include "accessibleeventlistener.h"
-#include "keystrokelistener.h"
-#include "Accessibility.h"
+#include <libspi/accessibleeventlistener.h>
+#include <libspi/keystrokelistener.h>
+#include <libspi/Accessibility.h>
typedef unsigned int boolean;
#ifndef _SPI_LISTENER_H_
#define _SPI_LISTENER_H_
+#include <libspi/accessibleeventlistener.h>
+#include <libspi/keystrokelistener.h>
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#include "accessibleeventlistener.h"
-#include "keystrokelistener.h"
+G_BEGIN_DECLS
/*
*
typedef VoidSpiEventListenerCB AccessibleEventListenerCB;
typedef BooleanKeystrokeListenerCB AccessibleKeystrokeListenerCB;
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
#endif
#ifndef _SPI_ROLETYPES_H_
#define _SPI_ROLETYPES_H_
+#include <glib/gmacros.h>
+
+G_BEGIN_DECLS
+
/**
* AccessibleRole:
* @SPI_ROLE_INVALID: role is not legal, something is wrong with this object
char* AccessibleRole_getName (AccessibleRole role);
+G_END_DECLS
+
#endif
#ifndef _SPI_STATETYPES_H_
#define _SPI_STATETYPES_H_
+#include <glib/gmacros.h>
+
+G_BEGIN_DECLS
+
/*
*
* Enumerated type for accessible state
SPI_STATE_LAST_DEFINED
} AccessibleState;
+G_END_DECLS
+
#endif
+#include <stdlib.h>
+#include <libbonobo.h>
+#include <cspi/spi-private.h>
+
void
spi_freeString (char *s)
{
}
boolean
-spi_warn_ev (CORBA_Environment *c_ev, char *error_string) {
-
- if (c_ev->_major != CORBA_NO_EXCEPTION) {
- fprintf (stderr,
- "Warning: AT-SPI error: %s: %s\n",
- error_string,
- CORBA_exception_id(c_ev));
- CORBA_exception_init (c_ev);
- return FALSE;
- }
+spi_warn_ev (CORBA_Environment *ev, const char *error_string)
+{
+ if (ev->_major != CORBA_NO_EXCEPTION)
+ {
+ char *err;
+
+ err = bonobo_exception_get_text (ev);
+
+ fprintf (stderr, "Warning: AT-SPI error: %s: %s\n",
+ error_string, err);
+
+ g_free (err);
+
+ CORBA_exception_free (ev);
+
+ return FALSE;
+ }
else
- {
- return TRUE;
- }
+ {
+ return TRUE;
+ }
}
void
-spi_check_ev (CORBA_Environment *c_ev, char *error_string) {
-
- if (c_ev->_major != CORBA_NO_EXCEPTION) {
- fprintf (stderr,
- ("AT-SPI error: %s: %s\n"),
- error_string,
- CORBA_exception_id(c_ev));
- CORBA_exception_free(c_ev);
- exit(-1);
- }
+spi_check_ev (CORBA_Environment *ev, const char *error_string)
+{
+ if (ev->_major != CORBA_NO_EXCEPTION)
+ {
+ char *err;
+
+ err = bonobo_exception_get_text (ev);
+
+ fprintf (stderr, "AT-SPI error: %s: %s\n",
+ error_string, err);
+
+ g_free (err);
+
+ CORBA_exception_free (ev);
+
+ exit (-1);
+ }
}
+++ /dev/null
-#include <libbonobo.h>
-#include <stdio.h>
-#include "spi.h"
-
-static CORBA_Environment ev;
-static AccessibilityRegistry registry;
-
-static Accessible *
-Obj_Add (Accessible object)
-{
- /* TODO: keep list of live object refs */
- Accessible *oref = NULL;
- if (!CORBA_Object_is_nil (object, &ev))
- {
- oref = g_malloc (sizeof (Accessible));
- *oref = object;
- }
- return oref;
-}
-
-/* temporary hack until we restructure these sources */
-
-#include "spi_main.c"
-#include "spi_event.c"
-#include "spi_registry.c"
-#include "spi_application.c"
-#include "spi-util.c"
-#include "spi_accessible.c"
-#include "spi_action.c"
-#include "spi_component.c"
-#include "spi_editabletext.c"
-#include "spi_hyperlink.c"
-#include "spi_hypertext.c"
-#include "spi_image.c"
-#include "spi_selection.c"
-#include "spi_table.c"
-#include "spi_text.c"
-#include "spi_value.c"
-
#ifndef _SPI_H
#define _SPI_H
-/* Implementation private definitions */
-
-#include "spi-impl.h"
+#include <glib/gmacros.h>
+#include <cspi/spi-impl.h>
/*
- * Definitions for AccessibleRole, AccessibleState, AccessibleEvent,
- * and event listeners.
+ * Definitions for AccessibleRole, AccessibleState,
+ * AccessibleEvent, and event listeners.
*/
-
-#include "spi-roletypes.h"
-#include "spi-statetypes.h"
-#include "spi-listener.h"
+#include <cspi/spi-roletypes.h>
+#include <cspi/spi-statetypes.h>
+#include <cspi/spi-listener.h>
/*
* Auxiliary typedefs and mask definitions
*/
-#include <keymasks.h>
+#include <libspi/keymasks.h>
+
+G_BEGIN_DECLS
/*
- *
* Enumerated type for text boundary types
- *
*/
-
typedef enum
{
SPI_TEXT_BOUNDARY_CHAR,
void
spi_freeString (char *s);
+G_END_DECLS
+
#endif
+#include <stdlib.h> /* for malloc */
+#include <cspi/spi-private.h>
+
#define MAX_ROLES 100
static char *role_names [MAX_ROLES] =
int
Accessible_ref (Accessible *obj)
{
- Accessibility_Accessible_ref (*obj, &ev);
- spi_check_ev (&ev, "ref");
+ Accessibility_Accessible_ref (*obj, spi_ev ());
+ spi_check_ev (spi_ev (), "ref");
return 0;
}
int
Accessible_unref (Accessible *obj)
{
- Accessibility_Accessible_unref (*obj, &ev);
- spi_check_ev (&ev, "unref");
+ Accessibility_Accessible_unref (*obj, spi_ev ());
+ spi_check_ev (spi_ev (), "unref");
return 0;
}
{
char *retval =
(char *)
- Accessibility_Accessible__get_name (*obj, &ev);
- spi_check_ev (&ev, "getName");
+ Accessibility_Accessible__get_name (*obj, spi_ev ());
+ spi_check_ev (spi_ev (), "getName");
return retval;
}
Accessible_getDescription (Accessible *obj)
{
char *retval = (char *)
- Accessibility_Accessible__get_description (*obj, &ev);
- spi_check_ev (&ev, "getDescription");
+ Accessibility_Accessible__get_description (*obj, spi_ev ());
+ spi_check_ev (spi_ev (), "getDescription");
return retval;
}
Accessible_getParent (Accessible *obj)
{
Accessible *retval =
- Obj_Add (Accessibility_Accessible__get_parent (*obj, &ev));
- spi_check_ev (&ev, "getParent");
+ spi_object_add (Accessibility_Accessible__get_parent (*obj, spi_ev ()));
+ spi_check_ev (spi_ev (), "getParent");
return retval;
}
long
Accessible_getChildCount (Accessible *obj)
{
- long retval = (long) Accessibility_Accessible__get_childCount (*obj, &ev);
- spi_check_ev (&ev, "getChildCount");
+ long retval = (long) Accessibility_Accessible__get_childCount (*obj, spi_ev ());
+ spi_check_ev (spi_ev (), "getChildCount");
return retval;
}
Accessible_getChildAtIndex (Accessible *obj,
long int childIndex)
{
- Accessible *retval = Obj_Add (Accessibility_Accessible_getChildAtIndex (*obj, childIndex, &ev));
- spi_check_ev (&ev, "getChildAtIndex");
+ Accessible *retval = spi_object_add (Accessibility_Accessible_getChildAtIndex (*obj, childIndex, spi_ev ()));
+ spi_check_ev (spi_ev (), "getChildAtIndex");
return retval;
}
long
Accessible_getIndexInParent (Accessible *obj)
{
- long retval = (long) Accessibility_Accessible_getIndexInParent (*obj, &ev);
- spi_check_ev (&ev, "getIndexInParent");
+ long retval = (long) Accessibility_Accessible_getIndexInParent (*obj, spi_ev ());
+ spi_check_ev (spi_ev (), "getIndexInParent");
return retval;
}
int n_relations;
int i;
Accessibility_RelationSet *relation_set =
- Accessibility_Accessible_getRelationSet (*obj, &ev);
+ Accessibility_Accessible_getRelationSet (*obj, spi_ev ());
/* this looks hack-ish, but it's based on the CORBA C bindings spec */
n_relations = relation_set->_length;
for (i=0; i<n_relations; ++i)
{
- relations[i] = Obj_Add (relation_set->_buffer[i]);
+ relations[i] = spi_object_add (relation_set->_buffer[i]);
}
relations[i] = CORBA_OBJECT_NIL;
Accessible_getRole (Accessible *obj)
{
char *retval = AccessibleRole_getName (
- Accessibility_Accessible_getRole (*obj, &ev));
- spi_check_ev (&ev, "getRole");
+ Accessibility_Accessible_getRole (*obj, spi_ev ()));
+ spi_check_ev (spi_ev (), "getRole");
return retval;
}
Bonobo_Unknown iface =
Accessibility_Accessible_queryInterface (*obj,
"IDL:Accessibility/Action:1.0",
- &ev);
- spi_warn_ev (&ev, "isAction");
+ spi_ev ());
+ spi_warn_ev (spi_ev (), "isAction");
- return (CORBA_Object_is_nil (iface, &ev)) ? FALSE : TRUE;
+ return (CORBA_Object_is_nil (iface, spi_ev ())) ? FALSE : TRUE;
}
/**
Bonobo_Unknown iface =
Accessibility_Accessible_queryInterface (*obj,
"IDL:Accessibility/Component:1.0",
- &ev);
- spi_warn_ev (&ev, "isComponent");
+ spi_ev ());
+ spi_warn_ev (spi_ev (), "isComponent");
- return (CORBA_Object_is_nil (iface, &ev)) ? FALSE : TRUE;
+ return (CORBA_Object_is_nil (iface, spi_ev ())) ? FALSE : TRUE;
}
/**
Bonobo_Unknown iface =
Accessibility_Accessible_queryInterface (*obj,
"IDL:Accessibility/EditableText:1.0",
- &ev);
- spi_check_ev (&ev, "isEditableText");
+ spi_ev ());
+ spi_check_ev (spi_ev (), "isEditableText");
- return (CORBA_Object_is_nil (iface, &ev)) ? FALSE : TRUE;
+ return (CORBA_Object_is_nil (iface, spi_ev ())) ? FALSE : TRUE;
}
/**
Bonobo_Unknown iface =
Accessibility_Accessible_queryInterface (*obj,
"IDL:Accessibility/Hypertext:1.0",
- &ev);
+ spi_ev ());
- spi_check_ev (&ev, "isHypertext");
+ spi_check_ev (spi_ev (), "isHypertext");
- return (CORBA_Object_is_nil (iface, &ev)) ? FALSE : TRUE;
+ return (CORBA_Object_is_nil (iface, spi_ev ())) ? FALSE : TRUE;
}
/**
Bonobo_Unknown iface =
Accessibility_Accessible_queryInterface (*obj,
"IDL:Accessibility/Image:1.0",
- &ev);
- spi_check_ev (&ev, "isImage");
+ spi_ev ());
+ spi_check_ev (spi_ev (), "isImage");
- return (CORBA_Object_is_nil (iface, &ev)) ? FALSE : TRUE;
+ return (CORBA_Object_is_nil (iface, spi_ev ())) ? FALSE : TRUE;
}
/**
Bonobo_Unknown iface =
Accessibility_Accessible_queryInterface (*obj,
"IDL:Accessibility/Selection:1.0",
- &ev);
- spi_warn_ev (&ev, "isSelection");
+ spi_ev ());
+ spi_warn_ev (spi_ev (), "isSelection");
- return (CORBA_Object_is_nil (iface, &ev)) ? FALSE : TRUE;
+ return (CORBA_Object_is_nil (iface, spi_ev ())) ? FALSE : TRUE;
}
Bonobo_Unknown iface =
Accessibility_Accessible_queryInterface (*obj,
"IDL:Accessibility/Table:1.0",
- &ev);
- spi_check_ev (&ev, "isTable");
+ spi_ev ());
+ spi_check_ev (spi_ev (), "isTable");
- return (CORBA_Object_is_nil (iface, &ev)) ? FALSE : TRUE;
+ return (CORBA_Object_is_nil (iface, spi_ev ())) ? FALSE : TRUE;
}
Bonobo_Unknown iface =
Accessibility_Accessible_queryInterface (*obj,
"IDL:Accessibility/Text:1.0",
- &ev);
- spi_warn_ev (&ev, "isText");
+ spi_ev ());
+ spi_warn_ev (spi_ev (), "isText");
- return (CORBA_Object_is_nil (iface, &ev)) ? FALSE : TRUE;
+ return (CORBA_Object_is_nil (iface, spi_ev ())) ? FALSE : TRUE;
}
/**
Bonobo_Unknown iface =
Accessibility_Accessible_queryInterface (*obj,
"IDL:Accessibility/Value:1.0",
- &ev);
- spi_check_ev (&ev, "isValue");
+ spi_ev ());
+ spi_check_ev (spi_ev (), "isValue");
- return (CORBA_Object_is_nil (iface, &ev)) ? FALSE : TRUE;
+ return (CORBA_Object_is_nil (iface, spi_ev ())) ? FALSE : TRUE;
}
/**
Bonobo_Unknown iface =
Accessibility_Accessible_queryInterface (*obj,
"IDL:Accessibility/Action:1.0",
- &ev);
- spi_check_ev (&ev, "getAction");
+ spi_ev ());
+ spi_check_ev (spi_ev (), "getAction");
- return (AccessibleAction *)
- ((CORBA_Object_is_nil (iface, &ev)) ? 0 : Obj_Add (iface));
+ return (AccessibleAction *) spi_object_add (iface);
}
/**
Bonobo_Unknown iface =
Accessibility_Accessible_queryInterface (*obj,
"IDL:Accessibility/Component:1.0",
- &ev);
- spi_check_ev (&ev, "getComponent");
+ spi_ev ());
+ spi_check_ev (spi_ev (), "getComponent");
- return (AccessibleComponent *) ((CORBA_Object_is_nil (iface, &ev)) ? 0 : Obj_Add (iface));
+ return (AccessibleComponent *) spi_object_add (iface);
}
/**
Bonobo_Unknown iface =
Accessibility_Accessible_queryInterface (*obj,
"IDL:Accessibility/EditableText:1.0",
- &ev);
- spi_check_ev (&ev, "getEditableText");
+ spi_ev ());
+ spi_check_ev (spi_ev (), "getEditableText");
- return (AccessibleEditableText *)
- ((CORBA_Object_is_nil (iface, &ev)) ? 0 : Obj_Add (iface));
+ return (AccessibleEditableText *) spi_object_add (iface);
}
Bonobo_Unknown iface =
Accessibility_Accessible_queryInterface (*obj,
"IDL:Accessibility/Hypertext:1.0",
- &ev);
- spi_check_ev (&ev, "getHypertext");
+ spi_ev ());
+ spi_check_ev (spi_ev (), "getHypertext");
- return (AccessibleHypertext *)
- ((CORBA_Object_is_nil (iface, &ev)) ? 0 : Obj_Add (iface));
+ return (AccessibleHypertext *) spi_object_add (iface);
}
Bonobo_Unknown iface =
Accessibility_Accessible_queryInterface (*obj,
"IDL:Accessibility/Image:1.0",
- &ev);
- spi_check_ev (&ev, "getImage");
+ spi_ev ());
+ spi_check_ev (spi_ev (), "getImage");
- return (AccessibleImage *)
- ((CORBA_Object_is_nil (iface, &ev)) ? 0 : Obj_Add (iface));
+ return (AccessibleImage *) spi_object_add (iface);
}
Bonobo_Unknown iface =
Accessibility_Accessible_queryInterface (*obj,
"IDL:Accessibility/Selection:1.0",
- &ev);
- spi_warn_ev (&ev, "getSelection");
+ spi_ev ());
+ spi_warn_ev (spi_ev (), "getSelection");
- return (AccessibleSelection *)
- ((CORBA_Object_is_nil (iface, &ev)) ? 0 : Obj_Add (iface));
+ return (AccessibleSelection *) spi_object_add (iface);
}
Bonobo_Unknown iface =
Accessibility_Accessible_queryInterface (*obj,
"IDL:Accessibility/Table:1.0",
- &ev);
- spi_check_ev (&ev, "getTable");
+ spi_ev ());
+ spi_check_ev (spi_ev (), "getTable");
- return (AccessibleTable *)
- ((CORBA_Object_is_nil (iface, &ev)) ? 0 : Obj_Add (iface));
+ return (AccessibleTable *) spi_object_add (iface);
}
/**
Bonobo_Unknown iface =
Accessibility_Accessible_queryInterface (*obj,
"IDL:Accessibility/Text:1.0",
- &ev);
+ spi_ev ());
- spi_check_ev (&ev, "getText");
+ spi_check_ev (spi_ev (), "getText");
- return (AccessibleText *)
- ((CORBA_Object_is_nil (iface, &ev)) ? 0 : Obj_Add (iface));
+ return (AccessibleText *) spi_object_add (iface);
}
Bonobo_Unknown iface =
Accessibility_Accessible_queryInterface (*obj,
"IDL:Accessibility/Value:1.0",
- &ev);
- return (AccessibleValue *)
- ((CORBA_Object_is_nil (iface, &ev)) ? 0 : Obj_Add (iface));
+ spi_ev ());
+ return (AccessibleValue *) spi_object_add (iface);
}
GenericInterface iface;
iface = Accessibility_Accessible_queryInterface (*obj,
interface_name,
- &ev);
- return (iface != NULL) ? Obj_Add (iface) : NULL;
+ spi_ev ());
+ return spi_object_add (iface);
}
int
AccessibleRelation_ref (AccessibleRelation *obj)
{
- Accessibility_Relation_ref (*obj, &ev);
- spi_check_ev (&ev, "ref");
+ Accessibility_Relation_ref (*obj, spi_ev ());
+ spi_check_ev (spi_ev (), "ref");
return 0;
}
int
AccessibleRelation_unref (AccessibleRelation *obj)
{
- Accessibility_Relation_unref (*obj, &ev);
- spi_check_ev (&ev, "unref");
+ Accessibility_Relation_unref (*obj, spi_ev ());
+ spi_check_ev (spi_ev (), "unref");
return 0;
}
int
AccessibleStateSet_ref (AccessibleStateSet *obj)
{
-/* Accessibility_StateSet_ref (*obj, &ev); */
- spi_check_ev (&ev, "ref");
+/* Accessibility_StateSet_ref (*obj, spi_ev ()); */
+ spi_check_ev (spi_ev (), "ref");
return 0;
}
int
AccessibleStateSet_unref (AccessibleStateSet *obj)
{
-/* Accessibility_StateSet_unref (*obj, &ev); */
- spi_check_ev (&ev, "unref");
+/* Accessibility_StateSet_unref (*obj, spi_ev ()); */
+ spi_check_ev (spi_ev (), "unref");
return 0;
}
AccessibleStateSet_contains (AccessibleStateSet *obj,
AccessibleState state)
{
- CORBA_boolean retval = Accessibility_StateSet_contains (*obj, state, &ev);
- spi_check_ev (&ev, "contains");
+ CORBA_boolean retval = Accessibility_StateSet_contains (*obj, state, spi_ev ());
+ spi_check_ev (spi_ev (), "contains");
return (boolean) retval;
}
AccessibleStateSet_add (AccessibleStateSet *obj,
AccessibleState state)
{
- Accessibility_StateSet_add (*obj, state, &ev);
- spi_check_ev (&ev, "contains");
+ Accessibility_StateSet_add (*obj, state, spi_ev ());
+ spi_check_ev (spi_ev (), "contains");
}
AccessibleStateSet_remove (AccessibleStateSet *obj,
AccessibleState state)
{
- Accessibility_StateSet_remove (*obj, state, &ev);
- spi_check_ev (&ev, "contains");
+ Accessibility_StateSet_remove (*obj, state, spi_ev ());
+ spi_check_ev (spi_ev (), "contains");
}
/**
AccessibleStateSet_equals (AccessibleStateSet *obj,
AccessibleStateSet *obj2)
{
- return Accessibility_StateSet_equals (*obj, *obj2, &ev);
+ return Accessibility_StateSet_equals (*obj, *obj2, spi_ev ());
}
/**
AccessibleStateSet_isEmpty (AccessibleStateSet *obj)
{
return TRUE;
- /* return Accessibility_StateSet_isEmpty (*obj, &ev);*/
+ /* return Accessibility_StateSet_isEmpty (*obj, spi_ev ());*/
}
+#include <cspi/spi-private.h>
+
/**
* AccessibleAction_ref:
* @obj: a pointer to the #AccessibleAction on which to operate.
AccessibleAction_ref (
AccessibleAction *obj)
{
- Accessibility_Action_ref (*obj, &ev);
+ Accessibility_Action_ref (*obj, spi_ev ());
return 0;
}
int
AccessibleAction_unref (AccessibleAction *obj)
{
- Accessibility_Action_unref (*obj, &ev);
+ Accessibility_Action_unref (*obj, spi_ev ());
return 0;
}
AccessibleAction_getNActions (AccessibleAction *obj)
{
return (long)
- Accessibility_Action__get_nActions (*obj, &ev);
+ Accessibility_Action__get_nActions (*obj, spi_ev ());
}
return (char *)
Accessibility_Action_getDescription (*obj,
(CORBA_long) i,
- &ev);
+ spi_ev ());
}
/**
return (char *)
Accessibility_Action_getKeyBinding (*obj,
(CORBA_long) i,
- &ev);
+ spi_ev ());
}
return (char *)
Accessibility_Action_getName (*obj,
(CORBA_long) i,
- &ev);
+ spi_ev ());
}
return (boolean)
Accessibility_Action_doAction (*obj,
(CORBA_long) i,
- &ev);
+ spi_ev ());
}
-
/*
*
* AccessibleApplication function prototypes
*
*/
+#include <cspi/spi-private.h>
+
/**
* AccessibleApplication_ref:
* @obj: a pointer to the #AccessibleApplication on which to operate.
int
AccessibleApplication_ref (AccessibleApplication *obj)
{
- Accessibility_Application_ref (*obj, &ev);
+ Accessibility_Application_ref (*obj, spi_ev ());
return 0;
}
int
AccessibleApplication_unref (AccessibleApplication *obj)
{
- Accessibility_Application_unref (*obj, &ev);
+ Accessibility_Application_unref (*obj, spi_ev ());
return 0;
}
char *
AccessibleApplication_getToolkitName (AccessibleApplication *obj)
{
- return Accessibility_Application__get_toolkitName (*obj, &ev);
+ return Accessibility_Application__get_toolkitName (*obj, spi_ev ());
}
/**
char *
AccessibleApplication_getVersion (AccessibleApplication *obj)
{
- return Accessibility_Application__get_version (*obj, &ev);
+ return Accessibility_Application__get_version (*obj, spi_ev ());
}
/**
long
AccessibleApplication_getID (AccessibleApplication *obj)
{
- return Accessibility_Application__get_id (*obj, &ev);
+ return Accessibility_Application__get_id (*obj, spi_ev ());
}
/**
*
*/
+#include <cspi/spi-private.h>
+
/**
* AccessibleComponent_ref:
* @obj: a pointer to an object implementing #AccessibleComponent on which to operate.
int
AccessibleComponent_ref (AccessibleComponent *obj)
{
- Accessibility_Component_ref (*obj, &ev);
+ Accessibility_Component_ref (*obj, spi_ev ());
return 0;
}
int
AccessibleComponent_unref (AccessibleComponent *obj)
{
- Accessibility_Component_unref (*obj, &ev);
+ Accessibility_Component_unref (*obj, spi_ev ());
return 0;
}
(CORBA_long) x,
(CORBA_long) y,
ctype,
- &ev);
+ spi_ev ());
}
/**
(CORBA_long) x,
(CORBA_long) y,
ctype,
- &ev);
- return (child != NULL) ? Obj_Add (child) : NULL;
+ spi_ev ());
+ return spi_object_add (child);
}
/**
&cw,
&ch,
ctype,
- &ev);
- spi_warn_ev (&ev, "AccessibleComponent_getExtents");
+ spi_ev ());
+ spi_warn_ev (spi_ev (), "AccessibleComponent_getExtents");
*x = (long) cx;
*y = (long) cy;
*width = (long) cw;
(CORBA_long *) x,
(CORBA_long *) y,
ctype,
- &ev);
+ spi_ev ());
}
/**
Accessibility_Component_getSize (*obj,
(CORBA_long *) width,
(CORBA_long *) height,
- &ev);
+ spi_ev ());
}
/**
+#include <cspi/spi-private.h>
+
/**
* AccessibleEditableText_ref:
* @obj: a pointer to the #AccessibleEditableText object on which to operate.
int
AccessibleEditableText_ref (AccessibleEditableText *obj)
{
- Accessibility_EditableText_ref (*obj, &ev);
+ Accessibility_EditableText_ref (*obj, spi_ev ());
return 0;
}
int
AccessibleEditableText_unref (AccessibleEditableText *obj)
{
- Accessibility_EditableText_unref (*obj, &ev);
+ Accessibility_EditableText_unref (*obj, spi_ev ());
return 0;
}
Accessibility_EditableText_setAttributes (*obj,
(CORBA_char *) attributes,
(CORBA_long) startPos,
- (CORBA_long) endPos, &ev);
+ (CORBA_long) endPos, spi_ev ());
}
const char *newContents)
{
Accessibility_EditableText_setTextContents (*obj,
- (CORBA_char *) newContents, &ev);
+ (CORBA_char *) newContents, spi_ev ());
return TRUE; /* TODO: make bonobo method return a boolean */
}
{
Accessibility_EditableText_insertText (*obj,
(CORBA_long) position, (CORBA_char *) text,
- (CORBA_long) length, &ev);
+ (CORBA_long) length, spi_ev ());
return TRUE;
}
long int endPos)
{
Accessibility_EditableText_copyText (*obj,
- (CORBA_long) startPos, (CORBA_long) endPos, &ev);
+ (CORBA_long) startPos, (CORBA_long) endPos, spi_ev ());
return TRUE;
}
long int endPos)
{
Accessibility_EditableText_cutText (*obj,
- (CORBA_long) startPos, (CORBA_long) endPos, &ev);
+ (CORBA_long) startPos, (CORBA_long) endPos, spi_ev ());
return TRUE;
}
long endPos)
{
Accessibility_EditableText_deleteText (*obj,
- (CORBA_long) startPos, (CORBA_long) endPos, &ev);
+ (CORBA_long) startPos, (CORBA_long) endPos, spi_ev ());
return TRUE;
}
long int position)
{
Accessibility_EditableText_pasteText (*obj,
- (CORBA_long) position, &ev);
+ (CORBA_long) position, spi_ev ());
return TRUE;
}
* Boston, MA 02111-1307, USA.
*/
+#include <cspi/spi-private.h>
+
/**
* createAccessibleEventListener:
* @callback : an #AccessibleEventListenerCB callback function, or NULL.
AccessibleEventListener_removeCallback (AccessibleEventListener *listener,
AccessibleEventListenerCB callback)
{
- spi_event_listener_remove_callback (listener, callback);
+/* spi_event_listener_remove_callback (listener, callback); */
return TRUE;
}
+#include <cspi/spi-private.h>
+
/**
* AccessibleHyperlink_ref:
* @obj: a pointer to the #AccessibleHyperlink object on which to operate.
int
AccessibleHyperlink_ref (AccessibleHyperlink *obj)
{
- Accessibility_Hyperlink_ref (*obj, &ev);
+ Accessibility_Hyperlink_ref (*obj, spi_ev ());
return 0;
}
int
AccessibleHyperlink_unref (AccessibleHyperlink *obj)
{
- Accessibility_Hyperlink_unref (*obj, &ev);
+ Accessibility_Hyperlink_unref (*obj, spi_ev ());
return 0;
}
AccessibleHyperlink_getNAnchors (AccessibleHyperlink *obj)
{
return (long)
- Accessibility_Hyperlink__get_nAnchors (*obj, &ev);
+ Accessibility_Hyperlink__get_nAnchors (*obj, spi_ev ());
}
{
return (char *)
Accessibility_Hyperlink_getURI (*obj,
- (CORBA_long) i, &ev);
+ (CORBA_long) i, spi_ev ());
}
/**
AccessibleHyperlink_getObject (AccessibleHyperlink *obj,
long int i)
{
- return Obj_Add (
+ return spi_object_add (
Accessibility_Hyperlink_getObject (*obj,
- (CORBA_long) i, &ev));
+ (CORBA_long) i, spi_ev ()));
}
/**
long int *endIndex)
{
*startIndex = (long)
- Accessibility_Hyperlink__get_startIndex (*obj, &ev);
+ Accessibility_Hyperlink__get_startIndex (*obj, spi_ev ());
*endIndex = (long)
- Accessibility_Hyperlink__get_endIndex (*obj, &ev);
+ Accessibility_Hyperlink__get_endIndex (*obj, spi_ev ());
}
AccessibleHyperlink_isValid (AccessibleHyperlink *obj)
{
return (boolean)
- Accessibility_Hyperlink_isValid (*obj, &ev);
+ Accessibility_Hyperlink_isValid (*obj, spi_ev ());
}
+#include <cspi/spi-private.h>
+
/**
* AccessibleHypertext_ref:
* @obj: a pointer to the #AccessibleHypertext object on which to operate.
int
AccessibleHypertext_ref (AccessibleHypertext *obj)
{
- Accessibility_Hypertext_ref (*obj, &ev);
+ Accessibility_Hypertext_ref (*obj, spi_ev ());
return 0;
}
int
AccessibleHypertext_unref (AccessibleHypertext *obj)
{
- Accessibility_Hypertext_unref (*obj, &ev);
+ Accessibility_Hypertext_unref (*obj, spi_ev ());
return 0;
}
AccessibleHypertext_getNLinks (AccessibleHypertext *obj)
{
return (long)
- Accessibility_Hypertext_getNLinks (*obj, &ev);
+ Accessibility_Hypertext_getNLinks (*obj, spi_ev ());
}
{
return (AccessibleHyperlink *)
Accessibility_Hypertext_getLink (*obj,
- (CORBA_long) linkIndex, &ev);
+ (CORBA_long) linkIndex, spi_ev ());
}
{
return (long)
Accessibility_Hypertext_getLinkIndex (*obj,
- (CORBA_long) characterOffset, &ev);
+ (CORBA_long) characterOffset, spi_ev ());
}
+#include <cspi/spi-private.h>
+
/**
* AccessibleImage_ref:
* @obj: a pointer to the #AccessibleImage implementor on which to operate.
int
AccessibleImage_ref (AccessibleImage *obj)
{
- Accessibility_Image_ref (*obj, &ev);
+ Accessibility_Image_ref (*obj, spi_ev ());
return 0;
}
int
AccessibleImage_unref (AccessibleImage *obj)
{
- Accessibility_Image_unref (*obj, &ev);
+ Accessibility_Image_unref (*obj, spi_ev ());
return 0;
}
AccessibleImage_getImageDescription (AccessibleImage *obj)
{
return (char *)
- Accessibility_Image__get_imageDescription (*obj, &ev);
+ Accessibility_Image__get_imageDescription (*obj, spi_ev ());
}
long int *height)
{
Accessibility_Image_getImageSize (*obj,
- (CORBA_long *) width, (CORBA_long *) height, &ev);
+ (CORBA_long *) width, (CORBA_long *) height, spi_ev ());
}
{
Accessibility_Image_getImagePosition (*obj,
(CORBA_long *) x, (CORBA_long *) y, (CORBA_short) ctype,
- &ev);
+ spi_ev ());
}
-
/*
*
* Basic SPI initialization and event loop function prototypes
*
*/
+#include <stdlib.h>
+#include <libbonobo.h>
+#include <cspi/spi-private.h>
+
+static CORBA_Environment ev = { 0 };
+static AccessibilityRegistry registry = CORBA_OBJECT_NIL;
+
+CORBA_Environment *
+spi_ev (void)
+{
+ /* This method is an ugly hack */
+ return &ev;
+}
+
+AccessibilityRegistry
+spi_registry (void)
+{
+ /* This method is an ugly hack */
+ return registry;
+}
+
+boolean
+spi_exception (void)
+{
+ boolean retval;
+
+ if (BONOBO_EX (&ev))
+ {
+ CORBA_exception_free (&ev);
+ retval = TRUE;
+ }
+ else
+ {
+ retval = FALSE;
+ }
+
+ return retval;
+}
+
+Accessible *
+spi_object_add (Accessible corba_object)
+{
+ /* TODO: keep list of live object refs */
+ Accessible *oref = NULL;
+
+ if (corba_object != CORBA_OBJECT_NIL)
+ {
+ oref = g_malloc (sizeof (Accessible));
+ *oref = corba_object;
+ }
+
+ return oref;
+}
/**
* SPI_init:
SPI_init (void)
{
int argc = 0;
- CORBA_Object oclient;
char *obj_id;
+ CORBA_Object oclient;
+ static gboolean inited = FALSE;
+
+ if (inited)
+ {
+ return 1;
+ }
+
+ inited = TRUE;
- CORBA_exception_init(&ev);
+ CORBA_exception_init (&ev);
if (!bonobo_init (&argc, NULL))
{
obj_id = "OAFIID:Accessibility_Registry:proto0.1";
- oclient = bonobo_activation_activate_from_id (obj_id, 0, NULL, &ev);
- if (ev._major != CORBA_NO_EXCEPTION) {
- fprintf (stderr,
- ("AT-SPI error: during registry activation: %s\n"),
- CORBA_exception_id(&ev));
- CORBA_exception_free(&ev);
- exit(-1);
- }
+ oclient = bonobo_activation_activate_from_id (
+ obj_id, 0, NULL, spi_ev ());
+
+ if (ev._major != CORBA_NO_EXCEPTION)
+ {
+ g_error ("AT-SPI error: during registry activation: %s\n",
+ bonobo_exception_get_text (spi_ev ()));
+ }
- if (CORBA_Object_is_nil (oclient, &ev))
+ if (CORBA_Object_is_nil (oclient, spi_ev ()))
{
g_error ("Could not locate registry");
- exit(-1);
}
registry = (Accessibility_Registry) oclient;
void
SPI_event_main (boolean isGNOMEApp)
{
- if (isGNOMEApp) {
- g_atexit(SPI_exit);
- bonobo_main();
- }
- else {
- /* TODO: install signal handlers to do cleanup */
- CORBA_ORB_run (bonobo_orb(), &ev);
- fprintf (stderr, "orb loop exited...\n");
- }
+ if (isGNOMEApp)
+ {
+ g_atexit (SPI_exit);
+ bonobo_main ();
+ }
+ else
+ {
+ /* TODO: install signal handlers to do cleanup */
+ CORBA_ORB_run (bonobo_orb(), spi_ev ());
+ fprintf (stderr, "orb loop exited...\n");
+ }
}
/**
* Boston, MA 02111-1307, USA.
*/
+#include <cspi/spi-private.h>
+
/*
*
* Global functions serviced by the registry
registerGlobalEventListener (AccessibleEventListener *listener,
char *eventType)
{
+ boolean retval;
+
Accessibility_Registry_registerGlobalEventListener (
- registry,
+ spi_registry (),
(Accessibility_EventListener)
bonobo_object_corba_objref (bonobo_object (listener)),
eventType,
- &ev);
+ spi_ev ());
- if (ev._major != CORBA_NO_EXCEPTION)
- {
- return FALSE;
- }
- else
- {
- return TRUE;
- }
+ retval = !spi_exception ();
+
+ return retval;
}
/**
deregisterGlobalEventListenerAll (AccessibleEventListener *listener)
{
Accessibility_Registry_deregisterGlobalEventListenerAll (
- registry,
+ spi_registry (),
(Accessibility_EventListener)
CORBA_Object_duplicate (
bonobo_object_corba_objref (
- bonobo_object (listener)), &ev),
- &ev);
+ bonobo_object (listener)), spi_ev ()),
+ spi_ev ());
- if (ev._major != CORBA_NO_EXCEPTION)
- {
- return FALSE;
- }
- else
- {
- return TRUE;
- }
+ return !spi_exception ();
}
/**
* deregisterGlobalEventListener:
char *eventType)
{
Accessibility_Registry_deregisterGlobalEventListener (
- registry,
+ spi_registry (),
(Accessibility_EventListener)
CORBA_Object_duplicate (
- bonobo_object_corba_objref (bonobo_object (listener)), &ev),
+ bonobo_object_corba_objref (bonobo_object (listener)), spi_ev ()),
(CORBA_char *) eventType,
- &ev);
+ spi_ev ());
- if (ev._major != CORBA_NO_EXCEPTION)
- {
- return FALSE;
- }
- else
- {
- return TRUE;
- }
+ return !spi_exception ();
}
/**
int
getDesktopCount ()
{
- return Accessibility_Registry_getDesktopCount (registry, &ev);
+ return Accessibility_Registry_getDesktopCount (
+ spi_registry (), spi_ev ());
}
/**
Accessible*
getDesktop (int i)
{
- return Obj_Add (Accessibility_Registry_getDesktop (registry, (CORBA_short) i, &ev));
+ return spi_object_add (Accessibility_Registry_getDesktop (spi_registry (), (CORBA_short) i, spi_ev ()));
}
/**
Accessibility_ControllerEventMask *controller_event_mask =
Accessibility_ControllerEventMask__alloc();
Accessibility_DeviceEventController device_event_controller =
- Accessibility_Registry_getDeviceEventController (registry, &ev);
+ Accessibility_Registry_getDeviceEventController (spi_registry (), spi_ev ());
Accessibility_KeySet *key_set = Accessibility_KeySet__alloc();
Accessibility_KeyEventTypeSeq *key_events = Accessibility_KeyEventTypeSeq__alloc();
Accessibility_KeystrokeListener spi_listener_corba_ref;
gint i, mask;
- Accessibility_DeviceEventController_ref (device_event_controller, &ev);
+ Accessibility_DeviceEventController_ref (device_event_controller, spi_ev ());
/* copy the keyval filter values from the C api into the CORBA KeySet */
if (keys)
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);
+ CORBA_Object_duplicate (bonobo_object_corba_objref (bonobo_object (listener)), spi_ev ());
Accessibility_DeviceEventController_registerKeystrokeListener (
device_event_controller,
controller_event_mask,
key_events,
(CORBA_boolean) ((sync_type & SPI_KEYLISTENER_ALL_WINDOWS)!=0),
- &ev);
+ spi_ev ());
}
/**
Accessibility_ControllerEventMask *controller_event_mask =
Accessibility_ControllerEventMask__alloc();
Accessibility_DeviceEventController device_event_controller =
- Accessibility_Registry_getDeviceEventController (registry, &ev);
+ Accessibility_Registry_getDeviceEventController (spi_registry (), spi_ev ());
Accessibility_KeySet *all_keys = Accessibility_KeySet__alloc();
Accessibility_KeyEventTypeSeq *key_events = Accessibility_KeyEventTypeSeq__alloc();
Accessibility_KeystrokeListener spi_listener_corba_ref;
- Accessibility_DeviceEventController_unref (device_event_controller, &ev);
+ Accessibility_DeviceEventController_unref (device_event_controller, spi_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);
+ CORBA_Object_duplicate (bonobo_object_corba_objref (bonobo_object (listener)), spi_ev ());
Accessibility_DeviceEventController_deregisterKeystrokeListener (
device_event_controller,
controller_event_mask,
key_events,
(CORBA_boolean) TRUE,
- &ev);
+ spi_ev ());
}
/**
* send keycode to alter, if necessary
*/
Accessibility_DeviceEventController device_event_controller =
- Accessibility_Registry_getDeviceEventController (registry, &ev);
+ Accessibility_Registry_getDeviceEventController (spi_registry (), spi_ev ());
Accessibility_DeviceEventController_generateKeyEvent (device_event_controller,
keyval,
(unsigned long) synth_type,
- &ev);
+ spi_ev ());
}
/**
+#include <cspi/spi-private.h>
+
/**
* AccessibleSelection_ref:
* @obj: a pointer to the #AccessibleSelection implementor on which to operate.
int
AccessibleSelection_ref (AccessibleSelection *obj)
{
- Accessibility_Selection_ref (*obj, &ev);
+ Accessibility_Selection_ref (*obj, spi_ev ());
return 0;
}
int
AccessibleSelection_unref (AccessibleSelection *obj)
{
- Accessibility_Selection_unref (*obj, &ev);
+ Accessibility_Selection_unref (*obj, spi_ev ());
return 0;
}
AccessibleSelection_getNSelectedChildren (AccessibleSelection *obj)
{
return (long)
- Accessibility_Selection__get_nSelectedChildren (*obj, &ev);
+ Accessibility_Selection__get_nSelectedChildren (*obj, spi_ev ());
}
{
Accessibility_Accessible child =
Accessibility_Selection_getSelectedChild (*obj,
- (CORBA_long) selectedChildIndex, &ev);
- spi_warn_ev (&ev, "getSelectedChild");
+ (CORBA_long) selectedChildIndex, spi_ev ());
+ spi_warn_ev (spi_ev (), "getSelectedChild");
- return (Accessible *) ((CORBA_Object_is_nil (child, &ev)) ? NULL : Obj_Add (child));
+ return (Accessible *) spi_object_add (child);
}
/**
{
return (boolean)
Accessibility_Selection_selectChild (*obj,
- (CORBA_long) childIndex, &ev);
+ (CORBA_long) childIndex, spi_ev ());
}
AccessibleSelection_deselectSelectedChild (AccessibleSelection *obj,
long int selectedChildIndex)
{
- Accessibility_Selection_deselectSelectedChild (*obj,
- (CORBA_long) selectedChildIndex, &ev);
+ return Accessibility_Selection_deselectSelectedChild (
+ *obj, (CORBA_long) selectedChildIndex, spi_ev ());
}
{
return (boolean)
Accessibility_Selection_isChildSelected (*obj,
- (CORBA_long) childIndex, &ev);
+ (CORBA_long) childIndex, spi_ev ());
}
boolean
AccessibleSelection_selectAll (AccessibleSelection *obj)
{
- Accessibility_Selection_selectAll (*obj, &ev);
+ Accessibility_Selection_selectAll (*obj, spi_ev ());
return TRUE; /* TODO: change the bonobo method to return boolean */
}
void
AccessibleSelection_clearSelection (AccessibleSelection *obj)
{
- Accessibility_Selection_clearSelection (*obj, &ev);
+ Accessibility_Selection_clearSelection (*obj, spi_ev ());
}
+#include <stdlib.h> /* for malloc */
+#include <cspi/spi-private.h>
+
/**
* AccessibleTable_ref:
* @obj: a pointer to the #AccessibleTable implementor on which to operate.
int
AccessibleTable_ref (AccessibleTable *obj)
{
- Accessibility_Table_ref (*obj, &ev);
+ Accessibility_Table_ref (*obj, spi_ev ());
return 0;
}
int
AccessibleTable_unref (AccessibleTable *obj)
{
- Accessibility_Table_unref (*obj, &ev);
+ Accessibility_Table_unref (*obj, spi_ev ());
return 0;
}
AccessibleTable_getCaption (AccessibleTable *obj)
{
return (Accessible *)
- Accessibility_Table__get_caption (*obj, &ev);
+ Accessibility_Table__get_caption (*obj, spi_ev ());
}
AccessibleTable_getSummary (AccessibleTable *obj)
{
return (Accessible *)
- Accessibility_Table__get_summary (*obj, &ev);
+ Accessibility_Table__get_summary (*obj, spi_ev ());
}
AccessibleTable_getNRows (AccessibleTable *obj)
{
return (long)
- Accessibility_Table__get_nRows (*obj, &ev);
+ Accessibility_Table__get_nRows (*obj, spi_ev ());
}
AccessibleTable_getNColumns (AccessibleTable *obj)
{
return (long)
- Accessibility_Table__get_nColumns (*obj, &ev);
+ Accessibility_Table__get_nColumns (*obj, spi_ev ());
}
{
return (Accessible *)
Accessibility_Table_getAccessibleAt (*obj,
- (CORBA_long) row, (CORBA_long) column, &ev);
+ (CORBA_long) row, (CORBA_long) column, spi_ev ());
}
{
return (long)
Accessibility_Table_getIndexAt (*obj,
- (CORBA_long) row, (CORBA_long) column, &ev);
+ (CORBA_long) row, (CORBA_long) column, spi_ev ());
}
{
return (long)
Accessibility_Table_getRowAtIndex (*obj,
- (CORBA_long) index, &ev);
+ (CORBA_long) index, spi_ev ());
}
{
return (long)
Accessibility_Table_getColumnAtIndex (*obj,
- (CORBA_long) index, &ev);
+ (CORBA_long) index, spi_ev ());
}
{
return (char *)
Accessibility_Table_getRowDescription (*obj,
- (CORBA_long) row, &ev);
+ (CORBA_long) row, spi_ev ());
}
{
return (char *)
Accessibility_Table_getColumnDescription (*obj,
- (CORBA_long) column, &ev);
+ (CORBA_long) column, spi_ev ());
}
{
return (long)
Accessibility_Table_getRowExtentAt (*obj,
- (CORBA_long) row, (CORBA_long) column, &ev);
+ (CORBA_long) row, (CORBA_long) column, spi_ev ());
}
{
return (long)
Accessibility_Table_getColumnExtentAt (*obj,
- (CORBA_long) row, (CORBA_long) column, &ev);
+ (CORBA_long) row, (CORBA_long) column, spi_ev ());
}
{
return (Accessible *)
Accessibility_Table_getRowHeader (*obj,
- (CORBA_long) row, &ev);
+ (CORBA_long) row, spi_ev ());
}
{
return (Accessible *)
Accessibility_Table_getColumnHeader (*obj,
- (CORBA_long) column, &ev);
+ (CORBA_long) column, spi_ev ());
}
AccessibleTable_getNSelectedRows (AccessibleTable *obj)
{
return (long)
- Accessibility_Table__get_nSelectedRows (*obj, &ev);
+ Accessibility_Table__get_nSelectedRows (*obj, spi_ev ());
}
AccessibleTable_getSelectedRows (AccessibleTable *obj,
long int **selectedRows)
{
- Accessibility_LongSeq *rows = Accessibility_Table_getSelectedRows (*obj, &ev);
+ Accessibility_LongSeq *rows = Accessibility_Table_getSelectedRows (*obj, spi_ev ());
CORBA_long *i;
long *j;
long length;
AccessibleTable_getNSelectedColumns (AccessibleTable *obj)
{
return (long)
- Accessibility_Table__get_nSelectedColumns (*obj, &ev);
+ Accessibility_Table__get_nSelectedColumns (*obj, spi_ev ());
}
AccessibleTable_getSelectedColumns (AccessibleTable *obj,
long int **selectedColumns)
{
- Accessibility_LongSeq *columns = Accessibility_Table_getSelectedColumns (*obj, &ev);
+ Accessibility_LongSeq *columns = Accessibility_Table_getSelectedColumns (*obj, spi_ev ());
CORBA_long *i;
long *j;
long length;
{
return (boolean)
Accessibility_Table_isRowSelected (*obj,
- (CORBA_long) row, &ev);
+ (CORBA_long) row, spi_ev ());
}
{
return (boolean)
Accessibility_Table_isColumnSelected (*obj,
- (CORBA_long) column, &ev);
+ (CORBA_long) column, spi_ev ());
}
{
return (boolean)
Accessibility_Table_isSelected (*obj,
- (CORBA_long) row, (CORBA_long) column, &ev);
+ (CORBA_long) row, (CORBA_long) column, spi_ev ());
}
+#include <cspi/spi-private.h>
+
/**
* AccessibleText_ref:
* @obj: a pointer to the #AccessibleText object on which to operate.
int
AccessibleText_ref (AccessibleText *obj)
{
- Accessibility_Text_ref (*obj, &ev);
+ Accessibility_Text_ref (*obj, spi_ev ());
return 0;
}
int
AccessibleText_unref (AccessibleText *obj)
{
- Accessibility_Text_unref (*obj, &ev);
+ Accessibility_Text_unref (*obj, spi_ev ());
return 0;
}
{
long retval;
- CORBA_exception_init (&ev);
+ CORBA_exception_init (spi_ev ());
retval = (long)
- Accessibility_Text__get_characterCount (*obj, &ev);
+ Accessibility_Text__get_characterCount (*obj, spi_ev ());
- spi_check_ev (&ev, "SpiAccessibleText_getCharacterCount");
+ spi_check_ev (spi_ev (), "SpiAccessibleText_getCharacterCount");
return retval;
}
{
return (char *)
Accessibility_Text_getText (*obj,
- (CORBA_long) startOffset, (CORBA_long) endOffset, &ev);
+ (CORBA_long) startOffset, (CORBA_long) endOffset, spi_ev ());
}
/**
AccessibleText_getCaretOffset (AccessibleText *obj)
{
return (long)
- Accessibility_Text__get_caretOffset (*obj, &ev);
+ Accessibility_Text__get_caretOffset (*obj, spi_ev ());
}
(CORBA_long) offset,
&retStartOffset,
&retEndOffset,
- &ev);
+ spi_ev ());
*startOffset = (long) retStartOffset;
*endOffset = (long) retEndOffset;
return retval;
{
return (boolean)
Accessibility_Text_setCaretOffset (*obj,
- (CORBA_long) newOffset, &ev);
+ (CORBA_long) newOffset, spi_ev ());
}
/**
Accessibility_Text_getTextBeforeOffset (*obj,
(CORBA_long) offset, (Accessibility_TEXT_BOUNDARY_TYPE) type,
&retStartOffset, &retEndOffset,
- &ev);
+ spi_ev ());
*startOffset = (long) retStartOffset;
*endOffset = (long) retEndOffset;
return retval;
(Accessibility_TEXT_BOUNDARY_TYPE) type,
&corbaStartOffset,
&corbaEndOffset,
- &ev);
+ spi_ev ());
*startOffset = (long) corbaStartOffset;
*endOffset = (long) corbaEndOffset;
#ifdef SPI_DEBUG
Accessibility_Text_getTextAfterOffset (*obj,
(CORBA_long) offset, (Accessibility_TEXT_BOUNDARY_TYPE) type,
&retStartOffset, &retEndOffset,
- &ev);
+ spi_ev ());
*startOffset = (long) retStartOffset;
*endOffset = (long) retEndOffset;
return retval;
{
return (unsigned long)
Accessibility_Text_getCharacterAtOffset (*obj,
- (CORBA_long) offset, &ev);
+ (CORBA_long) offset, spi_ev ());
}
/**
&retY,
&retWidth,
&retHeight,
- (CORBA_short) type, &ev);
+ (CORBA_short) type, spi_ev ());
*x = (long) retX;
*y = (long) retY;
*width = (long) retWidth;
{
return (long)
Accessibility_Text_getOffsetAtPoint (*obj,
- (CORBA_long) x, (CORBA_long) y, (CORBA_short) type, &ev);
+ (CORBA_long) x, (CORBA_long) y, (CORBA_short) type, spi_ev ());
}
AccessibleText_getNSelections (AccessibleText *obj)
{
return (long)
- Accessibility_Text_getNSelections (*obj, &ev);
+ Accessibility_Text_getNSelections (*obj, spi_ev ());
}
CORBA_long retStartOffset, retEndOffset;
Accessibility_Text_getSelection (*obj,
(CORBA_long) selectionNum,
- &retStartOffset, &retEndOffset, &ev);
+ &retStartOffset, &retEndOffset, spi_ev ());
*startOffset = (long) retStartOffset;
*endOffset = (long) retEndOffset;
return (boolean)
Accessibility_Text_addSelection (*obj,
(CORBA_long) startOffset, (CORBA_long) endOffset,
- &ev);
+ spi_ev ());
}
{
return (boolean)
Accessibility_Text_removeSelection (*obj,
- (CORBA_long) selectionNum, &ev);
+ (CORBA_long) selectionNum, spi_ev ());
}
/**
Accessibility_Text_setSelection (*obj,
(CORBA_long) selectionNum,
(CORBA_long) startOffset,
- (CORBA_long) endOffset, &ev);
+ (CORBA_long) endOffset, spi_ev ());
}
+#include <cspi/spi-private.h>
+
/**
* AccessibleValue_ref:
* @obj: a pointer to the #AccessibleValue implementor on which to operate.
int
AccessibleValue_ref (AccessibleValue *obj)
{
- Accessibility_Value_ref (*obj, &ev);
+ Accessibility_Value_ref (*obj, spi_ev ());
return 0;
}
int
AccessibleValue_unref (AccessibleValue *obj)
{
- Accessibility_Value_unref (*obj, &ev);
+ Accessibility_Value_unref (*obj, spi_ev ());
return 0;
}
AccessibleValue_getMinimumValue (AccessibleValue *obj)
{
return (float)
- Accessibility_Value__get_minimumValue (*obj, &ev);
+ Accessibility_Value__get_minimumValue (*obj, spi_ev ());
}
AccessibleValue_getCurrentValue (AccessibleValue *obj)
{
return (float)
- Accessibility_Value__get_currentValue (*obj, &ev);
+ Accessibility_Value__get_currentValue (*obj, spi_ev ());
}
AccessibleValue_getMaximumValue (AccessibleValue *obj)
{
return (float)
- Accessibility_Value__get_maximumValue (*obj, &ev);
+ Accessibility_Value__get_maximumValue (*obj, spi_ev ());
}
float newValue)
{
Accessibility_Value__set_currentValue (*obj,
- (CORBA_float) newValue, &ev);
+ (CORBA_float) newValue, spi_ev ());
return TRUE;
}
projects / platform / core / uifw / at-spi2-atk.git / commitdiff