X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=cspi%2Fspi_accessible.c;h=6817c302ec00a762dc5aa795b49481e080038f24;hb=ebd9b297363b8b3bd6708e6f0c6c7673e5cc32d6;hp=31fb8198a545f4b91daf7cd4ac17160d6d8fb662;hpb=783e63cad5945ddb6df3ee129d20d5b53c6cce04;p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git diff --git a/cspi/spi_accessible.c b/cspi/spi_accessible.c index 31fb819..6817c30 100644 --- a/cspi/spi_accessible.c +++ b/cspi/spi_accessible.c @@ -1,8 +1,9 @@ -#define MAX_ROLES 100 +#include /* for malloc */ +#include -static char *role_names [MAX_ROLES] = +static const char *role_names [] = { - " ", + "", "accelerator label", "alert", "animation", @@ -10,7 +11,7 @@ static char *role_names [MAX_ROLES] = "calendar", "canvas", "check box", - "menu item", + "check menu item", "color chooser", "column header", "combo box", @@ -53,74 +54,238 @@ static char *role_names [MAX_ROLES] = "scrollpane", "separator", "slider", - "split pane", "spin button", + "split pane", "status bar", "table", "table cell", "table column header", "table row header", "tearoff menu item", + "terminal", "text", "toggle button", "toolbar", "tooltip", "tree", - " ", + "tree table", + "", "viewport", "window", + }; +#define MAX_ROLES (sizeof (role_names) / sizeof (char *)) + +static SPIBoolean +cspi_init_role_table (AccessibleRole *role_table) +{ + int i; + for (i = 0; i < Accessibility_ROLE_LAST_DEFINED; ++i) + { + role_table [i] = SPI_ROLE_UNKNOWN; + } + role_table [Accessibility_ROLE_INVALID] = SPI_ROLE_INVALID; + role_table [Accessibility_ROLE_ACCELERATOR_LABEL] = SPI_ROLE_ACCEL_LABEL; + role_table [Accessibility_ROLE_ALERT] = SPI_ROLE_ALERT; + role_table [Accessibility_ROLE_ANIMATION] = SPI_ROLE_ANIMATION; + role_table [Accessibility_ROLE_ARROW] = SPI_ROLE_ARROW; + role_table [Accessibility_ROLE_CALENDAR] = SPI_ROLE_CALENDAR; + role_table [Accessibility_ROLE_CANVAS] = SPI_ROLE_CANVAS; + role_table [Accessibility_ROLE_CHECK_BOX] = SPI_ROLE_CHECK_BOX; + role_table [Accessibility_ROLE_CHECK_MENU_ITEM] = SPI_ROLE_CHECK_MENU_ITEM; + role_table [Accessibility_ROLE_COLOR_CHOOSER] = SPI_ROLE_COLOR_CHOOSER; + role_table [Accessibility_ROLE_COLUMN_HEADER] = SPI_ROLE_COLUMN_HEADER; + role_table [Accessibility_ROLE_COMBO_BOX] = SPI_ROLE_COMBO_BOX; + role_table [Accessibility_ROLE_DATE_EDITOR] = SPI_ROLE_DATE_EDITOR; + role_table [Accessibility_ROLE_DESKTOP_ICON] = SPI_ROLE_DESKTOP_ICON; + role_table [Accessibility_ROLE_DESKTOP_FRAME] = SPI_ROLE_DESKTOP_FRAME; + role_table [Accessibility_ROLE_DIAL] = SPI_ROLE_DIAL; + role_table [Accessibility_ROLE_DIALOG] = SPI_ROLE_DIALOG; + role_table [Accessibility_ROLE_DIRECTORY_PANE] = SPI_ROLE_DIRECTORY_PANE; + role_table[Accessibility_ROLE_DRAWING_AREA] = SPI_ROLE_DRAWING_AREA; + role_table [Accessibility_ROLE_FILE_CHOOSER] = SPI_ROLE_FILE_CHOOSER; + role_table [Accessibility_ROLE_FILLER] = SPI_ROLE_FILLER; + role_table [Accessibility_ROLE_FONT_CHOOSER] = SPI_ROLE_FONT_CHOOSER; + role_table [Accessibility_ROLE_FRAME] = SPI_ROLE_FRAME; + role_table [Accessibility_ROLE_GLASS_PANE] = SPI_ROLE_GLASS_PANE; + role_table [Accessibility_ROLE_HTML_CONTAINER] = SPI_ROLE_HTML_CONTAINER; + role_table [Accessibility_ROLE_ICON] = SPI_ROLE_ICON; + role_table [Accessibility_ROLE_IMAGE] = SPI_ROLE_IMAGE; + role_table [Accessibility_ROLE_INTERNAL_FRAME] = SPI_ROLE_INTERNAL_FRAME; + role_table [Accessibility_ROLE_LABEL] = SPI_ROLE_LABEL; + role_table [Accessibility_ROLE_LAYERED_PANE] = SPI_ROLE_LAYERED_PANE; + role_table [Accessibility_ROLE_LIST] = SPI_ROLE_LIST; + role_table [Accessibility_ROLE_LIST_ITEM] = SPI_ROLE_LIST_ITEM; + role_table [Accessibility_ROLE_MENU] = SPI_ROLE_MENU; + role_table [Accessibility_ROLE_MENU_BAR] = SPI_ROLE_MENU_BAR; + role_table [Accessibility_ROLE_MENU_ITEM] = SPI_ROLE_MENU_ITEM; + role_table [Accessibility_ROLE_OPTION_PANE] = SPI_ROLE_OPTION_PANE; + role_table [Accessibility_ROLE_PAGE_TAB] = SPI_ROLE_PAGE_TAB; + role_table [Accessibility_ROLE_PAGE_TAB_LIST] = SPI_ROLE_PAGE_TAB_LIST; + role_table [Accessibility_ROLE_PANEL] = SPI_ROLE_PANEL; + role_table [Accessibility_ROLE_PASSWORD_TEXT] = SPI_ROLE_PASSWORD_TEXT; + role_table [Accessibility_ROLE_POPUP_MENU] = SPI_ROLE_POPUP_MENU; + role_table [Accessibility_ROLE_PROGRESS_BAR] = SPI_ROLE_PROGRESS_BAR; + role_table [Accessibility_ROLE_PUSH_BUTTON] = SPI_ROLE_PUSH_BUTTON; + role_table [Accessibility_ROLE_RADIO_BUTTON] = SPI_ROLE_RADIO_BUTTON; + role_table [Accessibility_ROLE_RADIO_MENU_ITEM] = SPI_ROLE_RADIO_MENU_ITEM; + role_table [Accessibility_ROLE_ROOT_PANE] = SPI_ROLE_ROOT_PANE; + role_table [Accessibility_ROLE_ROW_HEADER] = SPI_ROLE_ROW_HEADER; + role_table [Accessibility_ROLE_SCROLL_BAR] = SPI_ROLE_SCROLL_BAR; + role_table [Accessibility_ROLE_SCROLL_PANE] = SPI_ROLE_SCROLL_PANE; + role_table [Accessibility_ROLE_SEPARATOR] = SPI_ROLE_SEPARATOR; + role_table [Accessibility_ROLE_SLIDER] = SPI_ROLE_SLIDER; + role_table [Accessibility_ROLE_SPIN_BUTTON] = SPI_ROLE_SPIN_BUTTON; + role_table [Accessibility_ROLE_SPLIT_PANE] = SPI_ROLE_SPLIT_PANE; + role_table [Accessibility_ROLE_STATUS_BAR] = SPI_ROLE_STATUS_BAR; + role_table [Accessibility_ROLE_TABLE] = SPI_ROLE_TABLE; + role_table [Accessibility_ROLE_TABLE_CELL] = SPI_ROLE_TABLE_CELL; + role_table[Accessibility_ROLE_TABLE_COLUMN_HEADER] = SPI_ROLE_TABLE_COLUMN_HEADER; + role_table[Accessibility_ROLE_TABLE_ROW_HEADER] = SPI_ROLE_TABLE_ROW_HEADER; + role_table [Accessibility_ROLE_TEAROFF_MENU_ITEM] = SPI_ROLE_TEAROFF_MENU_ITEM; + role_table[Accessibility_ROLE_TERMINAL] = SPI_ROLE_TERMINAL; + role_table [Accessibility_ROLE_TEXT] = SPI_ROLE_TEXT; + role_table [Accessibility_ROLE_TOGGLE_BUTTON] = SPI_ROLE_TOGGLE_BUTTON; + role_table [Accessibility_ROLE_TOOL_BAR] = SPI_ROLE_TOOL_BAR; + role_table [Accessibility_ROLE_TOOL_TIP] = SPI_ROLE_TOOL_TIP; + role_table [Accessibility_ROLE_TREE] = SPI_ROLE_TREE; + role_table [Accessibility_ROLE_TREE_TABLE] = SPI_ROLE_TREE_TABLE; + role_table [Accessibility_ROLE_VIEWPORT] = SPI_ROLE_VIEWPORT; + role_table [Accessibility_ROLE_WINDOW] = SPI_ROLE_WINDOW; + role_table [Accessibility_ROLE_EXTENDED] = SPI_ROLE_EXTENDED; + role_table [Accessibility_ROLE_LAST_DEFINED] = SPI_ROLE_EXTENDED; + + return TRUE; +} + +static AccessibleRole +cspi_role_from_spi_role (Accessibility_Role role) +{ + /* array is sized according to IDL roles because IDL roles are the index */ + static AccessibleRole cspi_role_table [Accessibility_ROLE_LAST_DEFINED]; + static SPIBoolean is_initialized = FALSE; + AccessibleRole cspi_role; + if (!is_initialized) + { + is_initialized = cspi_init_role_table (cspi_role_table); + } + if (role >= 0 && role < Accessibility_ROLE_LAST_DEFINED) + { + cspi_role = cspi_role_table [role]; + } + else + { + cspi_role = SPI_ROLE_EXTENDED; + } + return cspi_role; +} + +static SPIBoolean +init_state_table (Accessibility_StateType *state_table) +{ + int i; + + for (i = 0; i < Accessibility_STATE_LAST_DEFINED; i++) + state_table[i] = SPI_STATE_INVALID; + + state_table[SPI_STATE_ACTIVE] = Accessibility_STATE_ACTIVE; + state_table[SPI_STATE_ARMED] = Accessibility_STATE_ARMED; + state_table[SPI_STATE_BUSY] = Accessibility_STATE_BUSY; + state_table[SPI_STATE_CHECKED] = Accessibility_STATE_CHECKED; + state_table[SPI_STATE_DEFUNCT] = Accessibility_STATE_DEFUNCT; + state_table[SPI_STATE_EDITABLE] = Accessibility_STATE_EDITABLE; + state_table[SPI_STATE_ENABLED] = Accessibility_STATE_ENABLED; + state_table[SPI_STATE_EXPANDABLE] = Accessibility_STATE_EXPANDABLE; + state_table[SPI_STATE_EXPANDED] = Accessibility_STATE_EXPANDED; + state_table[SPI_STATE_FOCUSABLE] = Accessibility_STATE_FOCUSABLE; + state_table[SPI_STATE_FOCUSED] = Accessibility_STATE_FOCUSED; + state_table[SPI_STATE_HORIZONTAL] = Accessibility_STATE_HORIZONTAL; + state_table[SPI_STATE_ICONIFIED] = Accessibility_STATE_ICONIFIED; + state_table[SPI_STATE_MODAL] = Accessibility_STATE_MODAL; + state_table[SPI_STATE_MULTI_LINE] = Accessibility_STATE_MULTI_LINE; + state_table[SPI_STATE_MULTISELECTABLE] = Accessibility_STATE_MULTISELECTABLE; + state_table[SPI_STATE_OPAQUE] = Accessibility_STATE_OPAQUE; + state_table[SPI_STATE_PRESSED] = Accessibility_STATE_PRESSED; + state_table[SPI_STATE_RESIZABLE] = Accessibility_STATE_RESIZABLE; + state_table[SPI_STATE_SELECTABLE] = Accessibility_STATE_SELECTABLE; + state_table[SPI_STATE_SELECTED] = Accessibility_STATE_SELECTED; + state_table[SPI_STATE_SENSITIVE] = Accessibility_STATE_SENSITIVE; + state_table[SPI_STATE_SHOWING] = Accessibility_STATE_SHOWING; + state_table[SPI_STATE_SINGLE_LINE] = Accessibility_STATE_SINGLE_LINE; + state_table[SPI_STATE_STALE] = Accessibility_STATE_STALE; + state_table[SPI_STATE_TRANSIENT] = Accessibility_STATE_TRANSIENT; + state_table[SPI_STATE_VERTICAL] = Accessibility_STATE_VERTICAL; + state_table[SPI_STATE_VISIBLE] = Accessibility_STATE_VISIBLE; + + return TRUE; +} + + + +static Accessibility_StateType +spi_state_type_from_accessible_state (AccessibleState type) +{ + static Accessibility_StateType state_table[Accessibility_STATE_LAST_DEFINED]; + static SPIBoolean table_initialized = FALSE; + Accessibility_StateType rv; + + if (!table_initialized) + table_initialized = init_state_table (state_table); + if (type > SPI_STATE_INVALID && type < SPI_STATE_LAST_DEFINED) + rv = state_table[type]; + else + rv = Accessibility_STATE_INVALID; + return rv; +} + + + + /** * AccessibleRole_getName: * @role: an #AccessibleRole object to query. * * Get a localizeable string that indicates the name of an #AccessibleRole. + * DEPRECATED. * * Returns: a localizable string name for an #AccessibleRole enumerated type. **/ -char* +char * AccessibleRole_getName (AccessibleRole role) { - if (role < MAX_ROLES) return role_names [(int) role]; - else return ""; + if (role < MAX_ROLES) + { + return CORBA_string_dup (role_names [(int) role]); + } + else + { + return g_strdup (""); + } } - - /** * Accessible_ref: * @obj: a pointer to the #Accessible object on which to operate. * * Increment the reference count for an #Accessible object. - * - * Returns: (no return code implemented yet). - * **/ -int +void Accessible_ref (Accessible *obj) { - Accessibility_Accessible_ref (*obj, &ev); - spi_check_ev (&ev, "ref"); - return 0; + cspi_object_ref (obj); } - /** * Accessible_unref: * @obj: a pointer to the #Accessible object on which to operate. * * Decrement the reference count for an #Accessible object. - * - * Returns: (no return code implemented yet). - * **/ -int +void Accessible_unref (Accessible *obj) { - Accessibility_Accessible_unref (*obj, &ev); - spi_check_ev (&ev, "unref"); - return 0; + cspi_object_unref (obj); } /** @@ -130,15 +295,20 @@ Accessible_unref (Accessible *obj) * Get the name of an #Accessible object. * * Returns: a UTF-8 string indicating the name of the #Accessible object. - * + * or NULL on exception **/ char * Accessible_getName (Accessible *obj) { - char *retval = - (char *) - Accessibility_Accessible__get_name (*obj, &ev); - spi_check_ev (&ev, "getName"); + char *retval; + + cspi_return_val_if_fail (obj != NULL, NULL); + + retval = (char *) + Accessibility_Accessible__get_name (CSPI_OBJREF (obj), cspi_ev ()); + + cspi_return_val_if_ev ("getName", NULL); + return retval; } @@ -149,14 +319,21 @@ Accessible_getName (Accessible *obj) * Get the description of an #Accessible object. * * Returns: a UTF-8 string describing the #Accessible object. - * + * or NULL on exception **/ char * Accessible_getDescription (Accessible *obj) { - char *retval = (char *) - Accessibility_Accessible__get_description (*obj, &ev); - spi_check_ev (&ev, "getDescription"); + char *retval; + + cspi_return_val_if_fail (obj != NULL, NULL); + + retval = (char *) + Accessibility_Accessible__get_description (CSPI_OBJREF (obj), + cspi_ev ()); + + cspi_return_val_if_ev ("getDescription", NULL); + return retval; } @@ -173,9 +350,16 @@ Accessible_getDescription (Accessible *obj) Accessible * Accessible_getParent (Accessible *obj) { - Accessible *retval = - Obj_Add (Accessibility_Accessible__get_parent (*obj, &ev)); - spi_check_ev (&ev, "getParent"); + Accessible *retval; + + cspi_return_val_if_fail (obj != NULL, NULL); + + retval = cspi_object_add ( + Accessibility_Accessible__get_parent (CSPI_OBJREF (obj), + cspi_ev ())); + + cspi_return_val_if_ev ("getParent", NULL); + return retval; } @@ -186,14 +370,22 @@ Accessible_getParent (Accessible *obj) * Get the number of children contained by an #Accessible object. * * Returns: a #long indicating the number of #Accessible children - * contained by an #Accessible object. + * contained by an #Accessible object. or -1 on exception * **/ long Accessible_getChildCount (Accessible *obj) { - long retval = (long) Accessibility_Accessible__get_childCount (*obj, &ev); - spi_check_ev (&ev, "getChildCount"); + long retval; + + cspi_return_val_if_fail (obj != NULL, -1); + + retval = (long) + Accessibility_Accessible__get_childCount (CSPI_OBJREF (obj), + cspi_ev ()); + + cspi_return_val_if_ev ("getChildCount", -1); + return retval; } @@ -205,15 +397,20 @@ Accessible_getChildCount (Accessible *obj) * Get the #Accessible child of an #Accessible object at a given index. * * Returns: a pointer to the #Accessible child object at index - * @childIndex. - * + * @childIndex. or NULL on exception **/ Accessible * Accessible_getChildAtIndex (Accessible *obj, - long int childIndex) + long int childIndex) { - Accessible *retval = Obj_Add (Accessibility_Accessible_getChildAtIndex (*obj, childIndex, &ev)); - spi_check_ev (&ev, "getChildAtIndex"); + Accessible *retval; + + cspi_return_val_if_fail (obj != NULL, NULL); + + retval = cspi_object_add ( + Accessibility_Accessible_getChildAtIndex (CSPI_OBJREF (obj), + childIndex, cspi_ev ())); + return retval; } @@ -225,14 +422,19 @@ Accessible_getChildAtIndex (Accessible *obj, * * Returns: a #long indicating the index of the #Accessible object * in its parent (i.e. containing) #Accessible instance, - * or -1 if @obj has no containing parent. - * + * or -1 if @obj has no containing parent or on exception. **/ long Accessible_getIndexInParent (Accessible *obj) { - long retval = (long) Accessibility_Accessible_getIndexInParent (*obj, &ev); - spi_check_ev (&ev, "getIndexInParent"); + long retval; + + cspi_return_val_if_fail (obj != NULL, -1); + + retval = (long) + Accessibility_Accessible_getIndexInParent (CSPI_OBJREF (obj), cspi_ev ()); + + cspi_return_val_if_ev ("getIndexInparent", -1); return retval; } @@ -243,27 +445,34 @@ Accessible_getIndexInParent (Accessible *obj) * Get the set of #AccessibleRelation objects which describe this #Accessible object's * relationships with other #Accessible objects. * - * Returns: an array of #AccessibleRelation pointers. - * + * Returns: an array of #AccessibleRelation pointers. or NULL on exception **/ AccessibleRelation ** Accessible_getRelationSet (Accessible *obj) { - AccessibleRelation **relations; - int n_relations; int i; - Accessibility_RelationSet *relation_set = - Accessibility_Accessible_getRelationSet (*obj, &ev); + int n_relations; + AccessibleRelation **relations; + Accessibility_RelationSet *relation_set; + + cspi_return_val_if_fail (obj != NULL, NULL); + + relation_set = + Accessibility_Accessible_getRelationSet (CSPI_OBJREF (obj), cspi_ev ()); + + cspi_return_val_if_ev ("getRelationSet", NULL); - /* this looks hack-ish, but it's based on the CORBA C bindings spec */ n_relations = relation_set->_length; - relations = malloc (sizeof (AccessibleRelation *) * n_relations); + relations = malloc (sizeof (AccessibleRelation *) * (n_relations + 1)); - for (i=0; i_buffer[i]); + relations[i] = cspi_object_add (CORBA_Object_duplicate ( + relation_set->_buffer[i], cspi_ev ())); } - relations[i] = CORBA_OBJECT_NIL; + relations[i] = NULL; + + CORBA_free (relation_set); return relations; } @@ -273,16 +482,49 @@ Accessible_getRelationSet (Accessible *obj) * @obj: a pointer to the #Accessible object on which to operate. * * Get the UI role of an #Accessible object. + * A UTF-8 string describing this role can be obtained via Accessible_getRoleName (). * - * Returns: a UTF-8 string indicating the UI role of the #Accessible object. + * Returns: the #AccessibleRole of the object. * **/ -char * +AccessibleRole Accessible_getRole (Accessible *obj) { - char *retval = AccessibleRole_getName ( - Accessibility_Accessible_getRole (*obj, &ev)); - spi_check_ev (&ev, "getRole"); + AccessibleRole retval; + + cspi_return_val_if_fail (obj != NULL, SPI_ROLE_INVALID); + + retval = + Accessibility_Accessible_getRole (CSPI_OBJREF (obj), cspi_ev ()); + + cspi_return_val_if_ev ("getRole", SPI_ROLE_INVALID); + + return cspi_role_from_spi_role (retval); +} + +/** + * Accessible_getRoleName: + * @obj: a pointer to the #Accessible object on which to operate. + * + * Get a UTF-8 string describing the role this object plays in the UI. + * This method will return useful values for roles that fall outside the + * enumeration used in Accessible_getRole (). + * + * Returns: a UTF-8 string specifying the role of this #Accessible object. + * + **/ +char * +Accessible_getRoleName (Accessible *obj) +{ + char *retval; + + cspi_return_val_if_fail (obj != NULL, CORBA_string_dup ("invalid")); + + retval = + Accessibility_Accessible_getRoleName (CSPI_OBJREF (obj), cspi_ev ()); + + cspi_return_val_if_ev ("getRoleName", CORBA_string_dup ("invalid")); + return retval; } @@ -297,7 +539,15 @@ Accessible_getRole (Accessible *obj) AccessibleStateSet * Accessible_getStateSet (Accessible *obj) { - return NULL; + AccessibleStateSet *retval; + + cspi_return_val_if_fail (obj != NULL, NULL); + + retval = cspi_object_add ( + Accessibility_Accessible_getState (CSPI_OBJREF (obj), + cspi_ev ())); + + return retval; } /* Interface query methods */ @@ -311,16 +561,27 @@ Accessible_getStateSet (Accessible *obj) * Returns: #TRUE if @obj implements the #AccessibleAction interface, * #FALSE otherwise. **/ -boolean +SPIBoolean Accessible_isAction (Accessible *obj) { - Bonobo_Unknown iface = - Accessibility_Accessible_queryInterface (*obj, - "IDL:Accessibility/Action:1.0", - &ev); - spi_warn_ev (&ev, "isAction"); + return cspi_accessible_is_a (obj, + "IDL:Accessibility/Action:1.0"); +} - return (CORBA_Object_is_nil (iface, &ev)) ? FALSE : TRUE; +/** + * Accessible_isApplication: + * @obj: a pointer to the #Accessible instance to query. + * + * Query whether the specified #Accessible implements #AccessibleApplication. + * + * Returns: #TRUE if @obj implements the #AccessibleApplication interface, + * #FALSE otherwise. + **/ +SPIBoolean +Accessible_isApplication (Accessible *obj) +{ + return cspi_accessible_is_a (obj, + "IDL:Accessibility/Application:1.0"); } /** @@ -332,16 +593,11 @@ Accessible_isAction (Accessible *obj) * Returns: #TRUE if @obj implements the #AccessibleComponent interface, * #FALSE otherwise. **/ -boolean +SPIBoolean Accessible_isComponent (Accessible *obj) { - Bonobo_Unknown iface = - Accessibility_Accessible_queryInterface (*obj, - "IDL:Accessibility/Component:1.0", - &ev); - spi_warn_ev (&ev, "isComponent"); - - return (CORBA_Object_is_nil (iface, &ev)) ? FALSE : TRUE; + return cspi_accessible_is_a (obj, + "IDL:Accessibility/Component:1.0"); } /** @@ -353,16 +609,11 @@ Accessible_isComponent (Accessible *obj) * Returns: #TRUE if @obj implements the #AccessibleEditableText interface, * #FALSE otherwise. **/ -boolean +SPIBoolean Accessible_isEditableText (Accessible *obj) { - Bonobo_Unknown iface = - Accessibility_Accessible_queryInterface (*obj, - "IDL:Accessibility/EditableText:1.0", - &ev); - spi_check_ev (&ev, "isEditableText"); - - return (CORBA_Object_is_nil (iface, &ev)) ? FALSE : TRUE; + return cspi_accessible_is_a (obj, + "IDL:Accessibility/EditableText:1.0"); } /** @@ -374,17 +625,11 @@ Accessible_isEditableText (Accessible *obj) * Returns: #TRUE if @obj implements the #AccessibleHypertext interface, * #FALSE otherwise. **/ -boolean +SPIBoolean Accessible_isHypertext (Accessible *obj) { - Bonobo_Unknown iface = - Accessibility_Accessible_queryInterface (*obj, - "IDL:Accessibility/Hypertext:1.0", - &ev); - - spi_check_ev (&ev, "isHypertext"); - - return (CORBA_Object_is_nil (iface, &ev)) ? FALSE : TRUE; + return cspi_accessible_is_a (obj, + "IDL:Accessibility/Hypertext:1.0"); } /** @@ -396,16 +641,11 @@ Accessible_isHypertext (Accessible *obj) * Returns: #TRUE if @obj implements the #AccessibleImage interface, * #FALSE otherwise. **/ -boolean +SPIBoolean Accessible_isImage (Accessible *obj) { - Bonobo_Unknown iface = - Accessibility_Accessible_queryInterface (*obj, - "IDL:Accessibility/Image:1.0", - &ev); - spi_check_ev (&ev, "isImage"); - - return (CORBA_Object_is_nil (iface, &ev)) ? FALSE : TRUE; + return cspi_accessible_is_a (obj, + "IDL:Accessibility/Image:1.0"); } /** @@ -417,17 +657,11 @@ Accessible_isImage (Accessible *obj) * Returns: #TRUE if @obj implements the #AccessibleSelection interface, * #FALSE otherwise. **/ -boolean +SPIBoolean Accessible_isSelection (Accessible *obj) { - Bonobo_Unknown iface = - Accessibility_Accessible_queryInterface (*obj, - "IDL:Accessibility/Selection:1.0", - &ev); - spi_warn_ev (&ev, "isSelection"); - - return (CORBA_Object_is_nil (iface, &ev)) ? FALSE : TRUE; - + return cspi_accessible_is_a (obj, + "IDL:Accessibility/Selection:1.0"); } /** @@ -439,17 +673,28 @@ Accessible_isSelection (Accessible *obj) * Returns: #TRUE if @obj implements the #AccessibleTable interface, * #FALSE otherwise. **/ -boolean +SPIBoolean Accessible_isTable (Accessible *obj) { - Bonobo_Unknown iface = - Accessibility_Accessible_queryInterface (*obj, - "IDL:Accessibility/Table:1.0", - &ev); - spi_check_ev (&ev, "isTable"); - - return (CORBA_Object_is_nil (iface, &ev)) ? FALSE : TRUE; + return cspi_accessible_is_a (obj, + "IDL:Accessibility/Table:1.0"); +} +/** + * Accessible_isStreamableContent: + * @obj: a pointer to the #Accessible instance to query. + * + * Query whether the specified #Accessible implements + * #AccessibleStreamableContent. + * + * Returns: #TRUE if @obj implements the #AccessibleStreamableContent interface, + * #FALSE otherwise. +**/ +SPIBoolean +Accessible_isStreamableContent (Accessible *obj) +{ + return cspi_accessible_is_a (obj, + "IDL:Accessibility/StreamableContent:1.0"); } /** @@ -461,16 +706,11 @@ Accessible_isTable (Accessible *obj) * Returns: #TRUE if @obj implements the #AccessibleText interface, * #FALSE otherwise. **/ -boolean +SPIBoolean Accessible_isText (Accessible *obj) { - Bonobo_Unknown iface = - Accessibility_Accessible_queryInterface (*obj, - "IDL:Accessibility/Text:1.0", - &ev); - spi_warn_ev (&ev, "isText"); - - return (CORBA_Object_is_nil (iface, &ev)) ? FALSE : TRUE; + return cspi_accessible_is_a (obj, + "IDL:Accessibility/Text:1.0"); } /** @@ -482,16 +722,27 @@ Accessible_isText (Accessible *obj) * Returns: #TRUE if @obj implements the #AccessibleValue interface, * #FALSE otherwise. **/ -boolean +SPIBoolean Accessible_isValue (Accessible *obj) { - Bonobo_Unknown iface = - Accessibility_Accessible_queryInterface (*obj, - "IDL:Accessibility/Value:1.0", - &ev); - spi_check_ev (&ev, "isValue"); + return cspi_accessible_is_a (obj, + "IDL:Accessibility/Value:1.0"); +} - return (CORBA_Object_is_nil (iface, &ev)) ? FALSE : TRUE; +/** + * Accessible_getApplication: + * @obj: a pointer to the #Accessible instance to query. + * + * Get the #AccessibleApplication interface for an #Accessible. + * + * Returns: a pointer to an #AccessibleApplication interface instance, or + * NULL if @obj does not implement #AccessibleApplication. + **/ +AccessibleApplication * +Accessible_getApplication (Accessible *obj) +{ + return (AccessibleApplication *) Accessible_queryInterface ( + obj, "IDL:Accessibility/Application:1.0"); } /** @@ -506,14 +757,8 @@ Accessible_isValue (Accessible *obj) AccessibleAction * Accessible_getAction (Accessible *obj) { - Bonobo_Unknown iface = - Accessibility_Accessible_queryInterface (*obj, - "IDL:Accessibility/Action:1.0", - &ev); - spi_check_ev (&ev, "getAction"); - - return (AccessibleAction *) - ((CORBA_Object_is_nil (iface, &ev)) ? 0 : Obj_Add (iface)); + return (AccessibleAction *) Accessible_queryInterface ( + obj, "IDL:Accessibility/Action:1.0"); } /** @@ -528,13 +773,8 @@ Accessible_getAction (Accessible *obj) AccessibleComponent * Accessible_getComponent (Accessible *obj) { - Bonobo_Unknown iface = - Accessibility_Accessible_queryInterface (*obj, - "IDL:Accessibility/Component:1.0", - &ev); - spi_check_ev (&ev, "getComponent"); - - return (AccessibleComponent *) ((CORBA_Object_is_nil (iface, &ev)) ? 0 : Obj_Add (iface)); + return (AccessibleComponent *) Accessible_queryInterface ( + obj, "IDL:Accessibility/Component:1.0"); } /** @@ -549,14 +789,8 @@ Accessible_getComponent (Accessible *obj) AccessibleEditableText * Accessible_getEditableText (Accessible *obj) { - Bonobo_Unknown iface = - Accessibility_Accessible_queryInterface (*obj, - "IDL:Accessibility/EditableText:1.0", - &ev); - spi_check_ev (&ev, "getEditableText"); - - return (AccessibleEditableText *) - ((CORBA_Object_is_nil (iface, &ev)) ? 0 : Obj_Add (iface)); + return (AccessibleEditableText *) Accessible_queryInterface ( + obj, "IDL:Accessibility/EditableText:1.0"); } @@ -573,14 +807,8 @@ Accessible_getEditableText (Accessible *obj) AccessibleHypertext * Accessible_getHypertext (Accessible *obj) { - Bonobo_Unknown iface = - Accessibility_Accessible_queryInterface (*obj, - "IDL:Accessibility/Hypertext:1.0", - &ev); - spi_check_ev (&ev, "getHypertext"); - - return (AccessibleHypertext *) - ((CORBA_Object_is_nil (iface, &ev)) ? 0 : Obj_Add (iface)); + return (AccessibleHypertext *) Accessible_queryInterface ( + obj, "IDL:Accessibility/Hypertext:1.0"); } @@ -597,14 +825,8 @@ Accessible_getHypertext (Accessible *obj) AccessibleImage * Accessible_getImage (Accessible *obj) { - Bonobo_Unknown iface = - Accessibility_Accessible_queryInterface (*obj, - "IDL:Accessibility/Image:1.0", - &ev); - spi_check_ev (&ev, "getImage"); - - return (AccessibleImage *) - ((CORBA_Object_is_nil (iface, &ev)) ? 0 : Obj_Add (iface)); + return (AccessibleImage *) Accessible_queryInterface ( + obj, "IDL:Accessibility/Image:1.0"); } @@ -621,19 +843,29 @@ Accessible_getImage (Accessible *obj) AccessibleSelection * Accessible_getSelection (Accessible *obj) { - Bonobo_Unknown iface = - Accessibility_Accessible_queryInterface (*obj, - "IDL:Accessibility/Selection:1.0", - &ev); - spi_warn_ev (&ev, "getSelection"); - - return (AccessibleSelection *) - ((CORBA_Object_is_nil (iface, &ev)) ? 0 : Obj_Add (iface)); + return (AccessibleSelection *) Accessible_queryInterface ( + obj, "IDL:Accessibility/Selection:1.0"); } /** + * Accessible_getStreamableContent: + * @obj: a pointer to the #Accessible instance to query. + * + * Get the #AccessibleStreamableContent interface for an #Accessible. + * + * Returns: a pointer to an #AccessibleStreamableContent interface instance, or + * NULL if @obj does not implement #AccessibleStreamableContent. + **/ +AccessibleStreamableContent * +Accessible_getStreamableContent (Accessible *obj) +{ + return (AccessibleStreamableContent *) Accessible_queryInterface ( + obj, "IDL:Accessibility/StreamableContent:1.0"); +} + +/** * Accessible_getTable: * @obj: a pointer to the #Accessible instance to query. * @@ -645,14 +877,8 @@ Accessible_getSelection (Accessible *obj) AccessibleTable * Accessible_getTable (Accessible *obj) { - Bonobo_Unknown iface = - Accessibility_Accessible_queryInterface (*obj, - "IDL:Accessibility/Table:1.0", - &ev); - spi_check_ev (&ev, "getTable"); - - return (AccessibleTable *) - ((CORBA_Object_is_nil (iface, &ev)) ? 0 : Obj_Add (iface)); + return (AccessibleTable *) Accessible_queryInterface ( + obj, "IDL:Accessibility/Table:1.0"); } /** @@ -667,15 +893,8 @@ Accessible_getTable (Accessible *obj) AccessibleText * Accessible_getText (Accessible *obj) { - Bonobo_Unknown iface = - Accessibility_Accessible_queryInterface (*obj, - "IDL:Accessibility/Text:1.0", - &ev); - - spi_check_ev (&ev, "getText"); - - return (AccessibleText *) - ((CORBA_Object_is_nil (iface, &ev)) ? 0 : Obj_Add (iface)); + return (AccessibleText *) Accessible_queryInterface ( + obj, "IDL:Accessibility/Text:1.0"); } @@ -692,12 +911,8 @@ Accessible_getText (Accessible *obj) AccessibleValue * Accessible_getValue (Accessible *obj) { - 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)); + return (AccessibleValue *) Accessible_queryInterface ( + obj, "IDL:Accessibility/Value:1.0"); } @@ -713,14 +928,34 @@ Accessible_getValue (Accessible *obj) * by @obj, or NULL otherwise. * **/ -GenericInterface * -Accessible_queryInterface (Accessible *obj, char *interface_name) +AccessibleUnknown * +Accessible_queryInterface (Accessible *obj, + const char *interface_name) { - GenericInterface iface; - iface = Accessibility_Accessible_queryInterface (*obj, - interface_name, - &ev); - return (iface != NULL) ? Obj_Add (iface) : NULL; + Bonobo_Unknown iface; + + if (!obj) + { + return NULL; + } + + iface = Accessibility_Accessible_queryInterface (CSPI_OBJREF (obj), + interface_name, + cspi_ev ()); + + + cspi_return_val_if_ev ("queryInterface", NULL); + + /* + * FIXME: we need to be fairly sure that references are going + * to mach up if we are going to expose QueryInterface, ie. we + * can't allow people to do: + * b = a.qi ("b"); b.unref, b.unref to release a's reference. + * this should be no real problem though for this level of API + * user. + */ + + return cspi_object_add (iface); } @@ -730,15 +965,11 @@ Accessible_queryInterface (Accessible *obj, char *interface_name) * * Increment the reference count for an #AccessibleRelation object. * - * Returns: (no return code implemented yet). - * **/ -int +void AccessibleRelation_ref (AccessibleRelation *obj) { - Accessibility_Relation_ref (*obj, &ev); - spi_check_ev (&ev, "ref"); - return 0; + cspi_object_ref (obj); } /** @@ -747,15 +978,11 @@ AccessibleRelation_ref (AccessibleRelation *obj) * * Decrement the reference count for an #AccessibleRelation object. * - * Returns: (no return code implemented yet). - * **/ -int +void AccessibleRelation_unref (AccessibleRelation *obj) { - Accessibility_Relation_unref (*obj, &ev); - spi_check_ev (&ev, "unref"); - return 0; + cspi_object_unref (obj); } /** @@ -771,7 +998,13 @@ AccessibleRelation_unref (AccessibleRelation *obj) AccessibleRelationType AccessibleRelation_getRelationType (AccessibleRelation *obj) { - return 0; + AccessibleRelationType retval; + + cspi_return_val_if_fail (obj, SPI_RELATION_NULL); + retval = + Accessibility_Relation_getRelationType (CSPI_OBJREF (obj), cspi_ev()); + cspi_return_val_if_ev ("getRelationType", SPI_RELATION_NULL); + return retval; } /** @@ -789,7 +1022,13 @@ AccessibleRelation_getRelationType (AccessibleRelation *obj) int AccessibleRelation_getNTargets (AccessibleRelation *obj) { - return 0; + int retval; + + cspi_return_val_if_fail (obj, -1); + retval = (int) + Accessibility_Relation_getNTargets (CSPI_OBJREF (obj), cspi_ev()); + cspi_return_val_if_ev ("getNTargets", -1); + return retval; } /** @@ -807,7 +1046,15 @@ AccessibleRelation_getNTargets (AccessibleRelation *obj) Accessible * AccessibleRelation_getTarget (AccessibleRelation *obj, int i) { - return NULL; + Accessible *retval; + + cspi_return_val_if_fail (obj, NULL); + + retval = cspi_object_add ( + Accessibility_Relation_getTarget (CSPI_OBJREF(obj), + (CORBA_short) i, cspi_ev())); + cspi_return_val_if_ev ("getTarget", NULL); + return retval; } /** @@ -816,15 +1063,11 @@ AccessibleRelation_getTarget (AccessibleRelation *obj, int i) * * Increment the reference count for an #AccessibleStateSet object. * - * Returns: (no return code implemented yet). - * **/ -int +void AccessibleStateSet_ref (AccessibleStateSet *obj) { -/* Accessibility_StateSet_ref (*obj, &ev); */ - spi_check_ev (&ev, "ref"); - return 0; + cspi_object_ref (obj); } /** @@ -833,18 +1076,13 @@ AccessibleStateSet_ref (AccessibleStateSet *obj) * * Decrement the reference count for an #AccessibleStateSet object. * - * Returns: (no return code implemented yet). - * **/ -int +void AccessibleStateSet_unref (AccessibleStateSet *obj) { -/* Accessibility_StateSet_unref (*obj, &ev); */ - spi_check_ev (&ev, "unref"); - return 0; + cspi_object_unref (obj); } - /** * AccessibleStateSet_contains: * @obj: a pointer to the #AccessibleStateSet object on which to operate. @@ -858,13 +1096,22 @@ AccessibleStateSet_unref (AccessibleStateSet *obj) * otherwise #FALSE. * **/ -boolean +SPIBoolean AccessibleStateSet_contains (AccessibleStateSet *obj, AccessibleState state) { - CORBA_boolean retval = Accessibility_StateSet_contains (*obj, state, &ev); - spi_check_ev (&ev, "contains"); - return (boolean) retval; + CORBA_boolean retval; + Accessibility_StateType spi_state; + + cspi_return_val_if_fail (obj != NULL, FALSE); + + spi_state = spi_state_type_from_accessible_state (state); + retval = Accessibility_StateSet_contains (CSPI_OBJREF (obj), + spi_state, cspi_ev ()); + + cspi_return_val_if_ev ("contains", FALSE); + + return (SPIBoolean) retval; } /** @@ -880,10 +1127,14 @@ void AccessibleStateSet_add (AccessibleStateSet *obj, AccessibleState state) { - Accessibility_StateSet_add (*obj, state, &ev); - spi_check_ev (&ev, "contains"); -} + Accessibility_StateType spi_state; + + cspi_return_if_fail (obj != NULL); + spi_state = spi_state_type_from_accessible_state (state); + Accessibility_StateSet_add (CSPI_OBJREF (obj), spi_state, cspi_ev ()); + cspi_check_ev ("add"); +} /** * AccessibleStateSet_remove: @@ -898,8 +1149,13 @@ void AccessibleStateSet_remove (AccessibleStateSet *obj, AccessibleState state) { - Accessibility_StateSet_remove (*obj, state, &ev); - spi_check_ev (&ev, "contains"); + Accessibility_StateType spi_state; + + cspi_return_if_fail (obj != NULL); + + spi_state = spi_state_type_from_accessible_state (state); + Accessibility_StateSet_remove (CSPI_OBJREF (obj), spi_state, cspi_ev ()); + cspi_check_ev ("remove"); } /** @@ -917,11 +1173,20 @@ AccessibleStateSet_remove (AccessibleStateSet *obj, * otherwise #FALSE. * **/ -boolean +SPIBoolean AccessibleStateSet_equals (AccessibleStateSet *obj, AccessibleStateSet *obj2) { - return Accessibility_StateSet_equals (*obj, *obj2, &ev); + if (obj == obj2) + { + return TRUE; + } + + cspi_return_val_if_fail (obj != NULL, FALSE); + cspi_return_val_if_fail (obj2 != NULL, FALSE); + + return Accessibility_StateSet_equals (CSPI_OBJREF (obj), + CSPI_OBJREF (obj2), cspi_ev ()); } /** @@ -930,6 +1195,7 @@ AccessibleStateSet_equals (AccessibleStateSet *obj, * @obj2: a pointer to the second #AccessibleStateSet object on which to operate. * * Determine the differences between two instances of #AccessibleStateSet. + * Not Yet Implemented. *. * @see AccessibleStateSet_equals(). * @@ -937,11 +1203,17 @@ AccessibleStateSet_equals (AccessibleStateSet *obj, * the two sets but not the other. * **/ -void +AccessibleStateSet * AccessibleStateSet_compare (AccessibleStateSet *obj, - AccessibleStateSet *obj2, - AccessibleStateSet **differenceSet); + AccessibleStateSet *obj2) +{ + Accessibility_StateSet retval; + cspi_return_val_if_fail (obj != NULL, NULL); + cspi_return_val_if_fail (obj2 != NULL, NULL); + retval = Accessibility_StateSet_compare (CSPI_OBJREF(obj), CSPI_OBJREF(obj2), cspi_ev ()); + return NULL; +} /** * AccessibleStateSet_isEmpty: @@ -953,13 +1225,14 @@ AccessibleStateSet_compare (AccessibleStateSet *obj, * otherwise #FALSE. * **/ -boolean +SPIBoolean AccessibleStateSet_isEmpty (AccessibleStateSet *obj) { - return TRUE; - /* return Accessibility_StateSet_isEmpty (*obj, &ev);*/ -} - + CORBA_boolean retval; + cspi_return_val_if_fail (obj != NULL, FALSE); + retval = Accessibility_StateSet_isEmpty (CSPI_OBJREF (obj), cspi_ev ()); + return (SPIBoolean) retval; +}