* Boston, MA 02111-1307, USA.
*/
-/*
- * accessible.c: test for accessibility implementation
- *
- */
-#include <config.h>
-#include <bonobo/Bonobo.h>
+/* accessible.c: the core of the accessibility implementation */
+#include <config.h>
#include <stdio.h>
+#include <libspi/libspi.h>
-/*
- * This pulls the CORBA definitions for the "Accessibility::Accessible" server
- */
-#include <libspi/Accessibility.h>
-
-/*
- * This pulls the definition for the BonoboObject (Gtk Type)
- */
-#include "accessible.h"
-#include "component.h"
-#include "editabletext.h"
-#include "hyperlink.h"
-#include "hypertext.h"
-#include "image.h"
-#include "selection.h"
-#include "table.h"
-#include "text.h"
-#include "value.h"
-
-/*
- * Our parent Gtk object type
- */
-#define PARENT_TYPE BONOBO_OBJECT_TYPE
+/* Our parent Gtk object type */
+#define PARENT_TYPE BONOBO_TYPE_OBJECT
-/*
- * A pointer to our parent object class
- */
-static GObjectClass *accessible_parent_class;
+/* A pointer to our parent object class */
+static GObjectClass *spi_accessible_parent_class;
/*
* Implemented GObject::finalize
*/
static void
-accessible_object_finalize (GObject *object)
+spi_accessible_object_finalize (GObject *object)
{
- Accessible *accessible = ACCESSIBLE (object);
+ SpiAccessible *accessible = SPI_ACCESSIBLE (object);
- printf("accessible_object_finalize called\n");
- g_object_unref (accessible->atko);
+ printf("spi_accessible_object_finalize called\n");
+ ATK_OBJECT (accessible->atko); /* assertion */
+ g_object_unref (G_OBJECT(accessible->atko));
accessible->atko = NULL;
printf("atko freed, calling parent finalize\n");
- accessible_parent_class->finalize (object);
+ spi_accessible_parent_class->finalize (object);
}
/*
CORBA_Environment *ev)
{
CORBA_char * retval;
- Accessible *accessible = ACCESSIBLE (bonobo_object_from_servant (servant));
+ SpiAccessible *accessible = SPI_ACCESSIBLE (bonobo_object_from_servant (servant));
retval = (CORBA_char *) atk_object_get_name (accessible->atko);
if (retval )
retval = CORBA_string_dup (retval);
else
retval = CORBA_string_dup ("");
- fprintf (stderr, "Accessible get_name called: %s\n", retval);
+
return retval;
}
const CORBA_char *name,
CORBA_Environment *ev)
{
- Accessible *accessible = ACCESSIBLE (bonobo_object_from_servant (servant));
+ SpiAccessible *accessible = SPI_ACCESSIBLE (bonobo_object_from_servant (servant));
atk_object_set_name (accessible->atko, name);
- printf ("Accessible set_name called: %s\n", name);
+ printf ("SpiAccessible set_name called: %s\n", name);
}
/*
CORBA_Environment *ev)
{
CORBA_char * retval;
- Accessible *accessible = ACCESSIBLE (bonobo_object_from_servant (servant));
+ SpiAccessible *accessible = SPI_ACCESSIBLE (bonobo_object_from_servant (servant));
retval = CORBA_string_dup (atk_object_get_description (accessible->atko));
- fprintf (stderr, "Accessible get_description called: %s\n", retval);
+ if (retval )
+ retval = CORBA_string_dup (retval);
+ else
+ retval = CORBA_string_dup ("");
+
return retval;
}
const CORBA_char *name,
CORBA_Environment *ev)
{
- Accessible *accessible = ACCESSIBLE (bonobo_object_from_servant (servant));
+ SpiAccessible *accessible = SPI_ACCESSIBLE (bonobo_object_from_servant (servant));
atk_object_set_description (accessible->atko, name);
- printf ("Accessible set_description called: %s\n", name);
+ printf ("SpiAccessible set_description called: %s\n", name);
}
/*
CORBA_Environment *ev)
{
Accessibility_Accessible retval;
- Accessible *accessible = ACCESSIBLE (bonobo_object_from_servant (servant));
- AtkObject *parent;
+ SpiAccessible *accessible = SPI_ACCESSIBLE (bonobo_object_from_servant (servant));
+ AtkObject *parent;
+
parent = atk_object_get_parent (accessible->atko);
- retval = bonobo_object_corba_objref (bonobo_object (accessible_new (parent)));
- printf ("Accessible get_parent called\n");
- return retval;
+ retval = BONOBO_OBJREF (spi_accessible_new (parent));
+
+ printf ("SpiAccessible get_parent called\n");
+
+ return CORBA_Object_duplicate (retval, ev);
}
/*
CORBA_Environment *ev)
{
CORBA_long retval;
- Accessible *accessible = ACCESSIBLE (bonobo_object_from_servant (servant));
+ SpiAccessible *accessible = SPI_ACCESSIBLE (bonobo_object_from_servant (servant));
retval = (CORBA_long) atk_object_get_index_in_parent (accessible->atko);
- printf ("Accessible get_index_in_parent called\n");
+ printf ("SpiAccessible get_index_in_parent called\n");
return retval;
}
CORBA_Environment *ev)
{
CORBA_long retval;
- Accessible *accessible = ACCESSIBLE (bonobo_object_from_servant (servant));
+ SpiAccessible *accessible = SPI_ACCESSIBLE (bonobo_object_from_servant (servant));
retval = (CORBA_long) atk_object_get_n_accessible_children (accessible->atko);
- printf ("Accessible get_childCount called: %d\n", (int) retval);
+ printf ("SpiAccessible get_childCount called: %d\n", (int) retval);
return retval;
}
CORBA_Environment *ev)
{
Accessibility_Accessible retval;
- Accessible *accessible = ACCESSIBLE (bonobo_object_from_servant (servant));
+ SpiAccessible *accessible = SPI_ACCESSIBLE (bonobo_object_from_servant (servant));
AtkObject *child = atk_object_ref_accessible_child (accessible->atko, (gint) index);
- retval = bonobo_object_corba_objref ( bonobo_object (accessible_new (child)));
- printf ("Accessible get_child_at_index called.\n");
+ retval = BONOBO_OBJREF (spi_accessible_new (child));
+ printf ("SpiAccessible get_child_at_index called.\n");
+ return CORBA_Object_duplicate (retval, ev);
+}
+
+/*
+ * CORBA Accessibility::Accessible::getState method implementation
+ */
+static Accessibility_StateSet
+impl_accessibility_accessible_get_state (PortableServer_Servant servant,
+ CORBA_Environment *ev)
+{
+ Accessibility_StateSet retval;
+/* SpiAccessible *accessible = SPI_ACCESSIBLE (bonobo_object_from_servant (servant));
+ AtkStateSet *state = atk_object_ref_state_set (accessible->atko); */
+ retval = CORBA_OBJECT_NIL;
+ printf ("SpiAccessible get_state.\n");
+ /* TODO: implement the bonobo stateset class */
+ return (Accessibility_StateSet) retval;
+}
+
+/*
+ * CORBA Accessibility::Accessible::getRelationSet method implementation
+ */
+static Accessibility_RelationSet *
+impl_accessibility_accessible_get_relation_set (PortableServer_Servant servant,
+ CORBA_Environment *ev)
+{
+ Accessibility_RelationSet *retval;
+ gint n_relations;
+ gint i;
+ SpiAccessible *accessible = SPI_ACCESSIBLE (bonobo_object_from_servant (servant));
+ AtkRelationSet *relation_set = atk_object_ref_relation_set (accessible->atko);
+ n_relations = atk_relation_set_get_n_relations (relation_set);
+ retval = CORBA_sequence_Accessibility_Relation__alloc ();
+ CORBA_sequence_Accessibility_Relation_allocbuf (n_relations);
+
+ for (i=0; i<n_relations; ++i)
+ {
+ retval->_buffer[i] =
+ CORBA_Object_duplicate (bonobo_object_corba_objref (
+ BONOBO_OBJECT (spi_relation_new (atk_relation_set_get_relation (relation_set, i)))),
+ ev);
+ }
+
+ printf ("SpiAccessible get_relation_set.\n");
return retval;
}
+/*
+ * CORBA Accessibility::Accessible::getRole method implementation
+ */
+static Accessibility_Role
+impl_accessibility_accessible_get_role (PortableServer_Servant servant,
+ CORBA_Environment *ev)
+{
+ Accessibility_Role retval;
+ SpiAccessible *accessible = SPI_ACCESSIBLE (bonobo_object_from_servant (servant));
+ AtkRole role = atk_object_get_role (accessible->atko);
+ retval = role; /* relies on ability to cast these back and forth */
+ printf ("SpiAccessible get_role.\n");
+ return (Accessibility_Role) retval;
+}
+
static void
-accessible_class_init (AccessibleClass *klass)
+spi_accessible_class_init (SpiAccessibleClass *klass)
{
GObjectClass * object_class = (GObjectClass *) klass;
POA_Accessibility_Accessible__epv *epv = &klass->epv;
- accessible_parent_class = g_type_class_peek_parent (klass);
+ spi_accessible_parent_class = g_type_class_peek_parent (klass);
- object_class->finalize = accessible_object_finalize;
+ object_class->finalize = spi_accessible_object_finalize;
epv->_get_name = impl_accessibility_accessible_get_name;
epv->_set_name = impl_accessibility_accessible_set_name;
epv->getChildAtIndex = impl_accessibility_accessible_get_child_at_index;
epv->getIndexInParent = impl_accessibility_accessible_get_index_in_parent;
- /* epv->getRelationSet = impl_accessibility_accessible_get_relation_set; */
- /* epv->getState = impl_accessibility_accessible_get_state; */
- /* epv->getRole = impl_accessibility_accessible_get_role; */
+ epv->getRelationSet = impl_accessibility_accessible_get_relation_set;
+ epv->getState = impl_accessibility_accessible_get_state;
+ epv->getRole = impl_accessibility_accessible_get_role;
}
static void
-accessible_init (Accessible *accessible)
+spi_accessible_init (SpiAccessible *accessible)
{
}
-GType
-accessible_get_type (void)
-{
- static GType type = 0;
-
- if (!type) {
- static const GTypeInfo tinfo = {
- sizeof (AccessibleClass),
- (GBaseInitFunc) NULL,
- (GBaseFinalizeFunc) NULL,
- (GClassInitFunc) accessible_class_init,
- (GClassFinalizeFunc) NULL,
- NULL, /* class data */
- sizeof (Accessible),
- 0, /* n preallocs */
- (GInstanceInitFunc) accessible_init,
- NULL /* value table */
- };
- /*
- * Bonobo_type_unique auto-generates a load of
- * CORBA structures for us. All derived types must
- * use bonobo_type_unique.
- */
- type = bonobo_type_unique (
- PARENT_TYPE,
- POA_Accessibility_Accessible__init,
- NULL,
- G_STRUCT_OFFSET (AccessibleClass, epv),
- &tinfo,
- "Accessible");
- }
-
- return type;
-}
+BONOBO_TYPE_FUNC_FULL (SpiAccessible,
+ Accessibility_Accessible,
+ PARENT_TYPE,
+ spi_accessible);
-Accessible *
-accessible_new (AtkObject *o)
+SpiAccessible *
+spi_accessible_new (AtkObject *o)
{
- Accessible *retval =
- ACCESSIBLE (g_object_new (accessible_get_type (), NULL));
+ SpiAccessible *retval = g_object_new (SPI_ACCESSIBLE_TYPE, NULL);
+ CORBA_Environment ev;
+ CORBA_exception_init (&ev);
g_object_ref (o);
retval->atko = ATK_OBJECT (o);
- /*
- * TODO: add interface containers/constructors for EDITABLE_TEXT, HYPERTEXT,
- * IMAGE, SELECTION, TABLE, TEXT, VALUE.
- */
-
- /* add appropriate ATK interfaces */
+ /* aggregate appropriate SPI interfaces based on ATK interfaces */
if (ATK_IS_ACTION (o))
{
bonobo_object_add_interface (bonobo_object (retval),
- BONOBO_OBJECT (action_interface_new (o)));
+ BONOBO_OBJECT (spi_action_interface_new (o)));
}
if (ATK_IS_COMPONENT (o))
{
bonobo_object_add_interface (bonobo_object (retval),
- BONOBO_OBJECT (component_interface_new (o)));
+ BONOBO_OBJECT (spi_component_interface_new (o)));
}
if (ATK_IS_EDITABLE_TEXT (o))
{
bonobo_object_add_interface (bonobo_object (retval),
- BONOBO_OBJECT(editable_text_interface_new (o)));
+ BONOBO_OBJECT(spi_editable_text_interface_new (o)));
}
else if (ATK_IS_HYPERTEXT (o))
{
bonobo_object_add_interface (bonobo_object (retval),
- BONOBO_OBJECT (hypertext_interface_new (o)));
+ BONOBO_OBJECT (spi_hypertext_interface_new (o)));
}
else if (ATK_IS_TEXT (o))
{
bonobo_object_add_interface (bonobo_object (retval),
- BONOBO_OBJECT (text_interface_new (o)));
- }
-
- if (ATK_IS_HYPERLINK (o))
- {
- bonobo_object_add_interface (bonobo_object (retval),
- BONOBO_OBJECT (hyperlink_interface_new(o)));
+ BONOBO_OBJECT (spi_text_interface_new (o)));
}
if (ATK_IS_IMAGE (o))
{
bonobo_object_add_interface (bonobo_object (retval),
- BONOBO_OBJECT (image_interface_new (o)));
+ BONOBO_OBJECT (spi_image_interface_new (o)));
}
if (ATK_IS_SELECTION (o))
{
bonobo_object_add_interface (bonobo_object (retval),
- BONOBO_OBJECT (selection_interface_new (o)));
+ BONOBO_OBJECT (spi_selection_interface_new (o)));
}
if (ATK_IS_TABLE (o))
{
bonobo_object_add_interface (bonobo_object (retval),
- BONOBO_OBJECT (table_interface_new (o)));
+ BONOBO_OBJECT (spi_table_interface_new (o)));
}
if (ATK_IS_VALUE (o))
{
bonobo_object_add_interface (bonobo_object (retval),
- BONOBO_OBJECT (value_interface_new (o)));
+ BONOBO_OBJECT (spi_value_interface_new (o)));
}
-
return retval;
}
projects / platform / core / uifw / at-spi2-atk.git / blobdiff