Added relations DESCRIPTION_FOR and DESCRIBED_BY (from ATK).

[platform/core/uifw/at-spi2-atk.git] / cspi / spi_accessible.c

diff --git a/cspi/spi_accessible.c b/cspi/spi_accessible.c
index f28485e..ab80b9e 100644 (file)
--- a/cspi/spi_accessible.c
+++ b/cspi/spi_accessible.c
@@ -101,7 +101,18 @@ static const char *role_names [] =
   "fooler",
   "paragraph",
   "ruler",
-  "application"
+  "application",
+  "autocomplete",
+  "editbar",
+  "embedded",
+  "entry",
+  "chart",
+  "caption",
+  "document_frame",
+  "heading",
+  "page",
+  "section",
+  "form"
 };
 
 #define MAX_ROLES (sizeof (role_names) / sizeof (char *))
@@ -191,6 +202,14 @@ cspi_init_role_table (AccessibleRole *role_table)
   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;
 
   return TRUE;
 }
@@ -217,7 +236,7 @@ cspi_role_from_spi_role (Accessibility_Role role)
   return cspi_role; 
 }
 
-AccessibleAttributeSet *
+static AccessibleAttributeSet *
 cspi_attribute_set_from_sequence (const Accessibility_AttributeSet *seq)
 {
     AccessibleAttributeSet *set = g_new0 (AccessibleAttributeSet, 1);
@@ -525,6 +544,8 @@ Accessible_getRoleName (Accessible *obj)
  * 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.
  *
  **/
@@ -547,6 +568,8 @@ Accessible_getLocalizedRoleName (Accessible *obj)
  * Accessible_getStateSet:
  * @obj: a pointer to the #Accessible object on which to operate.
  *
+ * Gets the current state of an object.
+ *
  * Returns: a pointer to an #AccessibleStateSet representing the object's current state.
  **/
 AccessibleStateSet *
@@ -577,11 +600,13 @@ Accessible_getStateSet (Accessible *obj)
 
 /**
  * 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.
- * @obj: The #Accessible being queried.
+ *
  * Returns: The name-value-pair attributes assigned to this object.
  */
 AccessibleAttributeSet *
@@ -604,8 +629,10 @@ Accessible_getAttributes (Accessible *obj)
 
 /**
  * Accessible_getHostApplication:
- * Get the containing #AccessibleApplication for an object.
  * @obj: The #Accessible being queried.
+ *
+ * Get the containing #AccessibleApplication for an object.
+ *
  * Returns: the containing AccessibleApplication instance for this object.
  */
 AccessibleApplication *
@@ -1081,6 +1108,9 @@ cspi_init_relation_type_table (AccessibleRelationType *relation_type_table)
   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;
 }
 
@@ -1242,6 +1272,13 @@ spi_state_to_corba (AccessibleState state)
       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;
   }