Some refactoring to remove duplicate code and other clean-ups
authorMike Gorse <mgorse@linux-l2tz.site>
Wed, 27 Jul 2011 22:01:03 +0000 (17:01 -0500)
committerMike Gorse <mgorse@linux-l2tz.site>
Wed, 27 Jul 2011 22:01:03 +0000 (17:01 -0500)
Remove "common" directory (it was an artifact of at-spi2-core and
at-spi2-atk originally living in the same repository).  Where constants
essentially duplicated other constants in libatspi, use the constants defined
in libatspi, renaming as needed.  Otherwise move code from common into
atk-adaptor.

35 files changed:
Makefile.am
atk-adaptor/Makefile.include
atk-adaptor/accessible-stateset.c [moved from common/spi-stateset.c with 100% similarity]
atk-adaptor/accessible-stateset.h [moved from common/spi-stateset.h with 91% similarity]
atk-adaptor/adaptors/Makefile.am
atk-adaptor/adaptors/accessible-adaptor.c
atk-adaptor/adaptors/action-adaptor.c
atk-adaptor/adaptors/adaptors.h
atk-adaptor/adaptors/application-adaptor.c
atk-adaptor/adaptors/cache-adaptor.c
atk-adaptor/adaptors/collection-adaptor.c
atk-adaptor/adaptors/component-adaptor.c
atk-adaptor/adaptors/document-adaptor.c
atk-adaptor/adaptors/editabletext-adaptor.c
atk-adaptor/adaptors/hyperlink-adaptor.c
atk-adaptor/adaptors/hypertext-adaptor.c
atk-adaptor/adaptors/image-adaptor.c
atk-adaptor/adaptors/selection-adaptor.c
atk-adaptor/adaptors/socket-adaptor.c
atk-adaptor/adaptors/table-adaptor.c
atk-adaptor/adaptors/text-adaptor.c
atk-adaptor/adaptors/value-adaptor.c
atk-adaptor/bitarray.h [moved from common/bitarray.h with 100% similarity]
atk-adaptor/bridge.c
atk-adaptor/event.c
atk-adaptor/event.h
atk-adaptor/object.c
atk-adaptor/object.h
atk-adaptor/spi-dbus.c [moved from common/spi-dbus.c with 100% similarity]
atk-adaptor/spi-dbus.h [moved from common/spi-dbus.h with 62% similarity]
common/Makefile.am [deleted file]
common/event-types.h [deleted file]
common/generated-types.h [deleted file]
common/keymasks.h [deleted file]
common/spi-types.h [deleted file]

index 8142b2d..d00a130 100644 (file)
@@ -1,4 +1,4 @@
-SUBDIRS=dbind droute common atk-adaptor po schemas
+SUBDIRS=dbind droute atk-adaptor po schemas
 
 gtk_modulesdir = $(libdir)/gnome-settings-daemon-3.0/gtk-modules/
 gtk_modules_DATA = at-spi2-atk.desktop
index cd1675e..1bddbbd 100644 (file)
@@ -21,7 +21,6 @@ libatk_bridge_la_LIBADD = $(DBUS_LIBS) \
                          $(ATSPI_LIBS)       \
                          $(X_LIBS)         \
                          $(top_builddir)/droute/libdroute.la \
-                         $(top_builddir)/common/libspicommon.la \
                          $(top_builddir)/atk-adaptor/adaptors/libatk-bridge-adaptors.la
 
 libatk_bridge_la_SOURCES =     \
similarity index 91%
rename from common/spi-stateset.h
rename to atk-adaptor/accessible-stateset.h
index f097c92..e27e3c5 100644 (file)
  * Boston, MA 02111-1307, USA.
  */
 
-#ifndef SPI_STATE_SET_H_
-#define SPI_STATE_SET_H_
+#ifndef ACCESSSIBLE_STATE_SET_H_
+#define ACCESSIBLE_STATE_SET_H_
 
-#include "spi-types.h"
 #include <atk/atkstateset.h>
+#include "atspi/atspi.h"
 
 G_BEGIN_DECLS
 
 /* private - internal API to abstract away atk API */
 AtkStateSet *spi_state_set_cache_from_sequence(GArray *seq);
-AtkState     spi_atk_state_from_spi_state     (Accessibility_StateType state);
+AtkState     spi_atk_state_from_spi_state     (AtspiStateType state);
 void spi_atk_state_to_dbus_array (AtkObject * object, dbus_uint32_t * array);
 void spi_atk_state_set_to_dbus_array (AtkStateSet *set, dbus_uint32_t * array);
 #define      spi_state_set_cache_ref(s)        g_object_ref (s)
@@ -48,4 +48,4 @@ void spi_atk_state_set_to_dbus_array (AtkStateSet *set, dbus_uint32_t * array);
 
 G_END_DECLS
 
-#endif /* SPI_STATE_SET_H_ */
+#endif /* ACCESSIBLE_STATE_SET_H_ */
index e34870c..58663ef 100644 (file)
@@ -3,6 +3,7 @@ noinst_LTLIBRARIES = libatk-bridge-adaptors.la
 libatk_bridge_adaptors_la_CFLAGS =\
                          $(DBUS_CFLAGS) \
                          $(ATK_CFLAGS)       \
+                         $(ATSPI_CFLAGS)       \
                          -I$(top_srcdir)     \
                          -I$(top_srcdir)/atk-adaptor \
        $(P2P_CFLAGS)
@@ -10,6 +11,7 @@ libatk_bridge_adaptors_la_CFLAGS =\
 libatk_bridge_adaptors_la_LIBADD =\
                          $(DBUS_LIBS) \
                          $(ATK_LIBS)       \
+                         $(ATSPI_LIBS)       \
                          $(X_LIBS)
 
 libatk_bridge_adaptors_la_SOURCES =\
index a8789c9..7572e49 100644 (file)
@@ -25,8 +25,9 @@
 #include <atk/atk.h>
 #include <droute/droute.h>
 
-#include "common/spi-dbus.h"
-#include "common/spi-stateset.h"
+#include "atspi/atspi.h"
+#include "spi-dbus.h"
+#include "accessible-stateset.h"
 #include "object.h"
 #include "introspection.h"
 
@@ -122,7 +123,7 @@ impl_get_Parent (DBusMessageIter * iter, void *user_data)
               spi_object_append_null_reference (&iter_variant);
             }
         }
-      else if (role != Accessibility_ROLE_APPLICATION)
+      else if (role != ATSPI_ROLE_APPLICATION)
          spi_object_append_null_reference (&iter_variant);
       else
          spi_object_append_desktop_reference (&iter_variant);
@@ -253,42 +254,42 @@ impl_GetIndexInParent (DBusConnection * bus,
 }
 
 static gboolean
-spi_init_relation_type_table (Accessibility_RelationType * types)
+spi_init_relation_type_table (AtspiRelationType * types)
 {
   gint i;
 
   for (i = 0; i < ATK_RELATION_LAST_DEFINED; i++)
-    types[i] = Accessibility_RELATION_NULL;
-
-  types[ATK_RELATION_CONTROLLED_BY] = Accessibility_RELATION_CONTROLLED_BY;
-  types[ATK_RELATION_CONTROLLER_FOR] = Accessibility_RELATION_CONTROLLER_FOR;
-  types[ATK_RELATION_LABEL_FOR] = Accessibility_RELATION_LABEL_FOR;
-  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;
-  types[ATK_RELATION_POPUP_FOR] = Accessibility_RELATION_POPUP_FOR;
+    types[i] = ATSPI_RELATION_NULL;
+
+  types[ATK_RELATION_CONTROLLED_BY] = ATSPI_RELATION_CONTROLLED_BY;
+  types[ATK_RELATION_CONTROLLER_FOR] = ATSPI_RELATION_CONTROLLER_FOR;
+  types[ATK_RELATION_LABEL_FOR] = ATSPI_RELATION_LABEL_FOR;
+  types[ATK_RELATION_LABELLED_BY] = ATSPI_RELATION_LABELLED_BY;
+  types[ATK_RELATION_MEMBER_OF] = ATSPI_RELATION_MEMBER_OF;
+  types[ATK_RELATION_NODE_CHILD_OF] = ATSPI_RELATION_NODE_CHILD_OF;
+  types[ATK_RELATION_FLOWS_TO] = ATSPI_RELATION_FLOWS_TO;
+  types[ATK_RELATION_FLOWS_FROM] = ATSPI_RELATION_FLOWS_FROM;
+  types[ATK_RELATION_SUBWINDOW_OF] = ATSPI_RELATION_SUBWINDOW_OF;
+  types[ATK_RELATION_EMBEDS] = ATSPI_RELATION_EMBEDS;
+  types[ATK_RELATION_EMBEDDED_BY] = ATSPI_RELATION_EMBEDDED_BY;
+  types[ATK_RELATION_POPUP_FOR] = ATSPI_RELATION_POPUP_FOR;
   types[ATK_RELATION_PARENT_WINDOW_OF] =
-    Accessibility_RELATION_PARENT_WINDOW_OF;
+    ATSPI_RELATION_PARENT_WINDOW_OF;
   types[ATK_RELATION_DESCRIPTION_FOR] =
-    Accessibility_RELATION_DESCRIPTION_FOR;
-  types[ATK_RELATION_DESCRIBED_BY] = Accessibility_RELATION_DESCRIBED_BY;
-  types[ATK_RELATION_NODE_PARENT_OF] = Accessibility_RELATION_NODE_PARENT_OF;
+    ATSPI_RELATION_DESCRIPTION_FOR;
+  types[ATK_RELATION_DESCRIBED_BY] = ATSPI_RELATION_DESCRIBED_BY;
+  types[ATK_RELATION_NODE_PARENT_OF] = ATSPI_RELATION_NODE_PARENT_OF;
 
   return TRUE;
 }
 
-static Accessibility_RelationType
+static AtspiRelationType
 spi_relation_type_from_atk_relation_type (AtkRelationType type)
 {
   static gboolean is_initialized = FALSE;
-  static Accessibility_RelationType
+  static AtspiRelationType
     spi_relation_type_table[ATK_RELATION_LAST_DEFINED];
-  Accessibility_RelationType spi_type;
+  AtspiRelationType spi_type;
 
   if (!is_initialized)
     is_initialized = spi_init_relation_type_table (spi_relation_type_table);
@@ -296,7 +297,7 @@ spi_relation_type_from_atk_relation_type (AtkRelationType type)
   if (type > ATK_RELATION_NULL && type < ATK_RELATION_LAST_DEFINED)
     spi_type = spi_relation_type_table[type];
   else
-    spi_type = Accessibility_RELATION_EXTENDED;
+    spi_type = ATSPI_RELATION_EXTENDED;
   return spi_type;
 }
 
@@ -551,7 +552,7 @@ void
 spi_initialize_accessible (DRoutePath * path)
 {
   droute_path_add_interface (path,
-                             SPI_DBUS_INTERFACE_ACCESSIBLE,
+                             ATSPI_DBUS_INTERFACE_ACCESSIBLE,
                              spi_org_a11y_atspi_Accessible,    
                              methods, properties);
 };
index 62f68f7..08e3a2c 100644 (file)
@@ -25,7 +25,7 @@
 #include <atk/atk.h>
 #include <droute/droute.h>
 
-#include "common/spi-dbus.h"
+#include "spi-dbus.h"
 
 #include "introspection.h"
 
@@ -224,6 +224,6 @@ void
 spi_initialize_action (DRoutePath * path)
 {
   droute_path_add_interface (path,
-                             SPI_DBUS_INTERFACE_ACTION,
+                             ATSPI_DBUS_INTERFACE_ACTION,
                              spi_org_a11y_atspi_Action, methods, properties);
 };
index 30f1a16..84d2ef4 100644 (file)
@@ -27,7 +27,7 @@
 #include <atk/atk.h>
 #include <droute/droute.h>
 
-Accessibility_Role spi_accessible_role_from_atk_role (AtkRole role);
+AtspiRole spi_accessible_role_from_atk_role (AtkRole role);
 
 void spi_initialize_accessible (DRoutePath * path);
 void spi_initialize_action (DRoutePath * path);
index c686c31..1b85969 100644 (file)
@@ -25,7 +25,7 @@
 #include <atk/atk.h>
 #include <droute/droute.h>
 
-#include "common/spi-dbus.h"
+#include "spi-dbus.h"
 #include "introspection.h"
 
 /* for spi_global_app_data  is there a better way? */
@@ -145,7 +145,7 @@ void
 spi_initialize_application (DRoutePath * path)
 {
   droute_path_add_interface (path,
-                             SPI_DBUS_INTERFACE_APPLICATION,
+                             ATSPI_DBUS_INTERFACE_APPLICATION,
                              spi_org_a11y_atspi_Application,
                              methods, properties);
 };
index 1f33ce3..3b5540c 100644 (file)
@@ -28,8 +28,8 @@
 #include <atk/atk.h>
 #include <droute/droute.h>
 
-#include "common/spi-dbus.h"
-#include "common/spi-stateset.h"
+#include "spi-dbus.h"
+#include "accessible-stateset.h"
 #include "accessible-cache.h"
 #include "bridge.h"
 #include "object.h"
@@ -132,7 +132,7 @@ append_cache_item (AtkObject * obj, gpointer data)
                 spi_object_append_null_reference (&iter_struct);
               }
           }
-        else if (role != Accessibility_ROLE_APPLICATION)
+        else if (role != ATSPI_ROLE_APPLICATION)
           spi_object_append_null_reference (&iter_struct);
         else
           spi_object_append_desktop_reference (&iter_struct);
@@ -238,7 +238,7 @@ emit_cache_remove (SpiCache *cache, GObject * obj)
   DBusMessage *message;
 
   if ((message = dbus_message_new_signal (SPI_CACHE_OBJECT_PATH,
-                                          SPI_DBUS_INTERFACE_CACHE,
+                                          ATSPI_DBUS_INTERFACE_CACHE,
                                           "RemoveAccessible")))
     {
       DBusMessageIter iter;
@@ -261,7 +261,7 @@ emit_cache_add (SpiCache *cache, GObject * obj)
   DBusMessage *message;
 
   if ((message = dbus_message_new_signal (SPI_CACHE_OBJECT_PATH,
-                                          SPI_DBUS_INTERFACE_CACHE,
+                                          ATSPI_DBUS_INTERFACE_CACHE,
                                           "AddAccessible")))
     {
       DBusMessageIter iter;
@@ -316,7 +316,7 @@ static DRouteMethod methods[] = {
 void
 spi_initialize_cache (DRoutePath * path)
 {
-  droute_path_add_interface (path, SPI_DBUS_INTERFACE_CACHE, spi_org_a11y_atspi_Cache, methods, NULL);
+  droute_path_add_interface (path, ATSPI_DBUS_INTERFACE_CACHE, spi_org_a11y_atspi_Cache, methods, NULL);
 
   g_signal_connect (spi_global_cache,
                     "object-added",
index f274239..efefa43 100644 (file)
@@ -27,9 +27,9 @@
 #include <atk/atk.h>
 #include <droute/droute.h>
 
-#include "common/bitarray.h"
-#include "common/spi-dbus.h"
-#include "common/spi-stateset.h"
+#include "bitarray.h"
+#include "spi-dbus.h"
+#include "accessible-stateset.h"
 
 #include "accessible-register.h"
 #include "object.h"
@@ -39,13 +39,13 @@ typedef struct _MatchRulePrivate MatchRulePrivate;
 struct _MatchRulePrivate
 {
   gint *states;
-  Accessibility_Collection_MatchType statematchtype;
+  AtspiCollectionMatchType statematchtype;
   AtkAttributeSet *attributes;
-  Accessibility_Collection_MatchType attributematchtype;
+  AtspiCollectionMatchType attributematchtype;
   gint *roles;
-  Accessibility_Collection_MatchType rolematchtype;
+  AtspiCollectionMatchType rolematchtype;
   gchar **ifaces;
-  Accessibility_Collection_MatchType interfacematchtype;
+  AtspiCollectionMatchType interfacematchtype;
   gboolean invert;
 };
 
@@ -161,17 +161,17 @@ match_states_lookup (AtkObject * child, MatchRulePrivate * mrp)
 {
   switch (mrp->statematchtype)
     {
-    case Accessibility_Collection_MATCH_ALL:
+    case ATSPI_Collection_MATCH_ALL:
       if (match_states_all_p (child, mrp->states))
         return TRUE;
       break;
 
-    case Accessibility_Collection_MATCH_ANY:
+    case ATSPI_Collection_MATCH_ANY:
       if (match_states_any_p (child, mrp->states))
         return TRUE;
       break;
 
-    case Accessibility_Collection_MATCH_NONE:
+    case ATSPI_Collection_MATCH_NONE:
       if (match_states_none_p (child, mrp->states))
         return TRUE;
       break;
@@ -202,7 +202,7 @@ match_roles_all_p (AtkObject * child, gint * roles)
 static gboolean
 match_roles_any_p (AtkObject * child, gint * roles)
 {
-  Accessibility_Role role;
+  AtspiRole role;
   int i;
 
   if (roles == NULL || roles[0] == BITARRAY_SEQ_TERM)
@@ -240,17 +240,17 @@ match_roles_lookup (AtkObject * child, MatchRulePrivate * mrp)
 {
   switch (mrp->rolematchtype)
     {
-    case Accessibility_Collection_MATCH_ALL:
+    case ATSPI_Collection_MATCH_ALL:
       if (match_roles_all_p (child, mrp->roles))
         return TRUE;
       break;
 
-    case Accessibility_Collection_MATCH_ANY:
+    case ATSPI_Collection_MATCH_ANY:
       if (match_roles_any_p (child, mrp->roles))
         return TRUE;
       break;
 
-    case Accessibility_Collection_MATCH_NONE:
+    case ATSPI_Collection_MATCH_NONE:
       if (match_roles_none_p (child, mrp->roles))
         return TRUE;
       break;
@@ -313,17 +313,17 @@ match_interfaces_lookup (AtkObject * child, MatchRulePrivate * mrp)
   switch (mrp->interfacematchtype)
     {
 
-    case Accessibility_Collection_MATCH_ALL:
+    case ATSPI_Collection_MATCH_ALL:
       if (match_interfaces_all_p (child, mrp->ifaces))
         return TRUE;
       break;
 
-    case Accessibility_Collection_MATCH_ANY:
+    case ATSPI_Collection_MATCH_ANY:
       if (match_interfaces_any_p (child, mrp->ifaces))
         return TRUE;
       break;
 
-    case Accessibility_Collection_MATCH_NONE:
+    case ATSPI_Collection_MATCH_NONE:
       if (match_interfaces_none_p (child, mrp->ifaces))
         return TRUE;
       break;
@@ -449,17 +449,17 @@ match_attributes_lookup (AtkObject * child, MatchRulePrivate * mrp)
   switch (mrp->attributematchtype)
     {
 
-    case Accessibility_Collection_MATCH_ALL:
+    case ATSPI_Collection_MATCH_ALL:
       if (match_attributes_all_p (child, mrp->attributes))
         return TRUE;
       break;
 
-    case Accessibility_Collection_MATCH_ANY:
+    case ATSPI_Collection_MATCH_ANY:
       if (match_attributes_any_p (child, mrp->attributes))
         return TRUE;
       break;
 
-    case Accessibility_Collection_MATCH_NONE:
+    case ATSPI_Collection_MATCH_NONE:
       if (match_attributes_none_p (child, mrp->attributes))
         return TRUE;
       break;
@@ -583,7 +583,7 @@ sort_order_rev_canonical (MatchRulePrivate * mrp, GList * ls,
 }
 
 static int
-query_exec (MatchRulePrivate * mrp, Accessibility_Collection_SortOrder sortby,
+query_exec (MatchRulePrivate * mrp, AtspiCollectionSortOrder sortby,
             GList * ls, gint kount, gint max,
             AtkObject * obj, glong index,
             gboolean flag,
@@ -591,11 +591,11 @@ query_exec (MatchRulePrivate * mrp, Accessibility_Collection_SortOrder sortby,
 {
   switch (sortby)
     {
-    case Accessibility_Collection_SORT_ORDER_CANONICAL:
+    case ATSPI_Collection_SORT_ORDER_CANONICAL:
       kount = sort_order_canonical (mrp, ls, 0, max, obj, index, flag,
                                     pobj, recurse, traverse);
       break;
-    case Accessibility_Collection_SORT_ORDER_REVERSE_CANONICAL:
+    case ATSPI_Collection_SORT_ORDER_REVERSE_CANONICAL:
       kount = sort_order_canonical (mrp, ls, 0, max, obj, index, flag,
                                     pobj, recurse, traverse);
       break;
@@ -761,7 +761,7 @@ static DBusMessage *
 GetMatchesFrom (DBusMessage * message,
                 AtkObject * current_object,
                 MatchRulePrivate * mrp,
-                const Accessibility_Collection_SortOrder sortby,
+                const AtspiCollectionSortOrder sortby,
                 const dbus_bool_t isrestrict,
                 dbus_int32_t count, const dbus_bool_t traverse)
 {
@@ -784,7 +784,7 @@ GetMatchesFrom (DBusMessage * message,
 
   ls = g_list_remove (ls, ls->data);
 
-  if (sortby == Accessibility_Collection_SORT_ORDER_REVERSE_CANONICAL)
+  if (sortby == ATSPI_Collection_SORT_ORDER_REVERSE_CANONICAL)
     ls = g_list_reverse (ls);
 
   free_mrp_data (mrp);
@@ -834,7 +834,7 @@ static DBusMessage *
 GetMatchesInOrder (DBusMessage * message,
                    AtkObject * current_object,
                    MatchRulePrivate * mrp,
-                   const Accessibility_Collection_SortOrder sortby,
+                   const AtspiCollectionSortOrder sortby,
                    const dbus_bool_t recurse,
                    dbus_int32_t count, const dbus_bool_t traverse)
 {
@@ -851,7 +851,7 @@ GetMatchesInOrder (DBusMessage * message,
 
   ls = g_list_remove (ls, ls->data);
 
-  if (sortby == Accessibility_Collection_SORT_ORDER_REVERSE_CANONICAL)
+  if (sortby == ATSPI_Collection_SORT_ORDER_REVERSE_CANONICAL)
     ls = g_list_reverse (ls);
 
   free_mrp_data (mrp);
@@ -867,7 +867,7 @@ static DBusMessage *
 GetMatchesInBackOrder (DBusMessage * message,
                        AtkObject * current_object,
                        MatchRulePrivate * mrp,
-                       const Accessibility_Collection_SortOrder sortby,
+                       const AtspiCollectionSortOrder sortby,
                        dbus_int32_t count)
 {
   GList *ls = NULL;
@@ -883,7 +883,7 @@ GetMatchesInBackOrder (DBusMessage * message,
 
   ls = g_list_remove (ls, ls->data);
 
-  if (sortby == Accessibility_Collection_SORT_ORDER_REVERSE_CANONICAL)
+  if (sortby == ATSPI_Collection_SORT_ORDER_REVERSE_CANONICAL)
     ls = g_list_reverse (ls);
 
   free_mrp_data (mrp);
@@ -894,7 +894,7 @@ static DBusMessage *
 GetMatchesTo (DBusMessage * message,
               AtkObject * current_object,
               MatchRulePrivate * mrp,
-              const Accessibility_Collection_SortOrder sortby,
+              const AtspiCollectionSortOrder sortby,
               const dbus_bool_t recurse,
               const dbus_bool_t isrestrict,
               dbus_int32_t count, const dbus_bool_t traverse)
@@ -920,7 +920,7 @@ GetMatchesTo (DBusMessage * message,
 
   ls = g_list_remove (ls, ls->data);
 
-  if (sortby != Accessibility_Collection_SORT_ORDER_REVERSE_CANONICAL)
+  if (sortby != ATSPI_Collection_SORT_ORDER_REVERSE_CANONICAL)
     ls = g_list_reverse (ls);
 
   free_mrp_data (mrp);
@@ -972,15 +972,15 @@ impl_GetMatchesFrom (DBusConnection * bus, DBusMessage * message,
 
   switch (tree)
     {
-    case Accessibility_Collection_TREE_RESTRICT_CHILDREN:
+    case ATSPI_Collection_TREE_RESTRICT_CHILDREN:
       return GetMatchesFrom (message, current_object,
                              &rule, sortby, TRUE, count, traverse);
       break;
-    case Accessibility_Collection_TREE_RESTRICT_SIBLING:
+    case ATSPI_Collection_TREE_RESTRICT_SIBLING:
       return GetMatchesFrom (message, current_object,
                              &rule, sortby, FALSE, count, traverse);
       break;
-    case Accessibility_Collection_TREE_INORDER:
+    case ATSPI_Collection_TREE_INORDER:
       return GetMatchesInOrder (message, current_object,
                                 &rule, sortby, TRUE, count, traverse);
       break;
@@ -1037,15 +1037,15 @@ impl_GetMatchesTo (DBusConnection * bus, DBusMessage * message,
 
   switch (tree)
     {
-    case Accessibility_Collection_TREE_RESTRICT_CHILDREN:
+    case ATSPI_Collection_TREE_RESTRICT_CHILDREN:
       return GetMatchesTo (message, current_object,
                            &rule, sortby, recurse, TRUE, count, traverse);
       break;
-    case Accessibility_Collection_TREE_RESTRICT_SIBLING:
+    case ATSPI_Collection_TREE_RESTRICT_SIBLING:
       return GetMatchesTo (message, current_object,
                            &rule, sortby, recurse, FALSE, count, traverse);
       break;
-    case Accessibility_Collection_TREE_INORDER:
+    case ATSPI_Collection_TREE_INORDER:
       return GetMatchesInBackOrder (message, current_object,
                                     &rule, sortby, count);
       break;
@@ -1088,7 +1088,7 @@ impl_GetMatches (DBusConnection * bus, DBusMessage * message, void *user_data)
                       obj, 0, TRUE, NULL, TRUE, traverse);
   ls = g_list_remove (ls, ls->data);
 
-  if (sortby == Accessibility_Collection_SORT_ORDER_REVERSE_CANONICAL)
+  if (sortby == ATSPI_Collection_SORT_ORDER_REVERSE_CANONICAL)
     ls = g_list_reverse (ls);
   free_mrp_data (&rule);
   return return_and_free_list (message, ls);
@@ -1105,5 +1105,5 @@ void
 spi_initialize_collection (DRoutePath * path)
 {
   droute_path_add_interface (path,
-                             SPI_DBUS_INTERFACE_COLLECTION, spi_org_a11y_atspi_Collection, methods, NULL);
+                             ATSPI_DBUS_INTERFACE_COLLECTION, spi_org_a11y_atspi_Collection, methods, NULL);
 };
index 3db9717..f477348 100644 (file)
@@ -26,7 +26,7 @@
 #include <droute/droute.h>
 #include <string.h>
 
-#include "common/spi-dbus.h"
+#include "spi-dbus.h"
 #include "object.h"
 #include "introspection.h"
 
@@ -184,28 +184,28 @@ impl_GetLayer (DBusConnection * bus, DBusMessage * message, void *user_data)
   switch (atklayer)
     {
     case ATK_LAYER_BACKGROUND:
-      rv = Accessibility_LAYER_BACKGROUND;
+      rv = ATSPI_LAYER_BACKGROUND;
       break;
     case ATK_LAYER_CANVAS:
-      rv = Accessibility_LAYER_CANVAS;
+      rv = ATSPI_LAYER_CANVAS;
       break;
     case ATK_LAYER_WIDGET:
-      rv = Accessibility_LAYER_WIDGET;
+      rv = ATSPI_LAYER_WIDGET;
       break;
     case ATK_LAYER_MDI:
-      rv = Accessibility_LAYER_MDI;
+      rv = ATSPI_LAYER_MDI;
       break;
     case ATK_LAYER_POPUP:
-      rv = Accessibility_LAYER_POPUP;
+      rv = ATSPI_LAYER_POPUP;
       break;
     case ATK_LAYER_OVERLAY:
-      rv = Accessibility_LAYER_OVERLAY;
+      rv = ATSPI_LAYER_OVERLAY;
       break;
     case ATK_LAYER_WINDOW:
-      rv = Accessibility_LAYER_WINDOW;
+      rv = ATSPI_LAYER_WINDOW;
       break;
     default:
-      rv = Accessibility_LAYER_INVALID;
+      rv = ATSPI_LAYER_INVALID;
       break;
     }
   reply = dbus_message_new_method_return (message);
@@ -418,5 +418,5 @@ void
 spi_initialize_component (DRoutePath * path)
 {
   droute_path_add_interface (path,
-                             SPI_DBUS_INTERFACE_COMPONENT, spi_org_a11y_atspi_Component, methods, NULL);
+                             ATSPI_DBUS_INTERFACE_COMPONENT, spi_org_a11y_atspi_Component, methods, NULL);
 };
index 53e35a8..5eacd38 100644 (file)
@@ -25,7 +25,7 @@
 #include <atk/atk.h>
 #include <droute/droute.h>
 
-#include "common/spi-dbus.h"
+#include "spi-dbus.h"
 #include "object.h"
 #include "introspection.h"
 
@@ -117,5 +117,5 @@ void
 spi_initialize_document (DRoutePath * path)
 {
   droute_path_add_interface (path,
-                             SPI_DBUS_INTERFACE_DOCUMENT, spi_org_a11y_atspi_Document, methods, NULL);
+                             ATSPI_DBUS_INTERFACE_DOCUMENT, spi_org_a11y_atspi_Document, methods, NULL);
 };
index e633a54..1e0a5b9 100644 (file)
@@ -26,7 +26,7 @@
 #include <droute/droute.h>
 #include "introspection.h"
 
-#include "common/spi-dbus.h"
+#include "spi-dbus.h"
 
 static DBusMessage *
 impl_SetTextContents (DBusConnection * bus, DBusMessage * message,
@@ -214,5 +214,5 @@ void
 spi_initialize_editabletext (DRoutePath * path)
 {
   droute_path_add_interface (path,
-                             SPI_DBUS_INTERFACE_EDITABLE_TEXT, spi_org_a11y_atspi_EditableText, methods, NULL);
+                             ATSPI_DBUS_INTERFACE_EDITABLE_TEXT, spi_org_a11y_atspi_EditableText, methods, NULL);
 };
index cd0a924..746676d 100644 (file)
@@ -25,7 +25,7 @@
 #include <atk/atk.h>
 #include <droute/droute.h>
 
-#include "common/spi-dbus.h"
+#include "spi-dbus.h"
 #include "introspection.h"
 #include "object.h"
 
@@ -153,7 +153,7 @@ void
 spi_initialize_hyperlink (DRoutePath * path)
 {
   droute_path_add_interface (path,
-                             SPI_DBUS_INTERFACE_HYPERLINK,
+                             ATSPI_DBUS_INTERFACE_HYPERLINK,
                              spi_org_a11y_atspi_Hyperlink,
                              methods, properties);
 };
index dbe1ffd..6569eaa 100644 (file)
@@ -25,7 +25,7 @@
 #include <atk/atk.h>
 #include <droute/droute.h>
 
-#include "common/spi-dbus.h"
+#include "spi-dbus.h"
 #include "object.h"
 
 #include "introspection.h"
@@ -111,5 +111,5 @@ void
 spi_initialize_hypertext (DRoutePath * path)
 {
   droute_path_add_interface (path,
-                             SPI_DBUS_INTERFACE_HYPERTEXT, spi_org_a11y_atspi_Hypertext, methods, NULL);
+                             ATSPI_DBUS_INTERFACE_HYPERTEXT, spi_org_a11y_atspi_Hypertext, methods, NULL);
 };
index da56a21..1ba1f4e 100644 (file)
@@ -25,7 +25,7 @@
 #include <atk/atk.h>
 #include <droute/droute.h>
 
-#include "common/spi-dbus.h"
+#include "spi-dbus.h"
 #include "object.h"
 #include "introspection.h"
 
@@ -139,5 +139,5 @@ void
 spi_initialize_image (DRoutePath * path)
 {
   droute_path_add_interface (path,
-                             SPI_DBUS_INTERFACE_IMAGE, spi_org_a11y_atspi_Image, methods, properties);
+                             ATSPI_DBUS_INTERFACE_IMAGE, spi_org_a11y_atspi_Image, methods, properties);
 };
index 353113d..23b0a4f 100644 (file)
@@ -25,7 +25,7 @@
 #include <atk/atk.h>
 #include <droute/droute.h>
 
-#include "common/spi-dbus.h"
+#include "spi-dbus.h"
 #include "object.h"
 #include "introspection.h"
 
@@ -259,7 +259,7 @@ void
 spi_initialize_selection (DRoutePath * path)
 {
   droute_path_add_interface (path,
-                             SPI_DBUS_INTERFACE_SELECTION,
+                             ATSPI_DBUS_INTERFACE_SELECTION,
                              spi_org_a11y_atspi_Selection,
                              methods, properties);
 };
index 58d19d5..ac7f646 100644 (file)
@@ -25,8 +25,8 @@
 #include <atk/atk.h>
 #include <droute/droute.h>
 
-#include "common/spi-dbus.h"
-#include "common/spi-stateset.h"
+#include "spi-dbus.h"
+#include "accessible-stateset.h"
 #include "object.h"
 #include "introspection.h"
 #include "bridge.h"
@@ -49,7 +49,7 @@ new_socket_call_message (AtkComponent *component, const char *member)
       DBusMessage *message;
       *(path_parent++) = '\0';
       message = dbus_message_new_method_call (bus_parent, path_parent,
-                                              SPI_DBUS_INTERFACE_COMPONENT,
+                                              ATSPI_DBUS_INTERFACE_COMPONENT,
                                               member);
       g_free (bus_parent);
       return message;
@@ -199,7 +199,7 @@ void
 spi_initialize_socket (DRoutePath * path)
 {
   droute_path_add_interface (path,
-                             SPI_DBUS_INTERFACE_SOCKET,
+                             ATSPI_DBUS_INTERFACE_SOCKET,
                              NULL, /* spi_org_a11y_atspi_Socket,        */
                              methods, NULL);
 };
index bd35f5f..26fec2b 100644 (file)
@@ -25,7 +25,7 @@
 #include <atk/atk.h>
 #include <droute/droute.h>
 
-#include "common/spi-dbus.h"
+#include "spi-dbus.h"
 #include "object.h"
 #include "introspection.h"
 
@@ -701,5 +701,5 @@ void
 spi_initialize_table (DRoutePath * path)
 {
   droute_path_add_interface (path,
-                             SPI_DBUS_INTERFACE_TABLE, spi_org_a11y_atspi_Table, methods, properties);
+                             ATSPI_DBUS_INTERFACE_TABLE, spi_org_a11y_atspi_Table, methods, properties);
 };
index 7a810b2..5600ed0 100644 (file)
@@ -27,7 +27,7 @@
 #include <atk/atk.h>
 #include <droute/droute.h>
 
-#include "common/spi-dbus.h"
+#include "spi-dbus.h"
 #include "object.h"
 #include "introspection.h"
 
@@ -847,5 +847,5 @@ void
 spi_initialize_text (DRoutePath * path)
 {
   droute_path_add_interface (path,
-                             SPI_DBUS_INTERFACE_TEXT, spi_org_a11y_atspi_Text, methods, properties);
+                             ATSPI_DBUS_INTERFACE_TEXT, spi_org_a11y_atspi_Text, methods, properties);
 };
index 188b6dd..89f29ff 100644 (file)
@@ -27,7 +27,7 @@
 #include <atk/atk.h>
 #include <droute/droute.h>
 
-#include "common/spi-dbus.h"
+#include "spi-dbus.h"
 #include "introspection.h"
 
 static dbus_bool_t
@@ -201,5 +201,5 @@ void
 spi_initialize_value (DRoutePath * path)
 {
   droute_path_add_interface (path,
-                             SPI_DBUS_INTERFACE_VALUE, spi_org_a11y_atspi_Value, methods, properties);
+                             ATSPI_DBUS_INTERFACE_VALUE, spi_org_a11y_atspi_Value, methods, properties);
 };
similarity index 100%
rename from common/bitarray.h
rename to atk-adaptor/bitarray.h
index 6aacd12..bcae3b9 100644 (file)
 #include "event.h"
 #include "adaptors.h"
 #include "object.h"
-#include "common/spi-stateset.h"
+#include "accessible-stateset.h"
 
 #include "accessible-register.h"
 #include "accessible-leasing.h"
 #include "accessible-cache.h"
 
-#include "common/spi-dbus.h"
+#include "spi-dbus.h"
 
 /*---------------------------------------------------------------------------*/
 
@@ -143,8 +143,8 @@ get_registered_event_listeners (SpiBridge *app)
   DBusMessageIter iter, iter_array, iter_struct;
 
   message = dbus_message_new_method_call (SPI_DBUS_NAME_REGISTRY,
-                                         SPI_DBUS_PATH_REGISTRY,
-                                         SPI_DBUS_INTERFACE_REGISTRY,
+                                         ATSPI_DBUS_PATH_REGISTRY,
+                                         ATSPI_DBUS_INTERFACE_REGISTRY,
                                          "GetRegisteredEvents");
   if (!message)
     return;
@@ -235,12 +235,12 @@ register_application (SpiBridge * app)
 
   /* These will be overridden when we get a reply, but in practice these
      defaults should always be correct */
-  app->desktop_name = SPI_DBUS_NAME_REGISTRY;
-  app->desktop_path = SPI_DBUS_PATH_ROOT;
+  app->desktop_name = ATSPI_DBUS_NAME_REGISTRY;
+  app->desktop_path = ATSPI_DBUS_PATH_ROOT;
 
   message = dbus_message_new_method_call (SPI_DBUS_NAME_REGISTRY,
-                                          SPI_DBUS_PATH_ROOT,
-                                          SPI_DBUS_INTERFACE_SOCKET,
+                                          ATSPI_DBUS_PATH_ROOT,
+                                          ATSPI_DBUS_INTERFACE_SOCKET,
                                           "Embed");
 
   dbus_message_iter_init_append (message, &iter);
@@ -285,8 +285,8 @@ deregister_application (SpiBridge * app)
   dbus_error_init (&error);
 
   message = dbus_message_new_method_call (SPI_DBUS_NAME_REGISTRY,
-                                          SPI_DBUS_PATH_REGISTRY,
-                                          SPI_DBUS_INTERFACE_REGISTRY,
+                                          ATSPI_DBUS_PATH_REGISTRY,
+                                          ATSPI_DBUS_INTERFACE_REGISTRY,
                                           "DeregisterApplication");
   dbus_message_set_no_reply (message, TRUE);
 
@@ -366,7 +366,7 @@ socket_ref_state_set (AtkObject *accessible)
       return NULL;
     }
   *(child_path++) = '\0';
-  message = dbus_message_new_method_call (child_name, child_path, SPI_DBUS_INTERFACE_ACCESSIBLE, "GetState");
+  message = dbus_message_new_method_call (child_name, child_path, ATSPI_DBUS_INTERFACE_ACCESSIBLE, "GetState");
   g_free (child_name);
   reply = dbus_connection_send_with_reply_and_block (spi_global_app_data->bus, message, 1, NULL);
   dbus_message_unref (message);
@@ -421,7 +421,7 @@ socket_embed_hook (AtkSocket * socket, gchar * plug_id)
     {
       DBusMessage *message;
       *(plug_path++) = '\0';
-      message = dbus_message_new_method_call (plug_name, plug_path, SPI_DBUS_INTERFACE_SOCKET, "Embedded");
+      message = dbus_message_new_method_call (plug_name, plug_path, ATSPI_DBUS_INTERFACE_SOCKET, "Embedded");
       dbus_message_append_args (message, DBUS_TYPE_STRING, &path, DBUS_TYPE_INVALID);
       dbus_connection_send (spi_global_app_data->bus, message, NULL);
     }
@@ -628,7 +628,7 @@ signal_filter (DBusConnection *bus, DBusMessage *message, void *user_data)
   if (dbus_message_get_type (message) != DBUS_MESSAGE_TYPE_SIGNAL)
     return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 
-  if (!strcmp (interface, SPI_DBUS_INTERFACE_REGISTRY))
+  if (!strcmp (interface, ATSPI_DBUS_INTERFACE_REGISTRY))
     {
       result = DBUS_HANDLER_RESULT_HANDLED;
       if (!strcmp (member, "EventListenerRegistered"))
index 7624844..f5a2d2d 100644 (file)
@@ -32,7 +32,7 @@
 #include "bridge.h"
 #include "accessible-register.h"
 
-#include "common/spi-dbus.h"
+#include "spi-dbus.h"
 #include "event.h"
 #include "object.h"
 
@@ -114,7 +114,7 @@ send_and_allow_reentry (DBusConnection * bus, DBusMessage * message)
 
 static gboolean
 Accessibility_DeviceEventController_NotifyListenersSync (const
-                                                         Accessibility_DeviceEvent
+                                                         AtspiDeviceEvent
                                                          * key_event)
 {
   DBusMessage *message;
@@ -123,8 +123,8 @@ Accessibility_DeviceEventController_NotifyListenersSync (const
 
   message =
     dbus_message_new_method_call (SPI_DBUS_NAME_REGISTRY,
-                                  SPI_DBUS_PATH_DEC,
-                                  SPI_DBUS_INTERFACE_DEC,
+                                  ATSPI_DBUS_PATH_DEC,
+                                  ATSPI_DBUS_INTERFACE_DEC,
                                   "NotifyListenersSync");
 
   dbus_error_init (&error);
@@ -146,7 +146,7 @@ Accessibility_DeviceEventController_NotifyListenersSync (const
 }
 
 static void
-spi_init_keystroke_from_atk_key_event (Accessibility_DeviceEvent * keystroke,
+spi_init_keystroke_from_atk_key_event (AtspiDeviceEvent * keystroke,
                                        AtkKeyEventStruct * event)
 {
   keystroke->id = (dbus_int32_t) event->keyval;
@@ -172,10 +172,10 @@ spi_init_keystroke_from_atk_key_event (Accessibility_DeviceEvent * keystroke,
   switch (event->type)
     {
     case (ATK_KEY_EVENT_PRESS):
-      keystroke->type = Accessibility_KEY_PRESSED_EVENT;
+      keystroke->type = ATSPI_KEY_PRESSED;
       break;
     case (ATK_KEY_EVENT_RELEASE):
-      keystroke->type = Accessibility_KEY_RELEASED_EVENT;
+      keystroke->type = ATSPI_KEY_RELEASED;
       break;
     default:
       keystroke->type = 0;
@@ -195,7 +195,7 @@ static gint
 spi_atk_bridge_key_listener (AtkKeyEventStruct * event, gpointer data)
 {
   gboolean result;
-  Accessibility_DeviceEvent key_event;
+  AtspiDeviceEvent key_event;
 
   spi_init_keystroke_from_atk_key_event (&key_event, event);
 
index 07a43df..1a9f9f3 100644 (file)
@@ -25,8 +25,6 @@
 #ifndef EVENT_H
 #define EVENT_H
 
-#include <common/spi-types.h>
-
 void spi_atk_register_event_listeners (void);
 void spi_atk_deregister_event_listeners (void);
 void spi_atk_tidy_windows (void);
index 6795cf7..4240a66 100644 (file)
@@ -30,8 +30,8 @@
  */
 
 #include <atk/atk.h>
-#include <common/spi-types.h>
-#include <common/spi-dbus.h>
+#include "atspi/atspi.h"
+#include "spi-dbus.h"
 
 #include "accessible-register.h"
 #include "accessible-cache.h"
@@ -78,7 +78,7 @@ spi_object_append_null_reference (DBusMessageIter * iter)
 {
   DBusMessageIter iter_struct;
   const char *name;
-  const char *path = SPI_DBUS_PATH_NULL;
+  const char *path = ATSPI_DBUS_PATH_NULL;
 
   name = dbus_bus_get_unique_name (spi_global_app_data->bus);
 
@@ -215,66 +215,66 @@ spi_object_append_interfaces (DBusMessageIter * iter, AtkObject * obj)
 {
   const gchar *itf;
 
-  itf = SPI_DBUS_INTERFACE_ACCESSIBLE;
+  itf = ATSPI_DBUS_INTERFACE_ACCESSIBLE;
   dbus_message_iter_append_basic (iter, DBUS_TYPE_STRING, &itf);
 
   if (ATK_IS_ACTION (obj))
     {
-      itf = SPI_DBUS_INTERFACE_ACTION;
+      itf = ATSPI_DBUS_INTERFACE_ACTION;
       dbus_message_iter_append_basic (iter, DBUS_TYPE_STRING, &itf);
     }
 
   if (atk_object_get_role (obj) == ATK_ROLE_APPLICATION)
     {
-      itf = SPI_DBUS_INTERFACE_APPLICATION;
+      itf = ATSPI_DBUS_INTERFACE_APPLICATION;
       dbus_message_iter_append_basic (iter, DBUS_TYPE_STRING, &itf);
     }
 
   if (ATK_IS_COMPONENT (obj))
     {
-      itf = SPI_DBUS_INTERFACE_COMPONENT;
+      itf = ATSPI_DBUS_INTERFACE_COMPONENT;
       dbus_message_iter_append_basic (iter, DBUS_TYPE_STRING, &itf);
     }
 
   if (ATK_IS_EDITABLE_TEXT (obj))
     {
-      itf = SPI_DBUS_INTERFACE_EDITABLE_TEXT;
+      itf = ATSPI_DBUS_INTERFACE_EDITABLE_TEXT;
       dbus_message_iter_append_basic (iter, DBUS_TYPE_STRING, &itf);
     }
 
   if (ATK_IS_TEXT (obj))
     {
-      itf = SPI_DBUS_INTERFACE_TEXT;
+      itf = ATSPI_DBUS_INTERFACE_TEXT;
       dbus_message_iter_append_basic (iter, DBUS_TYPE_STRING, &itf);
     }
 
   if (ATK_IS_HYPERTEXT (obj))
     {
-      itf = SPI_DBUS_INTERFACE_HYPERTEXT;
+      itf = ATSPI_DBUS_INTERFACE_HYPERTEXT;
       dbus_message_iter_append_basic (iter, DBUS_TYPE_STRING, &itf);
     }
 
   if (ATK_IS_IMAGE (obj))
     {
-      itf = SPI_DBUS_INTERFACE_IMAGE;
+      itf = ATSPI_DBUS_INTERFACE_IMAGE;
       dbus_message_iter_append_basic (iter, DBUS_TYPE_STRING, &itf);
     }
 
   if (ATK_IS_SELECTION (obj))
     {
-      itf = SPI_DBUS_INTERFACE_SELECTION;
+      itf = ATSPI_DBUS_INTERFACE_SELECTION;
       dbus_message_iter_append_basic (iter, DBUS_TYPE_STRING, &itf);
     }
 
   if (ATK_IS_TABLE (obj))
     {
-      itf = SPI_DBUS_INTERFACE_TABLE;
+      itf = ATSPI_DBUS_INTERFACE_TABLE;
       dbus_message_iter_append_basic (iter, DBUS_TYPE_STRING, &itf);
     }
 
   if (ATK_IS_VALUE (obj))
     {
-      itf = SPI_DBUS_INTERFACE_VALUE;
+      itf = ATSPI_DBUS_INTERFACE_VALUE;
       dbus_message_iter_append_basic (iter, DBUS_TYPE_STRING, &itf);
     }
 
@@ -290,13 +290,13 @@ spi_object_append_interfaces (DBusMessageIter * iter, AtkObject * obj)
     {
       itf = "org.a11y.atspi.Collection";
       dbus_message_iter_append_basic (iter, DBUS_TYPE_STRING, &itf);
-      itf = SPI_DBUS_INTERFACE_DOCUMENT;
+      itf = ATSPI_DBUS_INTERFACE_DOCUMENT;
       dbus_message_iter_append_basic (iter, DBUS_TYPE_STRING, &itf);
     }
 
   if (ATK_IS_HYPERLINK_IMPL (obj))
     {
-      itf = SPI_DBUS_INTERFACE_HYPERLINK;
+      itf = ATSPI_DBUS_INTERFACE_HYPERLINK;
       dbus_message_iter_append_basic (iter, DBUS_TYPE_STRING, &itf);
     }
 }
@@ -336,130 +336,130 @@ spi_object_append_attribute_set (DBusMessageIter * iter, AtkAttributeSet * attr)
 /*---------------------------------------------------------------------------*/
 
 static gboolean
-init_role_lookup_table (Accessibility_Role * role_table)
+init_role_lookup_table (AtspiRole * 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[i] = ATSPI_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] = ATSPI_ROLE_INVALID;
+  role_table[ATK_ROLE_ACCEL_LABEL] = ATSPI_ROLE_ACCELERATOR_LABEL;
+  role_table[ATK_ROLE_ALERT] = ATSPI_ROLE_ALERT;
+  role_table[ATK_ROLE_ANIMATION] = ATSPI_ROLE_ANIMATION;
+  role_table[ATK_ROLE_ARROW] = ATSPI_ROLE_ARROW;
+  role_table[ATK_ROLE_CALENDAR] = ATSPI_ROLE_CALENDAR;
+  role_table[ATK_ROLE_CANVAS] = ATSPI_ROLE_CANVAS;
+  role_table[ATK_ROLE_CHECK_BOX] = ATSPI_ROLE_CHECK_BOX;
+  role_table[ATK_ROLE_CHECK_MENU_ITEM] = ATSPI_ROLE_CHECK_MENU_ITEM;
+  role_table[ATK_ROLE_COLOR_CHOOSER] = ATSPI_ROLE_COLOR_CHOOSER;
+  role_table[ATK_ROLE_COLUMN_HEADER] = ATSPI_ROLE_COLUMN_HEADER;
+  role_table[ATK_ROLE_COMBO_BOX] = ATSPI_ROLE_COMBO_BOX;
+  role_table[ATK_ROLE_DATE_EDITOR] = ATSPI_ROLE_DATE_EDITOR;
+  role_table[ATK_ROLE_DESKTOP_ICON] = ATSPI_ROLE_DESKTOP_ICON;
+  role_table[ATK_ROLE_DESKTOP_FRAME] = ATSPI_ROLE_DESKTOP_FRAME;
+  role_table[ATK_ROLE_DIAL] = ATSPI_ROLE_DIAL;
+  role_table[ATK_ROLE_DIALOG] = ATSPI_ROLE_DIALOG;
+  role_table[ATK_ROLE_DIRECTORY_PANE] = ATSPI_ROLE_DIRECTORY_PANE;
+  role_table[ATK_ROLE_DRAWING_AREA] = ATSPI_ROLE_DRAWING_AREA;
+  role_table[ATK_ROLE_FILE_CHOOSER] = ATSPI_ROLE_FILE_CHOOSER;
+  role_table[ATK_ROLE_FILLER] = ATSPI_ROLE_FILLER;
+  role_table[ATK_ROLE_FONT_CHOOSER] = ATSPI_ROLE_FONT_CHOOSER;
+  role_table[ATK_ROLE_FRAME] = ATSPI_ROLE_FRAME;
+  role_table[ATK_ROLE_GLASS_PANE] = ATSPI_ROLE_GLASS_PANE;
+  role_table[ATK_ROLE_HTML_CONTAINER] = ATSPI_ROLE_HTML_CONTAINER;
+  role_table[ATK_ROLE_ICON] = ATSPI_ROLE_ICON;
+  role_table[ATK_ROLE_IMAGE] = ATSPI_ROLE_IMAGE;
+  role_table[ATK_ROLE_INTERNAL_FRAME] = ATSPI_ROLE_INTERNAL_FRAME;
+  role_table[ATK_ROLE_LABEL] = ATSPI_ROLE_LABEL;
+  role_table[ATK_ROLE_LAYERED_PANE] = ATSPI_ROLE_LAYERED_PANE;
+  role_table[ATK_ROLE_LIST] = ATSPI_ROLE_LIST;
+  role_table[ATK_ROLE_LIST_ITEM] = ATSPI_ROLE_LIST_ITEM;
+  role_table[ATK_ROLE_MENU] = ATSPI_ROLE_MENU;
+  role_table[ATK_ROLE_MENU_BAR] = ATSPI_ROLE_MENU_BAR;
+  role_table[ATK_ROLE_MENU_ITEM] = ATSPI_ROLE_MENU_ITEM;
+  role_table[ATK_ROLE_OPTION_PANE] = ATSPI_ROLE_OPTION_PANE;
+  role_table[ATK_ROLE_PAGE_TAB] = ATSPI_ROLE_PAGE_TAB;
+  role_table[ATK_ROLE_PAGE_TAB_LIST] = ATSPI_ROLE_PAGE_TAB_LIST;
+  role_table[ATK_ROLE_PANEL] = ATSPI_ROLE_PANEL;
+  role_table[ATK_ROLE_PASSWORD_TEXT] = ATSPI_ROLE_PASSWORD_TEXT;
+  role_table[ATK_ROLE_POPUP_MENU] = ATSPI_ROLE_POPUP_MENU;
+  role_table[ATK_ROLE_PROGRESS_BAR] = ATSPI_ROLE_PROGRESS_BAR;
+  role_table[ATK_ROLE_PUSH_BUTTON] = ATSPI_ROLE_PUSH_BUTTON;
+  role_table[ATK_ROLE_RADIO_BUTTON] = ATSPI_ROLE_RADIO_BUTTON;
+  role_table[ATK_ROLE_RADIO_MENU_ITEM] = ATSPI_ROLE_RADIO_MENU_ITEM;
+  role_table[ATK_ROLE_ROOT_PANE] = ATSPI_ROLE_ROOT_PANE;
+  role_table[ATK_ROLE_ROW_HEADER] = ATSPI_ROLE_ROW_HEADER;
+  role_table[ATK_ROLE_SCROLL_BAR] = ATSPI_ROLE_SCROLL_BAR;
+  role_table[ATK_ROLE_SCROLL_PANE] = ATSPI_ROLE_SCROLL_PANE;
+  role_table[ATK_ROLE_SEPARATOR] = ATSPI_ROLE_SEPARATOR;
+  role_table[ATK_ROLE_SLIDER] = ATSPI_ROLE_SLIDER;
+  role_table[ATK_ROLE_SPIN_BUTTON] = ATSPI_ROLE_SPIN_BUTTON;
+  role_table[ATK_ROLE_SPLIT_PANE] = ATSPI_ROLE_SPLIT_PANE;
+  role_table[ATK_ROLE_STATUSBAR] = ATSPI_ROLE_STATUS_BAR;
+  role_table[ATK_ROLE_TABLE] = ATSPI_ROLE_TABLE;
+  role_table[ATK_ROLE_TABLE_CELL] = ATSPI_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;
+    ATSPI_ROLE_TABLE_COLUMN_HEADER;
+  role_table[ATK_ROLE_TABLE_ROW_HEADER] = ATSPI_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;
-  role_table[ATK_ROLE_ENTRY] = Accessibility_ROLE_ENTRY;
-  role_table[ATK_ROLE_CHART] = Accessibility_ROLE_CHART;
-  role_table[ATK_ROLE_CAPTION] = Accessibility_ROLE_CAPTION;
-  role_table[ATK_ROLE_DOCUMENT_FRAME] = Accessibility_ROLE_DOCUMENT_FRAME;
-  role_table[ATK_ROLE_HEADING] = Accessibility_ROLE_HEADING;
-  role_table[ATK_ROLE_PAGE] = Accessibility_ROLE_PAGE;
-  role_table[ATK_ROLE_SECTION] = Accessibility_ROLE_SECTION;
-  role_table[ATK_ROLE_FORM] = Accessibility_ROLE_FORM;
-  role_table[ATK_ROLE_REDUNDANT_OBJECT] = Accessibility_ROLE_REDUNDANT_OBJECT;
-  role_table[ATK_ROLE_LINK] = Accessibility_ROLE_LINK;
+    ATSPI_ROLE_TEAROFF_MENU_ITEM;
+  role_table[ATK_ROLE_TERMINAL] = ATSPI_ROLE_TERMINAL;
+  role_table[ATK_ROLE_TEXT] = ATSPI_ROLE_TEXT;
+  role_table[ATK_ROLE_TOGGLE_BUTTON] = ATSPI_ROLE_TOGGLE_BUTTON;
+  role_table[ATK_ROLE_TOOL_BAR] = ATSPI_ROLE_TOOL_BAR;
+  role_table[ATK_ROLE_TOOL_TIP] = ATSPI_ROLE_TOOL_TIP;
+  role_table[ATK_ROLE_TREE] = ATSPI_ROLE_TREE;
+  role_table[ATK_ROLE_TREE_TABLE] = ATSPI_ROLE_TREE_TABLE;
+  role_table[ATK_ROLE_UNKNOWN] = ATSPI_ROLE_UNKNOWN;
+  role_table[ATK_ROLE_VIEWPORT] = ATSPI_ROLE_VIEWPORT;
+  role_table[ATK_ROLE_WINDOW] = ATSPI_ROLE_WINDOW;
+  role_table[ATK_ROLE_HEADER] = ATSPI_ROLE_HEADER;
+  role_table[ATK_ROLE_FOOTER] = ATSPI_ROLE_FOOTER;
+  role_table[ATK_ROLE_PARAGRAPH] = ATSPI_ROLE_PARAGRAPH;
+  role_table[ATK_ROLE_RULER] = ATSPI_ROLE_RULER;
+  role_table[ATK_ROLE_APPLICATION] = ATSPI_ROLE_APPLICATION;
+  role_table[ATK_ROLE_AUTOCOMPLETE] = ATSPI_ROLE_AUTOCOMPLETE;
+  role_table[ATK_ROLE_EDITBAR] = ATSPI_ROLE_EDITBAR;
+  role_table[ATK_ROLE_EMBEDDED] = ATSPI_ROLE_EMBEDDED;
+  role_table[ATK_ROLE_ENTRY] = ATSPI_ROLE_ENTRY;
+  role_table[ATK_ROLE_CHART] = ATSPI_ROLE_CHART;
+  role_table[ATK_ROLE_CAPTION] = ATSPI_ROLE_CAPTION;
+  role_table[ATK_ROLE_DOCUMENT_FRAME] = ATSPI_ROLE_DOCUMENT_FRAME;
+  role_table[ATK_ROLE_HEADING] = ATSPI_ROLE_HEADING;
+  role_table[ATK_ROLE_PAGE] = ATSPI_ROLE_PAGE;
+  role_table[ATK_ROLE_SECTION] = ATSPI_ROLE_SECTION;
+  role_table[ATK_ROLE_FORM] = ATSPI_ROLE_FORM;
+  role_table[ATK_ROLE_REDUNDANT_OBJECT] = ATSPI_ROLE_REDUNDANT_OBJECT;
+  role_table[ATK_ROLE_LINK] = ATSPI_ROLE_LINK;
   role_table[ATK_ROLE_INPUT_METHOD_WINDOW] =
-    Accessibility_ROLE_INPUT_METHOD_WINDOW;
-  role_table[ATK_ROLE_TABLE_ROW] = Accessibility_ROLE_TABLE_ROW;
-  role_table[ATK_ROLE_TREE_ITEM] = Accessibility_ROLE_TREE_ITEM;
+    ATSPI_ROLE_INPUT_METHOD_WINDOW;
+  role_table[ATK_ROLE_TABLE_ROW] = ATSPI_ROLE_TABLE_ROW;
+  role_table[ATK_ROLE_TREE_ITEM] = ATSPI_ROLE_TREE_ITEM;
   role_table[ATK_ROLE_DOCUMENT_SPREADSHEET] =
-    Accessibility_ROLE_DOCUMENT_SPREADSHEET;
+    ATSPI_ROLE_DOCUMENT_SPREADSHEET;
   role_table[ATK_ROLE_DOCUMENT_PRESENTATION] =
-    Accessibility_ROLE_DOCUMENT_PRESENTATION;
-  role_table[ATK_ROLE_DOCUMENT_TEXT] = Accessibility_ROLE_DOCUMENT_TEXT;
-  role_table[ATK_ROLE_DOCUMENT_WEB] = Accessibility_ROLE_DOCUMENT_WEB;
-  role_table[ATK_ROLE_DOCUMENT_EMAIL] = Accessibility_ROLE_DOCUMENT_EMAIL;
-  role_table[ATK_ROLE_COMMENT] = Accessibility_ROLE_COMMENT;
-  role_table[ATK_ROLE_LIST_BOX] = Accessibility_ROLE_LIST_BOX;
-  role_table[ATK_ROLE_GROUPING] = Accessibility_ROLE_GROUPING;
-  role_table[ATK_ROLE_IMAGE_MAP] = Accessibility_ROLE_IMAGE_MAP;
-  role_table[ATK_ROLE_NOTIFICATION] = Accessibility_ROLE_NOTIFICATION;
-  role_table[ATK_ROLE_INFO_BAR] = Accessibility_ROLE_INFO_BAR;
+    ATSPI_ROLE_DOCUMENT_PRESENTATION;
+  role_table[ATK_ROLE_DOCUMENT_TEXT] = ATSPI_ROLE_DOCUMENT_TEXT;
+  role_table[ATK_ROLE_DOCUMENT_WEB] = ATSPI_ROLE_DOCUMENT_WEB;
+  role_table[ATK_ROLE_DOCUMENT_EMAIL] = ATSPI_ROLE_DOCUMENT_EMAIL;
+  role_table[ATK_ROLE_COMMENT] = ATSPI_ROLE_COMMENT;
+  role_table[ATK_ROLE_LIST_BOX] = ATSPI_ROLE_LIST_BOX;
+  role_table[ATK_ROLE_GROUPING] = ATSPI_ROLE_GROUPING;
+  role_table[ATK_ROLE_IMAGE_MAP] = ATSPI_ROLE_IMAGE_MAP;
+  role_table[ATK_ROLE_NOTIFICATION] = ATSPI_ROLE_NOTIFICATION;
+  role_table[ATK_ROLE_INFO_BAR] = ATSPI_ROLE_INFO_BAR;
   return TRUE;
 }
 
-Accessibility_Role
+AtspiRole
 spi_accessible_role_from_atk_role (AtkRole role)
 {
   static gboolean is_initialized = FALSE;
-  static Accessibility_Role spi_role_table[ATK_ROLE_LAST_DEFINED];
-  Accessibility_Role spi_role;
+  static AtspiRole spi_role_table[ATK_ROLE_LAST_DEFINED];
+  AtspiRole spi_role;
 
   if (!is_initialized)
     {
@@ -472,7 +472,7 @@ spi_accessible_role_from_atk_role (AtkRole role)
     }
   else
     {
-      spi_role = Accessibility_ROLE_EXTENDED;
+      spi_role = ATSPI_ROLE_EXTENDED;
     }
   return spi_role;
 }
index 3b27292..5f283bc 100644 (file)
@@ -57,7 +57,7 @@ spi_object_append_interfaces (DBusMessageIter * iter, AtkObject * obj);
 void
 spi_object_append_attribute_set (DBusMessageIter * iter, AtkAttributeSet * attr);
 
-Accessibility_Role
+AtspiRole
 spi_accessible_role_from_atk_role (AtkRole role);
 
 #endif /* ACCESSIBLE_OBJECT_H */
similarity index 100%
rename from common/spi-dbus.c
rename to atk-adaptor/spi-dbus.c
similarity index 62%
rename from common/spi-dbus.h
rename to atk-adaptor/spi-dbus.h
index 1c10211..61a43be 100644 (file)
@@ -25,7 +25,7 @@
 #define SPI_DBUS_H_
 
 #include <glib.h>
-#include <common/spi-types.h>
+#include <atspi/atspi.h>
 
 #define DBG(a,b) if(_dbg>=(a))b
 
@@ -38,38 +38,14 @@ extern int _dbg;
 #define SPI_DBUS_PATH_NULL "/org/a11y/atspi/null"
 #define SPI_DBUS_PATH_ROOT "/org/a11y/atspi/accessible/root"
 
-#define SPI_DBUS_PATH_DEC "/org/a11y/atspi/registry/deviceeventcontroller"
-#define SPI_DBUS_INTERFACE_DEC "org.a11y.atspi.DeviceEventController"
-#define SPI_DBUS_INTERFACE_DEVICE_EVENT_LISTENER "org.a11y.atspi.DeviceEventListener"
-
-#define SPI_DBUS_INTERFACE_CACHE "org.a11y.atspi.Cache"
-#define SPI_DBUS_INTERFACE_ACCESSIBLE "org.a11y.atspi.Accessible"
-#define SPI_DBUS_INTERFACE_ACTION "org.a11y.atspi.Action"
-#define SPI_DBUS_INTERFACE_APPLICATION "org.a11y.atspi.Application"
-#define SPI_DBUS_INTERFACE_COLLECTION "org.a11y.atspi.Collection"
-#define SPI_DBUS_INTERFACE_COMPONENT "org.a11y.atspi.Component"
-#define SPI_DBUS_INTERFACE_DESKTOP "org.a11y.atspi.Desktop"
-#define SPI_DBUS_INTERFACE_DOCUMENT "org.a11y.atspi.Document"
-#define SPI_DBUS_INTERFACE_EDITABLE_TEXT "org.a11y.atspi.EditableText"
-#define SPI_DBUS_INTERFACE_EVENT_KEYBOARD "org.a11y.atspi.Event.Keyboard"
-#define SPI_DBUS_INTERFACE_EVENT_MOUSE "org.a11y.atspi.Event.Mouse"
-#define SPI_DBUS_INTERFACE_HYPERLINK "org.a11y.atspi.Hyperlink"
-#define SPI_DBUS_INTERFACE_HYPERTEXT "org.a11y.atspi.Hypertext"
-#define SPI_DBUS_INTERFACE_IMAGE "org.a11y.atspi.Image"
-#define SPI_DBUS_INTERFACE_SELECTION "org.a11y.atspi.Selection"
-#define SPI_DBUS_INTERFACE_TABLE "org.a11y.atspi.Table"
-#define SPI_DBUS_INTERFACE_TEXT "org.a11y.atspi.Text"
-#define SPI_DBUS_INTERFACE_VALUE "org.a11y.atspi.Value"
-#define SPI_DBUS_INTERFACE_SOCKET "org.a11y.atspi.Socket"
-
 DBusMessage *spi_dbus_general_error(DBusMessage *message);
 DBusMessage *spi_dbus_return_rect(DBusMessage *message, gint ix, gint iy, gint iwidth, gint iheight);
 
 void spi_dbus_emit_valist(DBusConnection *bus, const char *path, const char *interface, const char *name, int first_arg_type, va_list args);
 dbus_bool_t spi_dbus_message_iter_get_struct(DBusMessageIter *iter, ...);
 dbus_bool_t spi_dbus_message_iter_append_struct(DBusMessageIter *iter, ...);
-dbus_bool_t spi_dbus_marshal_deviceEvent(DBusMessage *message, const Accessibility_DeviceEvent *e);
-dbus_bool_t spi_dbus_demarshal_deviceEvent(DBusMessage *message, Accessibility_DeviceEvent *e);
+dbus_bool_t spi_dbus_marshal_deviceEvent(DBusMessage *message, const AtspiDeviceEvent *e);
+dbus_bool_t spi_dbus_demarshal_deviceEvent(DBusMessage *message, AtspiDeviceEvent *e);
 dbus_bool_t spi_dbus_get_simple_property (DBusConnection *bus, const char *dest, const char *path, const char *interface, const char *prop, int *type, void *ptr, DBusError *error);
 void spi_dbus_emit_signal(DBusConnection *bus, const char *path, const char *klass, const char *major, const char *minor, dbus_int32_t detail1, dbus_int32_t detail2, const char *type, const void *val);
 /*
diff --git a/common/Makefile.am b/common/Makefile.am
deleted file mode 100644 (file)
index 2732a3d..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-noinst_LTLIBRARIES = libspicommon.la
-
-libspicommon_la_CFLAGS = $(DBUS_CFLAGS)\
-                       $(ATK_CFLAGS) \
-                       -DATSPI_INTROSPECTION_PATH=\"$(DEFAULT_ATSPI_INTROSPECTION_PATH)\"\
-                       -I$(top_builddir)\
-                       -I$(top_srcdir)
-
-libspicommon_la_LIBADD = $(DBUS_LIBS)
-
-libspicommon_la_SOURCES =      \
-       bitarray.h              \
-        keymasks.h              \
-        generated-types.h       \
-       event-types.h           \
-       spi-types.h             \
-       spi-dbus.h              \
-       spi-dbus.c              \
-       spi-stateset.h          \
-       spi-stateset.c
-
-#BUILT_SOURCES = generated-types.h
-#CLEANFILES = generated-types.h
-
-#generated-types.h: $(top_srcdir)/xml/spec.xml $(top_srcdir)/tools/c-constants-generator.xsl
-#      xsltproc --stringparam mixed-case-prefix Accessibility_ $(top_srcdir)/tools/c-constants-generator.xsl $< >$@
diff --git a/common/event-types.h b/common/event-types.h
deleted file mode 100644 (file)
index ac0c059..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * 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.
- */
-
-#ifndef EVENT_TYPES_H_
-#define EVENT_TYPES_H_
-
-#include <dbus/dbus.h>
-
-typedef unsigned long Accessibility_ControllerEventMask;
-
-// TODO: auto-generate the below structs
-typedef struct _Accessibility_DeviceEvent Accessibility_DeviceEvent;
-struct _Accessibility_DeviceEvent
-{
-  Accessibility_EventType type;
-  dbus_uint32_t id;
-  dbus_uint16_t hw_code;
-  dbus_uint16_t modifiers;
-  dbus_uint32_t timestamp;
-  char * event_string;
-  dbus_bool_t is_text;
-};
-
-typedef struct _Accessibility_EventListenerMode Accessibility_EventListenerMode;
-struct _Accessibility_EventListenerMode
-{
-  dbus_bool_t synchronous;
-  dbus_bool_t preemptive;
-  dbus_bool_t global;
-};
-
-typedef struct _Accessibility_KeyDefinition Accessibility_KeyDefinition;
-struct _Accessibility_KeyDefinition
-{
-  dbus_int32_t keycode;
-  dbus_int32_t keysym;
-  char *keystring;
-  dbus_int32_t unused;
-};
-
-#endif /* EVENT_TYPES_H_ */
diff --git a/common/generated-types.h b/common/generated-types.h
deleted file mode 100644 (file)
index 28738dc..0000000
+++ /dev/null
@@ -1,792 +0,0 @@
-/* Generated from , version 1.24.0
-
-
-
- !\mainpage AT-SPI Interfaces and Subinterfaces
-
-  This is the main documentation page for the 
-  Assistive Technology Service Provider Interface (AT-SPI). 
-  
-  \section apps Applications and Interface Components
-  Namespace Accessibility includes service APIs implemented by
-  participating applications and their user interface components:\n\n
-  Accessibility::Accessible\n 
-  Accessibility::Application\n
-  Accessibility::Desktop\n
-  Accessibility::Collecgtion\n
-  Accessibility::Component\n
-  Accessibility::Hypertext\n
-  Accessibility::Image\n
-  Accessibility::Selection\n
-  Accessibility::Table\n
-  Accessibility::Text\n
-  Accessibility::EditableText\n
-  Accessibility::Value
-  \section types Enumerated Types
-  Accessibility defines a number of key enumerated types, including:\n\n
-  Accessibility::RelationType\n
-  Accessibility::Role\n
-  Accessibility::StateType\n
-  Accessibility::Event\n
-  Accessibility::EventDetails \n
-  \section Registry
-  Accessibility also includes Accessibility::Registry,
-  which is the service used by assistive technologies and related
-  AT-SPI clients to register interest in certain classes of events,
-  enumerate the currently available desktop and application list,
-  and to synthesize certain kinds of device events.
-  \section listeners Event Listener Interfaces
-  Accessibility::EventListener\n
-  Accessibility::DeviceEventListener
-  \section helpers Helper Interfaces
-  The following interfaces may be implemented by assistive technologies 
-  themselves, in order to export their services in a consistent manner or
-  in order to interoperate with other applications or desktop services.\n
-  Accessibility::LoginHelper : Implemented by adaptive technologies which 
-  need to participate in user-authentication or login activities, and which
-  therefore may need negotiation with authentication agents or processes.\n
-  Accessibility::Selector [NEW]: Implemented by user agents or assistive 
-  technologies which export lists of choices from which the end-user is 
-  expected to make selections.  Useful for various types of remote
-  activation or intercommunication between multiple ATs.
-
- */
-
-#ifndef _ACCESSIBILITY_H_
-#define _ACCESSIBILITY_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- *
-Accessibility_LOCALE_TYPE:
- * @Accessibility_LOCALE_TYPE_MESSAGES: <![CDATA[]]>
- * @Accessibility_LOCALE_TYPE_COLLATE: <![CDATA[]]>
- * @Accessibility_LOCALE_TYPE_CTYPE: <![CDATA[]]>
- * @Accessibility_LOCALE_TYPE_MONETARY: <![CDATA[]]>
- * @Accessibility_LOCALE_TYPE_NUMERIC: <![CDATA[]]>
- * @Accessibility_LOCALE_TYPE_TIME: <![CDATA[]]>
- *
- * <![CDATA[   Used by Text and Document interfaces these correspond to the POSIX 'setlocale' enum values.    ]]>
- *
- * Bitfield/set of flags generated from the AT-SPI specification.
- */
-typedef enum {
-    Accessibility_LOCALE_TYPE_MESSAGES,
-    Accessibility_LOCALE_TYPE_COLLATE,
-    Accessibility_LOCALE_TYPE_CTYPE,
-    Accessibility_LOCALE_TYPE_MONETARY,
-    Accessibility_LOCALE_TYPE_NUMERIC,
-    Accessibility_LOCALE_TYPE_TIME,
-} Accessibility_LOCALE_TYPE;
-
-/**
- * NUM_ACCESSIBILITY_LOCALE_TYPES:
- *
- * 1 higher than the highest valid value of #Accessibility_LOCALE_TYPE.
- */
-#define NUM_ACCESSIBILITY_LOCALE_TYPES (5+1)
-
-/**
- *
-Accessibility_COORD_TYPE:
- * @Accessibility_COORD_TYPE_SCREEN: <![CDATA[]]>
- * @Accessibility_COORD_TYPE_WINDOW: <![CDATA[]]>
- *
- * <![CDATA[   Used by Component, Image, and Text interfaces to specify whether coordinates are relative to the window or the screen.   ]]>
- *
- * Bitfield/set of flags generated from the AT-SPI specification.
- */
-typedef enum {
-    Accessibility_COORD_TYPE_SCREEN,
-    Accessibility_COORD_TYPE_WINDOW,
-} Accessibility_COORD_TYPE;
-
-/**
- * NUM_ACCESSIBILITY_COORD_TYPES:
- *
- * 1 higher than the highest valid value of #Accessibility_COORD_TYPE.
- */
-#define NUM_ACCESSIBILITY_COORD_TYPES (1+1)
-
-/**
- *
-Accessibility_Collection_SortOrder:
- * @Accessibility_Collection_SORT_ORDER_INVALID: <![CDATA[]]>
- * @Accessibility_Collection_SORT_ORDER_CANONICAL: <![CDATA[]]>
- * @Accessibility_Collection_SORT_ORDER_FLOW: <![CDATA[]]>
- * @Accessibility_Collection_SORT_ORDER_TAB: <![CDATA[]]>
- * @Accessibility_Collection_SORT_ORDER_REVERSE_CANONICAL: <![CDATA[]]>
- * @Accessibility_Collection_SORT_ORDER_REVERSE_FLOW: <![CDATA[]]>
- * @Accessibility_Collection_SORT_ORDER_REVERSE_TAB: <![CDATA[]]>
- * @Accessibility_Collection_SORT_ORDER_LAST_DEFINED: <![CDATA[]]>
- *
- * Bitfield/set of flags generated from the AT-SPI specification.
- */
-typedef enum {
-    Accessibility_Collection_SORT_ORDER_INVALID,
-    Accessibility_Collection_SORT_ORDER_CANONICAL,
-    Accessibility_Collection_SORT_ORDER_FLOW,
-    Accessibility_Collection_SORT_ORDER_TAB,
-    Accessibility_Collection_SORT_ORDER_REVERSE_CANONICAL,
-    Accessibility_Collection_SORT_ORDER_REVERSE_FLOW,
-    Accessibility_Collection_SORT_ORDER_REVERSE_TAB,
-    Accessibility_Collection_SORT_ORDER_LAST_DEFINED,
-} Accessibility_Collection_SortOrder;
-
-/**
- * NUM_ACCESSIBILITY_SORTORDERS:
- *
- * 1 higher than the highest valid value of #Accessibility_Collection_SortOrder.
- */
-#define NUM_ACCESSIBILITY_SORTORDERS (7+1)
-
-/**
- *
-Accessibility_Collection_MatchType:
- * @Accessibility_Collection_MATCH_INVALID: <![CDATA[]]>
- * @Accessibility_Collection_MATCH_ALL: <![CDATA[]]>
- * @Accessibility_Collection_MATCH_ANY: <![CDATA[]]>
- * @Accessibility_Collection_MATCH_NONE: <![CDATA[]]>
- * @Accessibility_Collection_MATCH_EMPTY: <![CDATA[]]>
- * @Accessibility_Collection_MATCH_LAST_DEFINED: <![CDATA[]]>
- *
- * Bitfield/set of flags generated from the AT-SPI specification.
- */
-typedef enum {
-    Accessibility_Collection_MATCH_INVALID,
-    Accessibility_Collection_MATCH_ALL,
-    Accessibility_Collection_MATCH_ANY,
-    Accessibility_Collection_MATCH_NONE,
-    Accessibility_Collection_MATCH_EMPTY,
-    Accessibility_Collection_MATCH_LAST_DEFINED,
-} Accessibility_Collection_MatchType;
-
-/**
- * NUM_ACCESSIBILITY_MATCHTYPES:
- *
- * 1 higher than the highest valid value of #Accessibility_Collection_MatchType.
- */
-#define NUM_ACCESSIBILITY_MATCHTYPES (5+1)
-
-/**
- *
-Accessibility_Collection_TreeTraversalType:
- * @Accessibility_Collection_TREE_RESTRICT_CHILDREN: <![CDATA[]]>
- * @Accessibility_Collection_TREE_RESTRICT_SIBLING: <![CDATA[]]>
- * @Accessibility_Collection_TREE_INORDER: <![CDATA[]]>
- * @Accessibility_Collection_TREE_LAST_DEFINED: <![CDATA[]]>
- *
- * Bitfield/set of flags generated from the AT-SPI specification.
- */
-typedef enum {
-    Accessibility_Collection_TREE_RESTRICT_CHILDREN,
-    Accessibility_Collection_TREE_RESTRICT_SIBLING,
-    Accessibility_Collection_TREE_INORDER,
-    Accessibility_Collection_TREE_LAST_DEFINED,
-} Accessibility_Collection_TreeTraversalType;
-
-/**
- * NUM_ACCESSIBILITY_TREETRAVERSALTYPES:
- *
- * 1 higher than the highest valid value of #Accessibility_Collection_TreeTraversalType.
- */
-#define NUM_ACCESSIBILITY_TREETRAVERSALTYPES (3+1)
-
-/**
- *
-Accessibility_ComponentLayer:
- * @Accessibility_LAYER_INVALID: <![CDATA[     Indicates an error condition or uninitialized value.    ]]>
- * @Accessibility_LAYER_BACKGROUND: <![CDATA[     The bottom-most layer, over which everything else is painted.        The 'desktop background' is generally in this layer.    ]]>
- * @Accessibility_LAYER_CANVAS: <![CDATA[     The 'background' layer for most content renderers and UI Component        containers.    ]]>
- * @Accessibility_LAYER_WIDGET: <![CDATA[     The layer in which the majority of ordinary 'foreground' widgets reside.   ]]>
- * @Accessibility_LAYER_MDI: <![CDATA[     A special layer between LAYER_CANVAS and LAYER_WIDGET, in which the       'pseudo windows' (e.g. the MDI frames) reside.        (See Component.GetMDIZOrder)    ]]>
- * @Accessibility_LAYER_POPUP: <![CDATA[     A layer for popup window content, above LAYER_WIDGET.    ]]>
- * @Accessibility_LAYER_OVERLAY: <![CDATA[     The topmost layer.    ]]>
- * @Accessibility_LAYER_WINDOW: <![CDATA[     The layer in which a toplevel window background usually resides.    ]]>
- * @Accessibility_LAYER_LAST_DEFINED: <![CDATA[     Used only to determine the end of the enumeration.    ]]>
- *
- * <![CDATA[     The ComponentLayer of a Component instance indicates its relative stacking order       with respect to the onscreen visual representation of the UI.       ComponentLayer, in combination with Component bounds information, can be used       to compute the visibility of all or part of a component.  This is important in       programmatic determination of region-of-interest for magnification, and in       &#168;flat screen review&#168; models of the screen, as well as for other uses.       Objects residing in two of the ComponentLayer categories support       further z-ordering information, with respect to their peers in the same layer:       namely, LAYER_WINDOW and LAYER_MDI.  Relative stacking order for other objects within       the same layer is not available; the recommended heuristic is &#168;first child paints first&#168;,        in other words, assume that the first siblings in the child list are subject to being       overpainted by later siblings if their bounds intersect.        The order of layers, from bottom to top, is:                        LAYER_BACKGROUND                LAYER_WINDOW            LAYER_MDI               LAYER_CANVAS            LAYER_WIDGET            LAYER_POPUP             LAYER_OVERLAY               ]]>
- *
- * Bitfield/set of flags generated from the AT-SPI specification.
- */
-typedef enum {
-    Accessibility_LAYER_INVALID,
-    Accessibility_LAYER_BACKGROUND,
-    Accessibility_LAYER_CANVAS,
-    Accessibility_LAYER_WIDGET,
-    Accessibility_LAYER_MDI,
-    Accessibility_LAYER_POPUP,
-    Accessibility_LAYER_OVERLAY,
-    Accessibility_LAYER_WINDOW,
-    Accessibility_LAYER_LAST_DEFINED,
-} Accessibility_ComponentLayer;
-
-/**
- * NUM_ACCESSIBILITY_COMPONENTLAYERS:
- *
- * 1 higher than the highest valid value of #Accessibility_ComponentLayer.
- */
-#define NUM_ACCESSIBILITY_COMPONENTLAYERS (8+1)
-
-/**
- *
-Accessibility_TEXT_BOUNDARY_TYPE:
- * @Accessibility_TEXT_BOUNDARY_CHAR: <![CDATA[     Text is bounded by this character only.        Start and end offsets differ by one, by definition, for this value.    ]]>
- * @Accessibility_TEXT_BOUNDARY_WORD_START: <![CDATA[     Boundary condition is start of a word; i.e. range is from start of       one word to the start of another word.    ]]>
- * @Accessibility_TEXT_BOUNDARY_WORD_END: <![CDATA[     Boundary condition is the end of a word; i.e. range is from        the end of one word to the end of another.     Some locales may not distinguish between words and       characters or glyphs, in particular those locales which use       wholly or partially ideographic character sets.  In these cases,       characters may be returned in lieu of multi-character substrings.   ]]>
- * @Accessibility_TEXT_BOUNDARY_SENTENCE_START: <![CDATA[     Boundary condition is start of a sentence, as determined             by the application.       Some locales or character sets may not include explicit sentence       delimiters, so this boundary type can not always be honored.       Some locales will return lines of text instead of grammatical sentences.   ]]>
- * @Accessibility_TEXT_BOUNDARY_SENTENCE_END: <![CDATA[     Boundary condition is end of a sentence, as determined by the application,             including the sentence-delimiting character, for instance '.'       Some locales or character sets may not include explicit sentence       delimiters, so this boundary type can not always be honored.       Some locales will return lines of text instead of grammatical sentences.   ]]>
- * @Accessibility_TEXT_BOUNDARY_LINE_START: <![CDATA[      Boundary condition is the start of a line; i.e. range is        from start of one line to the start of another.  This generally        means that an end-of-line character will appear at the end of the range.    ]]>
- * @Accessibility_TEXT_BOUNDARY_LINE_END: <![CDATA[      Boundary condition is the end of a line; i.e. range is       from start of one line to the start of another.  This generally        means that an end-of-line character will be the first character of the range.    ]]>
- *
- * <![CDATA[     Specifies the boundary conditions determining a run of text as returned from       GetTextAtOffset, GetTextAfterOffset, and GetTextBeforeOffset.   ]]>
- *
- * Bitfield/set of flags generated from the AT-SPI specification.
- */
-typedef enum {
-    Accessibility_TEXT_BOUNDARY_CHAR,
-    Accessibility_TEXT_BOUNDARY_WORD_START,
-    Accessibility_TEXT_BOUNDARY_WORD_END,
-    Accessibility_TEXT_BOUNDARY_SENTENCE_START,
-    Accessibility_TEXT_BOUNDARY_SENTENCE_END,
-    Accessibility_TEXT_BOUNDARY_LINE_START,
-    Accessibility_TEXT_BOUNDARY_LINE_END,
-} Accessibility_TEXT_BOUNDARY_TYPE;
-
-/**
- * NUM_ACCESSIBILITY_TEXT_BOUNDARY_TYPES:
- *
- * 1 higher than the highest valid value of #Accessibility_TEXT_BOUNDARY_TYPE.
- */
-#define NUM_ACCESSIBILITY_TEXT_BOUNDARY_TYPES (6+1)
-
-/**
- *
-Accessibility_TEXT_CLIP_TYPE:
- * @Accessibility_TEXT_CLIP_NONE: <![CDATA[]]>
- * @Accessibility_TEXT_CLIP_MIN: <![CDATA[     Characters/glyphs clipped by the minimum coordinate are omitted    ]]>
- * @Accessibility_TEXT_CLIP_MAX: <![CDATA[     Characters/glyphs which intersect the maximum coordinate are omitted    ]]>
- * @Accessibility_TEXT_CLIP_BOTH: <![CDATA[     Only glyphs falling entirely within the region bounded by min and max are retained.    ]]>
- *
- * <![CDATA[     TEXT_CLIP_TYPE:       CLIP_MIN means text clipped by min coordinate is omitted,       CLIP_MAX clips text interescted by the max coord, and CLIP_BOTH       will retain only text falling fully within the min/max bounds.     ]]>
- *
- * Bitfield/set of flags generated from the AT-SPI specification.
- */
-typedef enum {
-    Accessibility_TEXT_CLIP_NONE,
-    Accessibility_TEXT_CLIP_MIN,
-    Accessibility_TEXT_CLIP_MAX,
-    Accessibility_TEXT_CLIP_BOTH,
-} Accessibility_TEXT_CLIP_TYPE;
-
-/**
- * NUM_ACCESSIBILITY_TEXT_CLIP_TYPES:
- *
- * 1 higher than the highest valid value of #Accessibility_TEXT_CLIP_TYPE.
- */
-#define NUM_ACCESSIBILITY_TEXT_CLIP_TYPES (3+1)
-
-/**
- *
-Accessibility_StateType:
- * @Accessibility_STATE_INVALID: <![CDATA[]]>
- * @Accessibility_STATE_ACTIVE: <![CDATA[     Indicates a window is currently the active window, or is an active subelement within a container or table    ]]>
- * @Accessibility_STATE_ARMED: <![CDATA[     Indicates that the object is armed    ]]>
- * @Accessibility_STATE_BUSY: <![CDATA[     Indicates the current object is busy, i.e. onscreen representation is in the process of changing, or       the object is temporarily unavailable for interaction due to activity already in progress.   ]]>
- * @Accessibility_STATE_CHECKED: <![CDATA[     Indicates this object is currently checked    ]]>
- * @Accessibility_STATE_COLLAPSED: <![CDATA[     Indicates this object is collapsed    ]]>
- * @Accessibility_STATE_DEFUNCT: <![CDATA[     Indicates that this object no longer has a valid backing widget        (for instance, if its peer object has been destroyed)    ]]>
- * @Accessibility_STATE_EDITABLE: <![CDATA[     Indicates the user can change the contents of this object    ]]>
- * @Accessibility_STATE_ENABLED: <![CDATA[     Indicates that this object is enabled, i.e. that it currently reflects some application state.        Objects that are "greyed out" may lack this state, and may lack the STATE_SENSITIVE if direct user       interaction cannot cause them to acquire STATE_ENABLED.  @see STATE_SENSITIVE.   ]]>
- * @Accessibility_STATE_EXPANDABLE: <![CDATA[     Indicates this object allows progressive disclosure of its children    ]]>
- * @Accessibility_STATE_EXPANDED: <![CDATA[     Indicates this object its expanded    ]]>
- * @Accessibility_STATE_FOCUSABLE: <![CDATA[     Indicates this object can accept keyboard focus, which means all       events resulting from typing on the keyboard will normally be passed       to it when it has focus   ]]>
- * @Accessibility_STATE_FOCUSED: <![CDATA[     Indicates this object currently has the keyboard focus    ]]>
- * @Accessibility_STATE_HAS_TOOLTIP: <![CDATA[     Indicates that the object has an associated tooltip    ]]>
- * @Accessibility_STATE_HORIZONTAL: <![CDATA[     Indicates the orientation of thsi object is horizontal    ]]>
- * @Accessibility_STATE_ICONIFIED: <![CDATA[     Indicates this object is minimized and is represented only by an icon    ]]>
- * @Accessibility_STATE_MODAL: <![CDATA[     Indicates something must be done with this object before the user can       interact with an object in a different window.   ]]>
- * @Accessibility_STATE_MULTI_LINE: <![CDATA[     Indicates this (text) object can contain multiple lines of text    ]]>
- * @Accessibility_STATE_MULTISELECTABLE: <![CDATA[     Indicates this object allows more than one of its children to be       selected at the same time, or in the case of text objects,        that the object supports non-contiguous text selections.   ]]>
- * @Accessibility_STATE_OPAQUE: <![CDATA[     Indicates this object paints every pixel within its rectangular region.       It also indicates an alpha value of unity, if it supports alpha blending.    ]]>
- * @Accessibility_STATE_PRESSED: <![CDATA[     Indicates this object is currently pressed    ]]>
- * @Accessibility_STATE_RESIZABLE: <![CDATA[     Indicates the size of this object's size is not fixed    ]]>
- * @Accessibility_STATE_SELECTABLE: <![CDATA[     Indicates this object is the child of an object that allows its       children to be selected and that this child is one of those children       that can be selected.   ]]>
- * @Accessibility_STATE_SELECTED: <![CDATA[     Indicates this object is the child of an object that allows its       children to be selected and that this child is one of those children       that has been selected.   ]]>
- * @Accessibility_STATE_SENSITIVE: <![CDATA[     Indicates this object is sensitive, e.g. to user interaction.        STATE_SENSITIVE usually accompanies STATE_ENABLED for user-actionable controls,       but may be found in the absence of STATE_ENABLED if the current visible state of the        control is "disconnected" from the application state.  In such cases, direct user interaction       can often result in the object gaining STATE_SENSITIVE, for instance if a user makes        an explicit selection using an object whose current state is ambiguous or undefined.       @see STATE_ENABLED, STATE_INDETERMINATE.    ]]>
- * @Accessibility_STATE_SHOWING: <![CDATA[     Indicates this object, the object's parent, the object's parent's       parent, and so on, are all 'shown' to the end-user, i.e.       subject to "exposure" if blocking or obscuring objects do not interpose       between this object and the top of the window stack.   ]]>
- * @Accessibility_STATE_SINGLE_LINE: <![CDATA[     Indicates this (text) object can contain only a single line of text    ]]>
- * @Accessibility_STATE_STALE: <![CDATA[     Indicates that the information returned for this object may no longer be       synchronized with the application state.  This can occur if the object has STATE_TRANSIENT,       and can also occur towards the end of the object peer's lifecycle.    ]]>
- * @Accessibility_STATE_TRANSIENT: <![CDATA[     Indicates this object is transient    ]]>
- * @Accessibility_STATE_VERTICAL: <![CDATA[     Indicates the orientation of this object is vertical; for example this state may appear on        such objects as scrollbars, text objects (with vertical text flow), separators, etc.   ]]>
- * @Accessibility_STATE_VISIBLE: <![CDATA[       Indicates this object is visible, e.g. has been explicitly marked for exposure to the user.     STATE_VISIBLE is no guarantee that the object is actually unobscured on the screen, only       that it is 'potentially' visible, barring obstruction, being scrolled or clipped out of the        field of view, or having an ancestor container that has not yet made visible.       A widget is potentially onscreen if it has both STATE_VISIBLE and STATE_SHOWING.       The absence of STATE_VISIBLE and STATE_SHOWING is semantically equivalent to saying        that an object is 'hidden'.   ]]>
- * @Accessibility_STATE_MANAGES_DESCENDANTS: <![CDATA[     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.  The presence of STATE_MANAGES_DESCENDANTS is an indication to the client.       that the children should not, and need not, be enumerated by the client.       Objects implementing this state are expected to provide relevant state       notifications to listening clients, for instance notifications of visibility       changes and activation of their contained child objects, without the client        having previously requested references to those children.   ]]>
- * @Accessibility_STATE_INDETERMINATE: <![CDATA[     Indicates that a check box or other boolean indicator is in a state other than        checked or not checked.  This usually means that the boolean value reflected or        controlled by the object does not apply consistently to the entire current context.       For example, a checkbox for the "Bold" attribute of text may have STATE_INDETERMINATE       if the currently selected text contains a mixture of weight attributes.         In many cases interacting with a STATE_INDETERMINATE object will cause        the context's corresponding boolean attribute to be homogenized, whereupon the object       will lose STATE_INDETERMINATE and a corresponding state-changed event will be fired.   ]]>
- * @Accessibility_STATE_REQUIRED: <![CDATA[     Indicates that user interaction with this object is 'required' from the user,        for instance before completing the processing of a form.   ]]>
- * @Accessibility_STATE_TRUNCATED: <![CDATA[     Indicates that an object's onscreen content is truncated, e.g. a text value in a spreadsheet cell.    ]]>
- * @Accessibility_STATE_ANIMATED: <![CDATA[     Indicates this object's visual representation is dynamic, not static.       This state may be applied to an object during an animated 'effect' and        be removed from the object once its visual representation becomes static.     some applications, notably content viewers, may not be able to detect       all kinds of animated content.  Therefore the absence of this state should not       be taken as definitive evidence that the object's visual representation is       static; this state is advisory.   ]]>
- * @Accessibility_STATE_INVALID_ENTRY: <![CDATA[     This object has indicated an error condition due to failure of input       validation.  For instance, a form control may acquire this state in response       to invalid or malformed user input.     ]]>
- * @Accessibility_STATE_SUPPORTS_AUTOCOMPLETION: <![CDATA[     This state indicates that the object in question implements some form of &#168;typeahead&#168; or        pre-selection behavior whereby entering the first character of one or more sub-elements       causes those elements to scroll into view or become selected.  Subsequent character input       may narrow the selection further as long as one or more sub-elements match the string.       This state is normally only useful and encountered on objects that implement Selection.       In some cases the typeahead behavior may result in full or partial &#168;completion&#168; of        the data in the input field, in which case these input events may trigger text-changed       events from the source.     ]]>
- * @Accessibility_STATE_SELECTABLE_TEXT: <![CDATA[     This state indicates that the object in question supports text selection.        It should only be exposed on objects which implement the Text interface,        in order to distinguish this state from STATE_SELECTABLE, which infers that       the object in question is a selectable child of an object which implements       Selection.  While similar, text selection and subelement selection are       distinct operations.     ]]>
- * @Accessibility_STATE_IS_DEFAULT: <![CDATA[     This state indicates that the object in question is the 'default' interaction object        in a dialog, i.e. the one that gets activated if the user presses "Enter" when the       dialog is initially posted.     ]]>
- * @Accessibility_STATE_VISITED: <![CDATA[     This state indicates that the object (typically a hyperlink)       has already been activated or invoked, with the result that some backing data       has been downloaded or rendered.     ]]>
- * @Accessibility_STATE_LAST_DEFINED: <![CDATA[     This value of the enumeration should not be used as a parameter, it indicates the number of       items in the StateType enumeration.   ]]>
- *
- * Bitfield/set of flags generated from the AT-SPI specification.
- */
-typedef enum {
-    Accessibility_STATE_INVALID,
-    Accessibility_STATE_ACTIVE,
-    Accessibility_STATE_ARMED,
-    Accessibility_STATE_BUSY,
-    Accessibility_STATE_CHECKED,
-    Accessibility_STATE_COLLAPSED,
-    Accessibility_STATE_DEFUNCT,
-    Accessibility_STATE_EDITABLE,
-    Accessibility_STATE_ENABLED,
-    Accessibility_STATE_EXPANDABLE,
-    Accessibility_STATE_EXPANDED,
-    Accessibility_STATE_FOCUSABLE,
-    Accessibility_STATE_FOCUSED,
-    Accessibility_STATE_HAS_TOOLTIP,
-    Accessibility_STATE_HORIZONTAL,
-    Accessibility_STATE_ICONIFIED,
-    Accessibility_STATE_MODAL,
-    Accessibility_STATE_MULTI_LINE,
-    Accessibility_STATE_MULTISELECTABLE,
-    Accessibility_STATE_OPAQUE,
-    Accessibility_STATE_PRESSED,
-    Accessibility_STATE_RESIZABLE,
-    Accessibility_STATE_SELECTABLE,
-    Accessibility_STATE_SELECTED,
-    Accessibility_STATE_SENSITIVE,
-    Accessibility_STATE_SHOWING,
-    Accessibility_STATE_SINGLE_LINE,
-    Accessibility_STATE_STALE,
-    Accessibility_STATE_TRANSIENT,
-    Accessibility_STATE_VERTICAL,
-    Accessibility_STATE_VISIBLE,
-    Accessibility_STATE_MANAGES_DESCENDANTS,
-    Accessibility_STATE_INDETERMINATE,
-    Accessibility_STATE_REQUIRED,
-    Accessibility_STATE_TRUNCATED,
-    Accessibility_STATE_ANIMATED,
-    Accessibility_STATE_INVALID_ENTRY,
-    Accessibility_STATE_SUPPORTS_AUTOCOMPLETION,
-    Accessibility_STATE_SELECTABLE_TEXT,
-    Accessibility_STATE_IS_DEFAULT,
-    Accessibility_STATE_VISITED,
-    Accessibility_STATE_LAST_DEFINED,
-} Accessibility_StateType;
-
-/**
- * NUM_ACCESSIBILITY_STATETYPES:
- *
- * 1 higher than the highest valid value of #Accessibility_StateType.
- */
-#define NUM_ACCESSIBILITY_STATETYPES (41+1)
-
-/**
- *
-Accessibility_KeyEventType:
- * @Accessibility_KEY_PRESSED: <![CDATA[]]>
- * @Accessibility_KEY_RELEASED: <![CDATA[]]>
- *
- * <![CDATA[     Deprecated, DO NOT USE!    ]]>
- *
- * Bitfield/set of flags generated from the AT-SPI specification.
- */
-typedef enum {
-    Accessibility_KEY_PRESSED,
-    Accessibility_KEY_RELEASED,
-} Accessibility_KeyEventType;
-
-/**
- * NUM_ACCESSIBILITY_KEYEVENTTYPES:
- *
- * 1 higher than the highest valid value of #Accessibility_KeyEventType.
- */
-#define NUM_ACCESSIBILITY_KEYEVENTTYPES (1+1)
-
-/**
- *
-Accessibility_EventType:
- * @Accessibility_KEY_PRESSED_EVENT: <![CDATA[     < key on a keyboard device was pressed.    ]]>
- * @Accessibility_KEY_RELEASED_EVENT: <![CDATA[     < key on a keyboard device was released.    ]]>
- * @Accessibility_BUTTON_PRESSED_EVENT: <![CDATA[     < button on a non-keyboard human interface device        (HID) was pressed    ]]>
- * @Accessibility_BUTTON_RELEASED_EVENT: <![CDATA[     < button on a non-keyboard human interface device        (HID) was pressed    ]]>
- *
- * <![CDATA[     Used to specify the event types of interest to an EventListener, or       to identify the type of an event for which notification has been sent.        @see EventTypeSeq, DeviceEvent::type   ]]>
- *
- * Bitfield/set of flags generated from the AT-SPI specification.
- */
-typedef enum {
-    Accessibility_KEY_PRESSED_EVENT,
-    Accessibility_KEY_RELEASED_EVENT,
-    Accessibility_BUTTON_PRESSED_EVENT,
-    Accessibility_BUTTON_RELEASED_EVENT,
-} Accessibility_EventType;
-
-/**
- * NUM_ACCESSIBILITY_EVENTTYPES:
- *
- * 1 higher than the highest valid value of #Accessibility_EventType.
- */
-#define NUM_ACCESSIBILITY_EVENTTYPES (3+1)
-
-/**
- *
-Accessibility_KeySynthType:
- * @Accessibility_KEY_PRESS: <![CDATA[     emulate the pressing of a hardware keyboard key.    ]]>
- * @Accessibility_KEY_RELEASE: <![CDATA[     emulate the release of a hardware keyboard key.    ]]>
- * @Accessibility_KEY_PRESSRELEASE: <![CDATA[     a hardware keyboard key is pressed and immediately released.    ]]>
- * @Accessibility_KEY_SYM: <![CDATA[     a symbolic key event is generated, without specifying a hardware key.        @note if the keysym is not present in the current keyboard map,       the DeviceEventController instance has a limited ability to generate       such keysyms on-the-fly.  Reliability of GenerateKeyboardEvent calls       using out-of-keymap keysyms will vary from system to system, and on the       number of different out-of-keymap being generated in quick succession.       In practice this is rarely significant, since the keysyms of interest to       AT clients and keyboard emulators are usually part of the current keymap, i.e.       present on the system keyboard for the current locale (even if a physical       hardware keyboard is not connected.   ]]>
- * @Accessibility_KEY_STRING: <![CDATA[     a string is converted to its equivalent keyboard events and emitted.        If the string consists of complex character or composed characters       which are not in the current keymap, string emission is subject to the       out-of-keymap limitations described for KeySynthType::KEY_SYM.       In practice this limitation primarily effects Chinese and Japanese locales.   ]]>
- *
- * <![CDATA[     Used when synthesizing keyboard input via DeviceEventController:GenerateKeyboardEvent.   ]]>
- *
- * Bitfield/set of flags generated from the AT-SPI specification.
- */
-typedef enum {
-    Accessibility_KEY_PRESS,
-    Accessibility_KEY_RELEASE,
-    Accessibility_KEY_PRESSRELEASE,
-    Accessibility_KEY_SYM,
-    Accessibility_KEY_STRING,
-} Accessibility_KeySynthType;
-
-/**
- * NUM_ACCESSIBILITY_KEYSYNTHTYPES:
- *
- * 1 higher than the highest valid value of #Accessibility_KeySynthType.
- */
-#define NUM_ACCESSIBILITY_KEYSYNTHTYPES (4+1)
-
-/**
- *
-Accessibility_ModifierType:
- * @Accessibility_MODIFIER_SHIFT: <![CDATA[     The left or right 'Shift' key    ]]>
- * @Accessibility_MODIFIER_SHIFTLOCK: <![CDATA[     The ShiftLock or CapsLock key    ]]>
- * @Accessibility_MODIFIER_CONTROL: <![CDATA[     'Control'/'Ctrl'    ]]>
- * @Accessibility_MODIFIER_ALT: <![CDATA[     The Alt key (as opposed to AltGr)    ]]>
- * @Accessibility_MODIFIER_META: <![CDATA[     depending on the platform this may map to 'Window', 'Function', 'Meta',       'Menu', or 'NumLock'.         Such 'Meta keys' will map to one of META, META2, META3.       On X Windows platforms these META values map to        the modifier masks Mod1Mask, Mod2Mask, Mod3Mask, e.g. an event having       ModifierType::MODIFIER_META2 means that the 'Mod2Mask' bit is       set in the corresponding XEvent.   ]]>
- * @Accessibility_MODIFIER_META2: <![CDATA[]]>
- * @Accessibility_MODIFIER_META3: <![CDATA[]]>
- * @Accessibility_MODIFIER_NUMLOCK: <![CDATA[     A symbolic meta key name that is mapped by AT-SPI to the        appropriate META value, for the convenience of the client.   ]]>
- *
- * Bitfield/set of flags generated from the AT-SPI specification.
- */
-typedef enum {
-    Accessibility_MODIFIER_SHIFT,
-    Accessibility_MODIFIER_SHIFTLOCK,
-    Accessibility_MODIFIER_CONTROL,
-    Accessibility_MODIFIER_ALT,
-    Accessibility_MODIFIER_META,
-    Accessibility_MODIFIER_META2,
-    Accessibility_MODIFIER_META3,
-    Accessibility_MODIFIER_NUMLOCK,
-} Accessibility_ModifierType;
-
-/**
- * NUM_ACCESSIBILITY_MODIFIERTYPES:
- *
- * 1 higher than the highest valid value of #Accessibility_ModifierType.
- */
-#define NUM_ACCESSIBILITY_MODIFIERTYPES (7+1)
-
-/**
- *
-Accessibility_RelationType:
- * @Accessibility_RELATION_NULL: <![CDATA[     Not a meaningful relationship; clients should not normally encounter this RelationType value.    ]]>
- * @Accessibility_RELATION_LABEL_FOR: <![CDATA[     Object is a label for one or more other objects.    ]]>
- * @Accessibility_RELATION_LABELLED_BY: <![CDATA[     Object is labelled by one or more other objects.    ]]>
- * @Accessibility_RELATION_CONTROLLER_FOR: <![CDATA[     Object is an interactive object which modifies the state, onscreen location, or other attributes       of one or more target objects.    ]]>
- * @Accessibility_RELATION_CONTROLLED_BY: <![CDATA[     Object state, position, etc. is modified/controlled by user interaction with one or        more other objects.   For instance a viewport or scroll pane may be CONTROLLED_BY scrollbars.    ]]>
- * @Accessibility_RELATION_MEMBER_OF: <![CDATA[     Object has a grouping relationship (e.g. 'same group as') to one or more other objects.     ]]>
- * @Accessibility_RELATION_TOOLTIP_FOR: <![CDATA[     Object is a tooltip associated with another object.    ]]>
- * @Accessibility_RELATION_NODE_CHILD_OF: <![CDATA[     Object is a child of the target.   ]]>
- * @Accessibility_RELATION_NODE_PARENT_OF: <![CDATA[     Object is a parent of the target.   ]]>
- * @Accessibility_RELATION_EXTENDED: <![CDATA[     Used to indicate that a relationship exists, but its type is not specified in the enumeration       and must be obtained via a call to getRelationTypeName.     ]]>
- * @Accessibility_RELATION_FLOWS_TO: <![CDATA[     Object renders content which flows logically to another object.         For instance, text in a paragraph may flow to another object which is not the        'next sibling' in the accessibility hierarchy.    ]]>
- * @Accessibility_RELATION_FLOWS_FROM: <![CDATA[     Reciprocal of RELATION_FLOWS_TO.    ]]>
- * @Accessibility_RELATION_SUBWINDOW_OF: <![CDATA[     Object is visually and semantically considered a subwindow of another object, even though       it is not the object's child.  Useful when dealing with embedded applications and other cases       where the widget hierarchy does not map cleanly to the onscreen presentation.     ]]>
- * @Accessibility_RELATION_EMBEDS: <![CDATA[     Similar to SUBWINDOW_OF, but specifically used for cross-process embedding.     ]]>
- * @Accessibility_RELATION_EMBEDDED_BY: <![CDATA[     Reciprocal of RELATION_EMBEDS; Used to denote content rendered by embedded renderers that       live in a separate process space from the embedding context.     ]]>
- * @Accessibility_RELATION_POPUP_FOR: <![CDATA[     Denotes that the object is a transient window or frame associated with another onscreen object.       Similar to TOOLTIP_FOR, but more general.  Useful for windows which are technically        toplevels but which, for one or more reasons, do not explicitly cause their associated       window to lose 'window focus'. Creation of a ROLE_WINDOW object with the POPUP_FOR relation       usually requires some presentation action on the part of assistive technology clients, even though       the previous toplevel ROLE_FRAME object may still be the active window.     ]]>
- * @Accessibility_RELATION_PARENT_WINDOW_OF: <![CDATA[     This is the reciprocal relation to RELATION_POPUP_FOR.    ]]>
- * @Accessibility_RELATION_DESCRIPTION_FOR: <![CDATA[     Indicates that an object provides descriptive information        about another object; more verbose than RELATION_LABEL_FOR.    ]]>
- * @Accessibility_RELATION_DESCRIBED_BY: <![CDATA[     Indicates that another object provides descriptive information        about this object; more verbose than RELATION_LABELLED_BY.    ]]>
- * @Accessibility_RELATION_LAST_DEFINED: <![CDATA[     Do not use as a parameter value, used to determine the size of the enumeration.    ]]>
- *
- * <![CDATA[     RelationType specifies a relationship between objects (possibly one-to-many or many-to-one)       outside of the normal parent/child hierarchical relationship.  It allows better semantic       identification of how objects are associated with one another.       For instance the RELATION_LABELLED_BY relationship may be used to identify labelling information       that should accompany the accessibleName property when presenting an object's content or identity       to the end user.  Similarly, RELATION_CONTROLLER_FOR can be used to further specify the context       in which a valuator is useful, and/or the other UI components which are directly effected by       user interactions with the valuator. Common examples include association of scrollbars with       the viewport or panel which they control.   ]]>
- *
- * Bitfield/set of flags generated from the AT-SPI specification.
- */
-typedef enum {
-    Accessibility_RELATION_NULL,
-    Accessibility_RELATION_LABEL_FOR,
-    Accessibility_RELATION_LABELLED_BY,
-    Accessibility_RELATION_CONTROLLER_FOR,
-    Accessibility_RELATION_CONTROLLED_BY,
-    Accessibility_RELATION_MEMBER_OF,
-    Accessibility_RELATION_TOOLTIP_FOR,
-    Accessibility_RELATION_NODE_CHILD_OF,
-    Accessibility_RELATION_NODE_PARENT_OF,
-    Accessibility_RELATION_EXTENDED,
-    Accessibility_RELATION_FLOWS_TO,
-    Accessibility_RELATION_FLOWS_FROM,
-    Accessibility_RELATION_SUBWINDOW_OF,
-    Accessibility_RELATION_EMBEDS,
-    Accessibility_RELATION_EMBEDDED_BY,
-    Accessibility_RELATION_POPUP_FOR,
-    Accessibility_RELATION_PARENT_WINDOW_OF,
-    Accessibility_RELATION_DESCRIPTION_FOR,
-    Accessibility_RELATION_DESCRIBED_BY,
-    Accessibility_RELATION_LAST_DEFINED,
-} Accessibility_RelationType;
-
-/**
- * NUM_ACCESSIBILITY_RELATIONTYPES:
- *
- * 1 higher than the highest valid value of #Accessibility_RelationType.
- */
-#define NUM_ACCESSIBILITY_RELATIONTYPES (19+1)
-
-/**
- *
-Accessibility_Role:
- * @Accessibility_ROLE_INVALID: <![CDATA[     A Role indicating an error condition, such as uninitialized Role data.    ]]>
- * @Accessibility_ROLE_ACCELERATOR_LABEL: <![CDATA[     Object is a label indicating the keyboard accelerators for the parent     ]]>
- * @Accessibility_ROLE_ALERT: <![CDATA[     Object is used to alert the user about something    ]]>
- * @Accessibility_ROLE_ANIMATION: <![CDATA[     Object contains a dynamic or moving image of some kind    ]]>
- * @Accessibility_ROLE_ARROW: <![CDATA[     Object is a 2d directional indicator    ]]>
- * @Accessibility_ROLE_CALENDAR: <![CDATA[     Object contains one or more dates, usually arranged into a 2d list    ]]>
- * @Accessibility_ROLE_CANVAS: <![CDATA[     Object that can be drawn into and is used to trap events    ]]>
- * @Accessibility_ROLE_CHECK_BOX: <![CDATA[     A choice that can be checked or unchecked and provides a separate       indicator for the current state.   ]]>
- * @Accessibility_ROLE_CHECK_MENU_ITEM: <![CDATA[     A menu item that behaves like a check box (see ROLE_CHECK_BOX)    ]]>
- * @Accessibility_ROLE_COLOR_CHOOSER: <![CDATA[     A specialized dialog that lets the user choose a color.    ]]>
- * @Accessibility_ROLE_COLUMN_HEADER: <![CDATA[     The header for a column of data    ]]>
- * @Accessibility_ROLE_COMBO_BOX: <![CDATA[     A list of choices the user can select from    ]]>
- * @Accessibility_ROLE_DATE_EDITOR: <![CDATA[     An object which allows entry of a date    ]]>
- * @Accessibility_ROLE_DESKTOP_ICON: <![CDATA[     An inconifed internal frame within a DESKTOP_PANE    ]]>
- * @Accessibility_ROLE_DESKTOP_FRAME: <![CDATA[     A pane that supports internal frames and iconified versions of those       internal frames.   ]]>
- * @Accessibility_ROLE_DIAL: <![CDATA[     An object that allows a value to be changed via rotating a visual element,       or which displays a value via such a rotating element.    ]]>
- * @Accessibility_ROLE_DIALOG: <![CDATA[     A top level window with title bar and a border    ]]>
- * @Accessibility_ROLE_DIRECTORY_PANE: <![CDATA[     A pane that allows the user to navigate through and select the contents       of a directory   ]]>
- * @Accessibility_ROLE_DRAWING_AREA: <![CDATA[     A specialized dialog that displays the files in the directory and lets       the user select a file, browse a different directory, or specify a       filename.   ]]>
- * @Accessibility_ROLE_FILE_CHOOSER: <![CDATA[     An object used for drawing custom user interface elements.   ]]>
- * @Accessibility_ROLE_FILLER: <![CDATA[     A object that fills up space in a user interface   ]]>
- * @Accessibility_ROLE_FOCUS_TRAVERSABLE: <![CDATA[     Don't use, reserved for future use.    ]]>
- * @Accessibility_ROLE_FONT_CHOOSER: <![CDATA[     Allows selection of a display font    ]]>
- * @Accessibility_ROLE_FRAME: <![CDATA[     A top level window with a title bar, border, menubar, etc.    ]]>
- * @Accessibility_ROLE_GLASS_PANE: <![CDATA[     A pane that is guaranteed to be painted on top of all panes beneath it    ]]>
- * @Accessibility_ROLE_HTML_CONTAINER: <![CDATA[     A document container for HTML, whose children       represent the document content.   ]]>
- * @Accessibility_ROLE_ICON: <![CDATA[     A small fixed size picture, typically used to decorate components    ]]>
- * @Accessibility_ROLE_IMAGE: <![CDATA[     An image, typically static.    ]]>
- * @Accessibility_ROLE_INTERNAL_FRAME: <![CDATA[     A frame-like object that is clipped by a desktop pane.    ]]>
- * @Accessibility_ROLE_LABEL: <![CDATA[     An object used to present an icon or short string in an interface    ]]>
- * @Accessibility_ROLE_LAYERED_PANE: <![CDATA[     A specialized pane that allows its children to be drawn in layers,       providing a form of stacking order.   ]]>
- * @Accessibility_ROLE_LIST: <![CDATA[     An object that presents a list of objects to the user and allows the       user to select one or more of them.   ]]>
- * @Accessibility_ROLE_LIST_ITEM: <![CDATA[     An object that represents an element of a list.    ]]>
- * @Accessibility_ROLE_MENU: <![CDATA[     An object usually found inside a menu bar that contains a list of       actions the user can choose from.   ]]>
- * @Accessibility_ROLE_MENU_BAR: <![CDATA[     An object usually drawn at the top of the primary dialog box of an       application that contains a list of menus the user can choose from.   ]]>
- * @Accessibility_ROLE_MENU_ITEM: <![CDATA[     An object usually contained in a menu that presents an action the       user can choose.   ]]>
- * @Accessibility_ROLE_OPTION_PANE: <![CDATA[     A specialized pane whose primary use is inside a DIALOG    ]]>
- * @Accessibility_ROLE_PAGE_TAB: <![CDATA[     An object that is a child of a page tab list    ]]>
- * @Accessibility_ROLE_PAGE_TAB_LIST: <![CDATA[     An object that presents a series of panels (or page tabs), one at a time,       through some mechanism provided by the object.   ]]>
- * @Accessibility_ROLE_PANEL: <![CDATA[     A generic container that is often used to group objects.    ]]>
- * @Accessibility_ROLE_PASSWORD_TEXT: <![CDATA[     A text object uses for passwords, or other places where the text       content is not shown visibly to the user.   ]]>
- * @Accessibility_ROLE_POPUP_MENU: <![CDATA[     A temporary window that is usually used to offer the user a list of       choices, and then hides when the user selects one of those choices.   ]]>
- * @Accessibility_ROLE_PROGRESS_BAR: <![CDATA[     An object used to indicate how much of a task has been completed.    ]]>
- * @Accessibility_ROLE_PUSH_BUTTON: <![CDATA[     An object the user can manipulate to tell the application to do       something.   ]]>
- * @Accessibility_ROLE_RADIO_BUTTON: <![CDATA[     A specialized check box that will cause other radio buttons in the       same group to become uncghecked when this one is checked.   ]]>
- * @Accessibility_ROLE_RADIO_MENU_ITEM: <![CDATA[     Object is both a menu item and a "radio button" (see ROLE_RADIO_BUTTON)    ]]>
- * @Accessibility_ROLE_ROOT_PANE: <![CDATA[     A specialized pane that has a glass pane and a layered pane as its       children.   ]]>
- * @Accessibility_ROLE_ROW_HEADER: <![CDATA[     The header for a row of data    ]]>
- * @Accessibility_ROLE_SCROLL_BAR: <![CDATA[     An object usually used to allow a user to incrementally view a large       amount of data by moving the bounds of a viewport along a one-dimensional axis.   ]]>
- * @Accessibility_ROLE_SCROLL_PANE: <![CDATA[     An object that allows a user to incrementally view a large amount       of information.  ROLE_SCROLL_PANE objects are usually accompanied by       ROLE_SCROLL_BAR controllers, on which the RELATION_CONTROLLER_FOR and       RELATION_CONTROLLED_BY reciprocal relations are set; \see        Accessibility::RelationSet.   ]]>
- * @Accessibility_ROLE_SEPARATOR: <![CDATA[     An object usually contained in a menu to provide a visible and       logical separation of the contents in a menu.   ]]>
- * @Accessibility_ROLE_SLIDER: <![CDATA[     An object that allows the user to select from a bounded range    ]]>
- * @Accessibility_ROLE_SPIN_BUTTON: <![CDATA[     An object which allows one of a set of choices to be selected,        and which displays the current choice.  Unlike ROLE_SCROLL_BAR,       ROLE_SLIDER objects need not control 'viewport'-like objects.   ]]>
- * @Accessibility_ROLE_SPLIT_PANE: <![CDATA[     A specialized panel that presents two other panels at the same time.    ]]>
- * @Accessibility_ROLE_STATUS_BAR: <![CDATA[     Object displays non-quantitative status information (c.f. ROLE_PROGRESS_BAR)    ]]>
- * @Accessibility_ROLE_TABLE: <![CDATA[     An object used to repesent information in terms of rows and columns.    ]]>
- * @Accessibility_ROLE_TABLE_CELL: <![CDATA[     A 'cell' or discrete child within a Table. \note Table cells need not have ROLE_TABLE_CELL,        other RoleType values are valid as well.     ]]>
- * @Accessibility_ROLE_TABLE_COLUMN_HEADER: <![CDATA[     An object which labels a particular column in a Table.    ]]>
- * @Accessibility_ROLE_TABLE_ROW_HEADER: <![CDATA[     An object which labels a particular row in a Table. Table rows and columns may also be        labelled via the RELATION_LABEL_FOR/RELATION_LABELLED_BY relationships;        see Accessibility.RelationSet.    ]]>
- * @Accessibility_ROLE_TEAROFF_MENU_ITEM: <![CDATA[     Object allows menu to be removed from menubar and shown in its own window.    ]]>
- * @Accessibility_ROLE_TERMINAL: <![CDATA[     An object that emulates a terminal    ]]>
- * @Accessibility_ROLE_TEXT: <![CDATA[     An object that presents text to the user, of nonspecific type.    ]]>
- * @Accessibility_ROLE_TOGGLE_BUTTON: <![CDATA[     A specialized push button that can be checked or unchecked, but does       not procide a separate indicator for the current state.   ]]>
- * @Accessibility_ROLE_TOOL_BAR: <![CDATA[     A bar or palette usually composed of push buttons or toggle buttons   ]]>
- * @Accessibility_ROLE_TOOL_TIP: <![CDATA[     An object that provides information about another object   ]]>
- * @Accessibility_ROLE_TREE: <![CDATA[     An object used to repsent hierarchical information to the user.    ]]>
- * @Accessibility_ROLE_TREE_TABLE: <![CDATA[     An object that presents both tabular and hierarchical info to the user    ]]>
- * @Accessibility_ROLE_UNKNOWN: <![CDATA[     The object contains some Accessible information, but its role is       not known.     ]]>
- * @Accessibility_ROLE_VIEWPORT: <![CDATA[     An object usually used in a scroll pane, or to otherwise clip a larger object or        content renderer to a specific onscreen viewport.    ]]>
- * @Accessibility_ROLE_WINDOW: <![CDATA[     A &#168;top level window&#168; with no title or border.    ]]>
- * @Accessibility_ROLE_EXTENDED: <![CDATA[     means that the role for this item is known, but not included in the        core enumeration    ]]>
- * @Accessibility_ROLE_HEADER: <![CDATA[     An object that serves as a document header.    ]]>
- * @Accessibility_ROLE_FOOTER: <![CDATA[     An object that serves as a document footer.    ]]>
- * @Accessibility_ROLE_PARAGRAPH: <![CDATA[     An object which is contains a single paragraph of text content. See also ROLE_TEXT.    ]]>
- * @Accessibility_ROLE_RULER: <![CDATA[     An object which describes margins and tab stops, etc.        for text objects which it controls        (should have CONTROLLER_FOR relation to such).    ]]>
- * @Accessibility_ROLE_APPLICATION: <![CDATA[     An object corresponding to the toplevel accessible of an        application, which may contain ROLE_FRAME objects or other       accessible objects.  Children of AccessibleDesktop objects        are generally ROLE_APPLICATION objects.   ]]>
- * @Accessibility_ROLE_AUTOCOMPLETE: <![CDATA[     The object is a dialog or list containing items for insertion        into an entry widget, for instance a list of words for completion        of a text entry.   ]]>
- * @Accessibility_ROLE_EDITBAR: <![CDATA[     The object is an editable text object in a toolbar.   ]]>
- * @Accessibility_ROLE_EMBEDDED: <![CDATA[     The object is an embedded component container.  This role is a        "grouping" hint that the contained objects share a context which is        different from the container in which this accessible is embedded.       In particular, it is used for some kinds of document embedding, and       for embedding of out-of-process component, "panel applets", etc.   ]]>
- * @Accessibility_ROLE_ENTRY: <![CDATA[     The object is a component whose textual content may be entered or modified by the user,        provided STATE_EDITABLE is present.       A readonly ROLE_ENTRY object (i.e. where STATE_EDITABLE is not present) implies a       read-only 'text field' in a form, as opposed to a title, label, or caption.     ]]>
- * @Accessibility_ROLE_CHART: <![CDATA[     The object is a graphical depiction of quantitative data.  It may contain multiple       subelements whose attributes and/or description may be queried to obtain both the       quantitative data and information about how the data is being presented.       The LABELLED_BY relation is particularly important in interpreting objects of this type,       as is the accessible-description property.         See ROLE_CAPTION     ]]>
- * @Accessibility_ROLE_CAPTION: <![CDATA[     The object contains descriptive information, usually textual, about another user interface       element such as a table, chart, or image.     ]]>
- * @Accessibility_ROLE_DOCUMENT_FRAME: <![CDATA[     The object is a visual frame or container which contains a view of document content.         Document frames may occur within another Document instance, in which case the second        document may be said to be embedded in the containing instance.  HTML frames are       often ROLE_DOCUMENT_FRAME.  Either this object, or a singleton descendant, should implement       the Document interface.     ]]>
- * @Accessibility_ROLE_HEADING: <![CDATA[     The object serves as a heading for content which follows it in a document.       The 'heading level' of the heading, if availabe,  may be obtained by       querying the object's attributes.      ]]>
- * @Accessibility_ROLE_PAGE: <![CDATA[     The object is a containing instance which encapsulates a page of        information.  ROLE_PAGE is used in documents and content which support       a paginated navigation model.     ]]>
- * @Accessibility_ROLE_SECTION: <![CDATA[     The object is a containing instance of document content which constitutes       a particular 'logical' section of the document.  The type of content within       a section, and the nature of the section division itself, may be obtained       by querying the object's attributes.  Sections may be nested.     ]]>
- * @Accessibility_ROLE_REDUNDANT_OBJECT: <![CDATA[     The object is redundant with another object in the hierarchy,        and is exposed for purely technical reasons.  Objects of this role        should be ignored by clients, if they are encountered at all.      ]]>
- * @Accessibility_ROLE_FORM: <![CDATA[     The object is a containing instance of document content which       has within it components with which the user can interact in order to       input information; i.e. the object is a container for pushbuttons,       comboboxes, text input fields, and other 'GUI' components.       ROLE_FORM should not, in general, be used for toplevel GUI containers       or dialogs, but should be reserved for 'GUI' containers which occur within       document content, for instance within Web documents, presentations, or        text documents.  Unlike other GUI containers and dialogs which occur inside       application instances, ROLE_FORM containers' components are associated with       the current document, rather than the current foreground application or       viewer instance.     ]]>
- * @Accessibility_ROLE_LINK: <![CDATA[     The object is a hypertext anchor, i.e. a "link" in a       hypertext document.  Such objects are distinct from 'inline'       content which may also use the Hypertext/Hyperlink interfaces       to indicate the range/location within a text object where       an inline or embedded object lies.     ]]>
- * @Accessibility_ROLE_INPUT_METHOD_WINDOW: <![CDATA[     The object is a window or similar viewport which is used       to allow composition or input of a 'complex character',       in other words it is an "input method window."     ]]>
- * @Accessibility_ROLE_TABLE_ROW: <![CDATA[A row in a table.]]>
- * @Accessibility_ROLE_TREE_ITEM: <![CDATA[An object that represents an element of a tree.]]>
- * @Accessibility_ROLE_DOCUMENT_SPREADSHEET: <![CDATA[A document frame which contains a spreadsheet.]]>
- * @Accessibility_ROLE_DOCUMENT_PRESENTATION: <![CDATA[A document frame which contains a presentation or slide content.]]>
- * @Accessibility_ROLE_DOCUMENT_TEXT: <![CDATA[A document frame which contains textual content, such as found in a word processing application.]]>
- * @Accessibility_ROLE_DOCUMENT_WEB: <![CDATA[A document frame which contains HTML or other markup suitable for display in a web browser.]]>
- * @Accessibility_ROLE_DOCUMENT_EMAIL: <![CDATA[A document frame which contains email content to be displayed or composed either in plain text or HTML.]]>
- * @Accessibility_ROLE_COMMENT: <![CDATA[An object found within a document and designed to present a comment, note, or other annotation. In some cases, this object might not be visible until activated.]]>
- * @Accessibility_ROLE_LIST_BOX: <![CDATA[A non-collapsible list of choices the user can select from.]]>
- * @Accessibility_ROLE_GROUPING: <![CDATA[A group of related widgets. This group typically has a label.]]>
- * @Accessibility_ROLE_IMAGE_MAP: <![CDATA[An image map object. Usually a graphic with multiple hotspots, where each hotspot can be activated resulting in the loading of another document or section of a document.]]>
- * @Accessibility_ROLE_NOTIFICATION: <![CDATA[A transitory object designed to present a message to the user, typically at the desktop level rather than inside a particular application.]]>
- * @Accessibility_ROLE_INFO_BAR: <![CDATA[An object designed to present a message to the user within an existing window.]]>
- * @Accessibility_ROLE_LAST_DEFINED: <![CDATA[     Not a valid role, used for finding end of enumeration.    ]]>
- *
- * Bitfield/set of flags generated from the AT-SPI specification.
- */
-typedef enum {
-    Accessibility_ROLE_INVALID,
-    Accessibility_ROLE_ACCELERATOR_LABEL,
-    Accessibility_ROLE_ALERT,
-    Accessibility_ROLE_ANIMATION,
-    Accessibility_ROLE_ARROW,
-    Accessibility_ROLE_CALENDAR,
-    Accessibility_ROLE_CANVAS,
-    Accessibility_ROLE_CHECK_BOX,
-    Accessibility_ROLE_CHECK_MENU_ITEM,
-    Accessibility_ROLE_COLOR_CHOOSER,
-    Accessibility_ROLE_COLUMN_HEADER,
-    Accessibility_ROLE_COMBO_BOX,
-    Accessibility_ROLE_DATE_EDITOR,
-    Accessibility_ROLE_DESKTOP_ICON,
-    Accessibility_ROLE_DESKTOP_FRAME,
-    Accessibility_ROLE_DIAL,
-    Accessibility_ROLE_DIALOG,
-    Accessibility_ROLE_DIRECTORY_PANE,
-    Accessibility_ROLE_DRAWING_AREA,
-    Accessibility_ROLE_FILE_CHOOSER,
-    Accessibility_ROLE_FILLER,
-    Accessibility_ROLE_FOCUS_TRAVERSABLE,
-    Accessibility_ROLE_FONT_CHOOSER,
-    Accessibility_ROLE_FRAME,
-    Accessibility_ROLE_GLASS_PANE,
-    Accessibility_ROLE_HTML_CONTAINER,
-    Accessibility_ROLE_ICON,
-    Accessibility_ROLE_IMAGE,
-    Accessibility_ROLE_INTERNAL_FRAME,
-    Accessibility_ROLE_LABEL,
-    Accessibility_ROLE_LAYERED_PANE,
-    Accessibility_ROLE_LIST,
-    Accessibility_ROLE_LIST_ITEM,
-    Accessibility_ROLE_MENU,
-    Accessibility_ROLE_MENU_BAR,
-    Accessibility_ROLE_MENU_ITEM,
-    Accessibility_ROLE_OPTION_PANE,
-    Accessibility_ROLE_PAGE_TAB,
-    Accessibility_ROLE_PAGE_TAB_LIST,
-    Accessibility_ROLE_PANEL,
-    Accessibility_ROLE_PASSWORD_TEXT,
-    Accessibility_ROLE_POPUP_MENU,
-    Accessibility_ROLE_PROGRESS_BAR,
-    Accessibility_ROLE_PUSH_BUTTON,
-    Accessibility_ROLE_RADIO_BUTTON,
-    Accessibility_ROLE_RADIO_MENU_ITEM,
-    Accessibility_ROLE_ROOT_PANE,
-    Accessibility_ROLE_ROW_HEADER,
-    Accessibility_ROLE_SCROLL_BAR,
-    Accessibility_ROLE_SCROLL_PANE,
-    Accessibility_ROLE_SEPARATOR,
-    Accessibility_ROLE_SLIDER,
-    Accessibility_ROLE_SPIN_BUTTON,
-    Accessibility_ROLE_SPLIT_PANE,
-    Accessibility_ROLE_STATUS_BAR,
-    Accessibility_ROLE_TABLE,
-    Accessibility_ROLE_TABLE_CELL,
-    Accessibility_ROLE_TABLE_COLUMN_HEADER,
-    Accessibility_ROLE_TABLE_ROW_HEADER,
-    Accessibility_ROLE_TEAROFF_MENU_ITEM,
-    Accessibility_ROLE_TERMINAL,
-    Accessibility_ROLE_TEXT,
-    Accessibility_ROLE_TOGGLE_BUTTON,
-    Accessibility_ROLE_TOOL_BAR,
-    Accessibility_ROLE_TOOL_TIP,
-    Accessibility_ROLE_TREE,
-    Accessibility_ROLE_TREE_TABLE,
-    Accessibility_ROLE_UNKNOWN,
-    Accessibility_ROLE_VIEWPORT,
-    Accessibility_ROLE_WINDOW,
-    Accessibility_ROLE_EXTENDED,
-    Accessibility_ROLE_HEADER,
-    Accessibility_ROLE_FOOTER,
-    Accessibility_ROLE_PARAGRAPH,
-    Accessibility_ROLE_RULER,
-    Accessibility_ROLE_APPLICATION,
-    Accessibility_ROLE_AUTOCOMPLETE,
-    Accessibility_ROLE_EDITBAR,
-    Accessibility_ROLE_EMBEDDED,
-    Accessibility_ROLE_ENTRY,
-    Accessibility_ROLE_CHART,
-    Accessibility_ROLE_CAPTION,
-    Accessibility_ROLE_DOCUMENT_FRAME,
-    Accessibility_ROLE_HEADING,
-    Accessibility_ROLE_PAGE,
-    Accessibility_ROLE_SECTION,
-    Accessibility_ROLE_REDUNDANT_OBJECT,
-    Accessibility_ROLE_FORM,
-    Accessibility_ROLE_LINK,
-    Accessibility_ROLE_INPUT_METHOD_WINDOW,
-    Accessibility_ROLE_TABLE_ROW,
-    Accessibility_ROLE_TREE_ITEM,
-    Accessibility_ROLE_DOCUMENT_SPREADSHEET,
-    Accessibility_ROLE_DOCUMENT_PRESENTATION,
-    Accessibility_ROLE_DOCUMENT_TEXT,
-    Accessibility_ROLE_DOCUMENT_WEB,
-    Accessibility_ROLE_DOCUMENT_EMAIL,
-    Accessibility_ROLE_COMMENT,
-    Accessibility_ROLE_LIST_BOX,
-    Accessibility_ROLE_GROUPING,
-    Accessibility_ROLE_IMAGE_MAP,
-    Accessibility_ROLE_NOTIFICATION,
-    Accessibility_ROLE_INFO_BAR,
-    Accessibility_ROLE_LAST_DEFINED,
-} Accessibility_Role;
-
-/**
- * NUM_ACCESSIBILITY_ROLES:
- *
- * 1 higher than the highest valid value of #Accessibility_Role.
- */
-#define NUM_ACCESSIBILITY_ROLES (103+1)
-
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/common/keymasks.h b/common/keymasks.h
deleted file mode 100644 (file)
index 34a3e30..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * 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.
- */
-
-#ifndef _SPI_KEYMASKS_H_
-#define _SPI_KEYMASKS_H_
-
-#include <X11/Xlib.h>
-#include <glib/gmacros.h>
-
-G_BEGIN_DECLS
-
-typedef unsigned long SpiKeyMaskType;
-
-#define SPI_KEYMASK_ALT       Mod1Mask
-#define SPI_KEYMASK_MOD1      Mod1Mask
-#define SPI_KEYMASK_MOD2      Mod2Mask
-#define SPI_KEYMASK_MOD3      Mod3Mask
-#define SPI_KEYMASK_MOD4      Mod4Mask
-#define SPI_KEYMASK_MOD5      Mod5Mask
-#define SPI_KEYMASK_BUTTON1   Button1Mask
-#define SPI_KEYMASK_BUTTON2   Button2Mask
-#define SPI_KEYMASK_BUTTON3   Button3Mask
-#define SPI_KEYMASK_BUTTON4   Button4Mask
-#define SPI_KEYMASK_BUTTON5   Button5Mask
-#define SPI_KEYMASK_CONTROL   ControlMask
-#define SPI_KEYMASK_SHIFT     ShiftMask
-#define SPI_KEYMASK_SHIFTLOCK LockMask
-#define SPI_KEYMASK_NUMLOCK   (1<<14)
-#define SPI_KEYMASK_UNMODIFIED 0
-
-G_END_DECLS
-
-#endif
diff --git a/common/spi-types.h b/common/spi-types.h
deleted file mode 100644 (file)
index 1293a5c..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.
- */
-
-#ifndef SPI_TYPES_H_
-#define SPI_TYPES_H_
-
-#include <common/generated-types.h>
-#include <common/event-types.h>
-
-#endif /* SPI_TYPES_H_ */