From 20958d891139849067a0e784e04c35cc3c575c3d Mon Sep 17 00:00:00 2001 From: Mike Gorse Date: Wed, 27 Jul 2011 17:01:03 -0500 Subject: [PATCH] Some refactoring to remove duplicate code and other clean-ups 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. --- Makefile.am | 2 +- atk-adaptor/Makefile.include | 1 - .../accessible-stateset.c | 0 .../accessible-stateset.h | 10 +- atk-adaptor/adaptors/Makefile.am | 2 + atk-adaptor/adaptors/accessible-adaptor.c | 55 +- atk-adaptor/adaptors/action-adaptor.c | 4 +- atk-adaptor/adaptors/adaptors.h | 2 +- atk-adaptor/adaptors/application-adaptor.c | 4 +- atk-adaptor/adaptors/cache-adaptor.c | 12 +- atk-adaptor/adaptors/collection-adaptor.c | 78 +- atk-adaptor/adaptors/component-adaptor.c | 20 +- atk-adaptor/adaptors/document-adaptor.c | 4 +- atk-adaptor/adaptors/editabletext-adaptor.c | 4 +- atk-adaptor/adaptors/hyperlink-adaptor.c | 4 +- atk-adaptor/adaptors/hypertext-adaptor.c | 4 +- atk-adaptor/adaptors/image-adaptor.c | 4 +- atk-adaptor/adaptors/selection-adaptor.c | 4 +- atk-adaptor/adaptors/socket-adaptor.c | 8 +- atk-adaptor/adaptors/table-adaptor.c | 4 +- atk-adaptor/adaptors/text-adaptor.c | 4 +- atk-adaptor/adaptors/value-adaptor.c | 4 +- {common => atk-adaptor}/bitarray.h | 0 atk-adaptor/bridge.c | 26 +- atk-adaptor/event.c | 16 +- atk-adaptor/event.h | 2 - atk-adaptor/object.c | 246 +++---- atk-adaptor/object.h | 2 +- {common => atk-adaptor}/spi-dbus.c | 0 {common => atk-adaptor}/spi-dbus.h | 30 +- common/Makefile.am | 26 - common/event-types.h | 61 -- common/generated-types.h | 792 --------------------- common/keymasks.h | 53 -- common/spi-types.h | 30 - 35 files changed, 266 insertions(+), 1252 deletions(-) rename common/spi-stateset.c => atk-adaptor/accessible-stateset.c (100%) rename common/spi-stateset.h => atk-adaptor/accessible-stateset.h (91%) rename {common => atk-adaptor}/bitarray.h (100%) rename {common => atk-adaptor}/spi-dbus.c (100%) rename {common => atk-adaptor}/spi-dbus.h (62%) delete mode 100644 common/Makefile.am delete mode 100644 common/event-types.h delete mode 100644 common/generated-types.h delete mode 100644 common/keymasks.h delete mode 100644 common/spi-types.h diff --git a/Makefile.am b/Makefile.am index 8142b2d..d00a130 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 diff --git a/atk-adaptor/Makefile.include b/atk-adaptor/Makefile.include index cd1675e..1bddbbd 100644 --- a/atk-adaptor/Makefile.include +++ b/atk-adaptor/Makefile.include @@ -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 = \ diff --git a/common/spi-stateset.c b/atk-adaptor/accessible-stateset.c similarity index 100% rename from common/spi-stateset.c rename to atk-adaptor/accessible-stateset.c diff --git a/common/spi-stateset.h b/atk-adaptor/accessible-stateset.h similarity index 91% rename from common/spi-stateset.h rename to atk-adaptor/accessible-stateset.h index f097c92..e27e3c5 100644 --- a/common/spi-stateset.h +++ b/atk-adaptor/accessible-stateset.h @@ -21,17 +21,17 @@ * 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 +#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_ */ diff --git a/atk-adaptor/adaptors/Makefile.am b/atk-adaptor/adaptors/Makefile.am index e34870c..58663ef 100644 --- a/atk-adaptor/adaptors/Makefile.am +++ b/atk-adaptor/adaptors/Makefile.am @@ -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 =\ diff --git a/atk-adaptor/adaptors/accessible-adaptor.c b/atk-adaptor/adaptors/accessible-adaptor.c index a8789c9..7572e49 100644 --- a/atk-adaptor/adaptors/accessible-adaptor.c +++ b/atk-adaptor/adaptors/accessible-adaptor.c @@ -25,8 +25,9 @@ #include #include -#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); }; diff --git a/atk-adaptor/adaptors/action-adaptor.c b/atk-adaptor/adaptors/action-adaptor.c index 62f68f7..08e3a2c 100644 --- a/atk-adaptor/adaptors/action-adaptor.c +++ b/atk-adaptor/adaptors/action-adaptor.c @@ -25,7 +25,7 @@ #include #include -#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); }; diff --git a/atk-adaptor/adaptors/adaptors.h b/atk-adaptor/adaptors/adaptors.h index 30f1a16..84d2ef4 100644 --- a/atk-adaptor/adaptors/adaptors.h +++ b/atk-adaptor/adaptors/adaptors.h @@ -27,7 +27,7 @@ #include #include -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); diff --git a/atk-adaptor/adaptors/application-adaptor.c b/atk-adaptor/adaptors/application-adaptor.c index c686c31..1b85969 100644 --- a/atk-adaptor/adaptors/application-adaptor.c +++ b/atk-adaptor/adaptors/application-adaptor.c @@ -25,7 +25,7 @@ #include #include -#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); }; diff --git a/atk-adaptor/adaptors/cache-adaptor.c b/atk-adaptor/adaptors/cache-adaptor.c index 1f33ce3..3b5540c 100644 --- a/atk-adaptor/adaptors/cache-adaptor.c +++ b/atk-adaptor/adaptors/cache-adaptor.c @@ -28,8 +28,8 @@ #include #include -#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", diff --git a/atk-adaptor/adaptors/collection-adaptor.c b/atk-adaptor/adaptors/collection-adaptor.c index f274239..efefa43 100644 --- a/atk-adaptor/adaptors/collection-adaptor.c +++ b/atk-adaptor/adaptors/collection-adaptor.c @@ -27,9 +27,9 @@ #include #include -#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); }; diff --git a/atk-adaptor/adaptors/component-adaptor.c b/atk-adaptor/adaptors/component-adaptor.c index 3db9717..f477348 100644 --- a/atk-adaptor/adaptors/component-adaptor.c +++ b/atk-adaptor/adaptors/component-adaptor.c @@ -26,7 +26,7 @@ #include #include -#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); }; diff --git a/atk-adaptor/adaptors/document-adaptor.c b/atk-adaptor/adaptors/document-adaptor.c index 53e35a8..5eacd38 100644 --- a/atk-adaptor/adaptors/document-adaptor.c +++ b/atk-adaptor/adaptors/document-adaptor.c @@ -25,7 +25,7 @@ #include #include -#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); }; diff --git a/atk-adaptor/adaptors/editabletext-adaptor.c b/atk-adaptor/adaptors/editabletext-adaptor.c index e633a54..1e0a5b9 100644 --- a/atk-adaptor/adaptors/editabletext-adaptor.c +++ b/atk-adaptor/adaptors/editabletext-adaptor.c @@ -26,7 +26,7 @@ #include #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); }; diff --git a/atk-adaptor/adaptors/hyperlink-adaptor.c b/atk-adaptor/adaptors/hyperlink-adaptor.c index cd0a924..746676d 100644 --- a/atk-adaptor/adaptors/hyperlink-adaptor.c +++ b/atk-adaptor/adaptors/hyperlink-adaptor.c @@ -25,7 +25,7 @@ #include #include -#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); }; diff --git a/atk-adaptor/adaptors/hypertext-adaptor.c b/atk-adaptor/adaptors/hypertext-adaptor.c index dbe1ffd..6569eaa 100644 --- a/atk-adaptor/adaptors/hypertext-adaptor.c +++ b/atk-adaptor/adaptors/hypertext-adaptor.c @@ -25,7 +25,7 @@ #include #include -#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); }; diff --git a/atk-adaptor/adaptors/image-adaptor.c b/atk-adaptor/adaptors/image-adaptor.c index da56a21..1ba1f4e 100644 --- a/atk-adaptor/adaptors/image-adaptor.c +++ b/atk-adaptor/adaptors/image-adaptor.c @@ -25,7 +25,7 @@ #include #include -#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); }; diff --git a/atk-adaptor/adaptors/selection-adaptor.c b/atk-adaptor/adaptors/selection-adaptor.c index 353113d..23b0a4f 100644 --- a/atk-adaptor/adaptors/selection-adaptor.c +++ b/atk-adaptor/adaptors/selection-adaptor.c @@ -25,7 +25,7 @@ #include #include -#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); }; diff --git a/atk-adaptor/adaptors/socket-adaptor.c b/atk-adaptor/adaptors/socket-adaptor.c index 58d19d5..ac7f646 100644 --- a/atk-adaptor/adaptors/socket-adaptor.c +++ b/atk-adaptor/adaptors/socket-adaptor.c @@ -25,8 +25,8 @@ #include #include -#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); }; diff --git a/atk-adaptor/adaptors/table-adaptor.c b/atk-adaptor/adaptors/table-adaptor.c index bd35f5f..26fec2b 100644 --- a/atk-adaptor/adaptors/table-adaptor.c +++ b/atk-adaptor/adaptors/table-adaptor.c @@ -25,7 +25,7 @@ #include #include -#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); }; diff --git a/atk-adaptor/adaptors/text-adaptor.c b/atk-adaptor/adaptors/text-adaptor.c index 7a810b2..5600ed0 100644 --- a/atk-adaptor/adaptors/text-adaptor.c +++ b/atk-adaptor/adaptors/text-adaptor.c @@ -27,7 +27,7 @@ #include #include -#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); }; diff --git a/atk-adaptor/adaptors/value-adaptor.c b/atk-adaptor/adaptors/value-adaptor.c index 188b6dd..89f29ff 100644 --- a/atk-adaptor/adaptors/value-adaptor.c +++ b/atk-adaptor/adaptors/value-adaptor.c @@ -27,7 +27,7 @@ #include #include -#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); }; diff --git a/common/bitarray.h b/atk-adaptor/bitarray.h similarity index 100% rename from common/bitarray.h rename to atk-adaptor/bitarray.h diff --git a/atk-adaptor/bridge.c b/atk-adaptor/bridge.c index 6aacd12..bcae3b9 100644 --- a/atk-adaptor/bridge.c +++ b/atk-adaptor/bridge.c @@ -44,13 +44,13 @@ #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")) diff --git a/atk-adaptor/event.c b/atk-adaptor/event.c index 7624844..f5a2d2d 100644 --- a/atk-adaptor/event.c +++ b/atk-adaptor/event.c @@ -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); diff --git a/atk-adaptor/event.h b/atk-adaptor/event.h index 07a43df..1a9f9f3 100644 --- a/atk-adaptor/event.h +++ b/atk-adaptor/event.h @@ -25,8 +25,6 @@ #ifndef EVENT_H #define EVENT_H -#include - void spi_atk_register_event_listeners (void); void spi_atk_deregister_event_listeners (void); void spi_atk_tidy_windows (void); diff --git a/atk-adaptor/object.c b/atk-adaptor/object.c index 6795cf7..4240a66 100644 --- a/atk-adaptor/object.c +++ b/atk-adaptor/object.c @@ -30,8 +30,8 @@ */ #include -#include -#include +#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; } diff --git a/atk-adaptor/object.h b/atk-adaptor/object.h index 3b27292..5f283bc 100644 --- a/atk-adaptor/object.h +++ b/atk-adaptor/object.h @@ -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 */ diff --git a/common/spi-dbus.c b/atk-adaptor/spi-dbus.c similarity index 100% rename from common/spi-dbus.c rename to atk-adaptor/spi-dbus.c diff --git a/common/spi-dbus.h b/atk-adaptor/spi-dbus.h similarity index 62% rename from common/spi-dbus.h rename to atk-adaptor/spi-dbus.h index 1c10211..61a43be 100644 --- a/common/spi-dbus.h +++ b/atk-adaptor/spi-dbus.h @@ -25,7 +25,7 @@ #define SPI_DBUS_H_ #include -#include +#include #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 index 2732a3d..0000000 --- a/common/Makefile.am +++ /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 index ac0c059..0000000 --- a/common/event-types.h +++ /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 - -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 index 28738dc..0000000 --- a/common/generated-types.h +++ /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: - * @Accessibility_LOCALE_TYPE_COLLATE: - * @Accessibility_LOCALE_TYPE_CTYPE: - * @Accessibility_LOCALE_TYPE_MONETARY: - * @Accessibility_LOCALE_TYPE_NUMERIC: - * @Accessibility_LOCALE_TYPE_TIME: - * - * - * - * 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: - * @Accessibility_COORD_TYPE_WINDOW: - * - * - * - * 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: - * @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: - * - * 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: - * @Accessibility_Collection_MATCH_ALL: - * @Accessibility_Collection_MATCH_ANY: - * @Accessibility_Collection_MATCH_NONE: - * @Accessibility_Collection_MATCH_EMPTY: - * @Accessibility_Collection_MATCH_LAST_DEFINED: - * - * 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: - * @Accessibility_Collection_TREE_RESTRICT_SIBLING: - * @Accessibility_Collection_TREE_INORDER: - * @Accessibility_Collection_TREE_LAST_DEFINED: - * - * 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: - * @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: - * - * - * - * 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: - * @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: - * - * - * - * 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: - * @Accessibility_TEXT_CLIP_MIN: - * @Accessibility_TEXT_CLIP_MAX: - * @Accessibility_TEXT_CLIP_BOTH: - * - * - * - * 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: - * @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: - * - * 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: - * @Accessibility_KEY_RELEASED: - * - * - * - * 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: - * @Accessibility_KEY_RELEASED_EVENT: - * @Accessibility_BUTTON_PRESSED_EVENT: - * @Accessibility_BUTTON_RELEASED_EVENT: - * - * - * - * 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: - * @Accessibility_KEY_RELEASE: - * @Accessibility_KEY_PRESSRELEASE: - * @Accessibility_KEY_SYM: - * @Accessibility_KEY_STRING: - * - * - * - * 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: - * @Accessibility_MODIFIER_SHIFTLOCK: - * @Accessibility_MODIFIER_CONTROL: - * @Accessibility_MODIFIER_ALT: - * @Accessibility_MODIFIER_META: - * @Accessibility_MODIFIER_META2: - * @Accessibility_MODIFIER_META3: - * @Accessibility_MODIFIER_NUMLOCK: - * - * 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: - * @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: - * - * - * - * 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: - * @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: - * - * 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 index 34a3e30..0000000 --- a/common/keymasks.h +++ /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 -#include - -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 index 1293a5c..0000000 --- a/common/spi-types.h +++ /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 -#include - -#endif /* SPI_TYPES_H_ */ -- 2.7.4