X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=cspi%2Fspi_accessible.c;h=c2acdfe9d7fcb3f005c6c3af2ebbd8f3263af0a7;hb=6d509d490749c6bac3149a5ec45862352ffcf290;hp=60c269917de13d6049156f29e058fc7fd6cfbee2;hpb=dacad129f84097f0d2499ae3d6f816ea31baa884;p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git diff --git a/cspi/spi_accessible.c b/cspi/spi_accessible.c index 60c2699..c2acdfe 100644 --- a/cspi/spi_accessible.c +++ b/cspi/spi_accessible.c @@ -1,77 +1,121 @@ +/* + * AT-SPI - Assistive Technology Service Provider Interface + * (Gnome Accessibility Project; http://developer.gnome.org/projects/gap) + * + * 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 + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + #include /* for malloc */ +#include #include static const char *role_names [] = { - "", - "accelerator label", + "invalid", + "accel-label", "alert", "animation", "arrow", "calendar", "canvas", - "check box", - "check menu item", - "color chooser", - "column header", - "combo box", - "date editor", - "desktop icon", - "desktop frame", + "check-box", + "check-menu-item", + "color-chooser", + "column-header", + "combo-box", + "date-editor", + "desktop-icon", + "desktop-frame", "dial", "dialog", - "directory pane", - "file chooser", + "directory-pane", + "drawing-area", + "file-chooser", "filler", - "focus traversable", - "font chooser", + "font-chooser", "frame", - "glass pane", - "HTML container", + "glass-pane", + "html-container", "icon", "image", - "internal frame", + "internalframe", "label", - "layered pane", + "layered-pane", "list", - "list item", + "list-item", "menu", - "menubar", - "menu item", - "option pane", - "page tab", - "page tab list", + "menu-bar", + "menu-item", + "option-pane", + "page-tab", + "page-tab-list", "panel", - "password text", - "popup menu", - "progress bar", - "pushbutton", - "radiobutton", - "radio menu item", - "root pane", - "row header", - "scrollbar", - "scrollpane", + "password-text", + "popup-menu", + "progress-bar", + "push-button", + "radio-button", + "radio-menu-item", + "root-pane", + "row-header", + "scroll-bar", + "scroll-pane", "separator", "slider", - "spin button", - "split pane", - "status bar", + "spin-button", + "split-pane", + "statusbar", "table", - "table cell", - "table column header", - "table row header", - "tearoff menu item", + "table-cell", + "table-column-header", + "table-row-header", + "tear-off-menu-item", + "terminal", "text", - "toggle button", - "toolbar", - "tooltip", + "toggle-button", + "tool-bar", + "tool-tip", "tree", "tree-table", - "", + "unknown", "viewport", "window", - + NULL, + "header", + "fooler", + "paragraph", + "ruler", + "application", + "autocomplete", + "editbar", + "embedded", + "entry", + "chart", + "caption", + "document_frame", + "heading", + "page", + "section", + "form", + "redundant object", + "link", + "input method window" }; #define MAX_ROLES (sizeof (role_names) / sizeof (char *)) @@ -102,6 +146,7 @@ cspi_init_role_table (AccessibleRole *role_table) 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; @@ -139,23 +184,43 @@ cspi_init_role_table (AccessibleRole *role_table) 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_UNKNOWN] = SPI_ROLE_UNKNOWN; 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; + role_table [Accessibility_ROLE_HEADER] = SPI_ROLE_HEADER; + role_table [Accessibility_ROLE_FOOTER] = SPI_ROLE_FOOTER; + role_table [Accessibility_ROLE_PARAGRAPH] = SPI_ROLE_PARAGRAPH; + role_table [Accessibility_ROLE_RULER] = SPI_ROLE_RULER; + role_table [Accessibility_ROLE_APPLICATION] = SPI_ROLE_APPLICATION; + role_table [Accessibility_ROLE_AUTOCOMPLETE] = SPI_ROLE_AUTOCOMPLETE; + role_table [Accessibility_ROLE_EDITBAR] = SPI_ROLE_EDITBAR; + role_table [Accessibility_ROLE_EMBEDDED] = SPI_ROLE_EMBEDDED; + role_table [Accessibility_ROLE_ENTRY] = SPI_ROLE_ENTRY; + role_table [Accessibility_ROLE_CHART] = SPI_ROLE_CHART; + role_table [Accessibility_ROLE_CAPTION] = SPI_ROLE_CAPTION; + role_table [Accessibility_ROLE_DOCUMENT_FRAME] = SPI_ROLE_DOCUMENT_FRAME; + role_table [Accessibility_ROLE_HEADING] = SPI_ROLE_HEADING; + role_table [Accessibility_ROLE_PAGE] = SPI_ROLE_PAGE; + role_table [Accessibility_ROLE_SECTION] = SPI_ROLE_SECTION; + role_table [Accessibility_ROLE_FORM] = SPI_ROLE_FORM; + role_table [Accessibility_ROLE_REDUNDANT_OBJECT] = SPI_ROLE_REDUNDANT_OBJECT; + role_table [Accessibility_ROLE_LINK] = SPI_ROLE_LINK; + role_table [Accessibility_ROLE_INPUT_METHOD_WINDOW] = SPI_ROLE_INPUT_METHOD_WINDOW; return TRUE; } -static AccessibleRole +AccessibleRole cspi_role_from_spi_role (Accessibility_Role role) { /* array is sized according to IDL roles because IDL roles are the index */ @@ -177,67 +242,21 @@ cspi_role_from_spi_role (Accessibility_Role role) return cspi_role; } -static SPIBoolean -init_state_table (Accessibility_StateType *state_table) +AccessibleAttributeSet * +_cspi_attribute_set_from_sequence (const Accessibility_AttributeSet *seq) { - 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; + AccessibleAttributeSet *set = g_new0 (AccessibleAttributeSet, 1); + int i; - 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; + set->len = seq->_length; + set->attributes = g_new0 (char *, set->len); + for (i = 0; i < set->len; ++i) + { + set->attributes[i] = g_strdup (seq->_buffer [i]); + } + return set; } - - - /** * AccessibleRole_getName: * @role: an #AccessibleRole object to query. @@ -250,13 +269,13 @@ spi_state_type_from_accessible_state (AccessibleState type) char * AccessibleRole_getName (AccessibleRole role) { - if (role < MAX_ROLES) + if (role < MAX_ROLES && role_names [(int) role]) { return CORBA_string_dup (role_names [(int) role]); } else { - return g_strdup (""); + return CORBA_string_dup (""); } } @@ -300,8 +319,7 @@ Accessible_getName (Accessible *obj) cspi_return_val_if_fail (obj != NULL, NULL); - retval = (char *) - Accessibility_Accessible__get_name (CSPI_OBJREF (obj), cspi_ev ()); + retval = Accessibility_Accessible__get_name (CSPI_OBJREF (obj), cspi_ev ()); cspi_return_val_if_ev ("getName", NULL); @@ -324,8 +342,7 @@ Accessible_getDescription (Accessible *obj) cspi_return_val_if_fail (obj != NULL, NULL); - retval = (char *) - Accessibility_Accessible__get_description (CSPI_OBJREF (obj), + retval = Accessibility_Accessible__get_description (CSPI_OBJREF (obj), cspi_ev ()); cspi_return_val_if_ev ("getDescription", NULL); @@ -376,8 +393,7 @@ Accessible_getChildCount (Accessible *obj) cspi_return_val_if_fail (obj != NULL, -1); - retval = (long) - Accessibility_Accessible__get_childCount (CSPI_OBJREF (obj), + retval = Accessibility_Accessible__get_childCount (CSPI_OBJREF (obj), cspi_ev ()); cspi_return_val_if_ev ("getChildCount", -1); @@ -407,6 +423,7 @@ Accessible_getChildAtIndex (Accessible *obj, Accessibility_Accessible_getChildAtIndex (CSPI_OBJREF (obj), childIndex, cspi_ev ())); + cspi_return_val_if_ev ("getChildAtIndex", NULL); return retval; } @@ -427,8 +444,7 @@ Accessible_getIndexInParent (Accessible *obj) cspi_return_val_if_fail (obj != NULL, -1); - retval = (long) - Accessibility_Accessible_getIndexInParent (CSPI_OBJREF (obj), cspi_ev ()); + retval = Accessibility_Accessible_getIndexInParent (CSPI_OBJREF (obj), cspi_ev ()); cspi_return_val_if_ev ("getIndexInparent", -1); return retval; @@ -453,6 +469,8 @@ Accessible_getRelationSet (Accessible *obj) cspi_return_val_if_fail (obj != NULL, NULL); + g_assert (!cspi_exception ()); + relation_set = Accessibility_Accessible_getRelationSet (CSPI_OBJREF (obj), cspi_ev ()); @@ -486,7 +504,7 @@ Accessible_getRelationSet (Accessible *obj) AccessibleRole Accessible_getRole (Accessible *obj) { - AccessibleRole retval; + Accessibility_Role retval; cspi_return_val_if_fail (obj != NULL, SPI_ROLE_INVALID); @@ -525,10 +543,38 @@ Accessible_getRoleName (Accessible *obj) } /** + * Accessible_getLocalizedRoleName: + * @obj: a pointer to the #Accessible object on which to operate. + * + * Get a UTF-8 string describing the (localized) role this object plays in the UI. + * This method will return useful values for roles that fall outside the + * enumeration used in Accessible_getRole (). + * + * @Since: AT-SPI 1.4 + * + * Returns: a UTF-8 string specifying the role of this #Accessible object. + * + **/ +char * +Accessible_getLocalizedRoleName (Accessible *obj) +{ + char *retval; + + cspi_return_val_if_fail (obj != NULL, CORBA_string_dup ("invalid")); + + retval = + Accessibility_Accessible_getLocalizedRoleName (CSPI_OBJREF (obj), cspi_ev ()); + + cspi_return_val_if_ev ("getLocalizedRoleName", CORBA_string_dup ("invalid")); + + return retval; +} + +/** * Accessible_getStateSet: * @obj: a pointer to the #Accessible object on which to operate. * - * Not Yet Implemented. + * Gets the current state of an object. * * Returns: a pointer to an #AccessibleStateSet representing the object's current state. **/ @@ -536,16 +582,80 @@ AccessibleStateSet * Accessible_getStateSet (Accessible *obj) { AccessibleStateSet *retval; + Accessibility_StateSet corba_stateset; + Accessibility_StateSeq *corba_seq; cspi_return_val_if_fail (obj != NULL, NULL); - retval = cspi_object_add ( - Accessibility_Accessible_getState (CSPI_OBJREF (obj), - cspi_ev ())); + corba_stateset = Accessibility_Accessible_getState ( + CSPI_OBJREF (obj), cspi_ev ()); + cspi_return_val_if_ev ("getState", NULL); + + cspi_return_val_if_fail (corba_stateset != CORBA_OBJECT_NIL, NULL); + cspi_return_val_if_fail (cspi_ping (corba_stateset), NULL); + corba_seq = Accessibility_StateSet_getStates (corba_stateset, cspi_ev ()); + cspi_return_val_if_ev ("getState", NULL); + + retval = spi_state_set_cache_new (corba_seq); + + CORBA_free (corba_seq); + cspi_release_unref (corba_stateset); return retval; } +/** + * Accessible_getAttributes: + * @obj: The #Accessible being queried. + * + * Get the #AttributeSet representing any assigned + * name-value pair attributes or annotations for this object. + * For typographic, textual, or textually-semantic attributes, see + * AccessibleText_getAttributes instead. + * + * Returns: The name-value-pair attributes assigned to this object. + */ +AccessibleAttributeSet * +Accessible_getAttributes (Accessible *obj) +{ + AccessibleAttributeSet *retval; + Accessibility_AttributeSet *corba_seq; + + cspi_return_val_if_fail (obj != NULL, NULL); + + corba_seq = Accessibility_Accessible_getAttributes ( + CSPI_OBJREF (obj), cspi_ev ()); + cspi_return_val_if_ev ("getAttributes", NULL); + + retval = _cspi_attribute_set_from_sequence (corba_seq); + CORBA_free (corba_seq); + + return retval; +} + +/** + * Accessible_getHostApplication: + * @obj: The #Accessible being queried. + * + * Get the containing #AccessibleApplication for an object. + * + * Returns: the containing AccessibleApplication instance for this object. + */ +AccessibleApplication * +Accessible_getHostApplication (Accessible *obj) +{ + AccessibleApplication *retval; + + cspi_return_val_if_fail (obj != NULL, NULL); + + retval = Accessible_getApplication (cspi_object_add ( + Accessibility_Accessible_getApplication (CSPI_OBJREF (obj), + cspi_ev ()))); + cspi_return_val_if_ev ("getApplication", NULL); + + return retval; +} + /* Interface query methods */ /** @@ -580,6 +690,21 @@ Accessible_isApplication (Accessible *obj) "IDL:Accessibility/Application:1.0"); } +/** + * Accessible_isCollection: * @obj: a pointer to the #Accessible instance to query. + * + * Query whether the specified #Accessible implements #AccessibleCollection. + * Returns: #TRUE if @obj implements the #AccessibleCollection interface, + * #FALSE otherwise. + **/ + +SPIBoolean +Accessible_isCollection (Accessible *obj) +{ + return cspi_accessible_is_a (obj, + "IDL:Accessibility/Collection:1.0"); +} + /** * Accessible_isComponent: * @obj: a pointer to the #Accessible instance to query. @@ -597,6 +722,22 @@ Accessible_isComponent (Accessible *obj) } /** + * Accessible_isDocument: + * @obj: a pointer to the #Accessible instance to query. + * + * Query whether the specified #Accessible implements #AccessibleDocument. + * + * Returns: #TRUE if @obj implements the #AccessibleDocument interface, + * #FALSE otherwise. + **/ +SPIBoolean +Accessible_isDocument (Accessible *obj) +{ + return cspi_accessible_is_a (obj, + "IDL:Accessibility/Document:1.0"); +} + +/** * Accessible_isEditableText: * @obj: a pointer to the #Accessible instance to query. * @@ -611,6 +752,22 @@ Accessible_isEditableText (Accessible *obj) return cspi_accessible_is_a (obj, "IDL:Accessibility/EditableText:1.0"); } + +/** + * Accessible_isMatchRule: + * @obj: a pointer to the #Accessible instance to query. + * + * Query whether the specified #Accessible implements #AccessibleMatchRule. + * + * Returns: #TRUE if @obj implements the #AccessibleMatchRule interface, + * #FALSE otherwise. + **/ +SPIBoolean +Accessible_isMatchRule (Accessible *obj) +{ + return cspi_accessible_is_a (obj, + "IDL:Accessibility/MatchRule:1.0"); +} /** * Accessible_isHypertext: @@ -757,6 +914,23 @@ Accessible_getAction (Accessible *obj) obj, "IDL:Accessibility/Action:1.0"); } + +/** + * Accessible_getCollection: + * @obj: a pointer to the #Accessible instance to query. + * + * Get the #AccessibleCollection interface for an #Accessible. + * + * Returns: a pointer to an #AccessibleCollection interface instance, or + * NULL if @obj does not implement #AccessibleCollection. + **/ +AccessibleCollection * +Accessible_getCollection (Accessible *obj) +{ + return (AccessibleCollection *) Accessible_queryInterface ( + obj, "IDL:Accessibility/Collection:1.0"); +} + /** * Accessible_getComponent: * @obj: a pointer to the #Accessible instance to query. @@ -772,6 +946,21 @@ Accessible_getComponent (Accessible *obj) return (AccessibleComponent *) Accessible_queryInterface ( obj, "IDL:Accessibility/Component:1.0"); } +/** + * Accessible_getDocument: + * @obj: a pointer to the #Accessible instance to query. + * + * Get the #AccessibleDocument interface for an #Accessible. + * + * Returns: a pointer to an #AccessibleDocument interface instance, or + * NULL if @obj does not implement #AccessibleDocument. + **/ +AccessibleDocument * +Accessible_getDocument (Accessible *obj) +{ + return (AccessibleDocument *) Accessible_queryInterface ( + obj, "IDL:Accessibility/Document:1.0"); +} /** * Accessible_getEditableText: @@ -825,7 +1014,21 @@ Accessible_getImage (Accessible *obj) obj, "IDL:Accessibility/Image:1.0"); } - +/** + * Accessible_getMatchRule: + * @obj: a pointer to the #Accessible instance to query. + * + * Get the #AccessibleMatchRule interface for an #Accessible. + * + * Returns: a pointer to an #AccessibleMatchRule interface instance, or + * NULL if @obj does not implement #AccessibleMatchRule. + **/ +AccessibleMatchRule * +Accessible_getMatchRule (Accessible *obj) +{ + return (AccessibleMatchRule *) Accessible_queryInterface ( + obj, "IDL:Accessibility/MatchRule:1.0"); +} /** * Accessible_getSelection: @@ -981,6 +1184,56 @@ AccessibleRelation_unref (AccessibleRelation *obj) cspi_object_unref (obj); } +static SPIBoolean +cspi_init_relation_type_table (AccessibleRelationType *relation_type_table) +{ + int i; + for (i = 0; i < Accessibility_RELATION_LAST_DEFINED; ++i) + { + relation_type_table [i] = SPI_RELATION_NULL; + } + relation_type_table [Accessibility_RELATION_NULL] = SPI_RELATION_NULL; + relation_type_table [Accessibility_RELATION_LABEL_FOR] = SPI_RELATION_LABEL_FOR; + relation_type_table [Accessibility_RELATION_LABELLED_BY] = SPI_RELATION_LABELED_BY; + relation_type_table [Accessibility_RELATION_CONTROLLER_FOR] = SPI_RELATION_CONTROLLER_FOR; + relation_type_table [Accessibility_RELATION_CONTROLLED_BY] = SPI_RELATION_CONTROLLED_BY; + relation_type_table [Accessibility_RELATION_MEMBER_OF] = SPI_RELATION_MEMBER_OF; + relation_type_table [Accessibility_RELATION_TOOLTIP_FOR] = SPI_RELATION_NULL; + relation_type_table [Accessibility_RELATION_NODE_CHILD_OF] = SPI_RELATION_NODE_CHILD_OF; + relation_type_table [Accessibility_RELATION_EXTENDED] = SPI_RELATION_EXTENDED; + relation_type_table [Accessibility_RELATION_FLOWS_TO] = SPI_RELATION_FLOWS_TO; + relation_type_table [Accessibility_RELATION_FLOWS_FROM] = SPI_RELATION_FLOWS_FROM; + relation_type_table [Accessibility_RELATION_SUBWINDOW_OF] = SPI_RELATION_SUBWINDOW_OF; + relation_type_table [Accessibility_RELATION_EMBEDS] = SPI_RELATION_EMBEDS; + relation_type_table [Accessibility_RELATION_EMBEDDED_BY] = SPI_RELATION_EMBEDDED_BY; + relation_type_table [Accessibility_RELATION_POPUP_FOR] = SPI_RELATION_POPUP_FOR; + relation_type_table [Accessibility_RELATION_PARENT_WINDOW_OF] = SPI_RELATION_PARENT_WINDOW_OF; + relation_type_table [Accessibility_RELATION_DESCRIBED_BY] = SPI_RELATION_DESCRIBED_BY; + relation_type_table [Accessibility_RELATION_DESCRIPTION_FOR] = SPI_RELATION_DESCRIPTION_FOR; + return TRUE; +} + +static AccessibleRelationType +cspi_relation_type_from_spi_relation_type (Accessibility_RelationType type) +{ + /* array is sized according to IDL RelationType because IDL RelationTypes are the index */ + static AccessibleRelationType cspi_relation_type_table [Accessibility_RELATION_LAST_DEFINED]; + static SPIBoolean is_initialized = FALSE; + AccessibleRelationType cspi_type; + if (!is_initialized) + { + is_initialized = cspi_init_relation_type_table (cspi_relation_type_table); + } + if (type >= 0 && type < Accessibility_RELATION_LAST_DEFINED) + { + cspi_type = cspi_relation_type_table [type]; + } + else + { + cspi_type = SPI_RELATION_NULL; + } + return cspi_type; +} /** * AccessibleRelation_getRelationType: * @obj: a pointer to the #AccessibleRelation object to query. @@ -994,13 +1247,13 @@ AccessibleRelation_unref (AccessibleRelation *obj) AccessibleRelationType AccessibleRelation_getRelationType (AccessibleRelation *obj) { - AccessibleRelationType retval; + Accessibility_RelationType 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; + return cspi_relation_type_from_spi_relation_type (retval); } /** @@ -1021,8 +1274,7 @@ AccessibleRelation_getNTargets (AccessibleRelation *obj) int retval; cspi_return_val_if_fail (obj, -1); - retval = (int) - Accessibility_Relation_getNTargets (CSPI_OBJREF (obj), cspi_ev()); + retval = Accessibility_Relation_getNTargets (CSPI_OBJREF (obj), cspi_ev()); cspi_return_val_if_ev ("getNTargets", -1); return retval; } @@ -1048,7 +1300,7 @@ AccessibleRelation_getTarget (AccessibleRelation *obj, int i) retval = cspi_object_add ( Accessibility_Relation_getTarget (CSPI_OBJREF(obj), - (CORBA_short) i, cspi_ev())); + i, cspi_ev())); cspi_return_val_if_ev ("getTarget", NULL); return retval; } @@ -1063,7 +1315,7 @@ AccessibleRelation_getTarget (AccessibleRelation *obj, int i) void AccessibleStateSet_ref (AccessibleStateSet *obj) { - cspi_object_ref (obj); + spi_state_set_cache_ref (obj); } /** @@ -1076,9 +1328,62 @@ AccessibleStateSet_ref (AccessibleStateSet *obj) void AccessibleStateSet_unref (AccessibleStateSet *obj) { - cspi_object_unref (obj); + spi_state_set_cache_unref (obj); } +static Accessibility_StateType +spi_state_to_corba (AccessibleState state) +{ +#define MAP_STATE(a) \ + case SPI_STATE_##a: \ + return Accessibility_STATE_##a + + switch (state) + { + MAP_STATE (INVALID); + MAP_STATE (ACTIVE); + MAP_STATE (ARMED); + MAP_STATE (BUSY); + MAP_STATE (CHECKED); + MAP_STATE (DEFUNCT); + MAP_STATE (EDITABLE); + MAP_STATE (ENABLED); + MAP_STATE (EXPANDABLE); + MAP_STATE (EXPANDED); + MAP_STATE (FOCUSABLE); + MAP_STATE (FOCUSED); + MAP_STATE (HORIZONTAL); + MAP_STATE (ICONIFIED); + MAP_STATE (MODAL); + MAP_STATE (MULTI_LINE); + MAP_STATE (MULTISELECTABLE); + MAP_STATE (OPAQUE); + MAP_STATE (PRESSED); + MAP_STATE (RESIZABLE); + MAP_STATE (SELECTABLE); + MAP_STATE (SELECTED); + MAP_STATE (SENSITIVE); + MAP_STATE (SHOWING); + MAP_STATE (SINGLE_LINE); + MAP_STATE (STALE); + MAP_STATE (TRANSIENT); + MAP_STATE (VERTICAL); + MAP_STATE (VISIBLE); + MAP_STATE (MANAGES_DESCENDANTS); + MAP_STATE (INDETERMINATE); + MAP_STATE (TRUNCATED); + MAP_STATE (REQUIRED); + MAP_STATE (INVALID_ENTRY); + MAP_STATE (SUPPORTS_AUTOCOMPLETION); + MAP_STATE (SELECTABLE_TEXT); + MAP_STATE (IS_DEFAULT); + MAP_STATE (VISITED); + default: + return Accessibility_STATE_INVALID; + } +#undef MAP_STATE +} + /** * AccessibleStateSet_contains: * @obj: a pointer to the #AccessibleStateSet object on which to operate. @@ -1096,18 +1401,7 @@ SPIBoolean AccessibleStateSet_contains (AccessibleStateSet *obj, AccessibleState state) { - 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; + return spi_state_set_cache_contains (obj, spi_state_to_corba (state)); } /** @@ -1123,13 +1417,7 @@ void AccessibleStateSet_add (AccessibleStateSet *obj, AccessibleState state) { - 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"); + spi_state_set_cache_add (obj, spi_state_to_corba (state)); } /** @@ -1145,13 +1433,7 @@ void AccessibleStateSet_remove (AccessibleStateSet *obj, AccessibleState state) { - 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"); + spi_state_set_cache_remove (obj, spi_state_to_corba (state)); } /** @@ -1173,16 +1455,19 @@ SPIBoolean AccessibleStateSet_equals (AccessibleStateSet *obj, AccessibleStateSet *obj2) { + SPIBoolean eq; + AtkStateSet *cmp; + if (obj == obj2) { return TRUE; } - cspi_return_val_if_fail (obj != NULL, FALSE); - cspi_return_val_if_fail (obj2 != NULL, FALSE); + cmp = spi_state_set_cache_xor (obj, obj2); + eq = spi_state_set_cache_is_empty (cmp); + spi_state_set_cache_unref (cmp); - return Accessibility_StateSet_equals (CSPI_OBJREF (obj), - CSPI_OBJREF (obj2), cspi_ev ()); + return eq; } /** @@ -1203,12 +1488,7 @@ AccessibleStateSet * AccessibleStateSet_compare (AccessibleStateSet *obj, 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; + return spi_state_set_cache_xor (obj, obj2); } /** @@ -1224,11 +1504,7 @@ AccessibleStateSet_compare (AccessibleStateSet *obj, SPIBoolean AccessibleStateSet_isEmpty (AccessibleStateSet *obj) { - CORBA_boolean retval; - - cspi_return_val_if_fail (obj != NULL, FALSE); - retval = Accessibility_StateSet_isEmpty (CSPI_OBJREF (obj), cspi_ev ()); - return (SPIBoolean) retval; + return spi_state_set_cache_is_empty (obj); }