Revved to 1.5.3; added ROLE_EMBEDDED (bug #144415).
[platform/core/uifw/at-spi2-atk.git] / libspi / accessible.c
index eff6d8a..9b4f70c 100644 (file)
@@ -2,7 +2,8 @@
  * AT-SPI - Assistive Technology Service Provider Interface
  * (Gnome Accessibility Project; http://developer.gnome.org/projects/gap)
  *
- * Copyright 2001 Sun Microsystems Inc.
+ * Copyright 2001, 2002 Sun Microsystems Inc.,
+ * Copyright 2001, 2002 Ximian, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * Boston, MA 02111-1307, USA.
  */
 
+/* accessible.c: the core of the accessibility implementation */
+
+#include <config.h>
+#include <stdio.h>
+#include <bonobo/bonobo-exception.h>
+#include <atk/atk.h>
+#include <libspi/libspi.h>
+
+/* Our parent Gtk object type  */
+#define PARENT_TYPE SPI_TYPE_BASE
+
+static gboolean spi_init_role_lookup_table (Accessibility_Role *role_table);
+static Accessibility_Role spi_role_from_atk_role (AtkRole role);
+
+static gboolean
+spi_init_role_lookup_table (Accessibility_Role *role_table)
+{
+  int i;
+  /* if it's not in the list below, dunno what it is */
+  for (i = 0; i < ATK_ROLE_LAST_DEFINED; ++i)
+    {
+      role_table [i] = Accessibility_ROLE_UNKNOWN;
+    }
+  
+  role_table [ATK_ROLE_INVALID] =             Accessibility_ROLE_INVALID;
+  role_table [ATK_ROLE_ACCEL_LABEL] =         Accessibility_ROLE_ACCELERATOR_LABEL;
+  role_table [ATK_ROLE_ALERT] =               Accessibility_ROLE_ALERT;
+  role_table [ATK_ROLE_ANIMATION] =           Accessibility_ROLE_ANIMATION; 
+  role_table [ATK_ROLE_ARROW] =               Accessibility_ROLE_ARROW; 
+  role_table [ATK_ROLE_CALENDAR] =            Accessibility_ROLE_CALENDAR; 
+  role_table [ATK_ROLE_CANVAS] =              Accessibility_ROLE_CANVAS;
+  role_table [ATK_ROLE_CHECK_BOX] =           Accessibility_ROLE_CHECK_BOX;
+  role_table [ATK_ROLE_CHECK_MENU_ITEM] =     Accessibility_ROLE_CHECK_MENU_ITEM;
+  role_table [ATK_ROLE_COLOR_CHOOSER] =       Accessibility_ROLE_COLOR_CHOOSER;
+  role_table [ATK_ROLE_COLUMN_HEADER] =       Accessibility_ROLE_COLUMN_HEADER;
+  role_table [ATK_ROLE_COMBO_BOX] =           Accessibility_ROLE_COMBO_BOX;
+  role_table [ATK_ROLE_DATE_EDITOR] =         Accessibility_ROLE_DATE_EDITOR;
+  role_table [ATK_ROLE_DESKTOP_ICON] =        Accessibility_ROLE_DESKTOP_ICON;
+  role_table [ATK_ROLE_DESKTOP_FRAME] =       Accessibility_ROLE_DESKTOP_FRAME;
+  role_table [ATK_ROLE_DIAL] =                Accessibility_ROLE_DIAL;
+  role_table [ATK_ROLE_DIALOG] =              Accessibility_ROLE_DIALOG;
+  role_table [ATK_ROLE_DIRECTORY_PANE] =      Accessibility_ROLE_DIRECTORY_PANE;
+  role_table [ATK_ROLE_DRAWING_AREA] =        Accessibility_ROLE_DRAWING_AREA;
+  role_table [ATK_ROLE_FILE_CHOOSER] =        Accessibility_ROLE_FILE_CHOOSER;
+  role_table [ATK_ROLE_FILLER] =              Accessibility_ROLE_FILLER;
+  role_table [ATK_ROLE_FONT_CHOOSER] =        Accessibility_ROLE_FONT_CHOOSER;
+  role_table [ATK_ROLE_FRAME] =               Accessibility_ROLE_FRAME;
+  role_table [ATK_ROLE_GLASS_PANE] =          Accessibility_ROLE_GLASS_PANE;
+  role_table [ATK_ROLE_HTML_CONTAINER] =      Accessibility_ROLE_HTML_CONTAINER;
+  role_table [ATK_ROLE_ICON] =                Accessibility_ROLE_ICON;
+  role_table [ATK_ROLE_IMAGE] =               Accessibility_ROLE_IMAGE; 
+  role_table [ATK_ROLE_INTERNAL_FRAME] =      Accessibility_ROLE_INTERNAL_FRAME; 
+  role_table [ATK_ROLE_LABEL] =               Accessibility_ROLE_LABEL;
+  role_table [ATK_ROLE_LAYERED_PANE] =        Accessibility_ROLE_LAYERED_PANE;
+  role_table [ATK_ROLE_LIST] =                Accessibility_ROLE_LIST;
+  role_table [ATK_ROLE_LIST_ITEM] =           Accessibility_ROLE_LIST_ITEM;
+  role_table [ATK_ROLE_MENU] =                Accessibility_ROLE_MENU;
+  role_table [ATK_ROLE_MENU_BAR] =            Accessibility_ROLE_MENU_BAR;
+  role_table [ATK_ROLE_MENU_ITEM] =           Accessibility_ROLE_MENU_ITEM;
+  role_table [ATK_ROLE_OPTION_PANE] =         Accessibility_ROLE_OPTION_PANE;
+  role_table [ATK_ROLE_PAGE_TAB] =            Accessibility_ROLE_PAGE_TAB;
+  role_table [ATK_ROLE_PAGE_TAB_LIST] =       Accessibility_ROLE_PAGE_TAB_LIST; 
+  role_table [ATK_ROLE_PANEL] =               Accessibility_ROLE_PANEL;
+  role_table [ATK_ROLE_PASSWORD_TEXT] =       Accessibility_ROLE_PASSWORD_TEXT;
+  role_table [ATK_ROLE_POPUP_MENU] =          Accessibility_ROLE_POPUP_MENU;
+  role_table [ATK_ROLE_PROGRESS_BAR] =        Accessibility_ROLE_PROGRESS_BAR;
+  role_table [ATK_ROLE_PUSH_BUTTON] =         Accessibility_ROLE_PUSH_BUTTON;
+  role_table [ATK_ROLE_RADIO_BUTTON] =        Accessibility_ROLE_RADIO_BUTTON;
+  role_table [ATK_ROLE_RADIO_MENU_ITEM] =     Accessibility_ROLE_RADIO_MENU_ITEM;
+  role_table [ATK_ROLE_ROOT_PANE] =           Accessibility_ROLE_ROOT_PANE;
+  role_table [ATK_ROLE_ROW_HEADER] =          Accessibility_ROLE_ROW_HEADER;
+  role_table [ATK_ROLE_SCROLL_BAR] =          Accessibility_ROLE_SCROLL_BAR;
+  role_table [ATK_ROLE_SCROLL_PANE] =         Accessibility_ROLE_SCROLL_PANE;
+  role_table [ATK_ROLE_SEPARATOR] =           Accessibility_ROLE_SEPARATOR;
+  role_table [ATK_ROLE_SLIDER] =              Accessibility_ROLE_SLIDER;
+  role_table [ATK_ROLE_SPIN_BUTTON] =         Accessibility_ROLE_SPIN_BUTTON;
+  role_table [ATK_ROLE_SPLIT_PANE] =          Accessibility_ROLE_SPLIT_PANE;
+  role_table [ATK_ROLE_STATUSBAR] =           Accessibility_ROLE_STATUS_BAR;
+  role_table [ATK_ROLE_TABLE] =               Accessibility_ROLE_TABLE;
+  role_table [ATK_ROLE_TABLE_CELL] =          Accessibility_ROLE_TABLE_CELL;
+  role_table [ATK_ROLE_TABLE_COLUMN_HEADER] = Accessibility_ROLE_TABLE_COLUMN_HEADER;
+  role_table [ATK_ROLE_TABLE_ROW_HEADER] =    Accessibility_ROLE_TABLE_ROW_HEADER;
+  role_table [ATK_ROLE_TEAR_OFF_MENU_ITEM] =  Accessibility_ROLE_TEAROFF_MENU_ITEM;
+  role_table [ATK_ROLE_TERMINAL] =            Accessibility_ROLE_TERMINAL;
+  role_table [ATK_ROLE_TEXT] =                Accessibility_ROLE_TEXT;
+  role_table [ATK_ROLE_TOGGLE_BUTTON] =       Accessibility_ROLE_TOGGLE_BUTTON;
+  role_table [ATK_ROLE_TOOL_BAR] =            Accessibility_ROLE_TOOL_BAR;
+  role_table [ATK_ROLE_TOOL_TIP] =            Accessibility_ROLE_TOOL_TIP;
+  role_table [ATK_ROLE_TREE] =                Accessibility_ROLE_TREE;
+  role_table [ATK_ROLE_TREE_TABLE] =          Accessibility_ROLE_TREE_TABLE;
+  role_table [ATK_ROLE_UNKNOWN] =             Accessibility_ROLE_UNKNOWN;
+  role_table [ATK_ROLE_VIEWPORT] =            Accessibility_ROLE_VIEWPORT;
+  role_table [ATK_ROLE_WINDOW] =              Accessibility_ROLE_WINDOW;
+  role_table [ATK_ROLE_HEADER] =              Accessibility_ROLE_HEADER;
+  role_table [ATK_ROLE_FOOTER] =              Accessibility_ROLE_FOOTER;
+  role_table [ATK_ROLE_PARAGRAPH] =           Accessibility_ROLE_PARAGRAPH;
+  role_table [ATK_ROLE_RULER] =               Accessibility_ROLE_RULER;
+  role_table [ATK_ROLE_APPLICATION] =         Accessibility_ROLE_APPLICATION;
+  role_table [ATK_ROLE_AUTOCOMPLETE] =        Accessibility_ROLE_AUTOCOMPLETE;
+  role_table [ATK_ROLE_EDITBAR] =             Accessibility_ROLE_EDITBAR;
+  role_table [ATK_ROLE_EMBEDDED] =            Accessibility_ROLE_EMBEDDED;
+  return TRUE;
+}
+
+static Accessibility_Role
+spi_role_from_atk_role (AtkRole role)
+{
+  static gboolean is_initialized = FALSE;
+  static Accessibility_Role spi_role_table [ATK_ROLE_LAST_DEFINED];
+  Accessibility_Role spi_role;
+
+  if (!is_initialized)
+   {
+     is_initialized = spi_init_role_lookup_table (spi_role_table);        
+   }
+
+  if (role >= 0 && role < ATK_ROLE_LAST_DEFINED)
+    {
+      spi_role = spi_role_table [role];
+    }
+  else
+    {
+      spi_role = Accessibility_ROLE_EXTENDED;      
+    }
+  return spi_role;
+}
+
+static AtkObject *
+get_atkobject_from_servant (PortableServer_Servant servant)
+{
+  SpiBase *object = SPI_BASE (bonobo_object_from_servant (servant));
+
+  g_return_val_if_fail (object, NULL);
+  g_return_val_if_fail (ATK_IS_OBJECT(object->gobj), NULL);
+  return ATK_OBJECT(object->gobj);
+}
+
 /*
- * accessible.c: test for accessibility implementation
- *
+ * CORBA Accessibility::Accessible::get_name method implementation
  */
-#include <config.h>
-#include <bonobo/Bonobo.h>
+static CORBA_char *
+impl_accessibility_accessible_get_name (PortableServer_Servant servant,
+                                        CORBA_Environment     *ev)
+{
+  const gchar *name;
+  CORBA_char  *retval;
+  AtkObject   *object = get_atkobject_from_servant (servant);
 
-#include <stdio.h>
+  g_return_val_if_fail (object != NULL, CORBA_string_dup (""));
+
+  name = atk_object_get_name (object);
+
+  if (name)
+    {
+      retval = CORBA_string_dup (name);
+    }
+  else
+    {
+      retval = CORBA_string_dup ("");
+    }
+
+  return retval;
+}
+
+/*
+ * CORBA Accessibility::Accessible::set_name method implementation
+ */
+static void
+impl_accessibility_accessible_set_name (PortableServer_Servant servant,
+                                        const CORBA_char      *name,
+                                        CORBA_Environment     *ev)
+{
+  AtkObject *object = get_atkobject_from_servant (servant);
+
+  g_return_if_fail (object != NULL);
+
+  atk_object_set_name (object, name);
+}
 
 /*
- * This pulls the CORBA definitions for the "Accessibility::Accessible" server
+ * CORBA Accessibility::Accessible::get_description method implementation
  */
-#include "Accessible.h"
+static CORBA_char *
+impl_accessibility_accessible_get_description (PortableServer_Servant servant,
+                                               CORBA_Environment     *ev)
+{
+  const gchar *descr;
+  CORBA_char  *retval;
+  AtkObject   *object = get_atkobject_from_servant (servant);
+
+  g_return_val_if_fail (object != NULL, CORBA_string_dup (""));
+
+  descr = atk_object_get_description (object);
+
+  if (descr)
+    {
+      retval = CORBA_string_dup (descr);
+    }
+  else
+    {
+      retval = CORBA_string_dup ("");
+    }
+
+  return retval;
+}
 
 /*
- * This pulls the definition for the BonoboObject (Gtk Type)
+ * CORBA Accessibility::Accessible::set_description method implementation
  */
-#include "accessible.h"
+static void
+impl_accessibility_accessible_set_description (PortableServer_Servant servant,
+                                               const CORBA_char      *descr,
+                                               CORBA_Environment     *ev)
+{
+  AtkObject *object = get_atkobject_from_servant (servant);
+
+  g_return_if_fail (object != NULL);
+
+  atk_object_set_description (object, descr);
+}
 
 /*
- * Our parent Gtk object type
+ * CORBA Accessibility::Accessible::get_parent method implementation
  */
-#define PARENT_TYPE BONOBO_X_OBJECT_TYPE
+static Accessibility_Accessible
+impl_accessibility_accessible_get_parent (PortableServer_Servant servant,
+                                          CORBA_Environment     *ev)
+{
+  AtkObject *parent;
+  AtkObject *object = get_atkobject_from_servant (servant);
+
+  g_return_val_if_fail (object != NULL, CORBA_OBJECT_NIL);
+
+  parent = atk_object_get_parent (object);
+
+  return spi_accessible_new_return (parent, FALSE, ev);
+}
 
 /*
- * A pointer to our parent object class
+ * CORBA Accessibility::Accessible::get_IndexInParent method implementation
  */
-static GObjectClass *accessible_parent_class;
+static CORBA_long
+impl_accessibility_accessible_get_index_in_parent (PortableServer_Servant servant,
+                                                   CORBA_Environment     *ev)
+{
+  AtkObject *object = get_atkobject_from_servant (servant);
+
+  g_return_val_if_fail (object != NULL, -1);
+
+  return atk_object_get_index_in_parent (object);
+}
 
 /*
- * Implemented GObject::finalize
+ * CORBA Accessibility::Accessible::get_childCount method implementation
  */
-static void
-accessible_object_finalize (GObject *object)
+static CORBA_long
+impl_accessibility_accessible_get_child_count (PortableServer_Servant servant,
+                                               CORBA_Environment     *ev)
 {
-        Accessible *accessible = ACCESSIBLE (object);
+  AtkObject *object = get_atkobject_from_servant (servant);
 
-        printf("accessible_object_finalize called\n");
-        g_free (accessible->atko);
+  g_return_val_if_fail (object != NULL, 0);
 
-        printf("atko freed, calling parent finalize\n");
-        accessible_parent_class->finalize (object);
+  return atk_object_get_n_accessible_children (object);
 }
 
 /*
- * CORBA Accessibility::Accessible::get_name method implementation
+ * CORBA Accessibility::Accessible::getChildAtIndex method implementation
  */
-static CORBA_char *
-impl_accessibility_accessible_get_name (PortableServer_Servant servant,
-                                        CORBA_Environment     *ev)
+static Accessibility_Accessible
+impl_accessibility_accessible_get_child_at_index (PortableServer_Servant servant,
+                                                  const CORBA_long      index,
+                                                  CORBA_Environment     *ev)
+{
+  AtkObject *child;
+  AtkObject *object = get_atkobject_from_servant (servant);
+
+  g_return_val_if_fail (object != NULL, CORBA_OBJECT_NIL);
+
+  child = atk_object_ref_accessible_child (object, index);
+
+  return spi_accessible_new_return (child, TRUE, ev);
+}
+
+/*
+ * CORBA Accessibility::Accessible::getState method implementation
+ */
+static Accessibility_StateSet
+impl_accessibility_accessible_get_state (PortableServer_Servant servant,
+                                        CORBA_Environment     *ev)
 {
-  CORBA_char * retval;
-  Accessible *accessible = ACCESSIBLE (bonobo_object_from_servant (servant));
-  retval = CORBA_string_dup (atk_object_get_name (accessible->atko));
-  fprintf (stderr, "Accessible get_name called: %s\n", retval);
+  AtkObject *object = get_atkobject_from_servant (servant);
+  AtkStateSet *atk_set;
+  SpiStateSet *set;
+  Accessibility_StateSet retval;
+
+  bonobo_return_val_if_fail (object != NULL, NULL, ev);
+
+  atk_set = atk_object_ref_state_set (object);
+  
+  set = spi_state_set_new (atk_set);
+  retval = bonobo_object_dup_ref (
+                                 BONOBO_OBJREF(set),
+                                 ev);
+
   return retval;
 }
 
 /*
- * CORBA Accessibility::Accessible::set_name method implementation
+ * CORBA Accessibility::Accessible::getRelationSet method implementation
  */
-static void
-impl_accessibility_accessible_set_name (PortableServer_Servant servant,
-                                        const CORBA_char      *name,
-                                        CORBA_Environment     *ev)
+static Accessibility_RelationSet *
+impl_accessibility_accessible_get_relation_set (PortableServer_Servant servant,
+                                               CORBA_Environment     *ev)
+{
+  Accessibility_RelationSet *retval;
+  gint n_relations;
+  gint i;
+  AtkRelationSet *relation_set;
+  AtkObject      *object = get_atkobject_from_servant (servant);
+
+  bonobo_return_val_if_fail (object != NULL, NULL, ev);
+
+  relation_set = atk_object_ref_relation_set (object);
+
+  n_relations = atk_relation_set_get_n_relations (relation_set);
+
+  retval = CORBA_sequence_Accessibility_Relation__alloc ();
+  retval->_length = retval->_maximum = n_relations;
+  retval->_buffer = CORBA_sequence_Accessibility_Relation_allocbuf (n_relations);
+  CORBA_sequence_set_release (retval, CORBA_TRUE);
+         
+  for (i = 0; i < n_relations; ++i)
+    {
+      retval->_buffer[i] =
+        bonobo_object_dup_ref (
+          BONOBO_OBJREF (
+            spi_relation_new (atk_relation_set_get_relation (relation_set, i))),
+         ev);
+    }
+  
+  return retval;
+}
+
+/*
+ * CORBA Accessibility::Accessible::getRole method implementation
+ */
+static Accessibility_Role
+impl_accessibility_accessible_get_role (PortableServer_Servant servant,
+                                       CORBA_Environment     *ev)
 {
-  Accessible *accessible = ACCESSIBLE (bonobo_object_from_servant (servant));
-  atk_object_set_name (accessible->atko, name);
-  printf ("Accessible set_name called: %s\n", name);
+  AtkRole            role;
+  Accessibility_Role retval;
+  AtkObject         *object = get_atkobject_from_servant (servant);
+
+  g_return_val_if_fail (object != NULL, 0);
+
+  role = atk_object_get_role (object);
+  retval = spi_role_from_atk_role (role);
+
+  return retval;
+}
+
+/*
+ * CORBA Accessibility::Accessible::getRole method implementation
+ */
+static CORBA_char *
+impl_accessibility_accessible_get_role_name (PortableServer_Servant servant,
+                                            CORBA_Environment     *ev)
+{
+  const gchar     *role_name;
+  AtkRole    role;
+  AtkObject *object = get_atkobject_from_servant (servant);
+
+  g_return_val_if_fail (object != NULL, 0);
+
+  role = atk_object_get_role (object);
+
+  role_name = atk_role_get_name (role);
+  if (role_name)
+    return CORBA_string_dup (role_name);
+  else
+    return CORBA_string_dup ("");
+}
+
+/*
+ * CORBA Accessibility::Accessible::getLocalizedRole method implementation
+ */
+static CORBA_char *
+impl_accessibility_accessible_get_local_role_name (PortableServer_Servant servant,
+                                                  CORBA_Environment     *ev)
+{
+  const gchar     *role_name;
+  AtkRole    role;
+  AtkObject *object = get_atkobject_from_servant (servant);
+
+  g_return_val_if_fail (object != NULL, 0);
+
+  role = atk_object_get_role (object);
+
+  role_name = atk_role_get_localized_name (role);
+  if (role_name)
+    return CORBA_string_dup (role_name);
+  else
+    return CORBA_string_dup ("");
 }
 
 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_ref (BONOBO_X_OBJECT_TYPE);
-        /*accessible_parent_class = g_type_class_peek_parent (klass);*/
-
-        object_class->finalize = accessible_object_finalize;
 
         epv->_get_name = impl_accessibility_accessible_get_name;
         epv->_set_name = impl_accessibility_accessible_set_name;
+        epv->_get_description = impl_accessibility_accessible_get_description;
+        epv->_set_description = impl_accessibility_accessible_set_description;
+
+        epv->_get_parent = impl_accessibility_accessible_get_parent;
+        epv->_get_childCount = impl_accessibility_accessible_get_child_count;
+        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->getRoleName = impl_accessibility_accessible_get_role_name;
+       epv->getLocalizedRoleName = impl_accessibility_accessible_get_local_role_name;
+}
+
+static void
+spi_accessible_init (SpiAccessible *accessible)
+{
+}
+
+BONOBO_TYPE_FUNC_FULL (SpiAccessible,
+                      Accessibility_Accessible,
+                      PARENT_TYPE,
+                      spi_accessible)
+
+static GHashTable *public_corba_refs = NULL;
+
+static GHashTable *
+get_public_refs (void)
+{
+  if (!public_corba_refs)
+    {
+      public_corba_refs = g_hash_table_new (NULL, NULL);
+    }
+  return public_corba_refs;
 }
 
 static void
-accessible_init (Accessible *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 */
-                };
-                /*
-                 *   Here we use bonobo_x_type_unique instead of
-                 * gtk_type_unique, this auto-generates a load of
-                 * CORBA structures for us. All derived types must
-                 * use bonobo_x_type_unique.
-                 */
-                type = bonobo_x_type_unique (
-                        PARENT_TYPE,
-                        POA_Accessibility_Accessible__init,
-                        NULL,
-                        G_STRUCT_OFFSET (AccessibleClass, epv),
-                        &tinfo,
-                        "Accessible");
-        }
-
-        return type;
-}
-
-Accessible *
-accessible_new (AtkObject *o)
-{
-    Accessible *retval =
-               ACCESSIBLE (g_object_new (accessible_get_type (), NULL));
-    retval->atko = ATK_OBJECT (o);
+de_register_public_ref (SpiBase *object)
+{
+  g_hash_table_remove (get_public_refs (), object->gobj);
+}
+
+SpiAccessible *
+spi_accessible_new (AtkObject *o)
+{
+  return spi_accessible_construct (SPI_ACCESSIBLE_TYPE, o);      
+}
+
+SpiAccessible *
+spi_accessible_construct (GType type, AtkObject *o)
+{
+    SpiAccessible *retval;
+    CORBA_Environment ev;
+
+    CORBA_exception_init (&ev);
+
+    g_assert (o);
+    g_assert (g_type_is_a (type, SPI_ACCESSIBLE_TYPE));
+
+    if ((retval = g_hash_table_lookup (get_public_refs (), o)))
+      {
+        bonobo_object_ref (BONOBO_OBJECT (retval));
+       return retval;
+      }
+    else
+      {
+        retval = g_object_new (type, NULL);
+        spi_base_construct (SPI_BASE (retval), G_OBJECT(o));
+      }
+    
+    g_hash_table_insert (get_public_refs (), o, retval);
+    g_signal_connect (G_OBJECT (retval), "destroy",
+                     G_CALLBACK (de_register_public_ref),
+                     NULL);
+
+    /* aggregate appropriate SPI interfaces based on ATK interfaces */
+    if (ATK_IS_ACTION (o))
+      {
+        bonobo_object_add_interface (bonobo_object (retval),
+               BONOBO_OBJECT (spi_action_interface_new (o)));
+      }
+
+    if (ATK_IS_COMPONENT (o))
+      {
+        bonobo_object_add_interface (bonobo_object (retval),
+                                    BONOBO_OBJECT (spi_component_interface_new (o)));
+      }
+
+    if (ATK_IS_EDITABLE_TEXT (o))
+      {
+         bonobo_object_add_interface (bonobo_object (retval),
+                                     BONOBO_OBJECT(spi_editable_text_interface_new (o)));
+      }
+
+    else if (ATK_IS_TEXT (o))
+       {
+         bonobo_object_add_interface (bonobo_object (retval),
+                                     BONOBO_OBJECT (spi_text_interface_new (o)));
+       }
+
+    if (ATK_IS_HYPERTEXT (o))
+      {
+        bonobo_object_add_interface (bonobo_object (retval),
+                                    BONOBO_OBJECT (spi_hypertext_interface_new (o)));
+      }
+
+    if (ATK_IS_IMAGE (o))
+      {
+        bonobo_object_add_interface (bonobo_object (retval),
+                                    BONOBO_OBJECT (spi_image_interface_new (o)));
+      }
+
+    if (ATK_IS_SELECTION (o))
+      {
+        bonobo_object_add_interface (bonobo_object (retval),
+                                    BONOBO_OBJECT (spi_selection_interface_new (o)));
+      }
+
+    if (ATK_IS_TABLE (o))
+      {
+        bonobo_object_add_interface (bonobo_object (retval),
+                                    BONOBO_OBJECT (spi_table_interface_new (o)));
+      }
+
+    if (ATK_IS_VALUE (o))
+      {
+        bonobo_object_add_interface (bonobo_object (retval),
+                                    BONOBO_OBJECT (spi_value_interface_new (o)));
+      }
+
     return retval;
 }
+
+/**
+ * spi_accessible_new_return:
+ * @o: an AtkObject or NULL
+ * @release_ref: whether to unref this AtkObject before return
+ * @ev: a CORBA environment
+ * 
+ * A helper function to instantiate a CORBA accessiblility
+ * proxy from an AtkObject.
+ * 
+ * Return value: the proxy or CORBA_OBJECT_NIL
+ **/
+Accessibility_Accessible
+spi_accessible_new_return (AtkObject         *o,
+                          gboolean           release_ref,
+                          CORBA_Environment *ev)
+{
+  SpiAccessible *accessible;
+  Accessibility_Accessible retval;
+
+  if (!o)
+    {
+      return CORBA_OBJECT_NIL;
+    }
+  else if (SPI_IS_REMOTE_OBJECT (o))
+    {
+      retval = spi_remote_object_get_accessible (SPI_REMOTE_OBJECT (o));
+    }
+  else
+    {
+      accessible = spi_accessible_construct (SPI_ACCESSIBLE_TYPE, o);
+      retval = CORBA_Object_duplicate (BONOBO_OBJREF (accessible), ev); 
+    }
+
+  if (release_ref)
+    {
+      g_object_unref (G_OBJECT (o));
+    }
+  
+  return retval;
+}