projects / platform / core / uifw / at-spi2-atk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 0636c73)
2002-11-19 Darren Kenny <darren.kenny@sun.com>
authordarrenk <darrenk@e2bd861d-eb25-0410-b326-f6ed22b6b98c>
Tue, 19 Nov 2002 13:48:56 +0000 (13:48 +0000)
committerdarrenk <darrenk@e2bd861d-eb25-0410-b326-f6ed22b6b98c>
Tue, 19 Nov 2002 13:48:56 +0000 (13:48 +0000)
Fixes for bugs 98127 and 97914.
* cspi/spi-roletypes.h:
Added SPI_ROLE_HEADER, SPI_ROLE_FOOTER, SPI_ROLE_PARAGRAPH,
SPI_ROLE_RULER
* cspi/spi-statetypes.h:
Added SPI_STATE_MANAGES_DESCENDANTS
* cspi/spi.h:
Added SPI_RELATION_FLOWS_TO, SPI_RELATIONS_FLOWS_FROM,
SPI_RELATION_SUBWINDOW_OF, SPI_RELATION_EMBEDS, SPI_RELATION_EMBEDDED_BY
* cspi/spi_accessible.c:
Added mapping in role_table from new Accessibility_ROLE_* to SPI_ROLE_*
Added mapping from SPI_STATE_MANAGES_DESCENDANTS to
Accessibility_STATE_MANAGES_DESCENDANTS
* libspi/accessible.c:
Added Mapping from ATK_ROLE_{FOOTER,HEADER,PARAGRAPH,RULER} to
Accessibility_ROLE_{FOOTER,HEADER,PARAGRAPH,RULER}
As requested by Bill, I also cleaned up the alignment.
* libspi/relation.c:
Added mapping of the ATK_RELATION_{FLOWS_TO,FLOWS_FROM,SUBWINDOW_OF,
EMBEDS,EMBEDDED_BY} to equivalend Accessibility_RELATION_*
* libspi/stateset.c:
Added mappings between ATK_STATE_MANAGES_DESCENDANTS and
Accessibility_STATE_MANAGES_DESCENDANTS
* docs/reference/cspi/tmpl/spi_accessible.sgml:
Document changes reflecting modifications to roles.
* docs/reference/cspi/tmpl/spi_relation.sgml:
Document changes reflecting modifications to relations.
* docs/reference/cspi/tmpl/spi_stateset.sgml:
Document changes reflecting modifications to states.

git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@361 e2bd861d-eb25-0410-b326-f6ed22b6b98c

ChangeLog patch | blob | history
cspi/spi-roletypes.h patch | blob | history
cspi/spi-statetypes.h patch | blob | history
cspi/spi.h patch | blob | history
cspi/spi_accessible.c patch | blob | history
docs/reference/cspi/tmpl/spi_accessible.sgml patch | blob | history
docs/reference/cspi/tmpl/spi_relation.sgml patch | blob | history
docs/reference/cspi/tmpl/spi_stateset.sgml patch | blob | history
libspi/accessible.c patch | blob | history
libspi/relation.c patch | blob | history
libspi/stateset.c patch | blob | history

diff --git a/ChangeLog b/ChangeLog
index 9725c93..db1f0b0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,35 @@
+2002-11-19  Darren Kenny  <darren.kenny@sun.com>
+
+       Fixes for bugs 98127 and 97914.
+       * cspi/spi-roletypes.h:
+       Added SPI_ROLE_HEADER, SPI_ROLE_FOOTER, SPI_ROLE_PARAGRAPH,
+       SPI_ROLE_RULER
+       * cspi/spi-statetypes.h:
+       Added SPI_STATE_MANAGES_DESCENDANTS
+       * cspi/spi.h:
+       Added SPI_RELATION_FLOWS_TO, SPI_RELATIONS_FLOWS_FROM,
+       SPI_RELATION_SUBWINDOW_OF, SPI_RELATION_EMBEDS, SPI_RELATION_EMBEDDED_BY
+       * cspi/spi_accessible.c:
+       Added mapping in role_table from new Accessibility_ROLE_* to SPI_ROLE_*
+       Added mapping from SPI_STATE_MANAGES_DESCENDANTS to 
+       Accessibility_STATE_MANAGES_DESCENDANTS
+       * libspi/accessible.c:
+       Added Mapping from ATK_ROLE_{FOOTER,HEADER,PARAGRAPH,RULER} to
+       Accessibility_ROLE_{FOOTER,HEADER,PARAGRAPH,RULER} 
+       As requested by Bill, I also cleaned up the alignment.
+       * libspi/relation.c:
+       Added mapping of the ATK_RELATION_{FLOWS_TO,FLOWS_FROM,SUBWINDOW_OF,
+       EMBEDS,EMBEDDED_BY} to equivalend Accessibility_RELATION_*
+       * libspi/stateset.c:
+       Added mappings between ATK_STATE_MANAGES_DESCENDANTS and
+       Accessibility_STATE_MANAGES_DESCENDANTS
+       * docs/reference/cspi/tmpl/spi_accessible.sgml:
+       Document changes reflecting modifications to roles.
+       * docs/reference/cspi/tmpl/spi_relation.sgml:
+       Document changes reflecting modifications to relations.
+       * docs/reference/cspi/tmpl/spi_stateset.sgml:
+       Document changes reflecting modifications to states.
+
 2002-11-17  Bill Haneman <bill.haneman@sun.com>
 
        * configure.in:
diff --git a/cspi/spi-roletypes.h b/cspi/spi-roletypes.h
index 545ed66..039b368 100644 (file)
--- a/cspi/spi-roletypes.h
+++ b/cspi/spi-roletypes.h
@@ -131,6 +131,11 @@ extern "C" {
  * @SPI_ROLE_WINDOW: A top level window with no title or border.
  * @SPI_ROLE_EXTENDED: This object's role is not included in the standard role list and
  *                     should be queried by name.
+ * @SPI_ROLE_HEADER: An object that serves as a document header.
+ * @SPI_ROLE_FOOTER: An object that serves as a document footer.
+ * @SPI_ROLE_PARAGRAPH: An object which is contains a paragraph of text content.
+ * @SPI_ROLE_RULER: An object which describes margins and tab stops, etc.  for text objects 
+ *                  which it controls (should have CONTROLLER_FOR relation to such). 
  * @SPI_ROLE_LAST_DEFINED: Used to determine the end of the role enumeration.
  **/
 typedef enum
@@ -205,6 +210,10 @@ typedef enum
   SPI_ROLE_VIEWPORT,
   SPI_ROLE_WINDOW,
   SPI_ROLE_EXTENDED,
+  SPI_ROLE_HEADER,
+  SPI_ROLE_FOOTER,
+  SPI_ROLE_PARAGRAPH,
+  SPI_ROLE_RULER,
   SPI_ROLE_LAST_DEFINED
 } AccessibleRole;
 
diff --git a/cspi/spi-statetypes.h b/cspi/spi-statetypes.h
index 0f69025..024ea87 100644 (file)
--- a/cspi/spi-statetypes.h
+++ b/cspi/spi-statetypes.h
@@ -112,6 +112,13 @@ typedef enum
   SPI_STATE_VERTICAL,
   /* Indicates this object is visible */
   SPI_STATE_VISIBLE,
+  /*
+   * Indicates that "active-descendant-changed" event is sent when children
+   * become 'active' (i.e. are selected or navigated to onscreen).  Used to
+   * prevent need to enumerate all children in very large containers, like
+   * tables.
+   */
+  SPI_STATE_MANAGES_DESCENDANTS, 
   SPI_STATE_LAST_DEFINED
 } AccessibleState;
 
diff --git a/cspi/spi.h b/cspi/spi.h
index 3105446..5fb95eb 100644 (file)
--- a/cspi/spi.h
+++ b/cspi/spi.h
@@ -74,6 +74,11 @@ typedef enum
   SPI_RELATION_MEMBER_OF,
   SPI_RELATION_NODE_CHILD_OF,
   SPI_RELATION_EXTENDED,
+  SPI_RELATION_FLOWS_TO,
+  SPI_RELATION_FLOWS_FROM,
+  SPI_RELATION_SUBWINDOW_OF,
+  SPI_RELATION_EMBEDS,
+  SPI_RELATION_EMBEDDED_BY,
   SPI_RELATION_LAST_DEFINED
 } AccessibleRelationType;
 
diff --git a/cspi/spi_accessible.c b/cspi/spi_accessible.c
index a63478d..6487f43 100644 (file)
--- a/cspi/spi_accessible.c
+++ b/cspi/spi_accessible.c
@@ -177,6 +177,10 @@ cspi_init_role_table (AccessibleRole *role_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_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_LAST_DEFINED] = SPI_ROLE_EXTENDED;
 
   return TRUE;
@@ -240,6 +244,7 @@ init_state_table (Accessibility_StateType *state_table)
   state_table[SPI_STATE_TRANSIENT] = Accessibility_STATE_TRANSIENT;
   state_table[SPI_STATE_VERTICAL] = Accessibility_STATE_VERTICAL;
   state_table[SPI_STATE_VISIBLE] = Accessibility_STATE_VISIBLE;
+  state_table[SPI_STATE_MANAGES_DESCENDANTS] = Accessibility_STATE_MANAGES_DESCENDANTS;
 
   return TRUE;
 }
diff --git a/docs/reference/cspi/tmpl/spi_accessible.sgml b/docs/reference/cspi/tmpl/spi_accessible.sgml
index 406676c..e7ffb5d 100644 (file)
--- a/docs/reference/cspi/tmpl/spi_accessible.sgml
+++ b/docs/reference/cspi/tmpl/spi_accessible.sgml
@@ -417,6 +417,10 @@ Accessible Objects
 @SPI_ROLE_VIEWPORT: 
 @SPI_ROLE_WINDOW: 
 @SPI_ROLE_EXTENDED: 
+@SPI_ROLE_HEADER: 
+@SPI_ROLE_FOOTER: 
+@SPI_ROLE_PARAGRAPH: 
+@SPI_ROLE_RULER: 
 @SPI_ROLE_LAST_DEFINED: 
 
 <!-- ##### FUNCTION AccessibleRole_getName ##### -->
diff --git a/docs/reference/cspi/tmpl/spi_relation.sgml b/docs/reference/cspi/tmpl/spi_relation.sgml
index 01c4d6a..519b4dd 100644 (file)
--- a/docs/reference/cspi/tmpl/spi_relation.sgml
+++ b/docs/reference/cspi/tmpl/spi_relation.sgml
@@ -27,6 +27,11 @@ AccessibleRelations and RelationSets
 @SPI_RELATION_MEMBER_OF: 
 @SPI_RELATION_NODE_CHILD_OF: 
 @SPI_RELATION_EXTENDED: 
+@SPI_RELATION_FLOWS_TO: 
+@SPI_RELATION_FLOWS_FROM: 
+@SPI_RELATION_SUBWINDOW_OF: 
+@SPI_RELATION_EMBEDS: 
+@SPI_RELATION_EMBEDDED_BY: 
 @SPI_RELATION_LAST_DEFINED: 
 
 <!-- ##### FUNCTION AccessibleRelation_ref ##### -->
diff --git a/docs/reference/cspi/tmpl/spi_stateset.sgml b/docs/reference/cspi/tmpl/spi_stateset.sgml
index 1776a3b..bf8abc9 100644 (file)
--- a/docs/reference/cspi/tmpl/spi_stateset.sgml
+++ b/docs/reference/cspi/tmpl/spi_stateset.sgml
@@ -49,6 +49,7 @@ State and StateSets
 @SPI_STATE_TRANSIENT: 
 @SPI_STATE_VERTICAL: 
 @SPI_STATE_VISIBLE: 
+@SPI_STATE_MANAGES_DESCENDANTS: 
 @SPI_STATE_LAST_DEFINED: 
 
 <!-- ##### FUNCTION AccessibleStateSet_ref ##### -->
diff --git a/libspi/accessible.c b/libspi/accessible.c
index e355444..d70fbab 100644 (file)
--- a/libspi/accessible.c
+++ b/libspi/accessible.c
@@ -45,76 +45,80 @@ spi_init_role_lookup_table (Accessibility_Role *role_table)
       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_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_LAST_DEFINED] =     Accessibility_ROLE_EXTENDED;
+  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_LAST_DEFINED] =        Accessibility_ROLE_EXTENDED;
   
   return TRUE;
 }
diff --git a/libspi/relation.c b/libspi/relation.c
index e1f2ad2..5595810 100644 (file)
--- a/libspi/relation.c
+++ b/libspi/relation.c
@@ -43,6 +43,11 @@ spi_init_relation_type_table (Accessibility_RelationType *types)
   types[ATK_RELATION_LABELLED_BY] = Accessibility_RELATION_LABELLED_BY;
   types[ATK_RELATION_MEMBER_OF] = Accessibility_RELATION_MEMBER_OF;
   types[ATK_RELATION_NODE_CHILD_OF] = Accessibility_RELATION_NODE_CHILD_OF;
+  types[ATK_RELATION_FLOWS_TO] = Accessibility_RELATION_FLOWS_TO;
+  types[ATK_RELATION_FLOWS_FROM] = Accessibility_RELATION_FLOWS_FROM;
+  types[ATK_RELATION_SUBWINDOW_OF] = Accessibility_RELATION_SUBWINDOW_OF;
+  types[ATK_RELATION_EMBEDS] = Accessibility_RELATION_EMBEDS;
+  types[ATK_RELATION_EMBEDDED_BY] = Accessibility_RELATION_EMBEDDED_BY;
   return TRUE;
 }
 
diff --git a/libspi/stateset.c b/libspi/stateset.c
index 7f52bbe..8728ee5 100644 (file)
--- a/libspi/stateset.c
+++ b/libspi/stateset.c
@@ -112,6 +112,8 @@ spi_init_state_type_tables (void)
   atk_state_types[Accessibility_STATE_VERTICAL] = ATK_STATE_VERTICAL;
   accessible_state_types[ATK_STATE_VISIBLE] = Accessibility_STATE_VISIBLE;
   atk_state_types[Accessibility_STATE_VISIBLE] = ATK_STATE_VISIBLE;
+  accessible_state_types[ATK_STATE_MANAGES_DESCENDANTS] = Accessibility_STATE_MANAGES_DESCENDANTS;
+  atk_state_types[Accessibility_STATE_MANAGES_DESCENDANTS] = ATK_STATE_MANAGES_DESCENDANTS;
 
   return TRUE;
 }
@@ -331,6 +333,8 @@ impl_getStates (PortableServer_Servant servant,
     states = g_slist_append (states, (gpointer) Accessibility_STATE_VERTICAL);
   if (atk_state_set_contains_state (set, ATK_STATE_VISIBLE))
     states = g_slist_append (states, (gpointer) Accessibility_STATE_VISIBLE);
+  if (atk_state_set_contains_state (set, ATK_STATE_MANAGES_DESCENDANTS))
+    states = g_slist_append (states, (gpointer) Accessibility_STATE_MANAGES_DESCENDANTS);
 
   rv = Accessibility_StateSeq__alloc ();
   rv->_length = rv->_maximum = g_slist_length (states);
Domain: UI Framework / Assistive Technology;