X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=libspi%2Faccessible.c;h=9b4f70cd98bb74343c332374159a6030d9b591ed;hb=bd703dfccbb700770f4629e5b5a8af45c3a8dfc3;hp=f6035277fb064c7005844be0d642d0cdca691d13;hpb=638c8a67ca492fdd3aa10b0e5fcf672ec27544e2;p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git diff --git a/libspi/accessible.c b/libspi/accessible.c index f603527..9b4f70c 100644 --- a/libspi/accessible.c +++ b/libspi/accessible.c @@ -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 @@ -24,29 +25,137 @@ #include #include +#include +#include #include /* Our parent Gtk object type */ -#define PARENT_TYPE BONOBO_TYPE_OBJECT +#define PARENT_TYPE SPI_TYPE_BASE -/* A pointer to our parent object class */ -static GObjectClass *spi_accessible_parent_class; +static gboolean spi_init_role_lookup_table (Accessibility_Role *role_table); +static Accessibility_Role spi_role_from_atk_role (AtkRole role); -/* - * Implemented GObject::finalize - */ -static void -spi_accessible_object_finalize (GObject *object) +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) { - SpiAccessible *accessible = SPI_ACCESSIBLE (object); + 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; +} - printf("spi_accessible_object_finalize called\n"); - ATK_OBJECT (accessible->atko); /* assertion */ - g_object_unref (G_OBJECT(accessible->atko)); - accessible->atko = NULL; +static AtkObject * +get_atkobject_from_servant (PortableServer_Servant servant) +{ + SpiBase *object = SPI_BASE (bonobo_object_from_servant (servant)); - printf("atko freed, calling parent finalize\n"); - spi_accessible_parent_class->finalize (object); + g_return_val_if_fail (object, NULL); + g_return_val_if_fail (ATK_IS_OBJECT(object->gobj), NULL); + return ATK_OBJECT(object->gobj); } /* @@ -56,13 +165,22 @@ static CORBA_char * impl_accessibility_accessible_get_name (PortableServer_Servant servant, CORBA_Environment *ev) { - CORBA_char * retval; - 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); + const gchar *name; + CORBA_char *retval; + AtkObject *object = get_atkobject_from_servant (servant); + + 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 (""); + { + retval = CORBA_string_dup (""); + } return retval; } @@ -75,9 +193,11 @@ impl_accessibility_accessible_set_name (PortableServer_Servant servant, const CORBA_char *name, CORBA_Environment *ev) { - SpiAccessible *accessible = SPI_ACCESSIBLE (bonobo_object_from_servant (servant)); - atk_object_set_name (accessible->atko, name); - printf ("SpiAccessible set_name called: %s\n", name); + AtkObject *object = get_atkobject_from_servant (servant); + + g_return_if_fail (object != NULL); + + atk_object_set_name (object, name); } /* @@ -87,13 +207,22 @@ static CORBA_char * impl_accessibility_accessible_get_description (PortableServer_Servant servant, CORBA_Environment *ev) { - CORBA_char * retval; - SpiAccessible *accessible = SPI_ACCESSIBLE (bonobo_object_from_servant (servant)); - retval = CORBA_string_dup (atk_object_get_description (accessible->atko)); - if (retval ) - retval = CORBA_string_dup (retval); + 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 (""); + { + retval = CORBA_string_dup (""); + } return retval; } @@ -103,12 +232,14 @@ impl_accessibility_accessible_get_description (PortableServer_Servant servant, */ static void impl_accessibility_accessible_set_description (PortableServer_Servant servant, - const CORBA_char *name, + const CORBA_char *descr, CORBA_Environment *ev) { - SpiAccessible *accessible = SPI_ACCESSIBLE (bonobo_object_from_servant (servant)); - atk_object_set_description (accessible->atko, name); - printf ("SpiAccessible set_description called: %s\n", name); + AtkObject *object = get_atkobject_from_servant (servant); + + g_return_if_fail (object != NULL); + + atk_object_set_description (object, descr); } /* @@ -118,16 +249,14 @@ static Accessibility_Accessible impl_accessibility_accessible_get_parent (PortableServer_Servant servant, CORBA_Environment *ev) { - Accessibility_Accessible retval; - SpiAccessible *accessible = SPI_ACCESSIBLE (bonobo_object_from_servant (servant)); - AtkObject *parent; + AtkObject *parent; + AtkObject *object = get_atkobject_from_servant (servant); - parent = atk_object_get_parent (accessible->atko); - retval = BONOBO_OBJREF (spi_accessible_new (parent)); + g_return_val_if_fail (object != NULL, CORBA_OBJECT_NIL); - printf ("SpiAccessible get_parent called\n"); + parent = atk_object_get_parent (object); - return CORBA_Object_duplicate (retval, ev); + return spi_accessible_new_return (parent, FALSE, ev); } /* @@ -137,11 +266,11 @@ static CORBA_long impl_accessibility_accessible_get_index_in_parent (PortableServer_Servant servant, CORBA_Environment *ev) { - CORBA_long retval; - SpiAccessible *accessible = SPI_ACCESSIBLE (bonobo_object_from_servant (servant)); - retval = (CORBA_long) atk_object_get_index_in_parent (accessible->atko); - printf ("SpiAccessible get_index_in_parent called\n"); - return retval; + AtkObject *object = get_atkobject_from_servant (servant); + + g_return_val_if_fail (object != NULL, -1); + + return atk_object_get_index_in_parent (object); } /* @@ -151,11 +280,11 @@ static CORBA_long impl_accessibility_accessible_get_child_count (PortableServer_Servant servant, CORBA_Environment *ev) { - CORBA_long retval; - SpiAccessible *accessible = SPI_ACCESSIBLE (bonobo_object_from_servant (servant)); - retval = (CORBA_long) atk_object_get_n_accessible_children (accessible->atko); - printf ("SpiAccessible get_childCount called: %d\n", (int) retval); - return retval; + AtkObject *object = get_atkobject_from_servant (servant); + + g_return_val_if_fail (object != NULL, 0); + + return atk_object_get_n_accessible_children (object); } /* @@ -166,12 +295,14 @@ impl_accessibility_accessible_get_child_at_index (PortableServer_Servant servant const CORBA_long index, CORBA_Environment *ev) { - Accessibility_Accessible retval; - SpiAccessible *accessible = SPI_ACCESSIBLE (bonobo_object_from_servant (servant)); - AtkObject *child = atk_object_ref_accessible_child (accessible->atko, (gint) index); - retval = BONOBO_OBJREF (spi_accessible_new (child)); - printf ("SpiAccessible get_child_at_index called.\n"); - return CORBA_Object_duplicate (retval, 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); } /* @@ -181,13 +312,21 @@ static Accessibility_StateSet impl_accessibility_accessible_get_state (PortableServer_Servant servant, CORBA_Environment *ev) { + AtkObject *object = get_atkobject_from_servant (servant); + AtkStateSet *atk_set; + SpiStateSet *set; 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; + + 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; } /* @@ -200,21 +339,29 @@ impl_accessibility_accessible_get_relation_set (PortableServer_Servant servant, 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); + 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 (); - CORBA_sequence_Accessibility_Relation_allocbuf (n_relations); + 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_buffer[i] = - CORBA_Object_duplicate (bonobo_object_corba_objref ( - BONOBO_OBJECT (spi_relation_new (atk_relation_set_get_relation (relation_set, i)))), - ev); + bonobo_object_dup_ref ( + BONOBO_OBJREF ( + spi_relation_new (atk_relation_set_get_relation (relation_set, i))), + ev); } - printf ("SpiAccessible get_relation_set.\n"); return retval; } @@ -225,22 +372,66 @@ static Accessibility_Role impl_accessibility_accessible_get_role (PortableServer_Servant servant, CORBA_Environment *ev) { + AtkRole role; 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; + 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 spi_accessible_class_init (SpiAccessibleClass *klass) { - GObjectClass * object_class = (GObjectClass *) klass; POA_Accessibility_Accessible__epv *epv = &klass->epv; - spi_accessible_parent_class = g_type_class_peek_parent (klass); - - object_class->finalize = spi_accessible_object_finalize; epv->_get_name = impl_accessibility_accessible_get_name; epv->_set_name = impl_accessibility_accessible_set_name; @@ -255,6 +446,8 @@ spi_accessible_class_init (SpiAccessibleClass *klass) 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 @@ -265,72 +458,155 @@ spi_accessible_init (SpiAccessible *accessible) BONOBO_TYPE_FUNC_FULL (SpiAccessible, Accessibility_Accessible, PARENT_TYPE, - spi_accessible); + 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 +de_register_public_ref (SpiBase *object) +{ + g_hash_table_remove (get_public_refs (), object->gobj); +} SpiAccessible * spi_accessible_new (AtkObject *o) { - SpiAccessible *retval = g_object_new (SPI_ACCESSIBLE_TYPE, NULL); + 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_object_ref (o); - retval->atko = ATK_OBJECT (o); - /* aggregate appropriate SPI interfaces based on ATK interfaces */ + g_assert (o); + g_assert (g_type_is_a (type, SPI_ACCESSIBLE_TYPE)); - if (ATK_IS_ACTION (o)) + if ((retval = g_hash_table_lookup (get_public_refs (), o))) { - bonobo_object_add_interface (bonobo_object (retval), - BONOBO_OBJECT (spi_action_interface_new (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); - if (ATK_IS_COMPONENT (o)) + /* aggregate appropriate SPI interfaces based on ATK interfaces */ + + if (ATK_IS_ACTION (o)) { bonobo_object_add_interface (bonobo_object (retval), - BONOBO_OBJECT (spi_component_interface_new (o))); + BONOBO_OBJECT (spi_action_interface_new (o))); } - if (ATK_IS_EDITABLE_TEXT (o)) + if (ATK_IS_COMPONENT (o)) { bonobo_object_add_interface (bonobo_object (retval), - BONOBO_OBJECT(spi_editable_text_interface_new (o))); + BONOBO_OBJECT (spi_component_interface_new (o))); } - else if (ATK_IS_HYPERTEXT (o)) + if (ATK_IS_EDITABLE_TEXT (o)) { - bonobo_object_add_interface (bonobo_object (retval), - BONOBO_OBJECT (spi_hypertext_interface_new (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_text_interface_new (o))); + 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))); + 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))); + 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))); + 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))); + 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; +}