diff options
| author | Federico Mena Quintero <federico@gnome.org> | 2022-12-06 20:44:48 -0600 |
|---|---|---|
| committer | Federico Mena Quintero <federico@gnome.org> | 2022-12-06 20:50:13 -0600 |
| commit | b10fcf21b1ef49dd3d6297ac657434ece3b23578 (patch) | |
| tree | d560f8449f3ae75fea343887dcb6d5f4df7b434c | |
| parent | bf4d71a38b970699f63ce7b701e9bf4c9d31f717 (diff) | |
| download | at-spi2-core-b10fcf21b1ef49dd3d6297ac657434ece3b23578.tar.gz | |
Reformat all the *.[ch] files with clang-format
I ran this on each directory with C files:
clang-format -i *.[ch]
"-i" is the in-place option.
I also adjusted the order of #includes for some files which failed to
build after that:
Clang-format reorders blocks of #include directives alphabetically,
but they can be grouped and separated by blank lines. If there is a
blank line between blocks, like
#include "zork.h"
#include "bar.h"
#include "foo.h"
then it will not put zork.h after the other two. The last two header
files will be sorted alphabetically.
We can adjust the formatting of chunks of code by hand with comments
like these:
/* clang-format off */
this code {
is, formatted, by, hand;
}
/* clang-format on */
See https://clang.llvm.org/docs/ClangFormat.html for the general
manual and https://clang.llvm.org/docs/ClangFormatStyleOptions.html
for the style options and the comments described above.
255 files changed, 13478 insertions, 13391 deletions
diff --git a/atk-adaptor/accessible-cache.c b/atk-adaptor/accessible-cache.c index a28a7a5f..1452a109 100644 --- a/atk-adaptor/accessible-cache.c +++ b/atk-adaptor/accessible-cache.c @@ -31,22 +31,24 @@ SpiCache *spi_global_cache = NULL; static gboolean -child_added_listener (GSignalInvocationHint * signal_hint, +child_added_listener (GSignalInvocationHint *signal_hint, guint n_param_values, - const GValue * param_values, gpointer data); + const GValue *param_values, + gpointer data); static void -toplevel_added_listener (AtkObject * accessible, - guint index, AtkObject * child); +toplevel_added_listener (AtkObject *accessible, + guint index, + AtkObject *child); static void -remove_object (GObject * source, GObject * gobj, gpointer data); +remove_object (GObject *source, GObject *gobj, gpointer data); static void -add_object (SpiCache * cache, GObject * gobj); +add_object (SpiCache *cache, GObject *gobj); static void -add_subtree (SpiCache *cache, AtkObject * accessible); +add_subtree (SpiCache *cache, AtkObject *accessible); static gboolean add_pending_items (gpointer data); @@ -54,7 +56,7 @@ add_pending_items (gpointer data); /*---------------------------------------------------------------------------*/ static void -spi_cache_finalize (GObject * object); +spi_cache_finalize (GObject *object); /*---------------------------------------------------------------------------*/ @@ -70,7 +72,8 @@ static guint cache_signals[LAST_SIGNAL] = { 0 }; G_DEFINE_TYPE (SpiCache, spi_cache, G_TYPE_OBJECT) -static void spi_cache_class_init (SpiCacheClass * klass) +static void +spi_cache_class_init (SpiCacheClass *klass) { GObjectClass *object_class = (GObjectClass *) klass; @@ -78,7 +81,7 @@ static void spi_cache_class_init (SpiCacheClass * klass) object_class->finalize = spi_cache_finalize; - cache_signals [OBJECT_ADDED] = \ + cache_signals[OBJECT_ADDED] = g_signal_new ("object-added", SPI_CACHE_TYPE, G_SIGNAL_ACTION, @@ -90,7 +93,7 @@ static void spi_cache_class_init (SpiCacheClass * klass) 1, G_TYPE_OBJECT); - cache_signals [OBJECT_REMOVED] = \ + cache_signals[OBJECT_REMOVED] = g_signal_new ("object-removed", SPI_CACHE_TYPE, G_SIGNAL_ACTION, @@ -104,7 +107,7 @@ static void spi_cache_class_init (SpiCacheClass * klass) } static void -spi_cache_init (SpiCache * cache) +spi_cache_init (SpiCache *cache) { cache->objects = g_hash_table_new (g_direct_hash, g_direct_equal); cache->add_traversal = g_queue_new (); @@ -123,7 +126,7 @@ spi_cache_init (SpiCache * cache) add_subtree (cache, spi_global_app_data->root); cache->child_added_listener = atk_add_global_event_listener (child_added_listener, - "Gtk:AtkObject:children-changed"); + "Gtk:AtkObject:children-changed"); g_signal_connect (G_OBJECT (spi_global_app_data->root), "children-changed::add", @@ -131,7 +134,7 @@ spi_cache_init (SpiCache * cache) } static void -spi_cache_finalize (GObject * object) +spi_cache_finalize (GObject *object) { SpiCache *cache = SPI_CACHE (object); @@ -154,18 +157,18 @@ spi_cache_finalize (GObject * object) /*---------------------------------------------------------------------------*/ static void -remove_object (GObject * source, GObject * gobj, gpointer data) +remove_object (GObject *source, GObject *gobj, gpointer data) { SpiCache *cache = SPI_CACHE (data); - + if (spi_cache_in (cache, gobj)) { #ifdef SPI_ATK_DEBUG - g_debug ("CACHE REM - %s - %d - %s\n", atk_object_get_name (ATK_OBJECT (gobj)), - atk_object_get_role (ATK_OBJECT (gobj)), - spi_register_object_to_path (spi_global_register, gobj)); + g_debug ("CACHE REM - %s - %d - %s\n", atk_object_get_name (ATK_OBJECT (gobj)), + atk_object_get_role (ATK_OBJECT (gobj)), + spi_register_object_to_path (spi_global_register, gobj)); #endif - g_signal_emit (cache, cache_signals [OBJECT_REMOVED], 0, gobj); + g_signal_emit (cache, cache_signals[OBJECT_REMOVED], 0, gobj); g_hash_table_remove (cache->objects, gobj); } else if (g_queue_remove (cache->add_traversal, gobj)) @@ -175,7 +178,7 @@ remove_object (GObject * source, GObject * gobj, gpointer data) } static void -add_object (SpiCache * cache, GObject * gobj) +add_object (SpiCache *cache, GObject *gobj) { g_return_if_fail (G_IS_OBJECT (gobj)); @@ -183,11 +186,11 @@ add_object (SpiCache * cache, GObject * gobj) #ifdef SPI_ATK_DEBUG g_debug ("CACHE ADD - %s - %d - %s\n", atk_object_get_name (ATK_OBJECT (gobj)), - atk_object_get_role (ATK_OBJECT (gobj)), - spi_register_object_to_path (spi_global_register, gobj)); + atk_object_get_role (ATK_OBJECT (gobj)), + spi_register_object_to_path (spi_global_register, gobj)); #endif - g_signal_emit (cache, cache_signals [OBJECT_ADDED], 0, gobj); + g_signal_emit (cache, cache_signals[OBJECT_ADDED], 0, gobj); } /*---------------------------------------------------------------------------*/ @@ -221,7 +224,7 @@ recursion_check_unset () /*---------------------------------------------------------------------------*/ static void -append_children (AtkObject * accessible, GQueue * traversal) +append_children (AtkObject *accessible, GQueue *traversal) { AtkObject *current; guint i; @@ -249,7 +252,7 @@ append_children (AtkObject * accessible, GQueue * traversal) * or if it has already been registered. */ static void -add_subtree (SpiCache *cache, AtkObject * accessible) +add_subtree (SpiCache *cache, AtkObject *accessible) { g_return_if_fail (ATK_IS_OBJECT (accessible)); @@ -278,10 +281,10 @@ add_pending_items (gpointer data) if (set && !atk_state_set_contains_state (set, ATK_STATE_TRANSIENT)) { /* transfer the ref into to_add */ - g_queue_push_tail (to_add, current); + g_queue_push_tail (to_add, current); if (!spi_cache_in (cache, G_OBJECT (current)) && - !atk_state_set_contains_state (set, ATK_STATE_MANAGES_DESCENDANTS) && - !atk_state_set_contains_state (set, ATK_STATE_DEFUNCT)) + !atk_state_set_contains_state (set, ATK_STATE_MANAGES_DESCENDANTS) && + !atk_state_set_contains_state (set, ATK_STATE_DEFUNCT)) { append_children (current, cache->add_traversal); } @@ -302,9 +305,9 @@ add_pending_items (gpointer data) /* Make sure object is registerd so we are notified if it goes away */ g_free (spi_register_object_to_path (spi_global_register, - G_OBJECT (current))); + G_OBJECT (current))); - add_object (cache, G_OBJECT(current)); + add_object (cache, G_OBJECT (current)); g_object_unref (G_OBJECT (current)); } @@ -316,16 +319,17 @@ add_pending_items (gpointer data) /*---------------------------------------------------------------------------*/ static gboolean -child_added_listener (GSignalInvocationHint * signal_hint, +child_added_listener (GSignalInvocationHint *signal_hint, guint n_param_values, - const GValue * param_values, gpointer data) + const GValue *param_values, + gpointer data) { SpiCache *cache = spi_global_cache; AtkObject *accessible; const gchar *detail = NULL; - /* + /* * Ensure that only accessibles already in the cache * have their signals processed. */ @@ -334,7 +338,7 @@ child_added_listener (GSignalInvocationHint * signal_hint, g_rec_mutex_lock (&cache_mutex); - if (spi_cache_in (cache, G_OBJECT(accessible))) + if (spi_cache_in (cache, G_OBJECT (accessible))) { #ifdef SPI_ATK_DEBUG if (recursion_check_and_set ()) @@ -374,8 +378,9 @@ child_added_listener (GSignalInvocationHint * signal_hint, /*---------------------------------------------------------------------------*/ static void -toplevel_added_listener (AtkObject * accessible, - guint index, AtkObject * child) +toplevel_added_listener (AtkObject *accessible, + guint index, + AtkObject *child) { SpiCache *cache = spi_global_cache; @@ -383,7 +388,7 @@ toplevel_added_listener (AtkObject * accessible, g_rec_mutex_lock (&cache_mutex); - if (spi_cache_in (cache, G_OBJECT(accessible))) + if (spi_cache_in (cache, G_OBJECT (accessible))) { #ifdef SPI_ATK_DEBUG if (recursion_check_and_set ()) @@ -413,13 +418,13 @@ toplevel_added_listener (AtkObject * accessible, /*---------------------------------------------------------------------------*/ void -spi_cache_foreach (SpiCache * cache, GHFunc func, gpointer data) +spi_cache_foreach (SpiCache *cache, GHFunc func, gpointer data) { g_hash_table_foreach (cache->objects, func, data); } gboolean -spi_cache_in (SpiCache * cache, GObject * object) +spi_cache_in (SpiCache *cache, GObject *object) { if (!cache) return FALSE; @@ -435,17 +440,17 @@ spi_cache_in (SpiCache * cache, GObject * object) #ifdef SPI_ATK_DEBUG void -spi_cache_print_info (GObject * obj) +spi_cache_print_info (GObject *obj) { - char * path = spi_register_object_to_path (spi_global_register, obj); - + char *path = spi_register_object_to_path (spi_global_register, obj); + if (spi_cache_in (spi_global_cache, obj)) - g_printf ("%s IC\n", path); + g_printf ("%s IC\n", path); else - g_printf ("%s NC\n", path); + g_printf ("%s NC\n", path); if (path) - g_free (path); + g_free (path); } #endif diff --git a/atk-adaptor/accessible-cache.h b/atk-adaptor/accessible-cache.h index dfd9d68f..af29dbd8 100644 --- a/atk-adaptor/accessible-cache.h +++ b/atk-adaptor/accessible-cache.h @@ -23,25 +23,25 @@ #ifndef ACCESSIBLE_CACHE_H #define ACCESSIBLE_CACHE_H -#include <glib.h> #include <glib-object.h> +#include <glib.h> typedef struct _SpiCache SpiCache; typedef struct _SpiCacheClass SpiCacheClass; G_BEGIN_DECLS -#define SPI_CACHE_TYPE (spi_cache_get_type ()) -#define SPI_CACHE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), SPI_CACHE_TYPE, SpiCache)) -#define SPI_CACHE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), SPI_CACHE_TYPE, SpiCacheClass)) -#define SPI_IS_CACHE(o) (G_TYPE_CHECK__INSTANCE_TYPE ((o), SPI_CACHE_TYPE)) +#define SPI_CACHE_TYPE (spi_cache_get_type ()) +#define SPI_CACHE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), SPI_CACHE_TYPE, SpiCache)) +#define SPI_CACHE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), SPI_CACHE_TYPE, SpiCacheClass)) +#define SPI_IS_CACHE(o) (G_TYPE_CHECK__INSTANCE_TYPE ((o), SPI_CACHE_TYPE)) #define SPI_IS_CACHE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), SPI_CACHE_TYPE)) struct _SpiCache { GObject parent; - GHashTable * objects; + GHashTable *objects; GQueue *add_traversal; gint add_pending_idle; @@ -58,10 +58,10 @@ GType spi_cache_get_type (void); extern SpiCache *spi_global_cache; void -spi_cache_foreach (SpiCache * cache, GHFunc func, gpointer data); +spi_cache_foreach (SpiCache *cache, GHFunc func, gpointer data); gboolean -spi_cache_in (SpiCache * cache, GObject * object); +spi_cache_in (SpiCache *cache, GObject *object); G_END_DECLS #endif /* ACCESSIBLE_CACHE_H */ diff --git a/atk-adaptor/accessible-leasing.c b/atk-adaptor/accessible-leasing.c index f60d7ffb..e662fbcb 100644 --- a/atk-adaptor/accessible-leasing.c +++ b/atk-adaptor/accessible-leasing.c @@ -41,17 +41,18 @@ typedef struct _ExpiryElement GObject *object; } ExpiryElement; -static void spi_leasing_dispose (GObject * object); +static void spi_leasing_dispose (GObject *object); -static void spi_leasing_finalize (GObject * object); +static void spi_leasing_finalize (GObject *object); -static void add_expiry_timeout (SpiLeasing * leasing); +static void add_expiry_timeout (SpiLeasing *leasing); /*---------------------------------------------------------------------------*/ G_DEFINE_TYPE (SpiLeasing, spi_leasing, G_TYPE_OBJECT) -static void spi_leasing_class_init (SpiLeasingClass * klass) +static void +spi_leasing_class_init (SpiLeasingClass *klass) { GObjectClass *object_class = (GObjectClass *) klass; @@ -62,14 +63,14 @@ static void spi_leasing_class_init (SpiLeasingClass * klass) } static void -spi_leasing_init (SpiLeasing * leasing) +spi_leasing_init (SpiLeasing *leasing) { leasing->expiry_queue = g_queue_new (); leasing->expiry_func_id = 0; } static void -spi_leasing_finalize (GObject * object) +spi_leasing_finalize (GObject *object) { SpiLeasing *leasing = SPI_LEASING (object); @@ -80,7 +81,7 @@ spi_leasing_finalize (GObject * object) } static void -spi_leasing_dispose (GObject * object) +spi_leasing_dispose (GObject *object) { SpiLeasing *leasing = SPI_LEASING (object); @@ -97,7 +98,7 @@ spi_leasing_dispose (GObject * object) /* End the lease on all objects whose expiry time has passed. - + Check when the next event is and set the next expiry func. */ static gboolean @@ -144,7 +145,7 @@ expiry_func (gpointer data) expiry function to add the next expiry timeout. */ static void -add_expiry_timeout (SpiLeasing * leasing) +add_expiry_timeout (SpiLeasing *leasing) { ExpiryElement *elem; gint64 secs = g_get_monotonic_time () / 1000000; @@ -175,7 +176,7 @@ add_expiry_timeout (SpiLeasing * leasing) #define EXPIRY_TIME_S (LEASE_TIME_S + 1) GObject * -spi_leasing_take (SpiLeasing * leasing, GObject * object) +spi_leasing_take (SpiLeasing *leasing, GObject *object) { /* Get the current time. diff --git a/atk-adaptor/accessible-leasing.h b/atk-adaptor/accessible-leasing.h index 7e982a75..eefc7f14 100644 --- a/atk-adaptor/accessible-leasing.h +++ b/atk-adaptor/accessible-leasing.h @@ -24,18 +24,18 @@ #ifndef ACCESSIBLE_LEASING_H #define ACCESSIBLE_LEASING_H -#include <glib.h> #include <glib-object.h> +#include <glib.h> typedef struct _SpiLeasing SpiLeasing; typedef struct _SpiLeasingClass SpiLeasingClass; G_BEGIN_DECLS -#define SPI_LEASING_TYPE (spi_leasing_get_type ()) -#define SPI_LEASING(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), SPI_LEASING_TYPE, SpiLeasing)) -#define SPI_LEASING_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), SPI_LEASING_TYPE, SpiLeasingClass)) -#define SPI_IS_LEASING(o) (G_TYPE_CHECK__INSTANCE_TYPE ((o), SPI_LEASING_TYPE)) +#define SPI_LEASING_TYPE (spi_leasing_get_type ()) +#define SPI_LEASING(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), SPI_LEASING_TYPE, SpiLeasing)) +#define SPI_LEASING_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), SPI_LEASING_TYPE, SpiLeasingClass)) +#define SPI_IS_LEASING(o) (G_TYPE_CHECK__INSTANCE_TYPE ((o), SPI_LEASING_TYPE)) #define SPI_IS_LEASING_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), SPI_LEASING_TYPE)) struct _SpiLeasing @@ -55,7 +55,7 @@ GType spi_leasing_get_type (void); extern SpiLeasing *spi_global_leasing; -GObject *spi_leasing_take (SpiLeasing * leasing, GObject * object); +GObject *spi_leasing_take (SpiLeasing *leasing, GObject *object); G_END_DECLS #endif /* ACCESSIBLE_LEASING_H */ diff --git a/atk-adaptor/accessible-register.c b/atk-adaptor/accessible-register.c index 49603f5a..6361ec46 100644 --- a/atk-adaptor/accessible-register.c +++ b/atk-adaptor/accessible-register.c @@ -25,19 +25,19 @@ #include <stdlib.h> #include <string.h> -#include "bridge.h" #include "accessible-register.h" +#include "bridge.h" /* * This module is responsible for keeping track of all the AtkObjects in * the application, so that they can be accessed remotely and placed in * a client side cache. * - * To access an AtkObject remotely we need to provide a D-Bus object + * To access an AtkObject remotely we need to provide a D-Bus object * path for it. The D-Bus object paths used have a standard prefix * (SPI_ATK_OBJECT_PATH_PREFIX). Appended to this prefix is a string - * representation of an integer reference. So to access an AtkObject - * remotely we keep a Hashtable that maps the given reference to + * representation of an integer reference. So to access an AtkObject + * remotely we keep a Hashtable that maps the given reference to * the AtkObject pointer. An object in this hash table is said to be 'registered'. * * The architecture of AT-SPI dbus is such that AtkObjects are not @@ -48,7 +48,7 @@ */ #define SPI_ATK_PATH_PREFIX_LENGTH 27 -#define SPI_ATK_OBJECT_PATH_PREFIX "/org/a11y/atspi/accessible/" +#define SPI_ATK_OBJECT_PATH_PREFIX "/org/a11y/atspi/accessible/" #define SPI_ATK_OBJECT_PATH_ROOT "root" #define SPI_ATK_OBJECT_REFERENCE_TEMPLATE SPI_ATK_OBJECT_PATH_PREFIX "%d" @@ -57,7 +57,7 @@ SpiRegister *spi_global_register = NULL; -static const gchar * spi_register_root_path = SPI_ATK_OBJECT_PATH_PREFIX SPI_ATK_OBJECT_PATH_ROOT; +static const gchar *spi_register_root_path = SPI_ATK_OBJECT_PATH_PREFIX SPI_ATK_OBJECT_PATH_ROOT; enum { @@ -70,13 +70,14 @@ static guint register_signals[LAST_SIGNAL] = { 0 }; /*---------------------------------------------------------------------------*/ static void -spi_register_finalize (GObject * object); +spi_register_finalize (GObject *object); /*---------------------------------------------------------------------------*/ G_DEFINE_TYPE (SpiRegister, spi_register, G_TYPE_OBJECT) -static void spi_register_class_init (SpiRegisterClass * klass) +static void +spi_register_class_init (SpiRegisterClass *klass) { GObjectClass *object_class = (GObjectClass *) klass; @@ -84,7 +85,7 @@ static void spi_register_class_init (SpiRegisterClass * klass) object_class->finalize = spi_register_finalize; - register_signals [OBJECT_REGISTERED] = + register_signals[OBJECT_REGISTERED] = g_signal_new ("object-registered", SPI_REGISTER_TYPE, G_SIGNAL_ACTION, @@ -96,7 +97,7 @@ static void spi_register_class_init (SpiRegisterClass * klass) 1, G_TYPE_OBJECT); - register_signals [OBJECT_DEREGISTERED] = + register_signals[OBJECT_DEREGISTERED] = g_signal_new ("object-deregistered", SPI_REGISTER_TYPE, G_SIGNAL_ACTION, @@ -110,14 +111,14 @@ static void spi_register_class_init (SpiRegisterClass * klass) } static void -spi_register_init (SpiRegister * reg) +spi_register_init (SpiRegister *reg) { reg->ref2ptr = g_hash_table_new (g_direct_hash, g_direct_equal); reg->reference_counter = 0; } static void -deregister_object (gpointer data, GObject * gobj) +deregister_object (gpointer data, GObject *gobj) { SpiRegister *reg = SPI_REGISTER (data); @@ -131,7 +132,7 @@ spi_register_remove_weak_ref (gpointer key, gpointer val, gpointer reg) } static void -spi_register_finalize (GObject * object) +spi_register_finalize (GObject *object) { SpiRegister *reg = SPI_REGISTER (object); @@ -152,7 +153,7 @@ spi_register_finalize (GObject * object) * TODO: Make this reference a little more unique, this is shoddy. */ static guint -assign_reference (SpiRegister * reg) +assign_reference (SpiRegister *reg) { reg->reference_counter++; /* Reference of 0 not allowed as used as direct key in hash table */ @@ -167,7 +168,7 @@ assign_reference (SpiRegister * reg) * Returns the reference of the object, or 0 if it is not registered. */ static guint -object_to_ref (GObject * gobj) +object_to_ref (GObject *gobj) { return GPOINTER_TO_INT (g_object_get_data (gobj, SPI_DBUS_ID)); } @@ -198,7 +199,7 @@ spi_register_deregister_object (SpiRegister *reg, GObject *gobj, gboolean unref) if (ref != 0) { g_signal_emit (reg, - register_signals [OBJECT_DEREGISTERED], + register_signals[OBJECT_DEREGISTERED], 0, gobj); if (unref) @@ -212,7 +213,7 @@ spi_register_deregister_object (SpiRegister *reg, GObject *gobj, gboolean unref) } static void -register_object (SpiRegister * reg, GObject * gobj) +register_object (SpiRegister *reg, GObject *gobj) { guint ref; g_return_if_fail (G_IS_OBJECT (gobj)); @@ -227,26 +228,25 @@ register_object (SpiRegister * reg, GObject * gobj) g_debug ("REG - %d", ref); #endif - g_signal_emit (reg, register_signals [OBJECT_REGISTERED], 0, gobj); + g_signal_emit (reg, register_signals[OBJECT_REGISTERED], 0, gobj); } /*---------------------------------------------------------------------------*/ /* * Used to lookup an GObject from its D-Bus path. - * + * * If the D-Bus path is not found this function returns NULL. */ GObject * -spi_register_path_to_object (SpiRegister * reg, const char *path) +spi_register_path_to_object (SpiRegister *reg, const char *path) { guint index; void *data; g_return_val_if_fail (path, NULL); - if (strncmp (path, SPI_ATK_OBJECT_PATH_PREFIX, SPI_ATK_PATH_PREFIX_LENGTH) - != 0) + if (strncmp (path, SPI_ATK_OBJECT_PATH_PREFIX, SPI_ATK_PATH_PREFIX_LENGTH) != 0) return NULL; path += SPI_ATK_PATH_PREFIX_LENGTH; /* Skip over the prefix */ @@ -258,25 +258,25 @@ spi_register_path_to_object (SpiRegister * reg, const char *path) index = atoi (path); data = g_hash_table_lookup (reg->ref2ptr, GINT_TO_POINTER (index)); if (data) - return G_OBJECT(data); + return G_OBJECT (data); else return NULL; } GObject * -spi_global_register_path_to_object (const char * path) +spi_global_register_path_to_object (const char *path) { return spi_register_path_to_object (spi_global_register, path); } /* * Used to lookup a D-Bus path from the GObject. - * - * If the objects is not already registered, + * + * If the objects is not already registered, * this function will register it. */ gchar * -spi_register_object_to_path (SpiRegister * reg, GObject * gobj) +spi_register_object_to_path (SpiRegister *reg, GObject *gobj) { guint ref; @@ -284,7 +284,7 @@ spi_register_object_to_path (SpiRegister * reg, GObject * gobj) return NULL; /* Map the root object to the root path. */ - if ((void *)gobj == (void *)spi_global_app_data->root) + if ((void *) gobj == (void *) spi_global_app_data->root) return g_strdup (spi_register_root_path); ref = object_to_ref (gobj); @@ -301,11 +301,11 @@ spi_register_object_to_path (SpiRegister * reg, GObject * gobj) } guint -spi_register_object_to_ref (GObject * gobj) +spi_register_object_to_ref (GObject *gobj) { return object_to_ref (gobj); } - + /* * Gets the path that indicates the accessible desktop object. * This object is logically located on the registry daemon and not diff --git a/atk-adaptor/accessible-register.h b/atk-adaptor/accessible-register.h index e2500659..3d1bb753 100644 --- a/atk-adaptor/accessible-register.h +++ b/atk-adaptor/accessible-register.h @@ -24,25 +24,25 @@ #ifndef ACCESSIBLE_REGISTER_H #define ACCESSIBLE_REGISTER_H -#include <glib.h> #include <glib-object.h> +#include <glib.h> typedef struct _SpiRegister SpiRegister; typedef struct _SpiRegisterClass SpiRegisterClass; G_BEGIN_DECLS -#define SPI_REGISTER_TYPE (spi_register_get_type ()) -#define SPI_REGISTER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), SPI_REGISTER_TYPE, SpiRegister)) -#define SPI_REGISTER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), SPI_REGISTER_TYPE, SpiRegisterClass)) -#define SPI_IS_REGISTER(o) (G_TYPE_CHECK__INSTANCE_TYPE ((o), SPI_REGISTER_TYPE)) +#define SPI_REGISTER_TYPE (spi_register_get_type ()) +#define SPI_REGISTER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), SPI_REGISTER_TYPE, SpiRegister)) +#define SPI_REGISTER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), SPI_REGISTER_TYPE, SpiRegisterClass)) +#define SPI_IS_REGISTER(o) (G_TYPE_CHECK__INSTANCE_TYPE ((o), SPI_REGISTER_TYPE)) #define SPI_IS_REGISTER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), SPI_REGISTER_TYPE)) struct _SpiRegister { GObject parent; - GHashTable * ref2ptr; + GHashTable *ref2ptr; guint reference_counter; }; @@ -58,17 +58,17 @@ extern SpiRegister *spi_global_register; /*---------------------------------------------------------------------------*/ GObject * -spi_register_path_to_object (SpiRegister * reg, const char *path); +spi_register_path_to_object (SpiRegister *reg, const char *path); GObject * -spi_global_register_path_to_object (const char * path); +spi_global_register_path_to_object (const char *path); gchar * -spi_register_object_to_path (SpiRegister * reg, GObject * gobj); +spi_register_object_to_path (SpiRegister *reg, GObject *gobj); guint -spi_register_object_to_ref (GObject * gobj); - +spi_register_object_to_ref (GObject *gobj); + gchar * spi_register_root_object_path (); diff --git a/atk-adaptor/accessible-stateset.c b/atk-adaptor/accessible-stateset.c index 7e9ddada..09f8962a 100644 --- a/atk-adaptor/accessible-stateset.c +++ b/atk-adaptor/accessible-stateset.c @@ -30,11 +30,9 @@ #include <stdio.h> - static AtspiStateType *accessible_state_types = NULL; static AtkStateType *atk_state_types = NULL; - static gboolean spi_init_state_type_tables (void) { @@ -48,15 +46,15 @@ spi_init_state_type_tables (void) atk_state_types = g_new (AtkStateType, ATSPI_STATE_LAST_DEFINED); g_return_val_if_fail (accessible_state_types, FALSE); g_return_val_if_fail (atk_state_types, FALSE); - + for (i = 0; i < ATSPI_STATE_LAST_DEFINED; i++) { atk_state_types[i] = ATK_STATE_INVALID; } - for (i=0; i < ATK_STATE_LAST_DEFINED; i++) + for (i = 0; i < ATK_STATE_LAST_DEFINED; i++) { - accessible_state_types[i] = ATSPI_STATE_INVALID; + accessible_state_types[i] = ATSPI_STATE_INVALID; } accessible_state_types[ATK_STATE_ACTIVE] = ATSPI_STATE_ACTIVE; @@ -72,9 +70,9 @@ spi_init_state_type_tables (void) accessible_state_types[ATK_STATE_DEFUNCT] = ATSPI_STATE_DEFUNCT; atk_state_types[ATSPI_STATE_DEFUNCT] = ATK_STATE_DEFUNCT; accessible_state_types[ATK_STATE_EDITABLE] = ATSPI_STATE_EDITABLE; - atk_state_types[ATSPI_STATE_EDITABLE] = ATK_STATE_EDITABLE; + atk_state_types[ATSPI_STATE_EDITABLE] = ATK_STATE_EDITABLE; accessible_state_types[ATK_STATE_ENABLED] = ATSPI_STATE_ENABLED; - atk_state_types[ATSPI_STATE_ENABLED] = ATK_STATE_ENABLED; + atk_state_types[ATSPI_STATE_ENABLED] = ATK_STATE_ENABLED; accessible_state_types[ATK_STATE_EXPANDABLE] = ATSPI_STATE_EXPANDABLE; atk_state_types[ATSPI_STATE_EXPANDABLE] = ATK_STATE_EXPANDABLE; accessible_state_types[ATK_STATE_EXPANDED] = ATSPI_STATE_EXPANDED; @@ -154,7 +152,7 @@ state_spi_to_atk (AtspiStateType state) { guint idx = state; if (idx < ATSPI_STATE_LAST_DEFINED) - return atk_state_types [idx]; + return atk_state_types[idx]; else return ATK_STATE_INVALID; } @@ -174,10 +172,10 @@ spi_state_set_cache_from_sequence (GArray *seq) AtkStateType *states; spi_init_state_type_tables (); - + states = g_newa (AtkStateType, seq->len); for (i = 0; i < seq->len; i++) - states [i] = state_spi_to_atk (g_array_index (seq, dbus_int32_t, i)); + states[i] = state_spi_to_atk (g_array_index (seq, dbus_int32_t, i)); set = atk_state_set_new (); atk_state_set_add_states (set, states, seq->len); @@ -187,7 +185,7 @@ spi_state_set_cache_from_sequence (GArray *seq) } void -spi_atk_state_to_dbus_array (AtkObject * object, dbus_uint32_t * array) +spi_atk_state_to_dbus_array (AtkObject *object, dbus_uint32_t *array) { AtkStateSet *set = atk_object_ref_state_set (object); spi_atk_state_set_to_dbus_array (set, array); @@ -195,7 +193,7 @@ 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) +spi_atk_state_set_to_dbus_array (AtkStateSet *set, dbus_uint32_t *array) { int i; @@ -209,10 +207,10 @@ spi_atk_state_set_to_dbus_array (AtkStateSet * set, dbus_uint32_t * array) for (i = 0; i < ATK_STATE_LAST_DEFINED; i++) { if (atk_state_set_contains_state (set, i)) - { - int a = accessible_state_types[i]; - g_assert (a < 64); - BITARRAY_SET (array, a); - } + { + int a = accessible_state_types[i]; + g_assert (a < 64); + BITARRAY_SET (array, a); + } } } diff --git a/atk-adaptor/accessible-stateset.h b/atk-adaptor/accessible-stateset.h index 4896cb6b..cffab536 100644 --- a/atk-adaptor/accessible-stateset.h +++ b/atk-adaptor/accessible-stateset.h @@ -30,21 +30,21 @@ 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 (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) -#define spi_state_set_cache_unref(s) g_object_unref (s) -#define spi_state_set_cache_new(seq) spi_state_set_cache_from_sequence (seq) -#define spi_state_set_cache_contains(s,a) atk_state_set_contains_state (ATK_STATE_SET (s), \ - spi_atk_state_from_spi_state (a)) -#define spi_state_set_cache_add(s,a) atk_state_set_add_state (ATK_STATE_SET (s), \ - spi_atk_state_from_spi_state (a)) -#define spi_state_set_cache_remove(s,a) atk_state_set_remove_state (ATK_STATE_SET (s), \ - spi_atk_state_from_spi_state (a)) -#define spi_state_set_cache_xor(a,b) atk_state_set_xor_sets (ATK_STATE_SET (a), ATK_STATE_SET (b)) -#define spi_state_set_cache_is_empty(a) atk_state_set_is_empty (ATK_STATE_SET (a)) +AtkStateSet *spi_state_set_cache_from_sequence (GArray *seq); +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) +#define spi_state_set_cache_unref(s) g_object_unref (s) +#define spi_state_set_cache_new(seq) spi_state_set_cache_from_sequence (seq) +#define spi_state_set_cache_contains(s, a) atk_state_set_contains_state (ATK_STATE_SET (s), \ + spi_atk_state_from_spi_state (a)) +#define spi_state_set_cache_add(s, a) atk_state_set_add_state (ATK_STATE_SET (s), \ + spi_atk_state_from_spi_state (a)) +#define spi_state_set_cache_remove(s, a) atk_state_set_remove_state (ATK_STATE_SET (s), \ + spi_atk_state_from_spi_state (a)) +#define spi_state_set_cache_xor(a, b) atk_state_set_xor_sets (ATK_STATE_SET (a), ATK_STATE_SET (b)) +#define spi_state_set_cache_is_empty(a) atk_state_set_is_empty (ATK_STATE_SET (a)) G_END_DECLS diff --git a/atk-adaptor/adaptors/accessible-adaptor.c b/atk-adaptor/adaptors/accessible-adaptor.c index baafda56..ad71a021 100644 --- a/atk-adaptor/adaptors/accessible-adaptor.c +++ b/atk-adaptor/adaptors/accessible-adaptor.c @@ -22,19 +22,19 @@ * Boston, MA 02110-1301, USA. */ +#include "bridge.h" #include <atk/atk.h> #include <droute/droute.h> -#include "bridge.h" -#include "atspi/atspi.h" -#include "spi-dbus.h" #include "accessible-stateset.h" -#include "object.h" +#include "atspi/atspi.h" #include "introspection.h" +#include "object.h" +#include "spi-dbus.h" #include <string.h> static dbus_bool_t -impl_get_Name (DBusMessageIter * iter, void *user_data) +impl_get_Name (DBusMessageIter *iter, void *user_data) { AtkObject *object = (AtkObject *) user_data; @@ -44,7 +44,7 @@ impl_get_Name (DBusMessageIter * iter, void *user_data) } static dbus_bool_t -impl_get_Description (DBusMessageIter * iter, void *user_data) +impl_get_Description (DBusMessageIter *iter, void *user_data) { AtkObject *object = (AtkObject *) user_data; @@ -54,7 +54,7 @@ impl_get_Description (DBusMessageIter * iter, void *user_data) } static dbus_bool_t -impl_get_Locale (DBusMessageIter * iter, void *user_data) +impl_get_Locale (DBusMessageIter *iter, void *user_data) { AtkObject *object = (AtkObject *) user_data; @@ -64,7 +64,7 @@ impl_get_Locale (DBusMessageIter * iter, void *user_data) } static dbus_bool_t -impl_get_Parent (DBusMessageIter * iter, void *user_data) +impl_get_Parent (DBusMessageIter *iter, void *user_data) { AtkObject *obj = (AtkObject *) user_data; AtkObject *parent; @@ -112,22 +112,21 @@ impl_get_Parent (DBusMessageIter * iter, void *user_data) } } else if (role != ATSPI_ROLE_APPLICATION) - spi_object_append_null_reference (&iter_variant); + spi_object_append_null_reference (&iter_variant); else - spi_object_append_desktop_reference (&iter_variant); - } + spi_object_append_desktop_reference (&iter_variant); + } else { spi_object_append_reference (&iter_variant, parent); } - dbus_message_iter_close_container (iter, &iter_variant); return TRUE; } static dbus_bool_t -impl_get_ChildCount (DBusMessageIter * iter, void *user_data) +impl_get_ChildCount (DBusMessageIter *iter, void *user_data) { AtkObject *object = (AtkObject *) user_data; int childCount; @@ -135,14 +134,15 @@ impl_get_ChildCount (DBusMessageIter * iter, void *user_data) g_return_val_if_fail (ATK_IS_OBJECT (user_data), FALSE); childCount = (ATK_IS_SOCKET (object) && atk_socket_is_occupied (ATK_SOCKET (object))) - ? 1 - : atk_object_get_n_accessible_children (object); + ? 1 + : atk_object_get_n_accessible_children (object); return droute_return_v_int32 (iter, childCount); } static DBusMessage * -impl_GetChildAtIndex (DBusConnection * bus, - DBusMessage * message, void *user_data) +impl_GetChildAtIndex (DBusConnection *bus, + DBusMessage *message, + void *user_data) { AtkObject *object = (AtkObject *) user_data; DBusMessage *reply; @@ -151,8 +151,7 @@ impl_GetChildAtIndex (DBusConnection * bus, g_return_val_if_fail (ATK_IS_OBJECT (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &i, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &i, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -189,8 +188,9 @@ impl_GetChildAtIndex (DBusConnection * bus, } static DBusMessage * -impl_GetChildren (DBusConnection * bus, - DBusMessage * message, void *user_data) +impl_GetChildren (DBusConnection *bus, + DBusMessage *message, + void *user_data) { AtkObject *object = (AtkObject *) user_data; gint i; @@ -205,13 +205,12 @@ impl_GetChildren (DBusConnection * bus, if (!reply) goto oom; dbus_message_iter_init_append (reply, &iter); - if (!dbus_message_iter_open_container - (&iter, DBUS_TYPE_ARRAY, "(so)", &iter_array)) + if (!dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, "(so)", &iter_array)) goto oom; for (i = 0; i < count; i++) { AtkObject *child = atk_object_ref_accessible_child (object, i); - spi_object_append_reference (&iter_array, child); + spi_object_append_reference (&iter_array, child); if (child) g_object_unref (child); } @@ -224,8 +223,9 @@ oom: } static DBusMessage * -impl_GetIndexInParent (DBusConnection * bus, - DBusMessage * message, void *user_data) +impl_GetIndexInParent (DBusConnection *bus, + DBusMessage *message, + void *user_data) { AtkObject *object = (AtkObject *) user_data; dbus_int32_t rv; @@ -241,7 +241,7 @@ impl_GetIndexInParent (DBusConnection * bus, } static gboolean -spi_init_relation_type_table (AtspiRelationType * types) +spi_init_relation_type_table (AtspiRelationType *types) { gint i; @@ -261,9 +261,9 @@ spi_init_relation_type_table (AtspiRelationType * types) types[ATK_RELATION_EMBEDDED_BY] = ATSPI_RELATION_EMBEDDED_BY; types[ATK_RELATION_POPUP_FOR] = ATSPI_RELATION_POPUP_FOR; types[ATK_RELATION_PARENT_WINDOW_OF] = - ATSPI_RELATION_PARENT_WINDOW_OF; + ATSPI_RELATION_PARENT_WINDOW_OF; types[ATK_RELATION_DESCRIPTION_FOR] = - ATSPI_RELATION_DESCRIPTION_FOR; + ATSPI_RELATION_DESCRIPTION_FOR; types[ATK_RELATION_DESCRIBED_BY] = ATSPI_RELATION_DESCRIBED_BY; types[ATK_RELATION_DETAILS] = ATSPI_RELATION_DETAILS; types[ATK_RELATION_DETAILS_FOR] = ATSPI_RELATION_DETAILS_FOR; @@ -279,7 +279,7 @@ spi_relation_type_from_atk_relation_type (AtkRelationType type) { static gboolean is_initialized = FALSE; static AtspiRelationType - spi_relation_type_table[ATK_RELATION_LAST_DEFINED]; + spi_relation_type_table[ATK_RELATION_LAST_DEFINED]; AtspiRelationType spi_type; if (!is_initialized) @@ -293,8 +293,9 @@ spi_relation_type_from_atk_relation_type (AtkRelationType type) } static DBusMessage * -impl_GetRelationSet (DBusConnection * bus, - DBusMessage * message, void *user_data) +impl_GetRelationSet (DBusConnection *bus, + DBusMessage *message, + void *user_data) { AtkObject *object = (AtkObject *) user_data; DBusMessage *reply; @@ -310,8 +311,7 @@ impl_GetRelationSet (DBusConnection * bus, return NULL; set = atk_object_ref_relation_set (object); dbus_message_iter_init_append (reply, &iter); - if (!dbus_message_iter_open_container - (&iter, DBUS_TYPE_ARRAY, "(ua(so))", &iter_array)) + if (!dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, "(ua(so))", &iter_array)) { goto oom; } @@ -329,14 +329,12 @@ impl_GetRelationSet (DBusConnection * bus, rt = atk_relation_get_relation_type (r); type = spi_relation_type_from_atk_relation_type (rt); target = atk_relation_get_target (r); - if (!dbus_message_iter_open_container - (&iter_array, DBUS_TYPE_STRUCT, NULL, &iter_struct)) + if (!dbus_message_iter_open_container (&iter_array, DBUS_TYPE_STRUCT, NULL, &iter_struct)) { goto oom; } dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_UINT32, &type); - if (!dbus_message_iter_open_container - (&iter_struct, DBUS_TYPE_ARRAY, "(so)", &iter_targets)) + if (!dbus_message_iter_open_container (&iter_struct, DBUS_TYPE_ARRAY, "(so)", &iter_targets)) { goto oom; } @@ -359,7 +357,7 @@ oom: } static DBusMessage * -impl_GetRole (DBusConnection * bus, DBusMessage * message, void *user_data) +impl_GetRole (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkObject *object = (AtkObject *) user_data; gint role; @@ -380,8 +378,9 @@ impl_GetRole (DBusConnection * bus, DBusMessage * message, void *user_data) } static DBusMessage * -impl_GetRoleName (DBusConnection * bus, - DBusMessage * message, void *user_data) +impl_GetRoleName (DBusConnection *bus, + DBusMessage *message, + void *user_data) { AtkObject *object = (AtkObject *) user_data; gint role; @@ -404,8 +403,9 @@ impl_GetRoleName (DBusConnection * bus, } static DBusMessage * -impl_GetLocalizedRoleName (DBusConnection * bus, - DBusMessage * message, void *user_data) +impl_GetLocalizedRoleName (DBusConnection *bus, + DBusMessage *message, + void *user_data) { AtkObject *object = (AtkObject *) user_data; gint role; @@ -428,7 +428,7 @@ impl_GetLocalizedRoleName (DBusConnection * bus, } static DBusMessage * -impl_GetState (DBusConnection * bus, DBusMessage * message, void *user_data) +impl_GetState (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkObject *object = (AtkObject *) user_data; @@ -457,8 +457,9 @@ impl_GetState (DBusConnection * bus, DBusMessage * message, void *user_data) } static DBusMessage * -impl_GetAttributes (DBusConnection * bus, - DBusMessage * message, void *user_data) +impl_GetAttributes (DBusConnection *bus, + DBusMessage *message, + void *user_data) { AtkObject *object = (AtkObject *) user_data; AtkAttributeSet *attributes; @@ -480,7 +481,7 @@ impl_GetAttributes (DBusConnection * bus, } static dbus_bool_t -impl_get_Attributes (DBusMessageIter * iter, void *user_data) +impl_get_Attributes (DBusMessageIter *iter, void *user_data) { DBusMessageIter iter_variant; AtkObject *object = (AtkObject *) user_data; @@ -500,15 +501,17 @@ impl_get_Attributes (DBusMessageIter * iter, void *user_data) } static DBusMessage * -impl_GetApplication (DBusConnection * bus, - DBusMessage * message, void *user_data) +impl_GetApplication (DBusConnection *bus, + DBusMessage *message, + void *user_data) { return spi_object_return_reference (message, atk_get_root ()); } static DBusMessage * -impl_GetInterfaces (DBusConnection * bus, - DBusMessage * message, void *user_data) +impl_GetInterfaces (DBusConnection *bus, + DBusMessage *message, + void *user_data) { AtkObject *object = (AtkObject *) user_data; DBusMessage *reply; @@ -529,7 +532,7 @@ impl_GetInterfaces (DBusConnection * bus, } static dbus_bool_t -impl_get_AccessibleId (DBusMessageIter * iter, void *user_data) +impl_get_AccessibleId (DBusMessageIter *iter, void *user_data) { AtkObject *object = (AtkObject *) user_data; @@ -539,36 +542,36 @@ impl_get_AccessibleId (DBusMessageIter * iter, void *user_data) } static DRouteMethod methods[] = { - {impl_GetChildAtIndex, "GetChildAtIndex"}, - {impl_GetChildren, "GetChildren"}, - {impl_GetIndexInParent, "GetIndexInParent"}, - {impl_GetRelationSet, "GetRelationSet"}, - {impl_GetRole, "GetRole"}, - {impl_GetRoleName, "GetRoleName"}, - {impl_GetLocalizedRoleName, "GetLocalizedRoleName"}, - {impl_GetState, "GetState"}, - {impl_GetAttributes, "GetAttributes"}, - {impl_GetApplication, "GetApplication"}, - {impl_GetInterfaces, "GetInterfaces"}, - {NULL, NULL} + { impl_GetChildAtIndex, "GetChildAtIndex" }, + { impl_GetChildren, "GetChildren" }, + { impl_GetIndexInParent, "GetIndexInParent" }, + { impl_GetRelationSet, "GetRelationSet" }, + { impl_GetRole, "GetRole" }, + { impl_GetRoleName, "GetRoleName" }, + { impl_GetLocalizedRoleName, "GetLocalizedRoleName" }, + { impl_GetState, "GetState" }, + { impl_GetAttributes, "GetAttributes" }, + { impl_GetApplication, "GetApplication" }, + { impl_GetInterfaces, "GetInterfaces" }, + { NULL, NULL } }; static DRouteProperty properties[] = { - {impl_get_Name, NULL, "Name"}, - {impl_get_Description, NULL, "Description"}, - {impl_get_Locale, NULL, "Locale"}, - {impl_get_Parent, NULL, "Parent"}, - {impl_get_ChildCount, NULL, "ChildCount"}, - {impl_get_Attributes, NULL, "Attributes"}, - {impl_get_AccessibleId, NULL, "AccessibleId"}, - {NULL, NULL, NULL} + { impl_get_Name, NULL, "Name" }, + { impl_get_Description, NULL, "Description" }, + { impl_get_Locale, NULL, "Locale" }, + { impl_get_Parent, NULL, "Parent" }, + { impl_get_ChildCount, NULL, "ChildCount" }, + { impl_get_Attributes, NULL, "Attributes" }, + { impl_get_AccessibleId, NULL, "AccessibleId" }, + { NULL, NULL, NULL } }; void -spi_initialize_accessible (DRoutePath * path) +spi_initialize_accessible (DRoutePath *path) { spi_atk_add_interface (path, ATSPI_DBUS_INTERFACE_ACCESSIBLE, - spi_org_a11y_atspi_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 ab80590a..284fd29d 100644 --- a/atk-adaptor/adaptors/action-adaptor.c +++ b/atk-adaptor/adaptors/action-adaptor.c @@ -22,16 +22,16 @@ * Boston, MA 02110-1301, USA. */ +#include "bridge.h" #include <atk/atk.h> #include <droute/droute.h> -#include "bridge.h" #include "spi-dbus.h" #include "introspection.h" static dbus_bool_t -impl_get_NActions (DBusMessageIter * iter, void *user_data) +impl_get_NActions (DBusMessageIter *iter, void *user_data) { AtkAction *action = (AtkAction *) user_data; @@ -40,8 +40,7 @@ impl_get_NActions (DBusMessageIter * iter, void *user_data) } static DBusMessage * -impl_get_description (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_get_description (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkAction *action = (AtkAction *) user_data; DBusMessage *reply; @@ -50,8 +49,7 @@ impl_get_description (DBusConnection * bus, DBusMessage * message, g_return_val_if_fail (ATK_IS_ACTION (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -68,7 +66,7 @@ impl_get_description (DBusConnection * bus, DBusMessage * message, } static DBusMessage * -impl_get_name (DBusConnection * bus, DBusMessage * message, void *user_data) +impl_get_name (DBusConnection *bus, DBusMessage *message, void *user_data) { DBusMessage *reply; dbus_int32_t index; @@ -77,8 +75,7 @@ impl_get_name (DBusConnection * bus, DBusMessage * message, void *user_data) g_return_val_if_fail (ATK_IS_ACTION (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -95,7 +92,7 @@ impl_get_name (DBusConnection * bus, DBusMessage * message, void *user_data) } static DBusMessage * -impl_get_localized_name (DBusConnection * bus, DBusMessage * message, void *user_data) +impl_get_localized_name (DBusConnection *bus, DBusMessage *message, void *user_data) { DBusMessage *reply; dbus_int32_t index; @@ -104,8 +101,7 @@ impl_get_localized_name (DBusConnection * bus, DBusMessage * message, void *user g_return_val_if_fail (ATK_IS_ACTION (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -122,8 +118,7 @@ impl_get_localized_name (DBusConnection * bus, DBusMessage * message, void *user } static DBusMessage * -impl_get_keybinding (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_get_keybinding (DBusConnection *bus, DBusMessage *message, void *user_data) { DBusMessage *reply; dbus_int32_t index; @@ -132,8 +127,7 @@ impl_get_keybinding (DBusConnection * bus, DBusMessage * message, g_return_val_if_fail (ATK_IS_ACTION (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -150,7 +144,7 @@ impl_get_keybinding (DBusConnection * bus, DBusMessage * message, } static DBusMessage * -impl_GetActions (DBusConnection * bus, DBusMessage * message, void *user_data) +impl_GetActions (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkAction *action = (AtkAction *) user_data; DBusMessage *reply; @@ -165,8 +159,7 @@ impl_GetActions (DBusConnection * bus, DBusMessage * message, void *user_data) if (!reply) goto oom; dbus_message_iter_init_append (reply, &iter); - if (!dbus_message_iter_open_container - (&iter, DBUS_TYPE_ARRAY, "(sss)", &iter_array)) + if (!dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, "(sss)", &iter_array)) goto oom; for (i = 0; i < count; i++) { @@ -179,8 +172,7 @@ impl_GetActions (DBusConnection * bus, DBusMessage * message, void *user_data) desc = ""; if (!kb) kb = ""; - if (!dbus_message_iter_open_container - (&iter_array, DBUS_TYPE_STRUCT, NULL, &iter_struct)) + if (!dbus_message_iter_open_container (&iter_array, DBUS_TYPE_STRUCT, NULL, &iter_struct)) goto oom; dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_STRING, &lname); dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_STRING, &desc); @@ -197,7 +189,7 @@ oom: } static DBusMessage * -impl_DoAction (DBusConnection * bus, DBusMessage * message, void *user_data) +impl_DoAction (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkAction *action = (AtkAction *) user_data; dbus_int32_t index; @@ -206,8 +198,7 @@ impl_DoAction (DBusConnection * bus, DBusMessage * message, void *user_data) g_return_val_if_fail (ATK_IS_ACTION (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -224,30 +215,24 @@ impl_DoAction (DBusConnection * bus, DBusMessage * message, void *user_data) } DRouteMethod methods[] = { - {impl_get_description, "GetDescription"} - , - {impl_get_name, "GetName"} - , - {impl_get_localized_name, "GetLocalizedName"} - , - {impl_get_keybinding, "GetKeyBinding"} - , - {impl_GetActions, "GetActions"} - , - {impl_DoAction, "DoAction"} - , - {NULL, NULL} + { impl_get_description, "GetDescription" }, + { impl_get_name, "GetName" }, + { impl_get_localized_name, "GetLocalizedName" }, + { impl_get_keybinding, "GetKeyBinding" }, + { impl_GetActions, "GetActions" }, + { impl_DoAction, "DoAction" }, + { NULL, NULL } }; static DRouteProperty properties[] = { - {impl_get_NActions, NULL, "NActions"}, - {NULL, NULL} + { impl_get_NActions, NULL, "NActions" }, + { NULL, NULL } }; void -spi_initialize_action (DRoutePath * path) +spi_initialize_action (DRoutePath *path) { spi_atk_add_interface (path, - ATSPI_DBUS_INTERFACE_ACTION, - spi_org_a11y_atspi_Action, methods, properties); + 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 711658c8..28691a76 100644 --- a/atk-adaptor/adaptors/adaptors.h +++ b/atk-adaptor/adaptors/adaptors.h @@ -29,22 +29,22 @@ AtspiRole spi_accessible_role_from_atk_role (AtkRole role); -void spi_initialize_accessible (DRoutePath * path); -void spi_initialize_action (DRoutePath * path); -void spi_initialize_application (DRoutePath * path); -void spi_initialize_collection (DRoutePath * path); -void spi_initialize_component (DRoutePath * path); -void spi_initialize_document (DRoutePath * path); -void spi_initialize_editabletext (DRoutePath * path); -void spi_initialize_hyperlink (DRoutePath * path); -void spi_initialize_hypertext (DRoutePath * path); -void spi_initialize_image (DRoutePath * path); -void spi_initialize_selection (DRoutePath * path); -void spi_initialize_socket (DRoutePath * path); -void spi_initialize_table (DRoutePath * path); -void spi_initialize_table_cell (DRoutePath * path); -void spi_initialize_text (DRoutePath * path); -void spi_initialize_value (DRoutePath * path); -void spi_initialize_cache (DRoutePath * path); +void spi_initialize_accessible (DRoutePath *path); +void spi_initialize_action (DRoutePath *path); +void spi_initialize_application (DRoutePath *path); +void spi_initialize_collection (DRoutePath *path); +void spi_initialize_component (DRoutePath *path); +void spi_initialize_document (DRoutePath *path); +void spi_initialize_editabletext (DRoutePath *path); +void spi_initialize_hyperlink (DRoutePath *path); +void spi_initialize_hypertext (DRoutePath *path); +void spi_initialize_image (DRoutePath *path); +void spi_initialize_selection (DRoutePath *path); +void spi_initialize_socket (DRoutePath *path); +void spi_initialize_table (DRoutePath *path); +void spi_initialize_table_cell (DRoutePath *path); +void spi_initialize_text (DRoutePath *path); +void spi_initialize_value (DRoutePath *path); +void spi_initialize_cache (DRoutePath *path); #endif /* ADAPTORS_H */ diff --git a/atk-adaptor/adaptors/application-adaptor.c b/atk-adaptor/adaptors/application-adaptor.c index ab9bb271..2c0d83db 100644 --- a/atk-adaptor/adaptors/application-adaptor.c +++ b/atk-adaptor/adaptors/application-adaptor.c @@ -25,26 +25,26 @@ #include <atk/atk.h> #include <droute/droute.h> -#include "spi-dbus.h" #include "introspection.h" +#include "spi-dbus.h" /* for spi_global_app_data is there a better way? */ #include "../bridge.h" static dbus_bool_t -impl_get_ToolkitName (DBusMessageIter * iter, void *user_data) +impl_get_ToolkitName (DBusMessageIter *iter, void *user_data) { return droute_return_v_string (iter, atk_get_toolkit_name ()); } static dbus_bool_t -impl_get_Version (DBusMessageIter * iter, void *user_data) +impl_get_Version (DBusMessageIter *iter, void *user_data) { return droute_return_v_string (iter, atk_get_toolkit_version ()); } static dbus_bool_t -impl_get_AtspiVersion (DBusMessageIter * iter, void *user_data) +impl_get_AtspiVersion (DBusMessageIter *iter, void *user_data) { return droute_return_v_string (iter, "2.1"); } @@ -52,42 +52,42 @@ impl_get_AtspiVersion (DBusMessageIter * iter, void *user_data) static dbus_int32_t id; static dbus_bool_t -impl_get_Id (DBusMessageIter * iter, void *user_data) +impl_get_Id (DBusMessageIter *iter, void *user_data) { return droute_return_v_int32 (iter, id); } static dbus_bool_t -impl_set_Id (DBusMessageIter * iter, void *user_data) +impl_set_Id (DBusMessageIter *iter, void *user_data) { id = droute_get_v_int32 (iter); return TRUE; } static DBusMessage * -impl_registerToolkitEventListener (DBusConnection * bus, - DBusMessage * message, void *user_data) +impl_registerToolkitEventListener (DBusConnection *bus, + DBusMessage *message, + void *user_data) { return NULL; } static DBusMessage * -impl_registerObjectEventListener (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_registerObjectEventListener (DBusConnection *bus, DBusMessage *message, void *user_data) { return NULL; } static DBusMessage * -impl_GetLocale (DBusConnection * bus, DBusMessage * message, void *user_data) +impl_GetLocale (DBusConnection *bus, DBusMessage *message, void *user_data) { return NULL; } static DBusMessage * -impl_get_app_bus(DBusConnection *bus, DBusMessage *msg, void *data) +impl_get_app_bus (DBusConnection *bus, DBusMessage *msg, void *data) { -DBusMessage *reply; + DBusMessage *reply; if (bus == spi_global_app_data->bus) spi_atk_add_client (dbus_message_get_sender (msg)); @@ -95,34 +95,32 @@ DBusMessage *reply; if (!spi_global_app_data->app_bus_addr) spi_atk_create_socket (spi_global_app_data); -reply = dbus_message_new_method_return(msg); -if (reply) + reply = dbus_message_new_method_return (msg); + if (reply) { - const char *retval = (atspi_is_initialized () ? - "": - spi_global_app_data->app_bus_addr); + const char *retval = (atspi_is_initialized () ? "" : spi_global_app_data->app_bus_addr); if (!retval) retval = ""; - dbus_message_append_args(reply, DBUS_TYPE_STRING, &retval, DBUS_TYPE_INVALID); + dbus_message_append_args (reply, DBUS_TYPE_STRING, &retval, DBUS_TYPE_INVALID); } -return reply; + return reply; } static DRouteMethod methods[] = { - {impl_registerToolkitEventListener, "registerToolkitEventListener"}, - {impl_registerObjectEventListener, "registerObjectEventListener"}, - {impl_GetLocale, "GetLocale"}, - {impl_get_app_bus, "GetApplicationBusAddress"}, - {NULL, NULL} + { impl_registerToolkitEventListener, "registerToolkitEventListener" }, + { impl_registerObjectEventListener, "registerObjectEventListener" }, + { impl_GetLocale, "GetLocale" }, + { impl_get_app_bus, "GetApplicationBusAddress" }, + { NULL, NULL } }; static DRouteProperty properties[] = { - {impl_get_ToolkitName, NULL, "ToolkitName"}, - {impl_get_Version, NULL, "Version"}, - {impl_get_AtspiVersion, NULL, "AtspiVersion"}, - {impl_get_Id, impl_set_Id, "Id"}, - {NULL, NULL, NULL} + { impl_get_ToolkitName, NULL, "ToolkitName" }, + { impl_get_Version, NULL, "Version" }, + { impl_get_AtspiVersion, NULL, "AtspiVersion" }, + { impl_get_Id, impl_set_Id, "Id" }, + { NULL, NULL, NULL } }; /*static long @@ -133,7 +131,7 @@ obj_is_root (const char *path, void *user_data) }*/ void -spi_initialize_application (DRoutePath * path) +spi_initialize_application (DRoutePath *path) { droute_path_add_interface (path, ATSPI_DBUS_INTERFACE_APPLICATION, diff --git a/atk-adaptor/adaptors/cache-adaptor.c b/atk-adaptor/adaptors/cache-adaptor.c index 2f86d091..63a984b5 100644 --- a/atk-adaptor/adaptors/cache-adaptor.c +++ b/atk-adaptor/adaptors/cache-adaptor.c @@ -28,36 +28,34 @@ #include <atk/atk.h> #include <droute/droute.h> -#include "spi-dbus.h" -#include "accessible-stateset.h" #include "accessible-cache.h" +#include "accessible-stateset.h" #include "bridge.h" -#include "object.h" #include "introspection.h" +#include "object.h" +#include "spi-dbus.h" /* TODO - This should possibly be a common define */ #define SPI_OBJECT_PREFIX "/org/a11y/atspi" #define SPI_CACHE_OBJECT_SUFFIX "/cache" #define SPI_CACHE_OBJECT_PATH SPI_OBJECT_PREFIX SPI_CACHE_OBJECT_SUFFIX -#define SPI_OBJECT_REFERENCE_SIGNATURE "(" \ - DBUS_TYPE_STRING_AS_STRING \ - DBUS_TYPE_OBJECT_PATH_AS_STRING \ +#define SPI_OBJECT_REFERENCE_SIGNATURE "(" DBUS_TYPE_STRING_AS_STRING \ + DBUS_TYPE_OBJECT_PATH_AS_STRING \ ")" - -#define SPI_CACHE_ITEM_SIGNATURE "(" \ - SPI_OBJECT_REFERENCE_SIGNATURE \ - SPI_OBJECT_REFERENCE_SIGNATURE \ - SPI_OBJECT_REFERENCE_SIGNATURE \ - DBUS_TYPE_INT32_AS_STRING \ - DBUS_TYPE_INT32_AS_STRING \ - DBUS_TYPE_ARRAY_AS_STRING \ - DBUS_TYPE_STRING_AS_STRING \ - DBUS_TYPE_STRING_AS_STRING \ - DBUS_TYPE_UINT32_AS_STRING \ - DBUS_TYPE_STRING_AS_STRING \ - DBUS_TYPE_ARRAY_AS_STRING \ - DBUS_TYPE_UINT32_AS_STRING \ + +#define SPI_CACHE_ITEM_SIGNATURE "(" SPI_OBJECT_REFERENCE_SIGNATURE \ + SPI_OBJECT_REFERENCE_SIGNATURE \ + SPI_OBJECT_REFERENCE_SIGNATURE \ + DBUS_TYPE_INT32_AS_STRING \ + DBUS_TYPE_INT32_AS_STRING \ + DBUS_TYPE_ARRAY_AS_STRING \ + DBUS_TYPE_STRING_AS_STRING \ + DBUS_TYPE_STRING_AS_STRING \ + DBUS_TYPE_UINT32_AS_STRING \ + DBUS_TYPE_STRING_AS_STRING \ + DBUS_TYPE_ARRAY_AS_STRING \ + DBUS_TYPE_UINT32_AS_STRING \ ")" /*---------------------------------------------------------------------------*/ @@ -111,7 +109,7 @@ should_cache_children (AtkObject *obj, AtkStateSet *set) * The format of the structure is (o(so)iiassusau). */ static void -append_cache_item (AtkObject * obj, gpointer data) +append_cache_item (AtkObject *obj, gpointer data) { DBusMessageIter iter_struct, iter_sub_array; dbus_uint32_t states[2]; @@ -122,7 +120,7 @@ append_cache_item (AtkObject * obj, gpointer data) dbus_uint32_t role; set = atk_object_ref_state_set (obj); - AtkObject *application, *parent; + AtkObject *application, *parent; dbus_message_iter_open_container (iter_array, DBUS_TYPE_STRUCT, NULL, &iter_struct); @@ -182,12 +180,14 @@ append_cache_item (AtkObject * obj, gpointer data) /* Marshal index in parent */ index = (should_call_index_in_parent (obj, set) - ? atk_object_get_index_in_parent (obj) : -1); + ? atk_object_get_index_in_parent (obj) + : -1); dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_INT32, &index); /* marshal child count */ count = (should_cache_children (obj, set) - ? atk_object_get_n_accessible_children (obj) : -1); + ? atk_object_get_n_accessible_children (obj) + : -1); if (ATK_IS_SOCKET (obj) && atk_socket_is_occupied (ATK_SOCKET (obj))) count = 1; @@ -256,7 +256,7 @@ add_to_list_hf (gpointer key, gpointer obj_data, gpointer data) /*---------------------------------------------------------------------------*/ static void -emit_cache_remove (SpiCache *cache, GObject * obj) +emit_cache_remove (SpiCache *cache, GObject *obj) { DBusMessage *message; @@ -277,7 +277,7 @@ emit_cache_remove (SpiCache *cache, GObject * obj) } static void -emit_cache_add (SpiCache *cache, GObject * obj) +emit_cache_add (SpiCache *cache, GObject *obj) { AtkObject *accessible = ATK_OBJECT (obj); DBusMessage *message; @@ -299,11 +299,10 @@ emit_cache_add (SpiCache *cache, GObject * obj) } } - /*---------------------------------------------------------------------------*/ static DBusMessage * -impl_GetRoot (DBusConnection * bus, DBusMessage * message, void *user_data) +impl_GetRoot (DBusConnection *bus, DBusMessage *message, void *user_data) { return spi_object_return_reference (message, spi_global_app_data->root); } @@ -311,7 +310,7 @@ impl_GetRoot (DBusConnection * bus, DBusMessage * message, void *user_data) /*---------------------------------------------------------------------------*/ static DBusMessage * -impl_GetItems (DBusConnection * bus, DBusMessage * message, void *user_data) +impl_GetItems (DBusConnection *bus, DBusMessage *message, void *user_data) { DBusMessage *reply; DBusMessageIter iter, iter_array; @@ -336,13 +335,13 @@ impl_GetItems (DBusConnection * bus, DBusMessage * message, void *user_data) /*---------------------------------------------------------------------------*/ static DRouteMethod methods[] = { - {impl_GetRoot, "GetRoot"}, - {impl_GetItems, "GetItems"}, - {NULL, NULL} + { impl_GetRoot, "GetRoot" }, + { impl_GetItems, "GetItems" }, + { NULL, NULL } }; void -spi_initialize_cache (DRoutePath * path) +spi_initialize_cache (DRoutePath *path) { droute_path_add_interface (path, ATSPI_DBUS_INTERFACE_CACHE, spi_org_a11y_atspi_Cache, methods, NULL); diff --git a/atk-adaptor/adaptors/collection-adaptor.c b/atk-adaptor/adaptors/collection-adaptor.c index f53acb39..8cd99304 100644 --- a/atk-adaptor/adaptors/collection-adaptor.c +++ b/atk-adaptor/adaptors/collection-adaptor.c @@ -24,17 +24,17 @@ #include <string.h> +#include "bridge.h" #include <atk/atk.h> #include <droute/droute.h> -#include "bridge.h" +#include "accessible-stateset.h" #include "bitarray.h" #include "spi-dbus.h" -#include "accessible-stateset.h" #include "accessible-register.h" -#include "object.h" #include "introspection.h" +#include "object.h" typedef struct _MatchRulePrivate MatchRulePrivate; struct _MatchRulePrivate @@ -51,7 +51,7 @@ struct _MatchRulePrivate }; static gboolean -child_interface_p (AtkObject * child, gchar * repo_id) +child_interface_p (AtkObject *child, gchar *repo_id) { if (!strcasecmp (repo_id, "action")) return ATK_IS_ACTION (child); @@ -81,7 +81,7 @@ child_interface_p (AtkObject * child, gchar * repo_id) #define child_collection_p(ch) (TRUE) static gboolean -match_states_all_p (AtkObject * child, gint * set) +match_states_all_p (AtkObject *child, gint *set) { AtkStateSet *chs; gint i; @@ -107,7 +107,7 @@ match_states_all_p (AtkObject * child, gint * set) } static gboolean -match_states_any_p (AtkObject * child, gint * set) +match_states_any_p (AtkObject *child, gint *set) { AtkStateSet *chs; gint i; @@ -132,7 +132,7 @@ match_states_any_p (AtkObject * child, gint * set) } static gboolean -match_states_none_p (AtkObject * child, gint * set) +match_states_none_p (AtkObject *child, gint *set) { AtkStateSet *chs; gint i; @@ -158,7 +158,7 @@ match_states_none_p (AtkObject * child, gint * set) // TODO: need to convert at-spi roles/states to atk roles/states */ static gboolean -match_states_lookup (AtkObject * child, MatchRulePrivate * mrp) +match_states_lookup (AtkObject *child, MatchRulePrivate *mrp) { switch (mrp->statematchtype) { @@ -186,10 +186,10 @@ match_states_lookup (AtkObject * child, MatchRulePrivate * mrp) // TODO: Map at-spi -> atk roles at mrp creation instead of doing this; // would be more efficient -#define spi_get_role(obj) spi_accessible_role_from_atk_role(atk_object_get_role(obj)) +#define spi_get_role(obj) spi_accessible_role_from_atk_role (atk_object_get_role (obj)) static gboolean -match_roles_all_p (AtkObject * child, gint * roles) +match_roles_all_p (AtkObject *child, gint *roles) { if (roles == NULL || roles[0] == BITARRAY_SEQ_TERM) return TRUE; @@ -197,11 +197,10 @@ match_roles_all_p (AtkObject * child, gint * roles) return FALSE; return (atk_object_get_role (child) == roles[0]); - } static gboolean -match_roles_any_p (AtkObject * child, gint * roles) +match_roles_any_p (AtkObject *child, gint *roles) { AtspiRole role; int i; @@ -219,7 +218,7 @@ match_roles_any_p (AtkObject * child, gint * roles) } static gboolean -match_roles_none_p (AtkObject * child, gint * roles) +match_roles_none_p (AtkObject *child, gint *roles) { AtkRole role; int i; @@ -237,7 +236,7 @@ match_roles_none_p (AtkObject * child, gint * roles) } static gboolean -match_roles_lookup (AtkObject * child, MatchRulePrivate * mrp) +match_roles_lookup (AtkObject *child, MatchRulePrivate *mrp) { switch (mrp->rolematchtype) { @@ -258,13 +257,12 @@ match_roles_lookup (AtkObject * child, MatchRulePrivate * mrp) default: break; - } return FALSE; } static gboolean -match_interfaces_all_p (AtkObject * obj, gchar ** ifaces) +match_interfaces_all_p (AtkObject *obj, gchar **ifaces) { gint i; @@ -280,14 +278,13 @@ match_interfaces_all_p (AtkObject * obj, gchar ** ifaces) } static gboolean -match_interfaces_any_p (AtkObject * obj, gchar ** ifaces) +match_interfaces_any_p (AtkObject *obj, gchar **ifaces) { gint i; if (ifaces == NULL) return TRUE; - for (i = 0; ifaces[i]; i++) if (child_interface_p (obj, ifaces[i])) { @@ -297,7 +294,7 @@ match_interfaces_any_p (AtkObject * obj, gchar ** ifaces) } static gboolean -match_interfaces_none_p (AtkObject * obj, gchar ** ifaces) +match_interfaces_none_p (AtkObject *obj, gchar **ifaces) { gint i; @@ -309,7 +306,7 @@ match_interfaces_none_p (AtkObject * obj, gchar ** ifaces) } static gboolean -match_interfaces_lookup (AtkObject * child, MatchRulePrivate * mrp) +match_interfaces_lookup (AtkObject *child, MatchRulePrivate *mrp) { switch (mrp->interfacematchtype) { @@ -339,7 +336,7 @@ match_interfaces_lookup (AtkObject * child, MatchRulePrivate * mrp) #define split_attributes(attributes) (g_strsplit (attributes, ";", 0)) static gboolean -match_attributes_all_p (AtkObject * child, AtkAttributeSet * attributes) +match_attributes_all_p (AtkObject *child, AtkAttributeSet *attributes) { int i, k; AtkAttributeSet *oa; @@ -379,7 +376,7 @@ match_attributes_all_p (AtkObject * child, AtkAttributeSet * attributes) } static gboolean -match_attributes_any_p (AtkObject * child, AtkAttributeSet * attributes) +match_attributes_any_p (AtkObject *child, AtkAttributeSet *attributes) { int i, k; @@ -412,7 +409,7 @@ match_attributes_any_p (AtkObject * child, AtkAttributeSet * attributes) } static gboolean -match_attributes_none_p (AtkObject * child, AtkAttributeSet * attributes) +match_attributes_none_p (AtkObject *child, AtkAttributeSet *attributes) { int i, k; @@ -445,7 +442,7 @@ match_attributes_none_p (AtkObject * child, AtkAttributeSet * attributes) } static gboolean -match_attributes_lookup (AtkObject * child, MatchRulePrivate * mrp) +match_attributes_lookup (AtkObject *child, MatchRulePrivate *mrp) { switch (mrp->attributematchtype) { @@ -472,7 +469,7 @@ match_attributes_lookup (AtkObject * child, MatchRulePrivate * mrp) } static gboolean -traverse_p (AtkObject * child, const gboolean traverse) +traverse_p (AtkObject *child, const gboolean traverse) { if (traverse) return TRUE; @@ -481,10 +478,7 @@ traverse_p (AtkObject * child, const gboolean traverse) } static int -sort_order_canonical (MatchRulePrivate * mrp, GList * ls, - gint kount, gint max, - AtkObject * obj, glong index, gboolean flag, - AtkObject * pobj, gboolean recurse, gboolean traverse) +sort_order_canonical (MatchRulePrivate *mrp, GList *ls, gint kount, gint max, AtkObject *obj, glong index, gboolean flag, AtkObject *pobj, gboolean recurse, gboolean traverse) { gint i = index; glong acount = atk_object_get_n_accessible_children (obj); @@ -503,10 +497,7 @@ sort_order_canonical (MatchRulePrivate * mrp, GList * ls, return kount; } - if (flag && match_interfaces_lookup (child, mrp) - && match_states_lookup (child, mrp) - && match_roles_lookup (child, mrp) - && match_attributes_lookup (child, mrp)) + if (flag && match_interfaces_lookup (child, mrp) && match_states_lookup (child, mrp) && match_roles_lookup (child, mrp) && match_attributes_lookup (child, mrp)) { ls = g_list_append (ls, child); @@ -526,9 +517,7 @@ sort_order_canonical (MatchRulePrivate * mrp, GList * ls, } static int -sort_order_rev_canonical (MatchRulePrivate * mrp, GList * ls, - gint kount, gint max, - AtkObject * obj, gboolean flag, AtkObject * pobj) +sort_order_rev_canonical (MatchRulePrivate *mrp, GList *ls, gint kount, gint max, AtkObject *obj, gboolean flag, AtkObject *pobj) { AtkObject *nextobj; AtkObject *parent; @@ -541,10 +530,7 @@ sort_order_rev_canonical (MatchRulePrivate * mrp, GList * ls, } /* Add to the list if it matches */ - if (flag && match_interfaces_lookup (obj, mrp) - && match_states_lookup (obj, mrp) - && match_roles_lookup (obj, mrp) && match_attributes_lookup (obj, mrp) - && (max == 0 || kount < max)) + if (flag && match_interfaces_lookup (obj, mrp) && match_states_lookup (obj, mrp) && match_roles_lookup (obj, mrp) && match_attributes_lookup (obj, mrp) && (max == 0 || kount < max)) { ls = g_list_append (ls, obj); kount++; @@ -564,36 +550,30 @@ sort_order_rev_canonical (MatchRulePrivate * mrp, GList * ls, /* Now, drill down the right side to the last descendant */ while (nextobj && atk_object_get_n_accessible_children (nextobj) > 0) { - AtkObject *follow; + AtkObject *follow; follow = atk_object_ref_accessible_child (nextobj, - atk_object_get_n_accessible_children - (nextobj) - 1); + atk_object_get_n_accessible_children (nextobj) - 1); g_object_unref (nextobj); - nextobj = follow; + nextobj = follow; } /* recurse with the last descendant */ kount = sort_order_rev_canonical (mrp, ls, kount, max, nextobj, TRUE, pobj); if (nextobj) - g_object_unref (nextobj); + g_object_unref (nextobj); } else if (max == 0 || kount < max) { /* no more siblings so next node must be the parent */ kount = sort_order_rev_canonical (mrp, ls, kount, max, parent, TRUE, pobj); - } return kount; } static int -query_exec (MatchRulePrivate * mrp, AtspiCollectionSortOrder sortby, - GList * ls, gint kount, gint max, - AtkObject * obj, glong index, - gboolean flag, - AtkObject * pobj, gboolean recurse, gboolean traverse) +query_exec (MatchRulePrivate *mrp, AtspiCollectionSortOrder sortby, GList *ls, gint kount, gint max, AtkObject *obj, glong index, gboolean flag, AtkObject *pobj, gboolean recurse, gboolean traverse) { switch (sortby) { @@ -642,9 +622,8 @@ bitarray_to_seq (dbus_uint32_t *array, int array_count, int **ret) return TRUE; } - static dbus_bool_t -read_mr (DBusMessageIter * iter, MatchRulePrivate * mrp) +read_mr (DBusMessageIter *iter, MatchRulePrivate *mrp) { DBusMessageIter iter_struct, iter_array, iter_dict, iter_dict_entry; dbus_uint32_t *array; @@ -666,7 +645,8 @@ read_mr (DBusMessageIter * iter, MatchRulePrivate * mrp) dbus_message_iter_next (&iter_struct); dbus_message_iter_get_basic (&iter_struct, &matchType); dbus_message_iter_next (&iter_struct); - mrp->statematchtype = matchType;; + mrp->statematchtype = matchType; + ; /* attributes */ mrp->attributes = NULL; @@ -681,36 +661,37 @@ read_mr (DBusMessageIter * iter, MatchRulePrivate * mrp) dbus_message_iter_get_basic (&iter_dict_entry, &val); p = q = val; for (;;) - { - if (*q == '\0' || (*q == ':' && (q == val || q[-1] != '\\'))) { - char *tmp; - attr = g_new (AtkAttribute, 1); - attr->name = g_strdup (key); - attr->value = g_strdup (p); - attr->value[q - p] = '\0'; - tmp = attr->value; - while (*tmp != '\0') - { - if (*tmp == '\\') - memmove (tmp, tmp + 1, strlen (tmp)); - else - tmp++; - } - mrp->attributes = g_slist_prepend (mrp->attributes, attr); - if (*q == '\0') - break; + if (*q == '\0' || (*q == ':' && (q == val || q[-1] != '\\'))) + { + char *tmp; + attr = g_new (AtkAttribute, 1); + attr->name = g_strdup (key); + attr->value = g_strdup (p); + attr->value[q - p] = '\0'; + tmp = attr->value; + while (*tmp != '\0') + { + if (*tmp == '\\') + memmove (tmp, tmp + 1, strlen (tmp)); + else + tmp++; + } + mrp->attributes = g_slist_prepend (mrp->attributes, attr); + if (*q == '\0') + break; + else + p = ++q; + } else - p = ++q; + q++; } - else - q++; - } dbus_message_iter_next (&iter_dict); } dbus_message_iter_next (&iter_struct); dbus_message_iter_get_basic (&iter_struct, &matchType); - mrp->attributematchtype = matchType;; + mrp->attributematchtype = matchType; + ; dbus_message_iter_next (&iter_struct); /* Get roles and role match */ @@ -719,7 +700,8 @@ read_mr (DBusMessageIter * iter, MatchRulePrivate * mrp) bitarray_to_seq (array, array_count, &mrp->roles); dbus_message_iter_next (&iter_struct); dbus_message_iter_get_basic (&iter_struct, &matchType); - mrp->rolematchtype = matchType;; + mrp->rolematchtype = matchType; + ; dbus_message_iter_next (&iter_struct); /* Get interfaces and interface match */ @@ -727,16 +709,17 @@ read_mr (DBusMessageIter * iter, MatchRulePrivate * mrp) mrp->ifaces = g_new0 (gchar *, 16); i = 0; while (i < 15 && dbus_message_iter_get_arg_type (&iter_array) != DBUS_TYPE_INVALID) - { - char *iface; - dbus_message_iter_get_basic (&iter_array, &iface); - mrp->ifaces [i] = g_strdup (iface); - i++; - dbus_message_iter_next (&iter_array); - } + { + char *iface; + dbus_message_iter_get_basic (&iter_array, &iface); + mrp->ifaces[i] = g_strdup (iface); + i++; + dbus_message_iter_next (&iter_array); + } dbus_message_iter_next (&iter_struct); dbus_message_iter_get_basic (&iter_struct, &matchType); - mrp->interfacematchtype = matchType;; + mrp->interfacematchtype = matchType; + ; dbus_message_iter_next (&iter_struct); /* get invert */ dbus_message_iter_get_basic (&iter_struct, &mrp->invert); @@ -745,7 +728,7 @@ read_mr (DBusMessageIter * iter, MatchRulePrivate * mrp) } static DBusMessage * -return_and_free_list (DBusMessage * message, GList * ls) +return_and_free_list (DBusMessage *message, GList *ls) { DBusMessage *reply; DBusMessageIter iter, iter_array; @@ -755,8 +738,7 @@ return_and_free_list (DBusMessage * message, GList * ls) if (!reply) return NULL; dbus_message_iter_init_append (reply, &iter); - if (!dbus_message_iter_open_container - (&iter, DBUS_TYPE_ARRAY, "(so)", &iter_array)) + if (!dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, "(so)", &iter_array)) goto oom; for (item = ls; item; item = g_list_next (item)) { @@ -773,7 +755,7 @@ oom: } static void -free_mrp_data (MatchRulePrivate * mrp) +free_mrp_data (MatchRulePrivate *mrp) { g_free (mrp->states); atk_attribute_set_free (mrp->attributes); @@ -782,12 +764,13 @@ free_mrp_data (MatchRulePrivate * mrp) } static DBusMessage * -GetMatchesFrom (DBusMessage * message, - AtkObject * current_object, - MatchRulePrivate * mrp, +GetMatchesFrom (DBusMessage *message, + AtkObject *current_object, + MatchRulePrivate *mrp, const AtspiCollectionSortOrder sortby, const dbus_bool_t isrestrict, - dbus_int32_t count, const dbus_bool_t traverse) + dbus_int32_t count, + const dbus_bool_t traverse) { GList *ls = NULL; AtkObject *parent; @@ -819,10 +802,7 @@ GetMatchesFrom (DBusMessage * message, */ static int -inorder (AtkObject * collection, MatchRulePrivate * mrp, - GList * ls, gint kount, gint max, - AtkObject * obj, - gboolean flag, AtkObject * pobj, dbus_bool_t traverse) +inorder (AtkObject *collection, MatchRulePrivate *mrp, GList *ls, gint kount, gint max, AtkObject *obj, gboolean flag, AtkObject *pobj, dbus_bool_t traverse) { int i = 0; @@ -854,19 +834,20 @@ inorder (AtkObject * collection, MatchRulePrivate * mrp, */ static DBusMessage * -GetMatchesInOrder (DBusMessage * message, - AtkObject * current_object, - MatchRulePrivate * mrp, +GetMatchesInOrder (DBusMessage *message, + AtkObject *current_object, + MatchRulePrivate *mrp, const AtspiCollectionSortOrder sortby, const dbus_bool_t recurse, - dbus_int32_t count, const dbus_bool_t traverse) + dbus_int32_t count, + const dbus_bool_t traverse) { GList *ls = NULL; AtkObject *obj; ls = g_list_append (ls, current_object); - obj = ATK_OBJECT(spi_register_path_to_object (spi_global_register, dbus_message_get_path (message))); + obj = ATK_OBJECT (spi_register_path_to_object (spi_global_register, dbus_message_get_path (message))); inorder (obj, mrp, ls, 0, count, current_object, TRUE, NULL, traverse); @@ -886,9 +867,9 @@ GetMatchesInOrder (DBusMessage * message, */ static DBusMessage * -GetMatchesInBackOrder (DBusMessage * message, - AtkObject * current_object, - MatchRulePrivate * mrp, +GetMatchesInBackOrder (DBusMessage *message, + AtkObject *current_object, + MatchRulePrivate *mrp, const AtspiCollectionSortOrder sortby, dbus_int32_t count) { @@ -897,7 +878,7 @@ GetMatchesInBackOrder (DBusMessage * message, ls = g_list_append (ls, current_object); - collection = ATK_OBJECT(spi_register_path_to_object (spi_global_register, dbus_message_get_path (message))); + collection = ATK_OBJECT (spi_register_path_to_object (spi_global_register, dbus_message_get_path (message))); sort_order_rev_canonical (mrp, ls, 0, count, current_object, FALSE, collection); @@ -912,13 +893,14 @@ GetMatchesInBackOrder (DBusMessage * message, } static DBusMessage * -GetMatchesTo (DBusMessage * message, - AtkObject * current_object, - MatchRulePrivate * mrp, +GetMatchesTo (DBusMessage *message, + AtkObject *current_object, + MatchRulePrivate *mrp, const AtspiCollectionSortOrder sortby, const dbus_bool_t recurse, const dbus_bool_t isrestrict, - dbus_int32_t count, const dbus_bool_t traverse) + dbus_int32_t count, + const dbus_bool_t traverse) { GList *ls = NULL; AtkObject *obj; @@ -935,7 +917,6 @@ GetMatchesTo (DBusMessage * message, obj = ATK_OBJECT (spi_register_path_to_object (spi_global_register, dbus_message_get_path (message))); query_exec (mrp, sortby, ls, 0, count, obj, 0, TRUE, current_object, TRUE, traverse); - } ls = g_list_remove (ls, ls->data); @@ -948,8 +929,7 @@ GetMatchesTo (DBusMessage * message, } static DBusMessage * -impl_GetMatchesFrom (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_GetMatchesFrom (DBusConnection *bus, DBusMessage *message, void *user_data) { char *current_object_path = NULL; AtkObject *current_object; @@ -1009,8 +989,7 @@ impl_GetMatchesFrom (DBusConnection * bus, DBusMessage * message, } static DBusMessage * -impl_GetMatchesTo (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_GetMatchesTo (DBusConnection *bus, DBusMessage *message, void *user_data) { char *current_object_path = NULL; AtkObject *current_object; @@ -1073,8 +1052,7 @@ impl_GetMatchesTo (DBusConnection * bus, DBusMessage * message, } static void -append_accessible_properties (DBusMessageIter *iter, AtkObject *obj, - GArray *properties) +append_accessible_properties (DBusMessageIter *iter, AtkObject *obj, GArray *properties) { DBusMessageIter iter_struct, iter_dict, iter_dict_entry; AtkStateSet *set; @@ -1085,75 +1063,75 @@ append_accessible_properties (DBusMessageIter *iter, AtkObject *obj, spi_object_append_reference (&iter_struct, obj); dbus_message_iter_open_container (&iter_struct, DBUS_TYPE_ARRAY, "{sv}", &iter_dict); if (properties && properties->len) - { - gint i; - for (i = 0; i < properties->len; i++) { - gchar *prop = g_array_index (properties, char *, i); - DRoutePropertyFunction func; - GType type; - func = _atk_bridge_find_property_func (prop, &type); - if (func && G_TYPE_CHECK_INSTANCE_TYPE (obj, type)) - { - dbus_message_iter_open_container (&iter_dict, DBUS_TYPE_DICT_ENTRY, - NULL, &iter_dict_entry); - dbus_message_iter_append_basic (&iter_dict_entry, DBUS_TYPE_STRING, &prop); - func (&iter_dict_entry, obj); - dbus_message_iter_close_container (&iter_dict, &iter_dict_entry); - } + gint i; + for (i = 0; i < properties->len; i++) + { + gchar *prop = g_array_index (properties, char *, i); + DRoutePropertyFunction func; + GType type; + func = _atk_bridge_find_property_func (prop, &type); + if (func && G_TYPE_CHECK_INSTANCE_TYPE (obj, type)) + { + dbus_message_iter_open_container (&iter_dict, DBUS_TYPE_DICT_ENTRY, + NULL, &iter_dict_entry); + dbus_message_iter_append_basic (&iter_dict_entry, DBUS_TYPE_STRING, &prop); + func (&iter_dict_entry, obj); + dbus_message_iter_close_container (&iter_dict, &iter_dict_entry); + } + } } - } else - { - GHashTableIter hi; - gpointer key, value; - g_hash_table_iter_init (&hi, spi_global_app_data->property_hash); - while (g_hash_table_iter_next (&hi, &key, &value)) { - const DRouteProperty *prop = value; - GType type = _atk_bridge_type_from_iface (key); - if (!G_TYPE_CHECK_INSTANCE_TYPE (obj, type)) - continue; - for (;prop->name; prop++) - { - const char *p = key + strlen (key); - gchar *property_name; - while (p[-1] != '.') - p--; - if (!strcmp (p, "Accessible")) - property_name = g_strdup (prop->name); - else - property_name = g_strconcat (p, ".", prop->name, NULL); - dbus_message_iter_open_container (&iter_dict, DBUS_TYPE_DICT_ENTRY, - NULL, &iter_dict_entry); - dbus_message_iter_append_basic (&iter_dict_entry, DBUS_TYPE_STRING, &property_name); - g_free (property_name); - prop->get (&iter_dict_entry, obj); - dbus_message_iter_close_container (&iter_dict, &iter_dict_entry); - } + GHashTableIter hi; + gpointer key, value; + g_hash_table_iter_init (&hi, spi_global_app_data->property_hash); + while (g_hash_table_iter_next (&hi, &key, &value)) + { + const DRouteProperty *prop = value; + GType type = _atk_bridge_type_from_iface (key); + if (!G_TYPE_CHECK_INSTANCE_TYPE (obj, type)) + continue; + for (; prop->name; prop++) + { + const char *p = key + strlen (key); + gchar *property_name; + while (p[-1] != '.') + p--; + if (!strcmp (p, "Accessible")) + property_name = g_strdup (prop->name); + else + property_name = g_strconcat (p, ".", prop->name, NULL); + dbus_message_iter_open_container (&iter_dict, DBUS_TYPE_DICT_ENTRY, + NULL, &iter_dict_entry); + dbus_message_iter_append_basic (&iter_dict_entry, DBUS_TYPE_STRING, &property_name); + g_free (property_name); + prop->get (&iter_dict_entry, obj); + dbus_message_iter_close_container (&iter_dict, &iter_dict_entry); + } + } } - } dbus_message_iter_close_container (&iter_struct, &iter_dict); dbus_message_iter_close_container (iter, &iter_struct); set = atk_object_ref_state_set (obj); if (set) - { - gboolean md = atk_state_set_contains_state (set, ATK_STATE_MANAGES_DESCENDANTS); - g_object_unref (set); - if (md) - return; - } + { + gboolean md = atk_state_set_contains_state (set, ATK_STATE_MANAGES_DESCENDANTS); + g_object_unref (set); + if (md) + return; + } count = atk_object_get_n_accessible_children (obj); for (i = 0; i < count; i++) - { - AtkObject *child = atk_object_ref_accessible_child (obj, i); - if (child) { - append_accessible_properties (iter, child, properties); - g_object_unref (child); + AtkObject *child = atk_object_ref_accessible_child (obj, i); + if (child) + { + append_accessible_properties (iter, child, properties); + g_object_unref (child); + } } - } } #if 0 @@ -1248,8 +1226,9 @@ walkm (DBusMessage *message) #endif static DBusMessage * -impl_GetTree (DBusConnection * bus, - DBusMessage * message, void *user_data) +impl_GetTree (DBusConnection *bus, + DBusMessage *message, + void *user_data) { AtkObject *object = (AtkObject *) user_data; DBusMessage *reply; @@ -1272,12 +1251,12 @@ impl_GetTree (DBusConnection * bus, dbus_message_iter_recurse (&iter, &iter_array); while (dbus_message_iter_get_arg_type (&iter_array) != DBUS_TYPE_INVALID) - { - const char *prop; - dbus_message_iter_get_basic (&iter_array, &prop); - g_array_append_val (properties, prop); - dbus_message_iter_next (&iter_array); - } + { + const char *prop; + dbus_message_iter_get_basic (&iter_array, &prop); + g_array_append_val (properties, prop); + dbus_message_iter_next (&iter_array); + } reply = dbus_message_new_method_return (message); if (reply) @@ -1295,7 +1274,7 @@ impl_GetTree (DBusConnection * bus, } static DBusMessage * -impl_GetMatches (DBusConnection * bus, DBusMessage * message, void *user_data) +impl_GetMatches (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkObject *obj = ATK_OBJECT (spi_register_path_to_object (spi_global_register, dbus_message_get_path (message))); DBusMessageIter iter; @@ -1335,15 +1314,15 @@ impl_GetMatches (DBusConnection * bus, DBusMessage * message, void *user_data) } static DRouteMethod methods[] = { - {impl_GetMatchesFrom, "GetMatchesFrom"}, - {impl_GetMatchesTo, "GetMatchesTo"}, - {impl_GetTree, "GetTree"}, - {impl_GetMatches, "GetMatches"}, - {NULL, NULL} + { impl_GetMatchesFrom, "GetMatchesFrom" }, + { impl_GetMatchesTo, "GetMatchesTo" }, + { impl_GetTree, "GetTree" }, + { impl_GetMatches, "GetMatches" }, + { NULL, NULL } }; void -spi_initialize_collection (DRoutePath * path) +spi_initialize_collection (DRoutePath *path) { spi_atk_add_interface (path, 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 78d06aa4..102ea34b 100644 --- a/atk-adaptor/adaptors/component-adaptor.c +++ b/atk-adaptor/adaptors/component-adaptor.c @@ -23,17 +23,18 @@ */ #define ATK_DISABLE_DEPRECATION_WARNINGS +#include "bridge.h" #include <atk/atk.h> #include <droute/droute.h> -#include "bridge.h" #include <string.h> #include "spi-dbus.h" -#include "object.h" + #include "introspection.h" +#include "object.h" static DBusMessage * -impl_Contains (DBusConnection * bus, DBusMessage * message, void *user_data) +impl_Contains (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkComponent *component = (AtkComponent *) user_data; dbus_int32_t x, y; @@ -44,14 +45,13 @@ impl_Contains (DBusConnection * bus, DBusMessage * message, void *user_data) g_return_val_if_fail (ATK_IS_COMPONENT (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y, - DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y, + DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } retval = - atk_component_contains (component, x, y, (AtkCoordType) coord_type); + atk_component_contains (component, x, y, (AtkCoordType) coord_type); reply = dbus_message_new_method_return (message); if (reply) { @@ -62,8 +62,7 @@ impl_Contains (DBusConnection * bus, DBusMessage * message, void *user_data) } static DBusMessage * -impl_GetAccessibleAtPoint (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_GetAccessibleAtPoint (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkComponent *component = (AtkComponent *) user_data; dbus_int32_t x, y; @@ -74,15 +73,14 @@ impl_GetAccessibleAtPoint (DBusConnection * bus, DBusMessage * message, g_return_val_if_fail (ATK_IS_COMPONENT (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y, - DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y, + DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } child = - atk_component_ref_accessible_at_point (component, x, y, - (AtkCoordType) coord_type); + atk_component_ref_accessible_at_point (component, x, y, + (AtkCoordType) coord_type); reply = spi_object_return_reference (message, child); if (child) g_object_unref (child); @@ -91,7 +89,7 @@ impl_GetAccessibleAtPoint (DBusConnection * bus, DBusMessage * message, } static DBusMessage * -impl_GetExtents (DBusConnection * bus, DBusMessage * message, void *user_data) +impl_GetExtents (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkComponent *component = (AtkComponent *) user_data; dbus_uint32_t coord_type; @@ -100,8 +98,7 @@ impl_GetExtents (DBusConnection * bus, DBusMessage * message, void *user_data) g_return_val_if_fail (ATK_IS_COMPONENT (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -111,8 +108,7 @@ impl_GetExtents (DBusConnection * bus, DBusMessage * message, void *user_data) } static DBusMessage * -impl_GetPosition (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_GetPosition (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkComponent *component = (AtkComponent *) user_data; dbus_uint32_t coord_type; @@ -123,8 +119,7 @@ impl_GetPosition (DBusConnection * bus, DBusMessage * message, g_return_val_if_fail (ATK_IS_COMPONENT (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -141,7 +136,7 @@ impl_GetPosition (DBusConnection * bus, DBusMessage * message, } static DBusMessage * -impl_GetSize (DBusConnection * bus, DBusMessage * message, void *user_data) +impl_GetSize (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkComponent *component = (AtkComponent *) user_data; gint iwidth = 0, iheight = 0; @@ -164,7 +159,7 @@ impl_GetSize (DBusConnection * bus, DBusMessage * message, void *user_data) } static DBusMessage * -impl_GetLayer (DBusConnection * bus, DBusMessage * message, void *user_data) +impl_GetLayer (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkComponent *component = (AtkComponent *) user_data; AtkLayer atklayer; @@ -213,8 +208,7 @@ impl_GetLayer (DBusConnection * bus, DBusMessage * message, void *user_data) } static DBusMessage * -impl_GetMDIZOrder (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_GetMDIZOrder (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkComponent *component = (AtkComponent *) user_data; dbus_int16_t rv; @@ -234,7 +228,7 @@ impl_GetMDIZOrder (DBusConnection * bus, DBusMessage * message, } static DBusMessage * -impl_GrabFocus (DBusConnection * bus, DBusMessage * message, void *user_data) +impl_GrabFocus (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkComponent *component = (AtkComponent *) user_data; dbus_bool_t rv; @@ -268,7 +262,7 @@ impl_deregisterFocusHandler (DBusConnection * bus, DBusMessage * message, #endif static DBusMessage * -impl_GetAlpha (DBusConnection * bus, DBusMessage * message, void *user_data) +impl_GetAlpha (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkComponent *component = (AtkComponent *) user_data; double rv; @@ -288,7 +282,7 @@ impl_GetAlpha (DBusConnection * bus, DBusMessage * message, void *user_data) } static DBusMessage * -impl_SetExtents (DBusConnection * bus, DBusMessage * message, void *user_data) +impl_SetExtents (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkComponent *component = (AtkComponent *) user_data; DBusMessageIter iter, iter_struct; @@ -331,7 +325,7 @@ impl_SetExtents (DBusConnection * bus, DBusMessage * message, void *user_data) } static DBusMessage * -impl_SetPosition (DBusConnection * bus, DBusMessage * message, void *user_data) +impl_SetPosition (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkComponent *component = (AtkComponent *) user_data; dbus_uint32_t coord_type; @@ -342,9 +336,8 @@ impl_SetPosition (DBusConnection * bus, DBusMessage * message, void *user_data) g_return_val_if_fail (ATK_IS_COMPONENT (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y, - DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y, + DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -362,7 +355,7 @@ impl_SetPosition (DBusConnection * bus, DBusMessage * message, void *user_data) } static dbus_bool_t -impl_get_ScreenExtents (DBusMessageIter * iter, void *user_data) +impl_get_ScreenExtents (DBusMessageIter *iter, void *user_data) { AtkComponent *component = (AtkComponent *) user_data; DBusMessageIter iter_variant, iter_struct; @@ -390,7 +383,7 @@ impl_get_ScreenExtents (DBusMessageIter * iter, void *user_data) } static DBusMessage * -impl_SetSize (DBusConnection * bus, DBusMessage * message, void *user_data) +impl_SetSize (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkComponent *component = (AtkComponent *) user_data; dbus_int32_t width, height; @@ -400,9 +393,8 @@ impl_SetSize (DBusConnection * bus, DBusMessage * message, void *user_data) g_return_val_if_fail (ATK_IS_COMPONENT (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &width, DBUS_TYPE_INT32, &height, - DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &width, DBUS_TYPE_INT32, &height, + DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -420,8 +412,9 @@ impl_SetSize (DBusConnection * bus, DBusMessage * message, void *user_data) } static DBusMessage * -impl_ScrollTo (DBusConnection * bus, - DBusMessage * message, void *user_data) +impl_ScrollTo (DBusConnection *bus, + DBusMessage *message, + void *user_data) { AtkComponent *component = (AtkComponent *) user_data; dbus_uint32_t type; @@ -431,8 +424,7 @@ impl_ScrollTo (DBusConnection * bus, g_return_val_if_fail (ATK_IS_COMPONENT (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_UINT32, &type, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_UINT32, &type, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -449,8 +441,9 @@ impl_ScrollTo (DBusConnection * bus, } static DBusMessage * -impl_ScrollToPoint (DBusConnection * bus, - DBusMessage * message, void *user_data) +impl_ScrollToPoint (DBusConnection *bus, + DBusMessage *message, + void *user_data) { AtkComponent *component = (AtkComponent *) user_data; dbus_uint32_t type; @@ -461,11 +454,10 @@ impl_ScrollToPoint (DBusConnection * bus, g_return_val_if_fail (ATK_IS_COMPONENT (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_UINT32, &type, - DBUS_TYPE_INT32, &x, - DBUS_TYPE_INT32, &y, - DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_UINT32, &type, + DBUS_TYPE_INT32, &x, + DBUS_TYPE_INT32, &y, + DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -482,31 +474,31 @@ impl_ScrollToPoint (DBusConnection * bus, } static DRouteMethod methods[] = { - {impl_Contains, "Contains"}, - {impl_GetAccessibleAtPoint, "GetAccessibleAtPoint"}, - {impl_GetExtents, "GetExtents"}, - {impl_GetPosition, "GetPosition"}, - {impl_GetSize, "GetSize"}, - {impl_GetLayer, "GetLayer"}, - {impl_GetMDIZOrder, "GetMDIZOrder"}, - {impl_GrabFocus, "GrabFocus"}, + { impl_Contains, "Contains" }, + { impl_GetAccessibleAtPoint, "GetAccessibleAtPoint" }, + { impl_GetExtents, "GetExtents" }, + { impl_GetPosition, "GetPosition" }, + { impl_GetSize, "GetSize" }, + { impl_GetLayer, "GetLayer" }, + { impl_GetMDIZOrder, "GetMDIZOrder" }, + { impl_GrabFocus, "GrabFocus" }, //{impl_registerFocusHandler, "registerFocusHandler"}, //{impl_deregisterFocusHandler, "deregisterFocusHandler"}, - {impl_GetAlpha, "GetAlpha"}, - {impl_SetExtents, "SetExtents"}, - {impl_SetPosition, "SetPosition"}, - {impl_SetSize, "SetSize"}, - {impl_ScrollTo, "ScrollTo"}, - {impl_ScrollToPoint, "ScrollToPoint"}, - {NULL, NULL} + { impl_GetAlpha, "GetAlpha" }, + { impl_SetExtents, "SetExtents" }, + { impl_SetPosition, "SetPosition" }, + { impl_SetSize, "SetSize" }, + { impl_ScrollTo, "ScrollTo" }, + { impl_ScrollToPoint, "ScrollToPoint" }, + { NULL, NULL } }; static DRouteProperty properties[] = { - {impl_get_ScreenExtents, NULL, "ScreenExtents"}, - {NULL, NULL, NULL} + { impl_get_ScreenExtents, NULL, "ScreenExtents" }, + { NULL, NULL, NULL } }; void -spi_initialize_component (DRoutePath * path) +spi_initialize_component (DRoutePath *path) { spi_atk_add_interface (path, ATSPI_DBUS_INTERFACE_COMPONENT, spi_org_a11y_atspi_Component, methods, properties); diff --git a/atk-adaptor/adaptors/document-adaptor.c b/atk-adaptor/adaptors/document-adaptor.c index 471ab461..bbe366bb 100644 --- a/atk-adaptor/adaptors/document-adaptor.c +++ b/atk-adaptor/adaptors/document-adaptor.c @@ -23,16 +23,17 @@ */ #define ATK_DISABLE_DEPRECATION_WARNINGS +#include "bridge.h" #include <atk/atk.h> #include <droute/droute.h> -#include "bridge.h" #include "spi-dbus.h" -#include "object.h" + #include "introspection.h" +#include "object.h" static dbus_bool_t -impl_get_CurrentPageNumber (DBusMessageIter * iter, void *user_data) +impl_get_CurrentPageNumber (DBusMessageIter *iter, void *user_data) { AtkDocument *document = (AtkDocument *) user_data; g_return_val_if_fail (ATK_IS_DOCUMENT (user_data), FALSE); @@ -40,7 +41,7 @@ impl_get_CurrentPageNumber (DBusMessageIter * iter, void *user_data) } static dbus_bool_t -impl_get_PageCount (DBusMessageIter * iter, void *user_data) +impl_get_PageCount (DBusMessageIter *iter, void *user_data) { AtkDocument *document = (AtkDocument *) user_data; g_return_val_if_fail (ATK_IS_DOCUMENT (user_data), FALSE); @@ -48,7 +49,7 @@ impl_get_PageCount (DBusMessageIter * iter, void *user_data) } static DBusMessage * -impl_GetLocale (DBusConnection * bus, DBusMessage * message, void *user_data) +impl_GetLocale (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkDocument *document = (AtkDocument *) user_data; const gchar *lc; @@ -69,8 +70,7 @@ impl_GetLocale (DBusConnection * bus, DBusMessage * message, void *user_data) } static DBusMessage * -impl_GetAttributeValue (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_GetAttributeValue (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkDocument *document = (AtkDocument *) user_data; gchar *attributename; @@ -79,8 +79,7 @@ impl_GetAttributeValue (DBusConnection * bus, DBusMessage * message, g_return_val_if_fail (ATK_IS_DOCUMENT (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_STRING, &attributename, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_STRING, &attributename, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -97,8 +96,7 @@ impl_GetAttributeValue (DBusConnection * bus, DBusMessage * message, } static DBusMessage * -impl_GetAttributes (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_GetAttributes (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkDocument *document = (AtkDocument *) user_data; DBusMessage *reply; @@ -123,20 +121,20 @@ impl_GetAttributes (DBusConnection * bus, DBusMessage * message, } static DRouteMethod methods[] = { - {impl_GetLocale, "GetLocale"}, - {impl_GetAttributeValue, "GetAttributeValue"}, - {impl_GetAttributes, "GetAttributes"}, - {NULL, NULL} + { impl_GetLocale, "GetLocale" }, + { impl_GetAttributeValue, "GetAttributeValue" }, + { impl_GetAttributes, "GetAttributes" }, + { NULL, NULL } }; static DRouteProperty properties[] = { - {impl_get_CurrentPageNumber, NULL, "CurrentPageNumber"}, - {impl_get_PageCount, NULL, "PageCount"}, - {NULL, NULL, NULL} + { impl_get_CurrentPageNumber, NULL, "CurrentPageNumber" }, + { impl_get_PageCount, NULL, "PageCount" }, + { NULL, NULL, NULL } }; void -spi_initialize_document (DRoutePath * path) +spi_initialize_document (DRoutePath *path) { droute_path_add_interface (path, ATSPI_DBUS_INTERFACE_DOCUMENT, spi_org_a11y_atspi_Document, methods, properties); diff --git a/atk-adaptor/adaptors/editabletext-adaptor.c b/atk-adaptor/adaptors/editabletext-adaptor.c index b82fdec4..81ec42f3 100644 --- a/atk-adaptor/adaptors/editabletext-adaptor.c +++ b/atk-adaptor/adaptors/editabletext-adaptor.c @@ -22,16 +22,15 @@ * Boston, MA 02110-1301, USA. */ -#include <atk/atk.h> -#include <droute/droute.h> #include "bridge.h" #include "introspection.h" +#include <atk/atk.h> +#include <droute/droute.h> #include "spi-dbus.h" static DBusMessage * -impl_SetTextContents (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_SetTextContents (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkEditableText *editable = (AtkEditableText *) user_data; const char *newContents; @@ -40,8 +39,7 @@ impl_SetTextContents (DBusConnection * bus, DBusMessage * message, g_return_val_if_fail (ATK_IS_EDITABLE_TEXT (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_STRING, &newContents, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_STRING, &newContents, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -58,7 +56,7 @@ impl_SetTextContents (DBusConnection * bus, DBusMessage * message, } static DBusMessage * -impl_InsertText (DBusConnection * bus, DBusMessage * message, void *user_data) +impl_InsertText (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkEditableText *editable = (AtkEditableText *) user_data; dbus_int32_t position, length; @@ -69,9 +67,8 @@ impl_InsertText (DBusConnection * bus, DBusMessage * message, void *user_data) g_return_val_if_fail (ATK_IS_EDITABLE_TEXT (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &position, DBUS_TYPE_STRING, &text, - DBUS_TYPE_INT32, &length, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &position, DBUS_TYPE_STRING, &text, + DBUS_TYPE_INT32, &length, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -89,16 +86,15 @@ impl_InsertText (DBusConnection * bus, DBusMessage * message, void *user_data) } static DBusMessage * -impl_CopyText (DBusConnection * bus, DBusMessage * message, void *user_data) +impl_CopyText (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkEditableText *editable = (AtkEditableText *) user_data; dbus_int32_t startPos, endPos; g_return_val_if_fail (ATK_IS_EDITABLE_TEXT (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &startPos, DBUS_TYPE_INT32, &endPos, - DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &startPos, DBUS_TYPE_INT32, &endPos, + DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -107,7 +103,7 @@ impl_CopyText (DBusConnection * bus, DBusMessage * message, void *user_data) } static DBusMessage * -impl_CutText (DBusConnection * bus, DBusMessage * message, void *user_data) +impl_CutText (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkEditableText *editable = (AtkEditableText *) user_data; dbus_int32_t startPos, endPos; @@ -116,9 +112,8 @@ impl_CutText (DBusConnection * bus, DBusMessage * message, void *user_data) g_return_val_if_fail (ATK_IS_EDITABLE_TEXT (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &startPos, DBUS_TYPE_INT32, &endPos, - DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &startPos, DBUS_TYPE_INT32, &endPos, + DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -135,7 +130,7 @@ impl_CutText (DBusConnection * bus, DBusMessage * message, void *user_data) } static DBusMessage * -impl_DeleteText (DBusConnection * bus, DBusMessage * message, void *user_data) +impl_DeleteText (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkEditableText *editable = (AtkEditableText *) user_data; dbus_int32_t startPos, endPos; @@ -144,9 +139,8 @@ impl_DeleteText (DBusConnection * bus, DBusMessage * message, void *user_data) g_return_val_if_fail (ATK_IS_EDITABLE_TEXT (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &startPos, DBUS_TYPE_INT32, &endPos, - DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &startPos, DBUS_TYPE_INT32, &endPos, + DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -163,7 +157,7 @@ impl_DeleteText (DBusConnection * bus, DBusMessage * message, void *user_data) } static DBusMessage * -impl_PasteText (DBusConnection * bus, DBusMessage * message, void *user_data) +impl_PasteText (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkEditableText *editable = (AtkEditableText *) user_data; dbus_int32_t position; @@ -172,8 +166,7 @@ impl_PasteText (DBusConnection * bus, DBusMessage * message, void *user_data) g_return_val_if_fail (ATK_IS_EDITABLE_TEXT (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &position, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &position, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -190,17 +183,17 @@ impl_PasteText (DBusConnection * bus, DBusMessage * message, void *user_data) } static DRouteMethod methods[] = { - {impl_SetTextContents, "SetTextContents"}, - {impl_InsertText, "InsertText"}, - {impl_CopyText, "CopyText"}, - {impl_CutText, "CutText"}, - {impl_DeleteText, "DeleteText"}, - {impl_PasteText, "PasteText"}, - {NULL, NULL} + { impl_SetTextContents, "SetTextContents" }, + { impl_InsertText, "InsertText" }, + { impl_CopyText, "CopyText" }, + { impl_CutText, "CutText" }, + { impl_DeleteText, "DeleteText" }, + { impl_PasteText, "PasteText" }, + { NULL, NULL } }; void -spi_initialize_editabletext (DRoutePath * path) +spi_initialize_editabletext (DRoutePath *path) { spi_atk_add_interface (path, 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 4cd6ebf8..a90946c6 100644 --- a/atk-adaptor/adaptors/hyperlink-adaptor.c +++ b/atk-adaptor/adaptors/hyperlink-adaptor.c @@ -22,11 +22,12 @@ * Boston, MA 02110-1301, USA. */ +#include "bridge.h" #include <atk/atk.h> #include <droute/droute.h> -#include "bridge.h" #include "spi-dbus.h" + #include "introspection.h" #include "object.h" @@ -41,16 +42,15 @@ get_hyperlink (void *user_data) } static dbus_bool_t -impl_get_NAnchors (DBusMessageIter * iter, void *user_data) +impl_get_NAnchors (DBusMessageIter *iter, void *user_data) { AtkHyperlink *link = get_hyperlink (user_data); g_return_val_if_fail (ATK_IS_HYPERLINK (link), FALSE); return droute_return_v_int32 (iter, atk_hyperlink_get_n_anchors (link)); } - static dbus_bool_t -impl_get_StartIndex (DBusMessageIter * iter, void *user_data) +impl_get_StartIndex (DBusMessageIter *iter, void *user_data) { AtkHyperlink *link = get_hyperlink (user_data); g_return_val_if_fail (ATK_IS_HYPERLINK (link), FALSE); @@ -58,7 +58,7 @@ impl_get_StartIndex (DBusMessageIter * iter, void *user_data) } static dbus_bool_t -impl_get_EndIndex (DBusMessageIter * iter, void *user_data) +impl_get_EndIndex (DBusMessageIter *iter, void *user_data) { AtkHyperlink *link = get_hyperlink (user_data); g_return_val_if_fail (ATK_IS_HYPERLINK (link), FALSE); @@ -66,7 +66,7 @@ impl_get_EndIndex (DBusMessageIter * iter, void *user_data) } static DBusMessage * -impl_GetObject (DBusConnection * bus, DBusMessage * message, void *user_data) +impl_GetObject (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkHyperlink *link = get_hyperlink (user_data); dbus_int32_t i; @@ -74,8 +74,7 @@ impl_GetObject (DBusConnection * bus, DBusMessage * message, void *user_data) g_return_val_if_fail (ATK_IS_HYPERLINK (link), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &i, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &i, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -84,7 +83,7 @@ impl_GetObject (DBusConnection * bus, DBusMessage * message, void *user_data) } static DBusMessage * -impl_GetURI (DBusConnection * bus, DBusMessage * message, void *user_data) +impl_GetURI (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkHyperlink *link = get_hyperlink (user_data); dbus_int32_t i; @@ -93,8 +92,7 @@ impl_GetURI (DBusConnection * bus, DBusMessage * message, void *user_data) g_return_val_if_fail (ATK_IS_HYPERLINK (link), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &i, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &i, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -113,7 +111,7 @@ impl_GetURI (DBusConnection * bus, DBusMessage * message, void *user_data) } static DBusMessage * -impl_IsValid (DBusConnection * bus, DBusMessage * message, void *user_data) +impl_IsValid (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkHyperlink *link = get_hyperlink (user_data); dbus_bool_t rv; @@ -133,21 +131,21 @@ impl_IsValid (DBusConnection * bus, DBusMessage * message, void *user_data) } static DRouteMethod methods[] = { - {impl_GetObject, "GetObject"}, - {impl_GetURI, "GetURI"}, - {impl_IsValid, "IsValid"}, - {NULL, NULL} + { impl_GetObject, "GetObject" }, + { impl_GetURI, "GetURI" }, + { impl_IsValid, "IsValid" }, + { NULL, NULL } }; static DRouteProperty properties[] = { - {impl_get_NAnchors, NULL, "NAnchors"}, - {impl_get_StartIndex, NULL, "StartIndex"}, - {impl_get_EndIndex, NULL, "EndIndex"}, - {NULL, NULL, NULL} + { impl_get_NAnchors, NULL, "NAnchors" }, + { impl_get_StartIndex, NULL, "StartIndex" }, + { impl_get_EndIndex, NULL, "EndIndex" }, + { NULL, NULL, NULL } }; void -spi_initialize_hyperlink (DRoutePath * path) +spi_initialize_hyperlink (DRoutePath *path) { spi_atk_add_interface (path, ATSPI_DBUS_INTERFACE_HYPERLINK, diff --git a/atk-adaptor/adaptors/hypertext-adaptor.c b/atk-adaptor/adaptors/hypertext-adaptor.c index c15b0d28..b00acb7a 100644 --- a/atk-adaptor/adaptors/hypertext-adaptor.c +++ b/atk-adaptor/adaptors/hypertext-adaptor.c @@ -22,17 +22,17 @@ * Boston, MA 02110-1301, USA. */ +#include "bridge.h" #include <atk/atk.h> #include <droute/droute.h> -#include "bridge.h" #include "spi-dbus.h" -#include "object.h" #include "introspection.h" +#include "object.h" static DBusMessage * -impl_GetNLinks (DBusConnection * bus, DBusMessage * message, void *user_data) +impl_GetNLinks (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkHypertext *hypertext = (AtkHypertext *) user_data; gint rv; @@ -51,7 +51,7 @@ impl_GetNLinks (DBusConnection * bus, DBusMessage * message, void *user_data) } static DBusMessage * -impl_GetLink (DBusConnection * bus, DBusMessage * message, void *user_data) +impl_GetLink (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkHypertext *hypertext = (AtkHypertext *) user_data; dbus_int32_t linkIndex; @@ -59,8 +59,7 @@ impl_GetLink (DBusConnection * bus, DBusMessage * message, void *user_data) g_return_val_if_fail (ATK_IS_HYPERTEXT (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &linkIndex, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &linkIndex, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -72,8 +71,7 @@ impl_GetLink (DBusConnection * bus, DBusMessage * message, void *user_data) } static DBusMessage * -impl_GetLinkIndex (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_GetLinkIndex (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkHypertext *hypertext = (AtkHypertext *) user_data; dbus_int32_t characterIndex; @@ -82,8 +80,7 @@ impl_GetLinkIndex (DBusConnection * bus, DBusMessage * message, g_return_val_if_fail (ATK_IS_HYPERTEXT (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &characterIndex, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &characterIndex, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -98,14 +95,14 @@ impl_GetLinkIndex (DBusConnection * bus, DBusMessage * message, } static DRouteMethod methods[] = { - {impl_GetNLinks, "GetNLinks"}, - {impl_GetLink, "GetLink"}, - {impl_GetLinkIndex, "GetLinkIndex"}, - {NULL, NULL} + { impl_GetNLinks, "GetNLinks" }, + { impl_GetLink, "GetLink" }, + { impl_GetLinkIndex, "GetLinkIndex" }, + { NULL, NULL } }; void -spi_initialize_hypertext (DRoutePath * path) +spi_initialize_hypertext (DRoutePath *path) { spi_atk_add_interface (path, 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 e47f4cfc..350e037e 100644 --- a/atk-adaptor/adaptors/image-adaptor.c +++ b/atk-adaptor/adaptors/image-adaptor.c @@ -22,16 +22,17 @@ * Boston, MA 02110-1301, USA. */ +#include "bridge.h" #include <atk/atk.h> #include <droute/droute.h> -#include "bridge.h" #include "spi-dbus.h" -#include "object.h" + #include "introspection.h" +#include "object.h" static dbus_bool_t -impl_get_ImageDescription (DBusMessageIter * iter, void *user_data) +impl_get_ImageDescription (DBusMessageIter *iter, void *user_data) { AtkImage *image = (AtkImage *) user_data; g_return_val_if_fail (ATK_IS_IMAGE (user_data), FALSE); @@ -40,7 +41,7 @@ impl_get_ImageDescription (DBusMessageIter * iter, void *user_data) } static dbus_bool_t -impl_get_ImageLocale (DBusMessageIter * iter, void *user_data) +impl_get_ImageLocale (DBusMessageIter *iter, void *user_data) { AtkImage *image = (AtkImage *) user_data; g_return_val_if_fail (ATK_IS_IMAGE (user_data), FALSE); @@ -48,8 +49,7 @@ impl_get_ImageLocale (DBusMessageIter * iter, void *user_data) } static DBusMessage * -impl_GetImageExtents (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_GetImageExtents (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkImage *image = (AtkImage *) user_data; dbus_uint32_t coordType; @@ -57,8 +57,7 @@ impl_GetImageExtents (DBusConnection * bus, DBusMessage * message, g_return_val_if_fail (ATK_IS_IMAGE (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_UINT32, &coordType, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_UINT32, &coordType, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -68,8 +67,7 @@ impl_GetImageExtents (DBusConnection * bus, DBusMessage * message, } static DBusMessage * -impl_GetImagePosition (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_GetImagePosition (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkImage *image = (AtkImage *) user_data; dbus_uint32_t coord_type; @@ -79,8 +77,7 @@ impl_GetImagePosition (DBusConnection * bus, DBusMessage * message, g_return_val_if_fail (ATK_IS_IMAGE (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -97,8 +94,7 @@ impl_GetImagePosition (DBusConnection * bus, DBusMessage * message, } static DBusMessage * -impl_GetImageSize (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_GetImageSize (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkImage *image = (AtkImage *) user_data; gint iwidth = 0, iheight = 0; @@ -120,20 +116,20 @@ impl_GetImageSize (DBusConnection * bus, DBusMessage * message, } static DRouteMethod methods[] = { - {impl_GetImageExtents, "GetImageExtents"}, - {impl_GetImagePosition, "GetImagePosition"}, - {impl_GetImageSize, "GetImageSize"}, - {NULL, NULL} + { impl_GetImageExtents, "GetImageExtents" }, + { impl_GetImagePosition, "GetImagePosition" }, + { impl_GetImageSize, "GetImageSize" }, + { NULL, NULL } }; static DRouteProperty properties[] = { - {impl_get_ImageDescription, NULL, "ImageDescription"}, - {impl_get_ImageLocale, NULL, "ImageLocale"}, - {NULL, NULL, NULL} + { impl_get_ImageDescription, NULL, "ImageDescription" }, + { impl_get_ImageLocale, NULL, "ImageLocale" }, + { NULL, NULL, NULL } }; void -spi_initialize_image (DRoutePath * path) +spi_initialize_image (DRoutePath *path) { spi_atk_add_interface (path, 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 5dbb4456..ec9f8ab5 100644 --- a/atk-adaptor/adaptors/selection-adaptor.c +++ b/atk-adaptor/adaptors/selection-adaptor.c @@ -22,22 +22,22 @@ * Boston, MA 02110-1301, USA. */ +#include "bridge.h" #include <atk/atk.h> #include <droute/droute.h> -#include "bridge.h" #include "spi-dbus.h" -#include "object.h" + #include "introspection.h" +#include "object.h" static dbus_bool_t -impl_get_NSelectedChildren (DBusMessageIter * iter, void *user_data) +impl_get_NSelectedChildren (DBusMessageIter *iter, void *user_data) { AtkSelection *selection = (AtkSelection *) user_data; g_return_val_if_fail (ATK_IS_SELECTION (user_data), FALSE); return droute_return_v_int32 (iter, - atk_selection_get_selection_count - (selection)); + atk_selection_get_selection_count (selection)); } /*static char * @@ -50,8 +50,7 @@ impl_get_NSelectedChildren_str (void *datum) }*/ static DBusMessage * -impl_GetSelectedChild (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_GetSelectedChild (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkSelection *selection = (AtkSelection *) user_data; DBusMessage *reply; @@ -60,9 +59,8 @@ impl_GetSelectedChild (DBusConnection * bus, DBusMessage * message, g_return_val_if_fail (ATK_IS_SELECTION (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &selectedChildIndex, - DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &selectedChildIndex, + DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -75,8 +73,7 @@ impl_GetSelectedChild (DBusConnection * bus, DBusMessage * message, } static DBusMessage * -impl_SelectChild (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_SelectChild (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkSelection *selection = (AtkSelection *) user_data; dbus_int32_t childIndex; @@ -85,8 +82,7 @@ impl_SelectChild (DBusConnection * bus, DBusMessage * message, g_return_val_if_fail (ATK_IS_SELECTION (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &childIndex, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &childIndex, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -101,8 +97,7 @@ impl_SelectChild (DBusConnection * bus, DBusMessage * message, } static DBusMessage * -impl_DeselectSelectedChild (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_DeselectSelectedChild (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkSelection *selection = (AtkSelection *) user_data; dbus_int32_t selectedChildIndex; @@ -111,9 +106,8 @@ impl_DeselectSelectedChild (DBusConnection * bus, DBusMessage * message, g_return_val_if_fail (ATK_IS_SELECTION (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &selectedChildIndex, - DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &selectedChildIndex, + DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -128,8 +122,7 @@ impl_DeselectSelectedChild (DBusConnection * bus, DBusMessage * message, } static DBusMessage * -impl_IsChildSelected (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_IsChildSelected (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkSelection *selection = (AtkSelection *) user_data; dbus_int32_t childIndex; @@ -138,8 +131,7 @@ impl_IsChildSelected (DBusConnection * bus, DBusMessage * message, g_return_val_if_fail (ATK_IS_SELECTION (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &childIndex, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &childIndex, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -154,7 +146,7 @@ impl_IsChildSelected (DBusConnection * bus, DBusMessage * message, } static DBusMessage * -impl_SelectAll (DBusConnection * bus, DBusMessage * message, void *user_data) +impl_SelectAll (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkSelection *selection = (AtkSelection *) user_data; dbus_bool_t rv; @@ -173,8 +165,7 @@ impl_SelectAll (DBusConnection * bus, DBusMessage * message, void *user_data) } static DBusMessage * -impl_ClearSelection (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_ClearSelection (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkSelection *selection = (AtkSelection *) user_data; dbus_bool_t rv; @@ -193,8 +184,7 @@ impl_ClearSelection (DBusConnection * bus, DBusMessage * message, } static DBusMessage * -impl_DeselectChild (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_DeselectChild (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkSelection *selection = (AtkSelection *) user_data; dbus_int32_t selectedChildIndex; @@ -204,9 +194,8 @@ impl_DeselectChild (DBusConnection * bus, DBusMessage * message, g_return_val_if_fail (ATK_IS_SELECTION (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &selectedChildIndex, - DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &selectedChildIndex, + DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -232,23 +221,23 @@ impl_DeselectChild (DBusConnection * bus, DBusMessage * message, } static DRouteMethod methods[] = { - {impl_GetSelectedChild, "GetSelectedChild"}, - {impl_SelectChild, "SelectChild"}, - {impl_DeselectSelectedChild, "DeselectSelectedChild"}, - {impl_IsChildSelected, "IsChildSelected"}, - {impl_SelectAll, "SelectAll"}, - {impl_ClearSelection, "ClearSelection"}, - {impl_DeselectChild, "DeselectChild"}, - {NULL, NULL} + { impl_GetSelectedChild, "GetSelectedChild" }, + { impl_SelectChild, "SelectChild" }, + { impl_DeselectSelectedChild, "DeselectSelectedChild" }, + { impl_IsChildSelected, "IsChildSelected" }, + { impl_SelectAll, "SelectAll" }, + { impl_ClearSelection, "ClearSelection" }, + { impl_DeselectChild, "DeselectChild" }, + { NULL, NULL } }; static DRouteProperty properties[] = { - {impl_get_NSelectedChildren, NULL, "NSelectedChildren"}, - {NULL, NULL, NULL} + { impl_get_NSelectedChildren, NULL, "NSelectedChildren" }, + { NULL, NULL, NULL } }; void -spi_initialize_selection (DRoutePath * path) +spi_initialize_selection (DRoutePath *path) { spi_atk_add_interface (path, ATSPI_DBUS_INTERFACE_SELECTION, diff --git a/atk-adaptor/adaptors/socket-adaptor.c b/atk-adaptor/adaptors/socket-adaptor.c index 57fe3f78..91a5f103 100644 --- a/atk-adaptor/adaptors/socket-adaptor.c +++ b/atk-adaptor/adaptors/socket-adaptor.c @@ -25,11 +25,11 @@ #include <atk/atk.h> #include <droute/droute.h> -#include "spi-dbus.h" #include "accessible-stateset.h" -#include "object.h" -#include "introspection.h" #include "bridge.h" +#include "introspection.h" +#include "object.h" +#include "spi-dbus.h" static DBusMessage * new_socket_call_message (AtkComponent *component, const char *member) @@ -58,9 +58,7 @@ new_socket_call_message (AtkComponent *component, const char *member) } static void -atspi_plug_component_get_extents (AtkComponent *component, gint *x, gint *y, - gint *width, gint *height, - AtkCoordType coord_type) +atspi_plug_component_get_extents (AtkComponent *component, gint *x, gint *y, gint *width, gint *height, AtkCoordType coord_type) { DBusMessage *message = new_socket_call_message (component, "GetExtents"); DBusMessage *reply; @@ -111,8 +109,7 @@ atspi_plug_component_get_extents (AtkComponent *component, gint *x, gint *y, } static void -atspi_plug_component_get_position (AtkComponent *component, gint *x, gint *y, - AtkCoordType coord_type) +atspi_plug_component_get_position (AtkComponent *component, gint *x, gint *y, AtkCoordType coord_type) { DBusMessage *message = new_socket_call_message (component, "GetPosition"); DBusMessage *reply; @@ -149,7 +146,8 @@ atspi_plug_component_get_position (AtkComponent *component, gint *x, gint *y, static void atspi_plug_component_get_size (AtkComponent *component, - gint *width, gint *height) + gint *width, + gint *height) { DBusMessage *message = new_socket_call_message (component, "GetSize"); DBusMessage *reply; @@ -184,8 +182,8 @@ atspi_plug_component_get_size (AtkComponent *component, static DBusMessage * impl_Embedded (DBusConnection *bus, - DBusMessage *message, - void *user_data) + DBusMessage *message, + void *user_data) { AtkObject *object = (AtkObject *) user_data; char *path; @@ -196,7 +194,7 @@ impl_Embedded (DBusConnection *bus, return droute_invalid_arguments_error (message); } id = g_strconcat (dbus_message_get_sender (message), ":", path, NULL); - g_object_set_data_full (G_OBJECT (object), "dbus-plug-parent", id, (GDestroyNotify)g_free); + g_object_set_data_full (G_OBJECT (object), "dbus-plug-parent", id, (GDestroyNotify) g_free); if (ATK_IS_COMPONENT (object)) { @@ -216,12 +214,12 @@ impl_Embedded (DBusConnection *bus, } static DRouteMethod methods[] = { - {impl_Embedded, "Embedded"}, - {NULL, NULL} + { impl_Embedded, "Embedded" }, + { NULL, NULL } }; void -spi_initialize_socket (DRoutePath * path) +spi_initialize_socket (DRoutePath *path) { droute_path_add_interface (path, ATSPI_DBUS_INTERFACE_SOCKET, diff --git a/atk-adaptor/adaptors/streamablecontent-adaptor.c b/atk-adaptor/adaptors/streamablecontent-adaptor.c index 29dc3e41..c09768f6 100644 --- a/atk-adaptor/adaptors/streamablecontent-adaptor.c +++ b/atk-adaptor/adaptors/streamablecontent-adaptor.c @@ -36,10 +36,10 @@ /* A pointer to our parent object class */ static GObjectClass *spi_streamable_parent_class; -#define SPI_CONTENT_STREAM_TYPE (spi_content_stream_get_type ()) -#define SPI_CONTENT_STREAM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SPI_CONTENT_STREAM_TYPE, SpiContentStream)) -#define SPI_CONTENT_STREAM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), SPI_CONTENT_STREAM_TYPE, SpiContentStreamClass)) -#define SPI_IS_CONTENT_STREAM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SPI_CONTENT_STREAM_TYPE)) +#define SPI_CONTENT_STREAM_TYPE (spi_content_stream_get_type ()) +#define SPI_CONTENT_STREAM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SPI_CONTENT_STREAM_TYPE, SpiContentStream)) +#define SPI_CONTENT_STREAM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SPI_CONTENT_STREAM_TYPE, SpiContentStreamClass)) +#define SPI_IS_CONTENT_STREAM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SPI_CONTENT_STREAM_TYPE)) #define SPI_IS_CONTENT_STREAM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SPI_CONTENT_STREAM_TYPE)) typedef struct _SpiContentStream SpiContentStream; @@ -60,7 +60,7 @@ struct _SpiContentStreamClass GType spi_content_stream_get_type (void); static SpiContentStream * -spi_content_stream_new (GIOChannel * gio) +spi_content_stream_new (GIOChannel *gio) { SpiContentStream *new_stream = g_object_new (SPI_CONTENT_STREAM_TYPE, NULL); new_stream->gio = gio; @@ -68,7 +68,7 @@ spi_content_stream_new (GIOChannel * gio) } static void -spi_content_stream_dispose (GObject * o) +spi_content_stream_dispose (GObject *o) { if (SPI_IS_CONTENT_STREAM (o)) { @@ -82,10 +82,10 @@ static CORBA_long impl_content_stream_seek (PortableServer_Servant servant, const CORBA_long offset, const Accessibility_ContentStream_SeekType whence, - CORBA_Environment * ev) + CORBA_Environment *ev) { SpiContentStream *stream = - SPI_CONTENT_STREAM (bonobo_object_from_servant (servant)); + SPI_CONTENT_STREAM (bonobo_object_from_servant (servant)); if (stream && stream->gio) { GError *err; @@ -112,11 +112,11 @@ impl_content_stream_seek (PortableServer_Servant servant, static CORBA_long impl_content_stream_read (PortableServer_Servant servant, const CORBA_long count, - Accessibility_ContentStream_iobuf ** buffer, - CORBA_Environment * ev) + Accessibility_ContentStream_iobuf **buffer, + CORBA_Environment *ev) { SpiContentStream *stream = - SPI_CONTENT_STREAM (bonobo_object_from_servant (servant)); + SPI_CONTENT_STREAM (bonobo_object_from_servant (servant)); CORBA_long realcount = 0; if (stream && stream->gio) @@ -130,12 +130,12 @@ impl_content_stream_read (PortableServer_Servant servant, { gbuf = g_malloc (count + 1); status = - g_io_channel_read_chars (stream->gio, gbuf, count, &realcount, - &err); + g_io_channel_read_chars (stream->gio, gbuf, count, &realcount, + &err); } else status = - g_io_channel_read_to_end (stream->gio, &gbuf, &realcount, &err); + g_io_channel_read_to_end (stream->gio, &gbuf, &realcount, &err); if (status == G_IO_STATUS_NORMAL || status == G_IO_STATUS_EOF) { @@ -143,7 +143,7 @@ impl_content_stream_read (PortableServer_Servant servant, CORBA_sequence_set_release (*buffer, TRUE); (*buffer)->_buffer = - CORBA_sequence_CORBA_octet_allocbuf (realcount); + CORBA_sequence_CORBA_octet_allocbuf (realcount); (*buffer)->_length = realcount; g_memmove ((*buffer)->_buffer, gbuf, realcount); @@ -157,12 +157,12 @@ impl_content_stream_read (PortableServer_Servant servant, static void impl_content_stream_close (PortableServer_Servant servant, - CORBA_Environment * ev) + CORBA_Environment *ev) { GIOStatus status; GError *err; SpiContentStream *stream = - SPI_CONTENT_STREAM (bonobo_object_from_servant (servant)); + SPI_CONTENT_STREAM (bonobo_object_from_servant (servant)); if (stream && stream->gio) { status = g_io_channel_shutdown (stream->gio, TRUE, &err); @@ -173,7 +173,7 @@ impl_content_stream_close (PortableServer_Servant servant, } static void -spi_content_stream_class_init (SpiContentStreamClass * klass) +spi_content_stream_class_init (SpiContentStreamClass *klass) { POA_Accessibility_ContentStream__epv *epv = &klass->epv; GObjectClass *object_class = (GObjectClass *) klass; @@ -185,18 +185,18 @@ spi_content_stream_class_init (SpiContentStreamClass * klass) object_class->dispose = spi_content_stream_dispose; } - static void -spi_content_stream_init (SpiContentStream * stream) +spi_content_stream_init (SpiContentStream *stream) { } - BONOBO_TYPE_FUNC_FULL (SpiContentStream, Accessibility_ContentStream, - BONOBO_TYPE_OBJECT, spi_content_stream) - static AtkStreamableContent - *get_streamable_from_servant (PortableServer_Servant servant) + BONOBO_TYPE_OBJECT, + spi_content_stream) +static AtkStreamableContent + * + get_streamable_from_servant (PortableServer_Servant servant) { SpiBase *object = SPI_BASE (bonobo_object_from_servant (servant)); g_return_val_if_fail (object != NULL, NULL); @@ -209,8 +209,8 @@ BONOBO_TYPE_FUNC_FULL (SpiContentStream, */ static Accessibility_StringSeq * impl_accessibility_streamable_get_content_types (PortableServer_Servant - servant, - CORBA_Environment * ev) + servant, + CORBA_Environment *ev) { Accessibility_StringSeq *typelist = Accessibility_StringSeq__alloc (); AtkStreamableContent *streamable = get_streamable_from_servant (servant); @@ -229,7 +229,7 @@ impl_accessibility_streamable_get_content_types (PortableServer_Servant for (i = 0; i < n_types; ++i) { const gchar *mimetype = - atk_streamable_content_get_mime_type (streamable, i); + atk_streamable_content_get_mime_type (streamable, i); typelist->_buffer[i] = CORBA_string_dup (mimetype ? mimetype : ""); } } @@ -241,8 +241,8 @@ impl_accessibility_streamable_get_content_types (PortableServer_Servant */ static Bonobo_Stream impl_accessibility_streamable_get_content (PortableServer_Servant servant, - const CORBA_char * content_type, - CORBA_Environment * ev) + const CORBA_char *content_type, + CORBA_Environment *ev) { Bonobo_Stream stream; AtkStreamableContent *streamable = get_streamable_from_servant (servant); @@ -252,10 +252,10 @@ impl_accessibility_streamable_get_content (PortableServer_Servant servant, gio = atk_streamable_content_get_stream (streamable, content_type); - stream = CORBA_OBJECT_NIL; /* deprecated, - * and it was never implemented, - * so don't bother fixing this - */ + stream = CORBA_OBJECT_NIL; /* deprecated, + * and it was never implemented, + * so don't bother fixing this + */ return stream; } @@ -264,8 +264,8 @@ impl_accessibility_streamable_get_content (PortableServer_Servant servant, */ static Accessibility_ContentStream impl_accessibility_streamable_get_stream (PortableServer_Servant servant, - const CORBA_char * content_type, - CORBA_Environment * ev) + const CORBA_char *content_type, + CORBA_Environment *ev) { SpiContentStream *stream; AtkStreamableContent *streamable = get_streamable_from_servant (servant); @@ -285,8 +285,8 @@ impl_accessibility_streamable_get_stream (PortableServer_Servant servant, */ static CORBA_string impl_accessibility_streamable_get_uri (PortableServer_Servant servant, - const CORBA_char * content_type, - CORBA_Environment * ev) + const CORBA_char *content_type, + CORBA_Environment *ev) { gchar *uri; AtkStreamableContent *streamable = get_streamable_from_servant (servant); @@ -299,7 +299,7 @@ impl_accessibility_streamable_get_uri (PortableServer_Servant servant, } static void -spi_streamable_class_init (SpiStreamableClass * klass) +spi_streamable_class_init (SpiStreamableClass *klass) { POA_Accessibility_StreamableContent__epv *epv = &klass->epv; spi_streamable_parent_class = g_type_class_peek_parent (klass); @@ -311,13 +311,12 @@ spi_streamable_class_init (SpiStreamableClass * klass) } static void -spi_streamable_init (SpiStreamable * streamable) +spi_streamable_init (SpiStreamable *streamable) { } - SpiStreamable * -spi_streamable_interface_new (AtkObject * o) +spi_streamable_interface_new (AtkObject *o) { SpiStreamable *retval = g_object_new (SPI_STREAMABLE_TYPE, NULL); @@ -328,4 +327,5 @@ spi_streamable_interface_new (AtkObject * o) BONOBO_TYPE_FUNC_FULL (SpiStreamable, Accessibility_StreamableContent, - PARENT_TYPE, spi_streamable) + PARENT_TYPE, + spi_streamable) diff --git a/atk-adaptor/adaptors/table-adaptor.c b/atk-adaptor/adaptors/table-adaptor.c index 483788d8..9b9ed521 100644 --- a/atk-adaptor/adaptors/table-adaptor.c +++ b/atk-adaptor/adaptors/table-adaptor.c @@ -23,16 +23,17 @@ */ #define ATK_DISABLE_DEPRECATION_WARNINGS +#include "bridge.h" #include <atk/atk.h> #include <droute/droute.h> -#include "bridge.h" #include "spi-dbus.h" -#include "object.h" + #include "introspection.h" +#include "object.h" static dbus_bool_t -impl_get_NRows (DBusMessageIter * iter, void *user_data) +impl_get_NRows (DBusMessageIter *iter, void *user_data) { AtkTable *table = (AtkTable *) user_data; g_return_val_if_fail (ATK_IS_TABLE (user_data), FALSE); @@ -40,7 +41,7 @@ impl_get_NRows (DBusMessageIter * iter, void *user_data) } static dbus_bool_t -impl_get_NColumns (DBusMessageIter * iter, void *user_data) +impl_get_NColumns (DBusMessageIter *iter, void *user_data) { AtkTable *table = (AtkTable *) user_data; g_return_val_if_fail (ATK_IS_TABLE (user_data), FALSE); @@ -48,7 +49,7 @@ impl_get_NColumns (DBusMessageIter * iter, void *user_data) } static dbus_bool_t -impl_get_Caption (DBusMessageIter * iter, void *user_data) +impl_get_Caption (DBusMessageIter *iter, void *user_data) { AtkTable *table = (AtkTable *) user_data; g_return_val_if_fail (ATK_IS_TABLE (user_data), FALSE); @@ -57,7 +58,7 @@ impl_get_Caption (DBusMessageIter * iter, void *user_data) } static dbus_bool_t -impl_get_Summary (DBusMessageIter * iter, void *user_data) +impl_get_Summary (DBusMessageIter *iter, void *user_data) { AtkTable *table = (AtkTable *) user_data; g_return_val_if_fail (ATK_IS_TABLE (user_data), FALSE); @@ -66,7 +67,7 @@ impl_get_Summary (DBusMessageIter * iter, void *user_data) } static dbus_bool_t -impl_get_NSelectedRows (DBusMessageIter * iter, void *user_data) +impl_get_NSelectedRows (DBusMessageIter *iter, void *user_data) { AtkTable *table = (AtkTable *) user_data; gint *selected_rows = NULL; @@ -79,7 +80,7 @@ impl_get_NSelectedRows (DBusMessageIter * iter, void *user_data) } static dbus_bool_t -impl_get_NSelectedColumns (DBusMessageIter * iter, void *user_data) +impl_get_NSelectedColumns (DBusMessageIter *iter, void *user_data) { AtkTable *table = (AtkTable *) user_data; gint *selected_columns = NULL; @@ -92,8 +93,7 @@ impl_get_NSelectedColumns (DBusMessageIter * iter, void *user_data) } static DBusMessage * -impl_GetAccessibleAt (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_GetAccessibleAt (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkTable *table = (AtkTable *) user_data; dbus_int32_t row, column; @@ -102,9 +102,8 @@ impl_GetAccessibleAt (DBusConnection * bus, DBusMessage * message, g_return_val_if_fail (ATK_IS_TABLE (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &row, DBUS_TYPE_INT32, &column, - DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &row, DBUS_TYPE_INT32, &column, + DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -117,7 +116,7 @@ impl_GetAccessibleAt (DBusConnection * bus, DBusMessage * message, } static DBusMessage * -impl_GetIndexAt (DBusConnection * bus, DBusMessage * message, void *user_data) +impl_GetIndexAt (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkTable *table = (AtkTable *) user_data; dbus_int32_t row, column; @@ -126,9 +125,8 @@ impl_GetIndexAt (DBusConnection * bus, DBusMessage * message, void *user_data) g_return_val_if_fail (ATK_IS_TABLE (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &row, DBUS_TYPE_INT32, &column, - DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &row, DBUS_TYPE_INT32, &column, + DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -143,8 +141,7 @@ impl_GetIndexAt (DBusConnection * bus, DBusMessage * message, void *user_data) } static DBusMessage * -impl_GetRowAtIndex (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_GetRowAtIndex (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkTable *table = (AtkTable *) user_data; dbus_int32_t index; @@ -153,8 +150,7 @@ impl_GetRowAtIndex (DBusConnection * bus, DBusMessage * message, g_return_val_if_fail (ATK_IS_TABLE (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -169,8 +165,7 @@ impl_GetRowAtIndex (DBusConnection * bus, DBusMessage * message, } static DBusMessage * -impl_GetColumnAtIndex (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_GetColumnAtIndex (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkTable *table = (AtkTable *) user_data; dbus_int32_t index; @@ -179,8 +174,7 @@ impl_GetColumnAtIndex (DBusConnection * bus, DBusMessage * message, g_return_val_if_fail (ATK_IS_TABLE (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -208,8 +202,7 @@ validate_unallocated_string (const gchar *str) } static DBusMessage * -impl_GetRowDescription (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_GetRowDescription (DBusConnection *bus, DBusMessage *message, void *user_data) { dbus_int32_t row; AtkTable *table = (AtkTable *) user_data; @@ -218,8 +211,7 @@ impl_GetRowDescription (DBusConnection * bus, DBusMessage * message, g_return_val_if_fail (ATK_IS_TABLE (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &row, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &row, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -235,8 +227,7 @@ impl_GetRowDescription (DBusConnection * bus, DBusMessage * message, } static DBusMessage * -impl_GetColumnDescription (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_GetColumnDescription (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkTable *table = (AtkTable *) user_data; dbus_int32_t column; @@ -245,8 +236,7 @@ impl_GetColumnDescription (DBusConnection * bus, DBusMessage * message, g_return_val_if_fail (ATK_IS_TABLE (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -262,8 +252,7 @@ impl_GetColumnDescription (DBusConnection * bus, DBusMessage * message, } static DBusMessage * -impl_GetRowExtentAt (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_GetRowExtentAt (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkTable *table = (AtkTable *) user_data; dbus_int32_t row, column; @@ -272,9 +261,8 @@ impl_GetRowExtentAt (DBusConnection * bus, DBusMessage * message, g_return_val_if_fail (ATK_IS_TABLE (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &row, DBUS_TYPE_INT32, &column, - DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &row, DBUS_TYPE_INT32, &column, + DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -289,8 +277,7 @@ impl_GetRowExtentAt (DBusConnection * bus, DBusMessage * message, } static DBusMessage * -impl_GetColumnExtentAt (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_GetColumnExtentAt (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkTable *table = (AtkTable *) user_data; dbus_int32_t row, column; @@ -299,9 +286,8 @@ impl_GetColumnExtentAt (DBusConnection * bus, DBusMessage * message, g_return_val_if_fail (ATK_IS_TABLE (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &row, DBUS_TYPE_INT32, &column, - DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &row, DBUS_TYPE_INT32, &column, + DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -316,8 +302,7 @@ impl_GetColumnExtentAt (DBusConnection * bus, DBusMessage * message, } static DBusMessage * -impl_GetRowHeader (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_GetRowHeader (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkTable *table = (AtkTable *) user_data; dbus_int32_t row; @@ -325,8 +310,7 @@ impl_GetRowHeader (DBusConnection * bus, DBusMessage * message, g_return_val_if_fail (ATK_IS_TABLE (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &row, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &row, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -335,8 +319,7 @@ impl_GetRowHeader (DBusConnection * bus, DBusMessage * message, } static DBusMessage * -impl_GetColumnHeader (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_GetColumnHeader (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkTable *table = (AtkTable *) user_data; dbus_int32_t column; @@ -344,8 +327,7 @@ impl_GetColumnHeader (DBusConnection * bus, DBusMessage * message, g_return_val_if_fail (ATK_IS_TABLE (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -354,8 +336,7 @@ impl_GetColumnHeader (DBusConnection * bus, DBusMessage * message, } static DBusMessage * -impl_GetSelectedRows (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_GetSelectedRows (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkTable *table = (AtkTable *) user_data; gint *selected_rows = NULL; @@ -380,8 +361,7 @@ impl_GetSelectedRows (DBusConnection * bus, DBusMessage * message, } static DBusMessage * -impl_GetSelectedColumns (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_GetSelectedColumns (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkTable *table = (AtkTable *) user_data; gint *selected_columns = NULL; @@ -406,8 +386,7 @@ impl_GetSelectedColumns (DBusConnection * bus, DBusMessage * message, } static DBusMessage * -impl_IsRowSelected (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_IsRowSelected (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkTable *table = (AtkTable *) user_data; dbus_int32_t row; @@ -416,8 +395,7 @@ impl_IsRowSelected (DBusConnection * bus, DBusMessage * message, g_return_val_if_fail (ATK_IS_TABLE (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &row, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &row, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -432,8 +410,7 @@ impl_IsRowSelected (DBusConnection * bus, DBusMessage * message, } static DBusMessage * -impl_IsColumnSelected (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_IsColumnSelected (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkTable *table = (AtkTable *) user_data; dbus_int32_t column; @@ -442,8 +419,7 @@ impl_IsColumnSelected (DBusConnection * bus, DBusMessage * message, g_return_val_if_fail (ATK_IS_TABLE (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -458,7 +434,7 @@ impl_IsColumnSelected (DBusConnection * bus, DBusMessage * message, } static DBusMessage * -impl_IsSelected (DBusConnection * bus, DBusMessage * message, void *user_data) +impl_IsSelected (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkTable *table = (AtkTable *) user_data; dbus_int32_t row, column; @@ -467,9 +443,8 @@ impl_IsSelected (DBusConnection * bus, DBusMessage * message, void *user_data) g_return_val_if_fail (ATK_IS_TABLE (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &row, DBUS_TYPE_INT32, &column, - DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &row, DBUS_TYPE_INT32, &column, + DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -484,8 +459,7 @@ impl_IsSelected (DBusConnection * bus, DBusMessage * message, void *user_data) } static DBusMessage * -impl_AddRowSelection (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_AddRowSelection (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkTable *table = (AtkTable *) user_data; dbus_int32_t row; @@ -494,8 +468,7 @@ impl_AddRowSelection (DBusConnection * bus, DBusMessage * message, g_return_val_if_fail (ATK_IS_TABLE (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &row, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &row, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -510,8 +483,7 @@ impl_AddRowSelection (DBusConnection * bus, DBusMessage * message, } static DBusMessage * -impl_AddColumnSelection (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_AddColumnSelection (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkTable *table = (AtkTable *) user_data; dbus_int32_t column; @@ -520,8 +492,7 @@ impl_AddColumnSelection (DBusConnection * bus, DBusMessage * message, g_return_val_if_fail (ATK_IS_TABLE (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -536,8 +507,7 @@ impl_AddColumnSelection (DBusConnection * bus, DBusMessage * message, } static DBusMessage * -impl_RemoveRowSelection (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_RemoveRowSelection (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkTable *table = (AtkTable *) user_data; dbus_int32_t row; @@ -546,8 +516,7 @@ impl_RemoveRowSelection (DBusConnection * bus, DBusMessage * message, g_return_val_if_fail (ATK_IS_TABLE (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &row, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &row, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -562,8 +531,7 @@ impl_RemoveRowSelection (DBusConnection * bus, DBusMessage * message, } static DBusMessage * -impl_RemoveColumnSelection (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_RemoveColumnSelection (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkTable *table = (AtkTable *) user_data; dbus_int32_t column; @@ -572,8 +540,7 @@ impl_RemoveColumnSelection (DBusConnection * bus, DBusMessage * message, g_return_val_if_fail (ATK_IS_TABLE (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -588,8 +555,7 @@ impl_RemoveColumnSelection (DBusConnection * bus, DBusMessage * message, } static DBusMessage * -impl_GetRowColumnExtentsAtIndex (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_GetRowColumnExtentsAtIndex (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkTable *table = (AtkTable *) user_data; dbus_int32_t index; @@ -602,8 +568,7 @@ impl_GetRowColumnExtentsAtIndex (DBusConnection * bus, DBusMessage * message, g_return_val_if_fail (ATK_IS_TABLE (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -614,10 +579,10 @@ impl_GetRowColumnExtentsAtIndex (DBusConnection * bus, DBusMessage * message, is_selected = atk_table_is_selected (table, row, column); cell = atk_table_ref_at (table, row, column); if (cell) - { - role = atk_object_get_role (cell); - g_object_unref (cell); - } + { + role = atk_object_get_role (cell); + g_object_unref (cell); + } ret = (role == ATK_ROLE_TABLE_CELL ? TRUE : FALSE); reply = dbus_message_new_method_return (message); if (reply) @@ -633,41 +598,41 @@ impl_GetRowColumnExtentsAtIndex (DBusConnection * bus, DBusMessage * message, } static DRouteMethod methods[] = { - {impl_GetAccessibleAt, "GetAccessibleAt"}, - {impl_GetIndexAt, "GetIndexAt"}, - {impl_GetRowAtIndex, "GetRowAtIndex"}, - {impl_GetColumnAtIndex, "GetColumnAtIndex"}, - {impl_GetRowDescription, "GetRowDescription"}, - {impl_GetColumnDescription, "GetColumnDescription"}, - {impl_GetRowExtentAt, "GetRowExtentAt"}, - {impl_GetColumnExtentAt, "GetColumnExtentAt"}, - {impl_GetRowHeader, "GetRowHeader"}, - {impl_GetColumnHeader, "GetColumnHeader"}, - {impl_GetSelectedRows, "GetSelectedRows"}, - {impl_GetSelectedColumns, "GetSelectedColumns"}, - {impl_IsRowSelected, "IsRowSelected"}, - {impl_IsColumnSelected, "IsColumnSelected"}, - {impl_IsSelected, "IsSelected"}, - {impl_AddRowSelection, "AddRowSelection"}, - {impl_AddColumnSelection, "AddColumnSelection"}, - {impl_RemoveRowSelection, "RemoveRowSelection"}, - {impl_RemoveColumnSelection, "RemoveColumnSelection"}, - {impl_GetRowColumnExtentsAtIndex, "GetRowColumnExtentsAtIndex"}, - {NULL, NULL} + { impl_GetAccessibleAt, "GetAccessibleAt" }, + { impl_GetIndexAt, "GetIndexAt" }, + { impl_GetRowAtIndex, "GetRowAtIndex" }, + { impl_GetColumnAtIndex, "GetColumnAtIndex" }, + { impl_GetRowDescription, "GetRowDescription" }, + { impl_GetColumnDescription, "GetColumnDescription" }, + { impl_GetRowExtentAt, "GetRowExtentAt" }, + { impl_GetColumnExtentAt, "GetColumnExtentAt" }, + { impl_GetRowHeader, "GetRowHeader" }, + { impl_GetColumnHeader, "GetColumnHeader" }, + { impl_GetSelectedRows, "GetSelectedRows" }, + { impl_GetSelectedColumns, "GetSelectedColumns" }, + { impl_IsRowSelected, "IsRowSelected" }, + { impl_IsColumnSelected, "IsColumnSelected" }, + { impl_IsSelected, "IsSelected" }, + { impl_AddRowSelection, "AddRowSelection" }, + { impl_AddColumnSelection, "AddColumnSelection" }, + { impl_RemoveRowSelection, "RemoveRowSelection" }, + { impl_RemoveColumnSelection, "RemoveColumnSelection" }, + { impl_GetRowColumnExtentsAtIndex, "GetRowColumnExtentsAtIndex" }, + { NULL, NULL } }; static DRouteProperty properties[] = { - {impl_get_NRows, NULL, "NRows"}, - {impl_get_NColumns, NULL, "NColumns"}, - {impl_get_Caption, NULL, "Caption"}, - {impl_get_Summary, NULL, "Summary"}, - {impl_get_NSelectedRows, NULL, "NSelectedRows"}, - {impl_get_NSelectedColumns, NULL, "NSelectedColumns"}, - {NULL, NULL, NULL} + { impl_get_NRows, NULL, "NRows" }, + { impl_get_NColumns, NULL, "NColumns" }, + { impl_get_Caption, NULL, "Caption" }, + { impl_get_Summary, NULL, "Summary" }, + { impl_get_NSelectedRows, NULL, "NSelectedRows" }, + { impl_get_NSelectedColumns, NULL, "NSelectedColumns" }, + { NULL, NULL, NULL } }; void -spi_initialize_table (DRoutePath * path) +spi_initialize_table (DRoutePath *path) { spi_atk_add_interface (path, ATSPI_DBUS_INTERFACE_TABLE, spi_org_a11y_atspi_Table, methods, properties); diff --git a/atk-adaptor/adaptors/table-cell-adaptor.c b/atk-adaptor/adaptors/table-cell-adaptor.c index 6f2cbf5d..c315b426 100644 --- a/atk-adaptor/adaptors/table-cell-adaptor.c +++ b/atk-adaptor/adaptors/table-cell-adaptor.c @@ -26,11 +26,12 @@ #include <droute/droute.h> #include "spi-dbus.h" -#include "object.h" + #include "introspection.h" +#include "object.h" static dbus_bool_t -impl_get_ColumnSpan (DBusMessageIter * iter, void *user_data) +impl_get_ColumnSpan (DBusMessageIter *iter, void *user_data) { AtkTableCell *cell = (AtkTableCell *) user_data; g_return_val_if_fail (ATK_IS_TABLE_CELL (user_data), FALSE); @@ -51,22 +52,20 @@ message_from_object_array (DBusMessage *message, GPtrArray *array) dbus_message_iter_init_append (reply, &iter); - if (!dbus_message_iter_open_container - (&iter, DBUS_TYPE_ARRAY, "(so)", &iter_array)) + if (!dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, "(so)", &iter_array)) return reply; /* TODO: handle out of memory */ - len = (array? array->len: 0); + len = (array ? array->len : 0); for (i = 0; i < len; i++) - { - spi_object_append_reference (&iter_array, g_ptr_array_index (array, i)); - } + { + spi_object_append_reference (&iter_array, g_ptr_array_index (array, i)); + } dbus_message_iter_close_container (&iter, &iter_array); g_ptr_array_unref (array); return reply; } static DBusMessage * -impl_GetColumnHeaderCells (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_GetColumnHeaderCells (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkTableCell *cell = user_data; GPtrArray *array; @@ -79,7 +78,7 @@ impl_GetColumnHeaderCells (DBusConnection * bus, DBusMessage * message, } static dbus_bool_t -impl_get_RowSpan (DBusMessageIter * iter, void *user_data) +impl_get_RowSpan (DBusMessageIter *iter, void *user_data) { AtkTableCell *cell = (AtkTableCell *) user_data; g_return_val_if_fail (ATK_IS_TABLE_CELL (user_data), FALSE); @@ -87,8 +86,7 @@ impl_get_RowSpan (DBusMessageIter * iter, void *user_data) } static DBusMessage * -impl_GetRowHeaderCells (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_GetRowHeaderCells (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkTableCell *cell = user_data; GPtrArray *array; @@ -101,7 +99,7 @@ impl_GetRowHeaderCells (DBusConnection * bus, DBusMessage * message, } static dbus_bool_t -impl_get_Position (DBusMessageIter * iter, void *user_data) +impl_get_Position (DBusMessageIter *iter, void *user_data) { AtkTableCell *cell = (AtkTableCell *) user_data; gint row = -1, column = -1; @@ -121,7 +119,7 @@ impl_get_Position (DBusMessageIter * iter, void *user_data) } static dbus_bool_t -impl_get_Table (DBusMessageIter * iter, void *user_data) +impl_get_Table (DBusMessageIter *iter, void *user_data) { AtkTableCell *cell = (AtkTableCell *) user_data; AtkObject *table; @@ -139,8 +137,7 @@ impl_get_Table (DBusMessageIter * iter, void *user_data) } static DBusMessage * -impl_GetRowColumnSpan (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_GetRowColumnSpan (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkTableCell *cell = (AtkTableCell *) user_data; gint row, column, row_span, column_span; @@ -150,7 +147,7 @@ impl_GetRowColumnSpan (DBusConnection * bus, DBusMessage * message, g_return_val_if_fail (ATK_IS_TABLE_CELL (user_data), droute_not_yet_handled_error (message)); atk_table_cell_get_row_column_span (cell, &row, &column, &row_span, - &column_span); + &column_span); d_row = row; d_column = column; d_row_span = row_span; @@ -167,22 +164,22 @@ impl_GetRowColumnSpan (DBusConnection * bus, DBusMessage * message, } static DRouteMethod methods[] = { - {impl_GetRowHeaderCells, "GetRowHeaderCells"}, - {impl_GetColumnHeaderCells, "GetColumnHeaderCells"}, - {impl_GetRowColumnSpan, "GetRowColumnSpan"}, - {NULL, NULL} + { impl_GetRowHeaderCells, "GetRowHeaderCells" }, + { impl_GetColumnHeaderCells, "GetColumnHeaderCells" }, + { impl_GetRowColumnSpan, "GetRowColumnSpan" }, + { NULL, NULL } }; static DRouteProperty properties[] = { - {impl_get_ColumnSpan, NULL, "ColumnSpan"}, - {impl_get_Position, NULL, "Position"}, - {impl_get_RowSpan, NULL, "RowSpan"}, - {impl_get_Table, NULL, "Table"}, - {NULL, NULL, NULL} + { impl_get_ColumnSpan, NULL, "ColumnSpan" }, + { impl_get_Position, NULL, "Position" }, + { impl_get_RowSpan, NULL, "RowSpan" }, + { impl_get_Table, NULL, "Table" }, + { NULL, NULL, NULL } }; void -spi_initialize_table_cell (DRoutePath * path) +spi_initialize_table_cell (DRoutePath *path) { droute_path_add_interface (path, ATSPI_DBUS_INTERFACE_TABLE_CELL, diff --git a/atk-adaptor/adaptors/text-adaptor.c b/atk-adaptor/adaptors/text-adaptor.c index 74d8a467..7a7a37bc 100644 --- a/atk-adaptor/adaptors/text-adaptor.c +++ b/atk-adaptor/adaptors/text-adaptor.c @@ -25,16 +25,17 @@ #include <string.h> #define ATK_DISABLE_DEPRECATION_WARNINGS +#include "bridge.h" #include <atk/atk.h> #include <droute/droute.h> -#include "bridge.h" #include "spi-dbus.h" -#include "object.h" + #include "introspection.h" +#include "object.h" static dbus_bool_t -impl_get_CharacterCount (DBusMessageIter * iter, void *user_data) +impl_get_CharacterCount (DBusMessageIter *iter, void *user_data) { AtkText *text = (AtkText *) user_data; g_return_val_if_fail (ATK_IS_TEXT (user_data), FALSE); @@ -42,7 +43,7 @@ impl_get_CharacterCount (DBusMessageIter * iter, void *user_data) } static dbus_bool_t -impl_get_CaretOffset (DBusMessageIter * iter, void *user_data) +impl_get_CaretOffset (DBusMessageIter *iter, void *user_data) { AtkText *text = (AtkText *) user_data; g_return_val_if_fail (ATK_IS_TEXT (user_data), FALSE); @@ -64,7 +65,7 @@ validate_allocated_string (gchar *str) } static DBusMessage * -impl_GetText (DBusConnection * bus, DBusMessage * message, void *user_data) +impl_GetText (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkText *text = (AtkText *) user_data; dbus_int32_t startOffset, endOffset; @@ -73,9 +74,8 @@ impl_GetText (DBusConnection * bus, DBusMessage * message, void *user_data) g_return_val_if_fail (ATK_IS_TEXT (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &startOffset, DBUS_TYPE_INT32, - &endOffset, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &startOffset, DBUS_TYPE_INT32, + &endOffset, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -92,8 +92,7 @@ impl_GetText (DBusConnection * bus, DBusMessage * message, void *user_data) } static DBusMessage * -impl_SetCaretOffset (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_SetCaretOffset (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkText *text = (AtkText *) user_data; dbus_int32_t offset; @@ -102,8 +101,7 @@ impl_SetCaretOffset (DBusConnection * bus, DBusMessage * message, g_return_val_if_fail (ATK_IS_TEXT (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &offset, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &offset, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -118,8 +116,7 @@ impl_SetCaretOffset (DBusConnection * bus, DBusMessage * message, } static DBusMessage * -impl_GetTextBeforeOffset (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_GetTextBeforeOffset (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkText *text = (AtkText *) user_data; dbus_int32_t offset; @@ -131,15 +128,14 @@ impl_GetTextBeforeOffset (DBusConnection * bus, DBusMessage * message, g_return_val_if_fail (ATK_IS_TEXT (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &offset, DBUS_TYPE_UINT32, &type, - DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &offset, DBUS_TYPE_UINT32, &type, + DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } txt = - atk_text_get_text_before_offset (text, offset, (AtkTextBoundary) type, - &intstart_offset, &intend_offset); + atk_text_get_text_before_offset (text, offset, (AtkTextBoundary) type, + &intstart_offset, &intend_offset); startOffset = intstart_offset; endOffset = intend_offset; txt = validate_allocated_string (txt); @@ -156,8 +152,7 @@ impl_GetTextBeforeOffset (DBusConnection * bus, DBusMessage * message, } static DBusMessage * -impl_GetTextAtOffset (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_GetTextAtOffset (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkText *text = (AtkText *) user_data; dbus_int32_t offset, type; @@ -168,15 +163,14 @@ impl_GetTextAtOffset (DBusConnection * bus, DBusMessage * message, g_return_val_if_fail (ATK_IS_TEXT (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &offset, DBUS_TYPE_UINT32, &type, - DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &offset, DBUS_TYPE_UINT32, &type, + DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } txt = - atk_text_get_text_at_offset (text, offset, (AtkTextBoundary) type, - &intstart_offset, &intend_offset); + atk_text_get_text_at_offset (text, offset, (AtkTextBoundary) type, + &intstart_offset, &intend_offset); startOffset = intstart_offset; endOffset = intend_offset; txt = validate_allocated_string (txt); @@ -193,8 +187,7 @@ impl_GetTextAtOffset (DBusConnection * bus, DBusMessage * message, } static DBusMessage * -impl_GetTextAfterOffset (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_GetTextAfterOffset (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkText *text = (AtkText *) user_data; dbus_int32_t offset; @@ -206,15 +199,14 @@ impl_GetTextAfterOffset (DBusConnection * bus, DBusMessage * message, g_return_val_if_fail (ATK_IS_TEXT (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &offset, DBUS_TYPE_UINT32, &type, - DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &offset, DBUS_TYPE_UINT32, &type, + DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } txt = - atk_text_get_text_after_offset (text, offset, (AtkTextBoundary) type, - &intstart_offset, &intend_offset); + atk_text_get_text_after_offset (text, offset, (AtkTextBoundary) type, + &intstart_offset, &intend_offset); startOffset = intstart_offset; endOffset = intend_offset; txt = validate_allocated_string (txt); @@ -231,8 +223,7 @@ impl_GetTextAfterOffset (DBusConnection * bus, DBusMessage * message, } static DBusMessage * -impl_GetCharacterAtOffset (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_GetCharacterAtOffset (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkText *text = (AtkText *) user_data; dbus_int32_t offset; @@ -241,8 +232,7 @@ impl_GetCharacterAtOffset (DBusConnection * bus, DBusMessage * message, g_return_val_if_fail (ATK_IS_TEXT (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &offset, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &offset, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -257,53 +247,53 @@ impl_GetCharacterAtOffset (DBusConnection * bus, DBusMessage * message, } static gchar * -get_text_for_legacy_implementations(AtkText *text, - gint offset, - AtkTextGranularity granularity, - gint *start_offset, - gint *end_offset) +get_text_for_legacy_implementations (AtkText *text, + gint offset, + AtkTextGranularity granularity, + gint *start_offset, + gint *end_offset) { gchar *txt = 0; AtkTextBoundary boundary = 0; - switch (granularity) { - case ATK_TEXT_GRANULARITY_CHAR: - boundary = ATK_TEXT_BOUNDARY_CHAR; - break; + switch (granularity) + { + case ATK_TEXT_GRANULARITY_CHAR: + boundary = ATK_TEXT_BOUNDARY_CHAR; + break; - case ATK_TEXT_GRANULARITY_WORD: - boundary = ATK_TEXT_BOUNDARY_WORD_START; - break; + case ATK_TEXT_GRANULARITY_WORD: + boundary = ATK_TEXT_BOUNDARY_WORD_START; + break; - case ATK_TEXT_GRANULARITY_SENTENCE: - boundary = ATK_TEXT_BOUNDARY_SENTENCE_START; - break; + case ATK_TEXT_GRANULARITY_SENTENCE: + boundary = ATK_TEXT_BOUNDARY_SENTENCE_START; + break; - case ATK_TEXT_GRANULARITY_LINE: - boundary = ATK_TEXT_BOUNDARY_LINE_START; - break; + case ATK_TEXT_GRANULARITY_LINE: + boundary = ATK_TEXT_BOUNDARY_LINE_START; + break; - case ATK_TEXT_GRANULARITY_PARAGRAPH: - /* This is not implemented in previous versions of ATK */ - txt = g_strdup(""); - break; + case ATK_TEXT_GRANULARITY_PARAGRAPH: + /* This is not implemented in previous versions of ATK */ + txt = g_strdup (""); + break; - default: - g_assert_not_reached(); - } + default: + g_assert_not_reached (); + } if (!txt) { txt = - atk_text_get_text_at_offset (text, offset, boundary, - start_offset, end_offset); + atk_text_get_text_at_offset (text, offset, boundary, + start_offset, end_offset); } return txt; } static DBusMessage * -impl_GetStringAtOffset (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_GetStringAtOffset (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkText *text = (AtkText *) user_data; dbus_int32_t offset; @@ -315,25 +305,24 @@ impl_GetStringAtOffset (DBusConnection * bus, DBusMessage * message, g_return_val_if_fail (ATK_IS_TEXT (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &offset, DBUS_TYPE_UINT32, &granularity, - DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &offset, DBUS_TYPE_UINT32, &granularity, + DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } txt = - atk_text_get_string_at_offset (text, offset, (AtkTextGranularity) granularity, - &intstart_offset, &intend_offset); + atk_text_get_string_at_offset (text, offset, (AtkTextGranularity) granularity, + &intstart_offset, &intend_offset); /* Accessibility layers implementing an older version of ATK (even if * a new enough version of libatk is installed) might return NULL due * not to provide an implementation for get_string_at_offset(), so we * try with the legacy implementation if that's the case. */ if (!txt) - txt = get_text_for_legacy_implementations(text, offset, - (AtkTextGranularity) granularity, - &intstart_offset, &intend_offset); + txt = get_text_for_legacy_implementations (text, offset, + (AtkTextGranularity) granularity, + &intstart_offset, &intend_offset); startOffset = intstart_offset; endOffset = intend_offset; @@ -351,8 +340,7 @@ impl_GetStringAtOffset (DBusConnection * bus, DBusMessage * message, } static DBusMessage * -impl_GetAttributeValue (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_GetAttributeValue (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkText *text = (AtkText *) user_data; dbus_int32_t offset; @@ -366,9 +354,8 @@ impl_GetAttributeValue (DBusConnection * bus, DBusMessage * message, g_return_val_if_fail (ATK_IS_TEXT (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &offset, DBUS_TYPE_STRING, - &attributeName, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &offset, DBUS_TYPE_STRING, + &attributeName, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -398,8 +385,7 @@ impl_GetAttributeValue (DBusConnection * bus, DBusMessage * message, } static DBusMessage * -impl_GetAttributes (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_GetAttributes (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkText *text = (AtkText *) user_data; dbus_int32_t offset; @@ -411,8 +397,7 @@ impl_GetAttributes (DBusConnection * bus, DBusMessage * message, g_return_val_if_fail (ATK_IS_TEXT (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &offset, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &offset, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -436,8 +421,7 @@ impl_GetAttributes (DBusConnection * bus, DBusMessage * message, } static DBusMessage * -impl_GetDefaultAttributes (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_GetDefaultAttributes (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkText *text = (AtkText *) user_data; DBusMessage *reply; @@ -459,8 +443,7 @@ impl_GetDefaultAttributes (DBusConnection * bus, DBusMessage * message, } static DBusMessage * -impl_GetCharacterExtents (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_GetCharacterExtents (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkText *text = (AtkText *) user_data; dbus_int32_t offset; @@ -471,9 +454,8 @@ impl_GetCharacterExtents (DBusConnection * bus, DBusMessage * message, g_return_val_if_fail (ATK_IS_TEXT (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &offset, DBUS_TYPE_UINT32, - &coordType, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &offset, DBUS_TYPE_UINT32, + &coordType, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -494,8 +476,7 @@ impl_GetCharacterExtents (DBusConnection * bus, DBusMessage * message, } static DBusMessage * -impl_GetOffsetAtPoint (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_GetOffsetAtPoint (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkText *text = (AtkText *) user_data; dbus_int32_t x, y; @@ -505,9 +486,8 @@ impl_GetOffsetAtPoint (DBusConnection * bus, DBusMessage * message, g_return_val_if_fail (ATK_IS_TEXT (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y, - DBUS_TYPE_UINT32, &coordType, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y, + DBUS_TYPE_UINT32, &coordType, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -522,8 +502,7 @@ impl_GetOffsetAtPoint (DBusConnection * bus, DBusMessage * message, } static DBusMessage * -impl_GetNSelections (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_GetNSelections (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkText *text = (AtkText *) user_data; dbus_int32_t rv; @@ -542,8 +521,7 @@ impl_GetNSelections (DBusConnection * bus, DBusMessage * message, } static DBusMessage * -impl_GetSelection (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_GetSelection (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkText *text = (AtkText *) user_data; dbus_int32_t selectionNum; @@ -553,14 +531,12 @@ impl_GetSelection (DBusConnection * bus, DBusMessage * message, g_return_val_if_fail (ATK_IS_TEXT (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &selectionNum, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &selectionNum, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } /* atk_text_get_selection returns gchar * which we discard */ - g_free (atk_text_get_selection - (text, selectionNum, &intstart_offset, &intend_offset)); + g_free (atk_text_get_selection (text, selectionNum, &intstart_offset, &intend_offset)); startOffset = intstart_offset; endOffset = intend_offset; reply = dbus_message_new_method_return (message); @@ -574,8 +550,7 @@ impl_GetSelection (DBusConnection * bus, DBusMessage * message, } static DBusMessage * -impl_AddSelection (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_AddSelection (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkText *text = (AtkText *) user_data; dbus_int32_t startOffset, endOffset; @@ -584,9 +559,8 @@ impl_AddSelection (DBusConnection * bus, DBusMessage * message, g_return_val_if_fail (ATK_IS_TEXT (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &startOffset, DBUS_TYPE_INT32, - &endOffset, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &startOffset, DBUS_TYPE_INT32, + &endOffset, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -601,8 +575,7 @@ impl_AddSelection (DBusConnection * bus, DBusMessage * message, } static DBusMessage * -impl_RemoveSelection (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_RemoveSelection (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkText *text = (AtkText *) user_data; dbus_int32_t selectionNum; @@ -611,8 +584,7 @@ impl_RemoveSelection (DBusConnection * bus, DBusMessage * message, g_return_val_if_fail (ATK_IS_TEXT (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &selectionNum, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &selectionNum, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -627,8 +599,7 @@ impl_RemoveSelection (DBusConnection * bus, DBusMessage * message, } static DBusMessage * -impl_SetSelection (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_SetSelection (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkText *text = (AtkText *) user_data; dbus_int32_t selectionNum, startOffset, endOffset; @@ -637,9 +608,8 @@ impl_SetSelection (DBusConnection * bus, DBusMessage * message, g_return_val_if_fail (ATK_IS_TEXT (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &selectionNum, DBUS_TYPE_INT32, - &startOffset, DBUS_TYPE_INT32, &endOffset, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &selectionNum, DBUS_TYPE_INT32, + &startOffset, DBUS_TYPE_INT32, &endOffset, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -654,8 +624,7 @@ impl_SetSelection (DBusConnection * bus, DBusMessage * message, } static DBusMessage * -impl_GetRangeExtents (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_GetRangeExtents (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkText *text = (AtkText *) user_data; dbus_int32_t startOffset, endOffset; @@ -666,9 +635,8 @@ impl_GetRangeExtents (DBusConnection * bus, DBusMessage * message, g_return_val_if_fail (ATK_IS_TEXT (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &startOffset, DBUS_TYPE_INT32, - &endOffset, DBUS_TYPE_UINT32, &coordType, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &startOffset, DBUS_TYPE_INT32, + &endOffset, DBUS_TYPE_UINT32, &coordType, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -692,8 +660,7 @@ impl_GetRangeExtents (DBusConnection * bus, DBusMessage * message, #define MAXRANGELEN 512 static DBusMessage * -impl_GetBoundedRanges (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_GetBoundedRanges (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkText *text = (AtkText *) user_data; dbus_int32_t x, y, width, height; @@ -705,11 +672,10 @@ impl_GetBoundedRanges (DBusConnection * bus, DBusMessage * message, g_return_val_if_fail (ATK_IS_TEXT (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y, - DBUS_TYPE_INT32, &height, DBUS_TYPE_INT32, &width, DBUS_TYPE_UINT32, - &coordType, DBUS_TYPE_UINT32, &xClipType, DBUS_TYPE_UINT32, &yClipType, - DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y, + DBUS_TYPE_INT32, &height, DBUS_TYPE_INT32, &width, DBUS_TYPE_UINT32, + &coordType, DBUS_TYPE_UINT32, &xClipType, DBUS_TYPE_UINT32, &yClipType, + DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -719,23 +685,21 @@ impl_GetBoundedRanges (DBusConnection * bus, DBusMessage * message, rect.height = height; range_list = - atk_text_get_bounded_ranges (text, &rect, (AtkCoordType) coordType, - (AtkTextClipType) xClipType, - (AtkTextClipType) yClipType); + atk_text_get_bounded_ranges (text, &rect, (AtkCoordType) coordType, + (AtkTextClipType) xClipType, + (AtkTextClipType) yClipType); reply = dbus_message_new_method_return (message); if (!reply) return NULL; /* This isn't pleasant. */ dbus_message_iter_init_append (reply, &iter); - if (dbus_message_iter_open_container - (&iter, DBUS_TYPE_ARRAY, "(iisv)", &array)) + if (dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, "(iisv)", &array)) { int len; int count = (range_list ? MAXRANGELEN : 0); for (len = 0; len < count && range_list[len]; ++len) { - if (dbus_message_iter_open_container - (&array, DBUS_TYPE_STRUCT, NULL, &struc)) + if (dbus_message_iter_open_container (&array, DBUS_TYPE_STRUCT, NULL, &struc)) { dbus_int32_t val; val = range_list[len]->start_offset; @@ -747,8 +711,7 @@ impl_GetBoundedRanges (DBusConnection * bus, DBusMessage * message, /* The variant is unimplemented in atk, but I don't want to * unilaterally muck with the spec and remove it, so I'll just * throw in a dummy value */ - if (dbus_message_iter_open_container - (&struc, DBUS_TYPE_VARIANT, "i", &variant)) + if (dbus_message_iter_open_container (&struc, DBUS_TYPE_VARIANT, "i", &variant)) { dbus_uint32_t dummy = 0; dbus_message_iter_append_basic (&variant, DBUS_TYPE_INT32, @@ -770,8 +733,7 @@ impl_GetBoundedRanges (DBusConnection * bus, DBusMessage * message, } static DBusMessage * -impl_GetAttributeRun (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_GetAttributeRun (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkText *text = (AtkText *) user_data; dbus_int32_t offset; @@ -784,9 +746,8 @@ impl_GetAttributeRun (DBusConnection * bus, DBusMessage * message, g_return_val_if_fail (ATK_IS_TEXT (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &offset, DBUS_TYPE_BOOLEAN, - &includeDefaults, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &offset, DBUS_TYPE_BOOLEAN, + &includeDefaults, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -820,8 +781,7 @@ impl_GetAttributeRun (DBusConnection * bus, DBusMessage * message, } static DBusMessage * -impl_GetDefaultAttributeSet (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_GetDefaultAttributeSet (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkText *text = (AtkText *) user_data; DBusMessage *reply; @@ -847,8 +807,9 @@ impl_GetDefaultAttributeSet (DBusConnection * bus, DBusMessage * message, } static DBusMessage * -impl_ScrollSubstringTo (DBusConnection * bus, - DBusMessage * message, void *user_data) +impl_ScrollSubstringTo (DBusConnection *bus, + DBusMessage *message, + void *user_data) { AtkText *text = (AtkText *) user_data; dbus_int32_t startOffset, endOffset; @@ -859,11 +820,10 @@ impl_ScrollSubstringTo (DBusConnection * bus, g_return_val_if_fail (ATK_IS_TEXT (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &startOffset, - DBUS_TYPE_INT32, &endOffset, - DBUS_TYPE_UINT32, &type, - DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &startOffset, + DBUS_TYPE_INT32, &endOffset, + DBUS_TYPE_UINT32, &type, + DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -880,8 +840,9 @@ impl_ScrollSubstringTo (DBusConnection * bus, } static DBusMessage * -impl_ScrollSubstringToPoint (DBusConnection * bus, - DBusMessage * message, void *user_data) +impl_ScrollSubstringToPoint (DBusConnection *bus, + DBusMessage *message, + void *user_data) { AtkText *text = (AtkText *) user_data; dbus_int32_t startOffset, endOffset; @@ -893,13 +854,12 @@ impl_ScrollSubstringToPoint (DBusConnection * bus, g_return_val_if_fail (ATK_IS_TEXT (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_INT32, &startOffset, - DBUS_TYPE_INT32, &endOffset, - DBUS_TYPE_UINT32, &type, - DBUS_TYPE_INT32, &x, - DBUS_TYPE_INT32, &y, - DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &startOffset, + DBUS_TYPE_INT32, &endOffset, + DBUS_TYPE_UINT32, &type, + DBUS_TYPE_INT32, &x, + DBUS_TYPE_INT32, &y, + DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -916,40 +876,40 @@ impl_ScrollSubstringToPoint (DBusConnection * bus, } static DRouteMethod methods[] = { - {impl_GetText, "GetText"}, - {impl_SetCaretOffset, "SetCaretOffset"}, - {impl_GetTextBeforeOffset, "GetTextBeforeOffset"}, - {impl_GetTextAtOffset, "GetTextAtOffset"}, - {impl_GetTextAfterOffset, "GetTextAfterOffset"}, - {impl_GetStringAtOffset, "GetStringAtOffset"}, - {impl_GetCharacterAtOffset, "GetCharacterAtOffset"}, - {impl_GetAttributeValue, "GetAttributeValue"}, - {impl_GetAttributes, "GetAttributes"}, - {impl_GetDefaultAttributes, "GetDefaultAttributes"}, - {impl_GetCharacterExtents, "GetCharacterExtents"}, - {impl_GetOffsetAtPoint, "GetOffsetAtPoint"}, - {impl_GetNSelections, "GetNSelections"}, - {impl_GetSelection, "GetSelection"}, - {impl_AddSelection, "AddSelection"}, - {impl_RemoveSelection, "RemoveSelection"}, - {impl_SetSelection, "SetSelection"}, - {impl_GetRangeExtents, "GetRangeExtents"}, - {impl_GetBoundedRanges, "GetBoundedRanges"}, - {impl_GetAttributeRun, "GetAttributeRun"}, - {impl_GetDefaultAttributeSet, "GetDefaultAttributeSet"}, - {impl_ScrollSubstringTo, "ScrollSubstringTo"}, - {impl_ScrollSubstringToPoint, "ScrollSubstringToPoint"}, - {NULL, NULL} + { impl_GetText, "GetText" }, + { impl_SetCaretOffset, "SetCaretOffset" }, + { impl_GetTextBeforeOffset, "GetTextBeforeOffset" }, + { impl_GetTextAtOffset, "GetTextAtOffset" }, + { impl_GetTextAfterOffset, "GetTextAfterOffset" }, + { impl_GetStringAtOffset, "GetStringAtOffset" }, + { impl_GetCharacterAtOffset, "GetCharacterAtOffset" }, + { impl_GetAttributeValue, "GetAttributeValue" }, + { impl_GetAttributes, "GetAttributes" }, + { impl_GetDefaultAttributes, "GetDefaultAttributes" }, + { impl_GetCharacterExtents, "GetCharacterExtents" }, + { impl_GetOffsetAtPoint, "GetOffsetAtPoint" }, + { impl_GetNSelections, "GetNSelections" }, + { impl_GetSelection, "GetSelection" }, + { impl_AddSelection, "AddSelection" }, + { impl_RemoveSelection, "RemoveSelection" }, + { impl_SetSelection, "SetSelection" }, + { impl_GetRangeExtents, "GetRangeExtents" }, + { impl_GetBoundedRanges, "GetBoundedRanges" }, + { impl_GetAttributeRun, "GetAttributeRun" }, + { impl_GetDefaultAttributeSet, "GetDefaultAttributeSet" }, + { impl_ScrollSubstringTo, "ScrollSubstringTo" }, + { impl_ScrollSubstringToPoint, "ScrollSubstringToPoint" }, + { NULL, NULL } }; static DRouteProperty properties[] = { - {impl_get_CharacterCount, NULL, "CharacterCount"}, - {impl_get_CaretOffset, NULL, "CaretOffset"}, - {NULL, NULL, NULL} + { impl_get_CharacterCount, NULL, "CharacterCount" }, + { impl_get_CaretOffset, NULL, "CaretOffset" }, + { NULL, NULL, NULL } }; void -spi_initialize_text (DRoutePath * path) +spi_initialize_text (DRoutePath *path) { spi_atk_add_interface (path, 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 d84d1b88..dd076a4a 100644 --- a/atk-adaptor/adaptors/value-adaptor.c +++ b/atk-adaptor/adaptors/value-adaptor.c @@ -25,15 +25,15 @@ #include <math.h> #define ATK_DISABLE_DEPRECATION_WARNINGS +#include "bridge.h" #include <atk/atk.h> #include <droute/droute.h> -#include "bridge.h" -#include "spi-dbus.h" #include "introspection.h" +#include "spi-dbus.h" static dbus_bool_t -impl_get_MinimumValue (DBusMessageIter * iter, void *user_data) +impl_get_MinimumValue (DBusMessageIter *iter, void *user_data) { AtkValue *value = (AtkValue *) user_data; GValue src = { 0 }; @@ -66,7 +66,7 @@ impl_get_MinimumValue (DBusMessageIter * iter, void *user_data) } static dbus_bool_t -impl_get_MaximumValue (DBusMessageIter * iter, void *user_data) +impl_get_MaximumValue (DBusMessageIter *iter, void *user_data) { AtkValue *value = (AtkValue *) user_data; GValue src = { 0 }; @@ -96,7 +96,7 @@ impl_get_MaximumValue (DBusMessageIter * iter, void *user_data) } static dbus_bool_t -impl_get_MinimumIncrement (DBusMessageIter * iter, void *user_data) +impl_get_MinimumIncrement (DBusMessageIter *iter, void *user_data) { AtkValue *value = (AtkValue *) user_data; GValue src = { 0 }; @@ -124,7 +124,7 @@ impl_get_MinimumIncrement (DBusMessageIter * iter, void *user_data) } static dbus_bool_t -impl_get_CurrentValue (DBusMessageIter * iter, void *user_data) +impl_get_CurrentValue (DBusMessageIter *iter, void *user_data) { AtkValue *value = (AtkValue *) user_data; GValue src = { 0 }; @@ -153,7 +153,7 @@ impl_get_CurrentValue (DBusMessageIter * iter, void *user_data) } static dbus_bool_t -impl_set_CurrentValue (DBusMessageIter * iter, void *user_data) +impl_set_CurrentValue (DBusMessageIter *iter, void *user_data) { AtkValue *value = (AtkValue *) user_data; GValue src = { 0 }; @@ -197,8 +197,7 @@ impl_set_CurrentValue (DBusMessageIter * iter, void *user_data) /* keeping this method around for backwards-compatibility for now; see * * BGO#652596 */ static DBusMessage * -impl_SetCurrentValue (DBusConnection * bus, DBusMessage * message, - void *user_data) +impl_SetCurrentValue (DBusConnection *bus, DBusMessage *message, void *user_data) { AtkValue *value = (AtkValue *) user_data; dbus_bool_t rv; @@ -209,8 +208,7 @@ impl_SetCurrentValue (DBusConnection * bus, DBusMessage * message, g_return_val_if_fail (ATK_IS_VALUE (value), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args - (message, NULL, DBUS_TYPE_DOUBLE, &dub, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_DOUBLE, &dub, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -229,7 +227,7 @@ impl_SetCurrentValue (DBusConnection * bus, DBusMessage * message, } static dbus_bool_t -impl_get_Text (DBusMessageIter * iter, void *user_data) +impl_get_Text (DBusMessageIter *iter, void *user_data) { AtkValue *value = (AtkValue *) user_data; gdouble dub; @@ -251,21 +249,21 @@ impl_get_Text (DBusMessageIter * iter, void *user_data) } static DRouteMethod methods[] = { - {impl_SetCurrentValue, "SetCurrentValue"}, - {NULL, NULL} + { impl_SetCurrentValue, "SetCurrentValue" }, + { NULL, NULL } }; static DRouteProperty properties[] = { - {impl_get_MinimumValue, NULL, "MinimumValue"}, - {impl_get_MaximumValue, NULL, "MaximumValue"}, - {impl_get_MinimumIncrement, NULL, "MinimumIncrement"}, - {impl_get_CurrentValue, impl_set_CurrentValue, "CurrentValue"}, - {impl_get_Text, NULL, "Text"}, - {NULL, NULL, NULL} + { impl_get_MinimumValue, NULL, "MinimumValue" }, + { impl_get_MaximumValue, NULL, "MaximumValue" }, + { impl_get_MinimumIncrement, NULL, "MinimumIncrement" }, + { impl_get_CurrentValue, impl_set_CurrentValue, "CurrentValue" }, + { impl_get_Text, NULL, "Text" }, + { NULL, NULL, NULL } }; void -spi_initialize_value (DRoutePath * path) +spi_initialize_value (DRoutePath *path) { spi_atk_add_interface (path, ATSPI_DBUS_INTERFACE_VALUE, spi_org_a11y_atspi_Value, methods, properties); diff --git a/atk-adaptor/atk-bridge.h b/atk-adaptor/atk-bridge.h index 90d73306..32c8897d 100644 --- a/atk-adaptor/atk-bridge.h +++ b/atk-adaptor/atk-bridge.h @@ -29,9 +29,9 @@ G_BEGIN_DECLS -int atk_bridge_adaptor_init (int * argc, char ** argv[]); +int atk_bridge_adaptor_init (int *argc, char **argv[]); void atk_bridge_adaptor_cleanup (void); -void atk_bridge_set_event_context(GMainContext *cnx); +void atk_bridge_set_event_context (GMainContext *cnx); G_END_DECLS diff --git a/atk-adaptor/bitarray.h b/atk-adaptor/bitarray.h index 6f66cc8a..ccce17bf 100644 --- a/atk-adaptor/bitarray.h +++ b/atk-adaptor/bitarray.h @@ -28,5 +28,5 @@ #define BITARRAY_SEQ_TERM 0xffffffff -#define BITARRAY_SET(p, n) ((p)[n>>5] |= (1<<(n&31))) -#endif /* _BITARRAY_H */ +#define BITARRAY_SET(p, n) ((p)[n >> 5] |= (1 << (n & 31))) +#endif /* _BITARRAY_H */ diff --git a/atk-adaptor/bridge.c b/atk-adaptor/bridge.c index b752ed7a..e5b6399d 100644 --- a/atk-adaptor/bridge.c +++ b/atk-adaptor/bridge.c @@ -25,27 +25,27 @@ #define _GNU_SOURCE #include "config.h" -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> +#include <atk/atk.h> #include <stdarg.h> +#include <stdio.h> +#include <stdlib.h> #include <string.h> -#include<sys/stat.h> -#include <atk/atk.h> +#include <sys/stat.h> +#include <unistd.h> -#include <droute/droute.h> -#include <atspi/atspi.h> #include <atk-bridge.h> +#include <atspi/atspi.h> +#include <droute/droute.h> +#include "accessible-stateset.h" +#include "adaptors.h" #include "bridge.h" #include "event.h" -#include "adaptors.h" #include "object.h" -#include "accessible-stateset.h" -#include "accessible-register.h" -#include "accessible-leasing.h" #include "accessible-cache.h" +#include "accessible-leasing.h" +#include "accessible-register.h" #include "spi-dbus.h" @@ -93,11 +93,11 @@ tally_event_reply () replies_received++; if (replies_received == 3) - { - if (!clients) - spi_atk_deregister_event_listeners (); - spi_global_app_data->events_initialized = TRUE; - } + { + if (!clients) + spi_atk_deregister_event_listeners (); + spi_global_app_data->events_initialized = TRUE; + } } GType @@ -136,40 +136,40 @@ _atk_bridge_find_property_func (const char *property, GType *type) DRouteProperty *dp; if (!strncasecmp (property, "action.", 7)) - { - iface = ATSPI_DBUS_INTERFACE_ACTION; - member = property + 7; - } + { + iface = ATSPI_DBUS_INTERFACE_ACTION; + member = property + 7; + } else if (!strncasecmp (property, "component.", 10)) - { - iface = ATSPI_DBUS_INTERFACE_COMPONENT; - member = property + 10; - } + { + iface = ATSPI_DBUS_INTERFACE_COMPONENT; + member = property + 10; + } else if (!strncasecmp (property, "selection.", 10)) - { - iface = ATSPI_DBUS_INTERFACE_SELECTION; - member = property + 10; - } + { + iface = ATSPI_DBUS_INTERFACE_SELECTION; + member = property + 10; + } else if (!strncasecmp (property, "table.", 6)) - { - iface = ATSPI_DBUS_INTERFACE_TABLE; - member = property + 6; - } + { + iface = ATSPI_DBUS_INTERFACE_TABLE; + member = property + 6; + } else if (!strncasecmp (property, "text.", 5)) - { - iface = ATSPI_DBUS_INTERFACE_TEXT; - member = property + 5; - } + { + iface = ATSPI_DBUS_INTERFACE_TEXT; + member = property + 5; + } else if (!strncasecmp (property, "value.", 6)) - { - iface = ATSPI_DBUS_INTERFACE_VALUE; - member = property + 6; - } + { + iface = ATSPI_DBUS_INTERFACE_VALUE; + member = property + 6; + } else - { - iface = ATSPI_DBUS_INTERFACE_ACCESSIBLE; - member = property; - } + { + iface = ATSPI_DBUS_INTERFACE_ACCESSIBLE; + member = property; + } *type = _atk_bridge_type_from_iface (iface); @@ -178,13 +178,13 @@ _atk_bridge_find_property_func (const char *property, GType *type) if (!dp) return NULL; - for (;dp->name; dp++) - { - if (!strcasecmp (dp->name, member)) + for (; dp->name; dp++) { - return dp->get; + if (!strcasecmp (dp->name, member)) + { + return dp->get; + } } - } return NULL; } @@ -194,11 +194,11 @@ add_property_to_event (event_data *evdata, const char *property) AtspiPropertyDefinition *prop = g_new0 (AtspiPropertyDefinition, 1); prop->func = _atk_bridge_find_property_func (property, &prop->type); if (!prop->func) - { - g_warning ("atk-bridge: Request for unknown property '%s'", property); - g_free (prop); - return; - } + { + g_warning ("atk-bridge: Request for unknown property '%s'", property); + g_free (prop); + return; + } prop->name = g_strdup (property); evdata->properties = g_slist_append (evdata->properties, prop); @@ -216,17 +216,17 @@ add_event_from_iter (DBusMessageIter *iter) dbus_message_iter_next (iter); evdata = add_event (bus_name, event); if (dbus_message_iter_get_arg_type (iter) == DBUS_TYPE_ARRAY) - { - DBusMessageIter iter_sub_array; - dbus_message_iter_recurse (iter, &iter_sub_array); - while (dbus_message_iter_get_arg_type (&iter_sub_array) != DBUS_TYPE_INVALID) { - const char *property; - dbus_message_iter_get_basic (&iter_sub_array, &property); - add_property_to_event (evdata, property); - dbus_message_iter_next (&iter_sub_array); + DBusMessageIter iter_sub_array; + dbus_message_iter_recurse (iter, &iter_sub_array); + while (dbus_message_iter_get_arg_type (&iter_sub_array) != DBUS_TYPE_INVALID) + { + const char *property; + dbus_message_iter_get_basic (&iter_sub_array, &property); + add_property_to_event (evdata, property); + dbus_message_iter_next (&iter_sub_array); + } } - } } static void @@ -305,9 +305,9 @@ get_registered_event_listeners (SpiBridge *app) DBusPendingCall *pending = NULL; message = dbus_message_new_method_call (SPI_DBUS_NAME_REGISTRY, - ATSPI_DBUS_PATH_REGISTRY, - ATSPI_DBUS_INTERFACE_REGISTRY, - "GetRegisteredEvents"); + ATSPI_DBUS_PATH_REGISTRY, + ATSPI_DBUS_INTERFACE_REGISTRY, + "GetRegisteredEvents"); if (!message) return; @@ -321,9 +321,9 @@ get_registered_event_listeners (SpiBridge *app) dbus_pending_call_set_notify (pending, get_events_reply, NULL, NULL); message = dbus_message_new_method_call (SPI_DBUS_NAME_REGISTRY, - ATSPI_DBUS_PATH_DEC, - ATSPI_DBUS_INTERFACE_DEC, - "GetKeystrokeListeners"); + ATSPI_DBUS_PATH_DEC, + ATSPI_DBUS_INTERFACE_DEC, + "GetKeystrokeListeners"); if (!message) return; pending = NULL; @@ -349,7 +349,7 @@ register_reply (DBusPendingCall *pending, void *user_data) if (!spi_global_app_data) { if (reply) - dbus_message_unref (reply); + dbus_message_unref (reply); return; } @@ -390,7 +390,7 @@ register_reply (DBusPendingCall *pending, void *user_data) static gboolean register_application (gpointer data) { - SpiBridge * app = data; + SpiBridge *app = data; DBusMessage *message; DBusMessageIter iter; DBusPendingCall *pending; @@ -404,18 +404,17 @@ register_application (gpointer data) dbus_message_iter_init_append (message, &iter); spi_object_append_reference (&iter, app->root); - - if (!dbus_connection_send_with_reply (app->bus, message, &pending, -1) - || !pending) + + if (!dbus_connection_send_with_reply (app->bus, message, &pending, -1) || !pending) { - if (pending) - dbus_pending_call_unref (pending); + if (pending) + dbus_pending_call_unref (pending); - dbus_message_unref (message); - return FALSE; + dbus_message_unref (message); + return FALSE; } - dbus_pending_call_set_notify (pending, register_reply, app, NULL); + dbus_pending_call_set_notify (pending, register_reply, app, NULL); if (message) dbus_message_unref (message); @@ -439,11 +438,11 @@ gboolean _atk_bridge_remove_pending_application_registration (SpiBridge *app) { if (app->registration_pending) - { - g_source_remove (app->registration_pending); - app->registration_pending = 0; - return TRUE; - } + { + g_source_remove (app->registration_pending); + app->registration_pending = 0; + return TRUE; + } return FALSE; } @@ -458,22 +457,22 @@ remove_socket () if (spi_global_app_data->app_bus_addr && !strncmp (spi_global_app_data->app_bus_addr, "unix:path=", 10)) - { - unlink (spi_global_app_data->app_bus_addr + 10); - g_free (spi_global_app_data->app_bus_addr); - spi_global_app_data->app_bus_addr = NULL; - } + { + unlink (spi_global_app_data->app_bus_addr + 10); + g_free (spi_global_app_data->app_bus_addr); + spi_global_app_data->app_bus_addr = NULL; + } if (spi_global_app_data->app_tmp_dir) - { - rmdir (spi_global_app_data->app_tmp_dir); - g_free (spi_global_app_data->app_tmp_dir); - spi_global_app_data->app_tmp_dir = NULL; - } + { + rmdir (spi_global_app_data->app_tmp_dir); + g_free (spi_global_app_data->app_tmp_dir); + spi_global_app_data->app_tmp_dir = NULL; + } } static void -deregister_application (SpiBridge * app) +deregister_application (SpiBridge *app) { DBusMessage *message; DBusMessageIter iter; @@ -512,7 +511,7 @@ static AtkPlugClass *plug_class; static AtkSocketClass *socket_class; static gchar * -get_plug_id (AtkPlug * plug) +get_plug_id (AtkPlug *plug) { const char *uname = dbus_bus_get_unique_name (spi_global_app_data->bus); gchar *path; @@ -584,11 +583,11 @@ socket_ref_state_set (AtkObject *accessible) } static void -socket_embed_hook (AtkSocket * socket, const gchar * plug_id) +socket_embed_hook (AtkSocket *socket, const gchar *plug_id) { g_return_if_fail (spi_global_register != NULL); - AtkObject *accessible = ATK_OBJECT(socket); + AtkObject *accessible = ATK_OBJECT (socket); gchar *plug_name, *plug_path; AtkObjectClass *klass; @@ -634,7 +633,7 @@ static guint get_ancestral_uid (guint pid) { FILE *fp; - char buf [80]; + char buf[80]; int ppid = 0; int uid = 0; gboolean got_ppid = 0; @@ -645,12 +644,12 @@ get_ancestral_uid (guint pid) if (!fp) return 0; while ((!got_ppid || !got_uid) && fgets (buf, sizeof (buf), fp)) - { - if (sscanf (buf, "PPid:\t%d", &ppid) == 1) - got_ppid = TRUE; - else if (sscanf (buf, "Uid:\t%d", &uid) == 1) - got_uid = TRUE; - } + { + if (sscanf (buf, "PPid:\t%d", &ppid) == 1) + got_ppid = TRUE; + else if (sscanf (buf, "Uid:\t%d", &uid) == 1) + got_uid = TRUE; + } fclose (fp); if (!got_ppid || !got_uid) @@ -668,10 +667,10 @@ user_check (DBusConnection *bus, unsigned long uid, void *data) if (uid == getuid () || uid == geteuid ()) return TRUE; if (getuid () == 0) - { - guint ancestor = get_ancestral_uid (getpid ()); - return (ancestor == uid || ancestor == 1 || ancestor == 0); - } + { + guint ancestor = get_ancestral_uid (getpid ()); + return (ancestor == uid || ancestor == 1 || ancestor == 0); + } return FALSE; } @@ -679,24 +678,23 @@ static void new_connection_cb (DBusServer *server, DBusConnection *con, void *data) { dbus_connection_set_unix_user_function (con, user_check, NULL, NULL); - dbus_connection_ref(con); - atspi_dbus_connection_setup_with_g_main(con, spi_context); + dbus_connection_ref (con); + atspi_dbus_connection_setup_with_g_main (con, spi_context); droute_intercept_dbus (con); droute_context_register (spi_global_app_data->droute, con); spi_global_app_data->direct_connections = g_list_append (spi_global_app_data->direct_connections, con); } - gchar *atspi_dbus_name = NULL; static gboolean atspi_no_register = FALSE; static GOptionEntry atspi_option_entries[] = { - {"atspi-dbus-name", 0, 0, G_OPTION_ARG_STRING, &atspi_dbus_name, - "D-Bus bus name to register as", NULL}, - {"atspi-no-register", 0, 0, G_OPTION_ARG_NONE, &atspi_no_register, - "Do not register with Registry Daemon", NULL}, - {NULL} + { "atspi-dbus-name", 0, 0, G_OPTION_ARG_STRING, &atspi_dbus_name, + "D-Bus bus name to register as", NULL }, + { "atspi-no-register", 0, 0, G_OPTION_ARG_NONE, &atspi_no_register, + "Do not register with Registry Daemon", NULL }, + { NULL } }; static void @@ -715,25 +713,25 @@ add_objects_for_introspection (AtkObject *obj, GString *str) p = strrchr (path, '/') + 1; g_string_append_printf (str, "<node name=\"%s\"/>\n", p); g_free (path); - + if (ATK_IS_SOCKET (obj)) return; set = atk_object_ref_state_set (obj); if (atk_state_set_contains_state (set, ATK_STATE_MANAGES_DESCENDANTS)) - { - g_object_unref (set); - return; - } + { + g_object_unref (set); + return; + } g_object_unref (set); count = atk_object_get_n_accessible_children (obj); for (i = 0; i < count; i++) - { - AtkObject *child = atk_object_ref_accessible_child (obj, i); - add_objects_for_introspection (child, str); - g_object_unref (child); - } + { + AtkObject *child = atk_object_ref_accessible_child (obj, i); + add_objects_for_introspection (child, str); + g_object_unref (child); + } } static gchar * @@ -750,18 +748,17 @@ introspect_children_cb (const char *path, void *data) } static void -handle_event_listener_registered (DBusConnection *bus, DBusMessage *message, - void *user_data) +handle_event_listener_registered (DBusConnection *bus, DBusMessage *message, void *user_data) { DBusMessageIter iter; const char *signature = dbus_message_get_signature (message); if (strcmp (signature, "ssas") != 0 && strcmp (signature, "ss") != 0) - { - g_warning ("got RegisterEvent with invalid signature '%s'", signature); - return; - } + { + g_warning ("got RegisterEvent with invalid signature '%s'", signature); + return; + } dbus_message_iter_init (message, &iter); add_event_from_iter (&iter); @@ -816,8 +813,7 @@ remove_events (const char *bus_name, const char *event) } static void -handle_event_listener_deregistered (DBusConnection *bus, DBusMessage *message, - void *user_data) +handle_event_listener_deregistered (DBusConnection *bus, DBusMessage *message, void *user_data) { gchar *name; char *sender; @@ -830,8 +826,7 @@ handle_event_listener_deregistered (DBusConnection *bus, DBusMessage *message, } static void -handle_device_listener_registered (DBusConnection *bus, DBusMessage *message, - void *user_data) +handle_device_listener_registered (DBusConnection *bus, DBusMessage *message, void *user_data) { char *sender; DBusMessageIter iter, iter_struct; @@ -880,8 +875,8 @@ signal_filter (DBusConnection *bus, DBusMessage *message, void *user_data) result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } - if (!g_strcmp0(interface, DBUS_INTERFACE_DBUS) && - !g_strcmp0(member, "NameOwnerChanged")) + if (!g_strcmp0 (interface, DBUS_INTERFACE_DBUS) && + !g_strcmp0 (member, "NameOwnerChanged")) { char *name, *old, *new; if (dbus_message_get_args (message, NULL, @@ -901,7 +896,7 @@ signal_filter (DBusConnection *bus, DBusMessage *message, void *user_data) registry_lost = TRUE; } else if (*old != '\0' && *new == '\0') - spi_atk_remove_client (old); + spi_atk_remove_client (old); } } @@ -922,16 +917,16 @@ spi_atk_create_socket (SpiBridge *app) return -1; if (getuid () != 0) - { - app->app_tmp_dir = g_build_filename (user_runtime_dir, - "at-spi2-XXXXXX", NULL); - if (!g_mkdtemp (app->app_tmp_dir)) { - g_free (app->app_tmp_dir); - app->app_tmp_dir = NULL; - return -1; + app->app_tmp_dir = g_build_filename (user_runtime_dir, + "at-spi2-XXXXXX", NULL); + if (!g_mkdtemp (app->app_tmp_dir)) + { + g_free (app->app_tmp_dir); + app->app_tmp_dir = NULL; + return -1; + } } - } if (app->app_tmp_dir) { @@ -949,18 +944,18 @@ spi_atk_create_socket (SpiBridge *app) app->app_bus_addr = g_strconcat ("unix:path=", escaped_socket_path, NULL); dbus_free (escaped_socket_path); - dbus_error_init(&error); - server = dbus_server_listen(app->app_bus_addr, &error); + dbus_error_init (&error); + server = dbus_server_listen (app->app_bus_addr, &error); if (server == NULL) - { - g_warning ("atk-bridge: Couldn't listen on dbus server: %s", error.message); - dbus_error_free (&error); - app->app_bus_addr [0] = '\0'; - return -1; - } + { + g_warning ("atk-bridge: Couldn't listen on dbus server: %s", error.message); + dbus_error_free (&error); + app->app_bus_addr[0] = '\0'; + return -1; + } - atspi_dbus_server_setup_with_g_main(server, spi_context); - dbus_server_set_new_connection_function(server, new_connection_cb, NULL, NULL); + atspi_dbus_server_setup_with_g_main (server, spi_context); + dbus_server_set_new_connection_function (server, new_connection_cb, NULL, NULL); app->server = server; #endif @@ -997,7 +992,7 @@ spi_atk_activate () spi_atk_register_event_listeners (); if (!spi_global_cache) { - spi_global_cache = g_object_new (SPI_CACHE_TYPE, NULL); + spi_global_cache = g_object_new (SPI_CACHE_TYPE, NULL); treepath = droute_add_one (spi_global_app_data->droute, "/org/a11y/atspi/cache", spi_global_cache); @@ -1048,7 +1043,7 @@ spi_object_has_dbus_interface (void *obj, const char *interface) return FALSE; - return TRUE; + return TRUE; } /** @@ -1065,7 +1060,7 @@ spi_object_has_dbus_interface (void *obj, const char *interface) * succesfully, -1 otherwise */ int -atk_bridge_adaptor_init (gint * argc, gchar ** argv[]) +atk_bridge_adaptor_init (gint *argc, gchar **argv[]) { GOptionContext *opt; GError *err = NULL; @@ -1123,16 +1118,14 @@ atk_bridge_adaptor_init (gint * argc, gchar ** argv[]) if (atspi_dbus_name != NULL) { - if (dbus_bus_request_name - (spi_global_app_data->bus, atspi_dbus_name, 0, &error)) + if (dbus_bus_request_name (spi_global_app_data->bus, atspi_dbus_name, 0, &error)) { g_print ("AT-SPI Received D-Bus name - %s\n", atspi_dbus_name); } else { - g_print - ("AT-SPI D-Bus name requested but could not be allocated - %s\n", - atspi_dbus_name); + g_print ("AT-SPI D-Bus name requested but could not be allocated - %s\n", + atspi_dbus_name); } } @@ -1143,17 +1136,17 @@ atk_bridge_adaptor_init (gint * argc, gchar ** argv[]) /* Hook our plug-and socket functions */ install_plug_hooks (); - /* + /* * Create the leasing, register and cache objects. * The order is important here, the cache depends on the * register object. */ spi_global_register = g_object_new (SPI_REGISTER_TYPE, NULL); - spi_global_leasing = g_object_new (SPI_LEASING_TYPE, NULL); + spi_global_leasing = g_object_new (SPI_LEASING_TYPE, NULL); /* Register droute for routing AT-SPI messages */ spi_global_app_data->droute = - droute_new (); + droute_new (); accpath = droute_add_many (spi_global_app_data->droute, "/org/a11y/atspi/accessible", @@ -1161,10 +1154,9 @@ atk_bridge_adaptor_init (gint * argc, gchar ** argv[]) introspect_children_cb, NULL, (DRouteGetDatumFunction) - spi_global_register_path_to_object, + spi_global_register_path_to_object, spi_object_has_dbus_interface); - /* Register all interfaces with droute and set up application accessible db */ spi_initialize_accessible (accpath); spi_initialize_application (accpath); @@ -1221,7 +1213,7 @@ atk_bridge_adaptor_cleanup (void) return; if (!spi_global_app_data) - return; + return; spi_atk_tidy_windows (); spi_atk_deregister_event_listeners (); @@ -1274,7 +1266,7 @@ atk_bridge_adaptor_cleanup (void) /*---------------------------------------------------------------------------*/ static gchar *name_match_tmpl = - "type='signal', interface='org.freedesktop.DBus', member='NameOwnerChanged', arg0='%s'"; + "type='signal', interface='org.freedesktop.DBus', member='NameOwnerChanged', arg0='%s'"; void spi_atk_add_client (const char *bus_name) @@ -1283,10 +1275,10 @@ spi_atk_add_client (const char *bus_name) gchar *match; for (l = clients; l; l = l->next) - { - if (!g_strcmp0 (l->data, bus_name)) - return; - } + { + if (!g_strcmp0 (l->data, bus_name)) + return; + } if (!clients) spi_atk_activate (); clients = g_slist_append (clients, g_strdup (bus_name)); @@ -1303,42 +1295,42 @@ spi_atk_remove_client (const char *bus_name) l = clients; while (l) - { - next_node = l->next; - - if (!g_strcmp0 (l->data, bus_name)) { - gchar *match = g_strdup_printf (name_match_tmpl, l->data); - dbus_bus_remove_match (spi_global_app_data->bus, match, NULL); - g_free (match); - g_free (l->data); - clients = g_slist_delete_link (clients, l); - if (!clients) - spi_atk_deregister_event_listeners (); - return; - } + next_node = l->next; + + if (!g_strcmp0 (l->data, bus_name)) + { + gchar *match = g_strdup_printf (name_match_tmpl, l->data); + dbus_bus_remove_match (spi_global_app_data->bus, match, NULL); + g_free (match); + g_free (l->data); + clients = g_slist_delete_link (clients, l); + if (!clients) + spi_atk_deregister_event_listeners (); + return; + } - l = next_node; - } + l = next_node; + } } void spi_atk_add_interface (DRoutePath *path, const char *name, const char *introspect, - const DRouteMethod *methods, + const DRouteMethod *methods, const DRouteProperty *properties) { droute_path_add_interface (path, name, introspect, methods, properties); if (properties) - { - if (!spi_global_app_data->property_hash) - spi_global_app_data->property_hash = g_hash_table_new_full (g_str_hash, - g_str_equal, - g_free, NULL); - g_hash_table_insert (spi_global_app_data->property_hash, g_strdup (name), - (gpointer) properties); - } + { + if (!spi_global_app_data->property_hash) + spi_global_app_data->property_hash = g_hash_table_new_full (g_str_hash, + g_str_equal, + g_free, NULL); + g_hash_table_insert (spi_global_app_data->property_hash, g_strdup (name), + (gpointer) properties); + } } /*END------------------------------------------------------------------------*/ diff --git a/atk-adaptor/bridge.h b/atk-adaptor/bridge.h index 9fc10fd2..8b6f91d7 100644 --- a/atk-adaptor/bridge.h +++ b/atk-adaptor/bridge.h @@ -56,20 +56,20 @@ struct _SpiBridge AtkObject *root; DBusConnection *bus; - DRouteContext *droute; + DRouteContext *droute; GMainContext *main_context; DBusServer *server; GList *direct_connections; -/* - SpiRegister *reg; - SpiCache *cache; - SpiLeasing *leasing; -*/ + /* + SpiRegister *reg; + SpiCache *cache; + SpiLeasing *leasing; + */ gchar *desktop_name; gchar *desktop_path; -gchar *app_tmp_dir; -gchar *app_bus_addr; + gchar *app_tmp_dir; + gchar *app_bus_addr; GList *events; gboolean events_initialized; GHashTable *property_hash; @@ -86,7 +86,7 @@ int spi_atk_create_socket (SpiBridge *app); void spi_atk_add_interface (DRoutePath *path, const char *name, const char *introspect, - const DRouteMethod *methods, + const DRouteMethod *methods, const DRouteProperty *properties); DRoutePropertyFunction _atk_bridge_find_property_func (const char *property, diff --git a/atk-adaptor/event.c b/atk-adaptor/event.c index ac682955..d243d347 100644 --- a/atk-adaptor/event.c +++ b/atk-adaptor/event.c @@ -23,20 +23,20 @@ * Boston, MA 02110-1301, USA. */ -#include <string.h> #include <ctype.h> +#include <string.h> #define ATK_DISABLE_DEPRECATION_WARNINGS #include <atk/atk.h> -#include <droute/droute.h> #include <atspi/atspi.h> +#include <droute/droute.h> -#include "bridge.h" #include "accessible-register.h" +#include "bridge.h" -#include "spi-dbus.h" #include "event.h" #include "object.h" +#include "spi-dbus.h" static GArray *listener_ids = NULL; @@ -47,17 +47,17 @@ GMainContext *spi_context = NULL; /*---------------------------------------------------------------------------*/ -#define ITF_EVENT_OBJECT "org.a11y.atspi.Event.Object" -#define ITF_EVENT_WINDOW "org.a11y.atspi.Event.Window" +#define ITF_EVENT_OBJECT "org.a11y.atspi.Event.Object" +#define ITF_EVENT_WINDOW "org.a11y.atspi.Event.Window" #define ITF_EVENT_DOCUMENT "org.a11y.atspi.Event.Document" -#define ITF_EVENT_FOCUS "org.a11y.atspi.Event.Focus" +#define ITF_EVENT_FOCUS "org.a11y.atspi.Event.Focus" /*---------------------------------------------------------------------------*/ -typedef struct _SpiReentrantCallClosure +typedef struct _SpiReentrantCallClosure { DBusConnection *bus; - GMainLoop *loop; + GMainLoop *loop; DBusMessage *reply; guint timeout; } SpiReentrantCallClosure; @@ -79,7 +79,7 @@ switch_main_context (GMainContext *cnx) } guint -spi_idle_add(GSourceFunc function, gpointer data) +spi_idle_add (GSourceFunc function, gpointer data) { GSource *source; guint id; @@ -93,7 +93,7 @@ spi_idle_add(GSourceFunc function, gpointer data) } guint -spi_timeout_add_seconds (gint interval, GSourceFunc function, gpointer data) +spi_timeout_add_seconds (gint interval, GSourceFunc function, gpointer data) { GSource *source; guint id; @@ -107,8 +107,7 @@ spi_timeout_add_seconds (gint interval, GSourceFunc function, gpointer data) } guint -spi_timeout_add_full (gint priority, guint interval, GSourceFunc function, - gpointer data, GDestroyNotify notify) +spi_timeout_add_full (gint priority, guint interval, GSourceFunc function, gpointer data, GDestroyNotify notify) { GSource *source; guint id; @@ -123,9 +122,9 @@ spi_timeout_add_full (gint priority, guint interval, GSourceFunc function, } static void -set_reply (DBusPendingCall * pending, void *user_data) +set_reply (DBusPendingCall *pending, void *user_data) { - SpiReentrantCallClosure* closure = (SpiReentrantCallClosure *) user_data; + SpiReentrantCallClosure *closure = (SpiReentrantCallClosure *) user_data; closure->reply = dbus_pending_call_steal_reply (pending); dbus_pending_call_unref (pending); @@ -145,7 +144,7 @@ timeout_reply (void *data) } static DBusMessage * -send_and_allow_reentry (DBusConnection * bus, DBusMessage * message) +send_and_allow_reentry (DBusConnection *bus, DBusMessage *message) { DBusPendingCall *pending; SpiReentrantCallClosure closure; @@ -166,10 +165,10 @@ send_and_allow_reentry (DBusConnection * bus, DBusMessage * message) g_source_set_callback (source, timeout_reply, &closure, NULL); closure.timeout = g_source_attach (source, spi_global_app_data->main_context); g_source_unref (source); - g_main_loop_run (closure.loop); + g_main_loop_run (closure.loop); if (closure.timeout != -1) g_source_destroy (source); - + g_main_loop_unref (closure.loop); if (!closure.reply) dbus_pending_call_cancel (pending); @@ -177,10 +176,10 @@ send_and_allow_reentry (DBusConnection * bus, DBusMessage * message) } void -atk_bridge_set_event_context(GMainContext *cnx) +atk_bridge_set_event_context (GMainContext *cnx) { spi_context = cnx; - switch_main_context(spi_context); + switch_main_context (spi_context); } /*---------------------------------------------------------------------------*/ @@ -192,29 +191,28 @@ atk_bridge_set_event_context(GMainContext *cnx) */ static gboolean -Accessibility_DeviceEventController_NotifyListenersSync (const - AtspiDeviceEvent - * key_event) +Accessibility_DeviceEventController_NotifyListenersSync (const AtspiDeviceEvent + *key_event) { DBusMessage *message; dbus_bool_t consumed = FALSE; message = - dbus_message_new_method_call (SPI_DBUS_NAME_REGISTRY, - ATSPI_DBUS_PATH_DEC, - ATSPI_DBUS_INTERFACE_DEC, - "NotifyListenersSync"); + dbus_message_new_method_call (SPI_DBUS_NAME_REGISTRY, + ATSPI_DBUS_PATH_DEC, + ATSPI_DBUS_INTERFACE_DEC, + "NotifyListenersSync"); if (spi_dbus_marshal_deviceEvent (message, key_event)) { DBusMessage *reply = - send_and_allow_reentry (spi_global_app_data->bus, message); + send_and_allow_reentry (spi_global_app_data->bus, message); if (reply) { DBusError error; dbus_error_init (&error); if (!dbus_message_get_args (reply, &error, DBUS_TYPE_BOOLEAN, - &consumed, DBUS_TYPE_INVALID)) + &consumed, DBUS_TYPE_INVALID)) { /* TODO: print a warning */ dbus_error_free (&error); @@ -227,8 +225,8 @@ Accessibility_DeviceEventController_NotifyListenersSync (const } static void -spi_init_keystroke_from_atk_key_event (AtspiDeviceEvent * keystroke, - AtkKeyEventStruct * event) +spi_init_keystroke_from_atk_key_event (AtspiDeviceEvent *keystroke, + AtkKeyEventStruct *event) { keystroke->id = (dbus_int32_t) event->keyval; keystroke->hw_code = (dbus_int16_t) event->keycode; @@ -271,9 +269,8 @@ spi_init_keystroke_from_atk_key_event (AtspiDeviceEvent * keystroke, #endif } - static gint -spi_atk_bridge_key_listener (AtkKeyEventStruct * event, gpointer data) +spi_atk_bridge_key_listener (AtkKeyEventStruct *event, gpointer data) { gboolean result; AtspiDeviceEvent key_event; @@ -281,7 +278,7 @@ spi_atk_bridge_key_listener (AtkKeyEventStruct * event, gpointer data) spi_init_keystroke_from_atk_key_event (&key_event, event); result = - Accessibility_DeviceEventController_NotifyListenersSync (&key_event); + Accessibility_DeviceEventController_NotifyListenersSync (&key_event); if (key_event.event_string) g_free (key_event.event_string); @@ -293,23 +290,23 @@ spi_atk_bridge_key_listener (AtkKeyEventStruct * event, gpointer data) static const void * validate_for_dbus (const gint type, - const void *val) + const void *val) { switch (type) { - case DBUS_TYPE_STRING: - case DBUS_TYPE_OBJECT_PATH: - if (!val) - return ""; - else if (!g_utf8_validate (val, -1, NULL)) - { - g_warning ("atk-bridge: Received bad UTF-8 string when emitting event"); - return ""; - } - else - return val; - default: - return val; + case DBUS_TYPE_STRING: + case DBUS_TYPE_OBJECT_PATH: + if (!val) + return ""; + else if (!g_utf8_validate (val, -1, NULL)) + { + g_warning ("atk-bridge: Received bad UTF-8 string when emitting event"); + return ""; + } + else + return val; + default: + return val; } } @@ -320,12 +317,12 @@ append_basic (DBusMessageIter *iter, { DBusMessageIter sub; - dbus_message_iter_open_container(iter, DBUS_TYPE_VARIANT, type, &sub); + dbus_message_iter_open_container (iter, DBUS_TYPE_VARIANT, type, &sub); - val = validate_for_dbus ((int) *type, val); - dbus_message_iter_append_basic(&sub, (int) *type, &val); + val = validate_for_dbus ((int) *type, val); + dbus_message_iter_append_basic (&sub, (int) *type, &val); - dbus_message_iter_close_container(iter, &sub); + dbus_message_iter_close_container (iter, &sub); } static void @@ -336,18 +333,18 @@ append_rect (DBusMessageIter *iter, DBusMessageIter variant, sub; const AtkRectangle *rect = (const AtkRectangle *) val; - dbus_message_iter_open_container(iter, DBUS_TYPE_VARIANT, type, &variant); + dbus_message_iter_open_container (iter, DBUS_TYPE_VARIANT, type, &variant); - dbus_message_iter_open_container (&variant, DBUS_TYPE_STRUCT, NULL, &sub); + dbus_message_iter_open_container (&variant, DBUS_TYPE_STRUCT, NULL, &sub); - dbus_message_iter_append_basic (&sub, DBUS_TYPE_INT32, &(rect->x)); - dbus_message_iter_append_basic (&sub, DBUS_TYPE_INT32, &(rect->y)); - dbus_message_iter_append_basic (&sub, DBUS_TYPE_INT32, &(rect->width)); - dbus_message_iter_append_basic (&sub, DBUS_TYPE_INT32, &(rect->height)); + dbus_message_iter_append_basic (&sub, DBUS_TYPE_INT32, &(rect->x)); + dbus_message_iter_append_basic (&sub, DBUS_TYPE_INT32, &(rect->y)); + dbus_message_iter_append_basic (&sub, DBUS_TYPE_INT32, &(rect->width)); + dbus_message_iter_append_basic (&sub, DBUS_TYPE_INT32, &(rect->height)); - dbus_message_iter_close_container (&variant, &sub); + dbus_message_iter_close_container (&variant, &sub); - dbus_message_iter_close_container(iter, &variant); + dbus_message_iter_close_container (iter, &variant); } static void @@ -366,12 +363,12 @@ signal_name_to_dbus (const gchar *s) if (!ret) return NULL; - ret [0] = toupper (ret [0]); + ret[0] = toupper (ret[0]); while ((t = strchr (ret, '-')) != NULL) - { - memmove (t, t + 1, strlen (t)); - *t = toupper (*t); - } + { + memmove (t, t + 1, strlen (t)); + *t = toupper (*t); + } return ret; } @@ -417,26 +414,25 @@ append_properties (GArray *properties, event_data *evdata) gint i; for (ls = evdata->properties; ls; ls = ls->next) - { - gboolean dup = FALSE; - for (i = 0; i < properties->len; i++) { - if (ls->data == g_array_index (properties, AtspiPropertyDefinition *, i)) - { - dup = TRUE; - break; - } + gboolean dup = FALSE; + for (i = 0; i < properties->len; i++) + { + if (ls->data == g_array_index (properties, AtspiPropertyDefinition *, i)) + { + dup = TRUE; + break; + } + } + if (!dup) + g_array_append_val (properties, ls->data); } - if (!dup) - g_array_append_val (properties, ls->data); - } } static gboolean -signal_is_needed (AtkObject *obj, const gchar *klass, const gchar *major, - const gchar *minor, GArray **properties) +signal_is_needed (AtkObject *obj, const gchar *klass, const gchar *major, const gchar *minor, GArray **properties) { - gchar *data [4]; + gchar *data[4]; event_data *evdata; gboolean ret = FALSE; GList *list; @@ -445,37 +441,36 @@ signal_is_needed (AtkObject *obj, const gchar *klass, const gchar *major, if (!spi_global_app_data->events_initialized) return TRUE; - data [0] = ensure_proper_format (klass[0] ? klass + 21 : klass); - data [1] = ensure_proper_format (major); - data [2] = ensure_proper_format (minor); - data [3] = NULL; + data[0] = ensure_proper_format (klass[0] ? klass + 21 : klass); + data[1] = ensure_proper_format (major); + data[2] = ensure_proper_format (minor); + data[3] = NULL; /* Hack: Always pass events that update the cache. * TODO: FOr 2.2, have at-spi2-core define a special "cache listener" for * this instead, so that we don't send these if no one is listening */ - if (!g_strcmp0 (data [1], "ChildrenChanged") || - ((!g_strcmp0 (data [1], "PropertyChange")) && - (!g_strcmp0 (data [2], "AccessibleName") || - !g_strcmp0 (data [2], "AccessibleDescription") || - !g_strcmp0 (data [2], "AccessibleParent") || - !g_strcmp0 (data [2], "AccessibleRole"))) || - !g_strcmp0 (data [1], "StateChanged")) - { - if (minor && !g_strcmp0 (minor, "defunct")) - ret = TRUE; - else + if (!g_strcmp0 (data[1], "ChildrenChanged") || + ((!g_strcmp0 (data[1], "PropertyChange")) && + (!g_strcmp0 (data[2], "AccessibleName") || + !g_strcmp0 (data[2], "AccessibleDescription") || + !g_strcmp0 (data[2], "AccessibleParent") || + !g_strcmp0 (data[2], "AccessibleRole"))) || + !g_strcmp0 (data[1], "StateChanged")) { - AtkStateSet *set = atk_object_ref_state_set (obj); - AtkState state = ((!g_strcmp0 (data[1], "ChildrenChanged")) ? - ATK_STATE_MANAGES_DESCENDANTS : ATK_STATE_TRANSIENT); - ret = !atk_state_set_contains_state (set, state); - g_object_unref (set); + if (minor && !g_strcmp0 (minor, "defunct")) + ret = TRUE; + else + { + AtkStateSet *set = atk_object_ref_state_set (obj); + AtkState state = ((!g_strcmp0 (data[1], "ChildrenChanged")) ? ATK_STATE_MANAGES_DESCENDANTS : ATK_STATE_TRANSIENT); + ret = !atk_state_set_contains_state (set, state); + g_object_unref (set); + } } - } /* Hack: events such as "object::text-changed::insert:system" as generated by Gecko */ - data [2][strcspn (data [2], ":")] = '\0'; + data[2][strcspn (data[2], ":")] = '\0'; for (list = spi_global_app_data->events; list; list = list->next) { @@ -484,14 +479,14 @@ signal_is_needed (AtkObject *obj, const gchar *klass, const gchar *major, { ret = TRUE; if (!props) - props = g_array_new (TRUE, TRUE, sizeof (AtspiPropertyDefinition *)); + props = g_array_new (TRUE, TRUE, sizeof (AtspiPropertyDefinition *)); append_properties (props, evdata); } } - g_free (data [2]); - g_free (data [1]); - g_free (data [0]); + g_free (data[2]); + g_free (data[1]); + g_free (data[0]); *properties = props; return ret; } @@ -518,8 +513,8 @@ adapt_minor_for_dbus (const char *source) * Marshals a basic type into the 'any_data' attribute of * the AT-SPI event. */ -static void -emit_event (AtkObject *obj, +static void +emit_event (AtkObject *obj, const char *klass, const char *major, const char *minor, @@ -537,16 +532,20 @@ emit_event (AtkObject *obj, DBusMessage *sig; DBusMessageIter iter, iter_dict, iter_dict_entry; GArray *properties = NULL; - - if (!klass) klass = ""; - if (!major) major = ""; - if (!minor) minor = ""; - if (!type) type = "u"; + + if (!klass) + klass = ""; + if (!major) + major = ""; + if (!minor) + minor = ""; + if (!type) + type = "u"; if (!signal_is_needed (obj, klass, major, minor, &properties)) return; - path = spi_register_object_to_path (spi_global_register, G_OBJECT (obj)); + path = spi_register_object_to_path (spi_global_register, G_OBJECT (obj)); g_return_if_fail (path != NULL); /* @@ -555,46 +554,46 @@ emit_event (AtkObject *obj, * on this side, and again on the client side. */ cname = signal_name_to_dbus (major); - sig = dbus_message_new_signal(path, klass, cname); + sig = dbus_message_new_signal (path, klass, cname); - dbus_message_iter_init_append(sig, &iter); + dbus_message_iter_init_append (sig, &iter); minor_dbus = adapt_minor_for_dbus (minor); - dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &minor_dbus); + dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &minor_dbus); g_free (minor_dbus); - dbus_message_iter_append_basic(&iter, DBUS_TYPE_INT32, &detail1); - dbus_message_iter_append_basic(&iter, DBUS_TYPE_INT32, &detail2); + dbus_message_iter_append_basic (&iter, DBUS_TYPE_INT32, &detail1); + dbus_message_iter_append_basic (&iter, DBUS_TYPE_INT32, &detail2); append_variant (&iter, type, val); dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, "{sv}", &iter_dict); /* Add requested properties, unless the object is being marked defunct, in which case it's safest not to touch it */ if (minor == NULL || strcmp (minor, "defunct") != 0 || detail1 == 0) - { - if (properties) { - gint i; - for (i = 0; i < properties->len; i++) - { - AtspiPropertyDefinition *prop = g_array_index (properties, AtspiPropertyDefinition *, i); - dbus_message_iter_open_container (&iter_dict, DBUS_TYPE_DICT_ENTRY, NULL, - &iter_dict_entry); - dbus_message_iter_append_basic (&iter_dict_entry, DBUS_TYPE_STRING, &prop->name); - prop->func (&iter_dict_entry, obj); - dbus_message_iter_close_container (&iter_dict, &iter_dict_entry); - } - g_array_free (properties, TRUE); + if (properties) + { + gint i; + for (i = 0; i < properties->len; i++) + { + AtspiPropertyDefinition *prop = g_array_index (properties, AtspiPropertyDefinition *, i); + dbus_message_iter_open_container (&iter_dict, DBUS_TYPE_DICT_ENTRY, NULL, + &iter_dict_entry); + dbus_message_iter_append_basic (&iter_dict_entry, DBUS_TYPE_STRING, &prop->name); + prop->func (&iter_dict_entry, obj); + dbus_message_iter_close_container (&iter_dict, &iter_dict_entry); + } + g_array_free (properties, TRUE); + } } - } - dbus_message_iter_close_container (&iter, &iter_dict); + dbus_message_iter_close_container (&iter, &iter_dict); - dbus_connection_send(bus, sig, NULL); - dbus_message_unref(sig); + dbus_connection_send (bus, sig, NULL); + dbus_message_unref (sig); if (g_strcmp0 (cname, "ChildrenChanged") != 0) spi_object_lease_if_needed (G_OBJECT (obj)); - g_free(cname); + g_free (cname); g_free (path); } @@ -605,7 +604,7 @@ emit_event (AtkObject *obj, * as the AT-SPI event, 'focus:' */ static void -focus_tracker (AtkObject * accessible) +focus_tracker (AtkObject *accessible) { emit_event (accessible, ITF_EVENT_FOCUS, "focus", "", 0, 0, DBUS_TYPE_INT32_AS_STRING, 0, append_basic); @@ -615,18 +614,19 @@ focus_tracker (AtkObject * accessible) #define PCHANGE "PropertyChange" -/* +/* * This handler handles the following ATK signals and * converts them to AT-SPI events: - * + * * Gtk:AtkObject:property-change -> object:property-change:(property-name) * * The property-name is part of the ATK property-change signal. */ static gboolean -property_event_listener (GSignalInvocationHint * signal_hint, +property_event_listener (GSignalInvocationHint *signal_hint, guint n_param_values, - const GValue * param_values, gpointer data) + const GValue *param_values, + gpointer data) { AtkObject *accessible; AtkPropertyValues *values; @@ -670,7 +670,7 @@ property_event_listener (GSignalInvocationHint * signal_hint, { i = atk_object_get_role (accessible); emit_event (accessible, ITF_EVENT_OBJECT, PCHANGE, pname, 0, 0, - DBUS_TYPE_UINT32_AS_STRING, GINT_TO_POINTER(i), append_basic); + DBUS_TYPE_UINT32_AS_STRING, GINT_TO_POINTER (i), append_basic); } else if (strcmp (pname, "accessible-table-summary") == 0) { @@ -718,7 +718,7 @@ property_event_listener (GSignalInvocationHint * signal_hint, else { emit_event (accessible, ITF_EVENT_OBJECT, PCHANGE, pname, 0, 0, - DBUS_TYPE_INT32_AS_STRING, 0, append_basic); + DBUS_TYPE_INT32_AS_STRING, 0, append_basic); } return TRUE; } @@ -733,9 +733,10 @@ property_event_listener (GSignalInvocationHint * signal_hint, * the param-name is part of the ATK state-change signal. */ static gboolean -state_event_listener (GSignalInvocationHint * signal_hint, +state_event_listener (GSignalInvocationHint *signal_hint, guint n_param_values, - const GValue * param_values, gpointer data) + const GValue *param_values, + gpointer data) { AtkObject *accessible; const gchar *pname; @@ -768,9 +769,10 @@ state_event_listener (GSignalInvocationHint * signal_hint, * window:deactivate -> window:deactivate */ static gboolean -window_event_listener (GSignalInvocationHint * signal_hint, +window_event_listener (GSignalInvocationHint *signal_hint, guint n_param_values, - const GValue * param_values, gpointer data) + const GValue *param_values, + gpointer data) { AtkObject *accessible; GSignalQuery signal_query; @@ -789,7 +791,7 @@ window_event_listener (GSignalInvocationHint * signal_hint, /*---------------------------------------------------------------------------*/ -/* +/* * The document event listener handles the following ATK signals * and converts them to AT-SPI events: * @@ -799,9 +801,10 @@ window_event_listener (GSignalInvocationHint * signal_hint, * Gtk:AtkDocument:page-changed -> document:page-changed */ static gboolean -document_event_listener (GSignalInvocationHint * signal_hint, +document_event_listener (GSignalInvocationHint *signal_hint, guint n_param_values, - const GValue * param_values, gpointer data) + const GValue *param_values, + gpointer data) { AtkObject *accessible; GSignalQuery signal_query; @@ -830,9 +833,10 @@ document_event_listener (GSignalInvocationHint * signal_hint, * this to an AT-SPI event - "object:bounds-changed". */ static gboolean -bounds_event_listener (GSignalInvocationHint * signal_hint, +bounds_event_listener (GSignalInvocationHint *signal_hint, guint n_param_values, - const GValue * param_values, gpointer data) + const GValue *param_values, + gpointer data) { AtkObject *accessible; AtkRectangle *atk_rect; @@ -845,26 +849,27 @@ bounds_event_listener (GSignalInvocationHint * signal_hint, accessible = ATK_OBJECT (g_value_get_object (¶m_values[0])); if (G_VALUE_HOLDS_BOXED (param_values + 1)) - { - atk_rect = g_value_get_boxed (param_values + 1); + { + atk_rect = g_value_get_boxed (param_values + 1); - emit_event (accessible, ITF_EVENT_OBJECT, name, "", 0, 0, - "(iiii)", atk_rect, append_rect); - } + emit_event (accessible, ITF_EVENT_OBJECT, name, "", 0, 0, + "(iiii)", atk_rect, append_rect); + } return TRUE; } /*---------------------------------------------------------------------------*/ -/* - * Handles the ATK signal 'Gtk:AtkObject:active-descendant-changed' and +/* + * Handles the ATK signal 'Gtk:AtkObject:active-descendant-changed' and * converts it to the AT-SPI signal - 'object:active-descendant-changed'. * */ static gboolean -active_descendant_event_listener (GSignalInvocationHint * signal_hint, +active_descendant_event_listener (GSignalInvocationHint *signal_hint, guint n_param_values, - const GValue * param_values, gpointer data) + const GValue *param_values, + gpointer data) { AtkObject *accessible; AtkObject *child; @@ -887,9 +892,10 @@ active_descendant_event_listener (GSignalInvocationHint * signal_hint, } static gboolean -announcement_event_listener (GSignalInvocationHint * signal_hint, +announcement_event_listener (GSignalInvocationHint *signal_hint, guint n_param_values, - const GValue * param_values, gpointer data) + const GValue *param_values, + gpointer data) { AtkObject *accessible; const gchar *text; @@ -910,15 +916,16 @@ announcement_event_listener (GSignalInvocationHint * signal_hint, /*---------------------------------------------------------------------------*/ -/* +/* * Handles the ATK signal 'Gtk:AtkHypertext:link-selected' and * converts it to the AT-SPI signal - 'object:link-selected' * */ static gboolean -link_selected_event_listener (GSignalInvocationHint * signal_hint, +link_selected_event_listener (GSignalInvocationHint *signal_hint, guint n_param_values, - const GValue * param_values, gpointer data) + const GValue *param_values, + gpointer data) { AtkObject *accessible; GSignalQuery signal_query; @@ -941,7 +948,7 @@ link_selected_event_listener (GSignalInvocationHint * signal_hint, /*---------------------------------------------------------------------------*/ -/* +/* * Handles the ATK signal 'Gtk:AtkText:text-changed' and * converts it to the AT-SPI signal - 'object:text-changed' * This signal is deprecated by Gtk:AtkText:text-insert @@ -949,9 +956,10 @@ link_selected_event_listener (GSignalInvocationHint * signal_hint, * */ static gboolean -text_changed_event_listener (GSignalInvocationHint * signal_hint, +text_changed_event_listener (GSignalInvocationHint *signal_hint, guint n_param_values, - const GValue * param_values, gpointer data) + const GValue *param_values, + gpointer data) { AtkObject *accessible; GSignalQuery signal_query; @@ -972,7 +980,7 @@ text_changed_event_listener (GSignalInvocationHint * signal_hint, detail2 = g_value_get_int (¶m_values[2]); selected = - atk_text_get_text (ATK_TEXT (accessible), detail1, detail1 + detail2); + atk_text_get_text (ATK_TEXT (accessible), detail1, detail1 + detail2); emit_event (accessible, ITF_EVENT_OBJECT, name, minor, detail1, detail2, DBUS_TYPE_STRING_AS_STRING, selected, append_basic); @@ -981,15 +989,16 @@ text_changed_event_listener (GSignalInvocationHint * signal_hint, return TRUE; } -/* +/* * Handles the ATK signal 'Gtk:AtkText:text-insert' and * converts it to the AT-SPI signal - 'object:text-changed' * */ static gboolean -text_insert_event_listener (GSignalInvocationHint * signal_hint, +text_insert_event_listener (GSignalInvocationHint *signal_hint, guint n_param_values, - const GValue * param_values, gpointer data) + const GValue *param_values, + gpointer data) { AtkObject *accessible; guint text_changed_signal_id; @@ -1007,7 +1016,6 @@ text_insert_event_listener (GSignalInvocationHint * signal_hint, g_signal_query (text_changed_signal_id, &signal_query); name = signal_query.signal_name; - /* Add the insert and keep any detail coming from atk */ minor_raw = g_quark_to_string (signal_hint->detail); if (minor_raw) @@ -1032,15 +1040,16 @@ text_insert_event_listener (GSignalInvocationHint * signal_hint, return TRUE; } -/* +/* * Handles the ATK signal 'Gtk:AtkText:text-remove' and * converts it to the AT-SPI signal - 'object:text-changed' * */ static gboolean -text_remove_event_listener (GSignalInvocationHint * signal_hint, +text_remove_event_listener (GSignalInvocationHint *signal_hint, guint n_param_values, - const GValue * param_values, gpointer data) + const GValue *param_values, + gpointer data) { AtkObject *accessible; guint text_changed_signal_id; @@ -1083,18 +1092,17 @@ text_remove_event_listener (GSignalInvocationHint * signal_hint, return TRUE; } - /*---------------------------------------------------------------------------*/ -/* +/* * Handles the ATK signal 'Gtk:AtkText:text-selection-changed' and * converts it to the AT-SPI signal - 'object:text-selection-changed' * */ static gboolean -text_selection_changed_event_listener (GSignalInvocationHint * signal_hint, +text_selection_changed_event_listener (GSignalInvocationHint *signal_hint, guint n_param_values, - const GValue * param_values, + const GValue *param_values, gpointer data) { AtkObject *accessible; @@ -1125,15 +1133,16 @@ text_selection_changed_event_listener (GSignalInvocationHint * signal_hint, * any_data is the child reference. */ static gboolean -children_changed_event_listener (GSignalInvocationHint * signal_hint, +children_changed_event_listener (GSignalInvocationHint *signal_hint, guint n_param_values, - const GValue * param_values, gpointer data) + const GValue *param_values, + gpointer data) { GSignalQuery signal_query; const gchar *name, *minor; gint detail1 = 0, detail2 = 0; - AtkObject *accessible, *ao=NULL; + AtkObject *accessible, *ao = NULL; gpointer child; AtkStateSet *set; gboolean ret; @@ -1164,7 +1173,7 @@ children_changed_event_listener (GSignalInvocationHint * signal_hint, } else if ((minor != NULL) && (strcmp (minor, "add") == 0)) { - ao = atk_object_ref_accessible_child (accessible, + ao = atk_object_ref_accessible_child (accessible, detail1); emit_event (accessible, ITF_EVENT_OBJECT, name, minor, detail1, detail2, "(so)", ao, append_object); @@ -1175,7 +1184,7 @@ children_changed_event_listener (GSignalInvocationHint * signal_hint, emit_event (accessible, ITF_EVENT_OBJECT, name, minor, detail1, detail2, "(so)", ao, append_object); } - + return TRUE; } @@ -1192,9 +1201,10 @@ children_changed_event_listener (GSignalInvocationHint * signal_hint, * any_data is NULL. */ static gboolean -generic_event_listener (GSignalInvocationHint * signal_hint, +generic_event_listener (GSignalInvocationHint *signal_hint, guint n_param_values, - const GValue * param_values, gpointer data) + const GValue *param_values, + gpointer data) { AtkObject *accessible; GSignalQuery signal_query; @@ -1257,10 +1267,10 @@ spi_atk_register_event_listeners (void) g_object_unref (ao); if (listener_ids) - { - g_warning ("atk_bridge: spi_atk-register_event_listeners called multiple times"); - return; - } + { + g_warning ("atk_bridge: spi_atk-register_event_listeners called multiple times"); + return; + } /* Register for focus event notifications, and register app with central registry */ listener_ids = g_array_sized_new (FALSE, TRUE, sizeof (guint), 16); @@ -1362,12 +1372,12 @@ spi_atk_register_event_listeners (void) * atk_add_global_event_listener (spi_atk_bridge_widgetkey_listener, "Gtk:GtkWidget:key-release-event"); */ atk_bridge_key_event_listener_id = - atk_add_key_event_listener (spi_atk_bridge_key_listener, NULL); + atk_add_key_event_listener (spi_atk_bridge_key_listener, NULL); } /*---------------------------------------------------------------------------*/ -/* +/* * De-registers all ATK signal handlers. */ void @@ -1378,10 +1388,10 @@ spi_atk_deregister_event_listeners (void) listener_ids = NULL; if (atk_bridge_focus_tracker_id) - { - atk_remove_focus_tracker (atk_bridge_focus_tracker_id); - atk_bridge_focus_tracker_id = 0; - } + { + atk_remove_focus_tracker (atk_bridge_focus_tracker_id); + atk_bridge_focus_tracker_id = 0; + } if (ids) { @@ -1393,10 +1403,10 @@ spi_atk_deregister_event_listeners (void) } if (atk_bridge_key_event_listener_id) - { - atk_remove_key_event_listener (atk_bridge_key_event_listener_id); - atk_bridge_key_event_listener_id = 0; - } + { + atk_remove_key_event_listener (atk_bridge_key_event_listener_id); + atk_bridge_key_event_listener_id = 0; + } } /*---------------------------------------------------------------------------*/ diff --git a/atk-adaptor/event.h b/atk-adaptor/event.h index fe4aad06..023f83ea 100644 --- a/atk-adaptor/event.h +++ b/atk-adaptor/event.h @@ -32,8 +32,7 @@ void spi_atk_tidy_windows (void); gboolean spi_event_is_subtype (gchar **needle, gchar **haystack); extern GMainContext *spi_context; -guint spi_idle_add(GSourceFunc function, gpointer data); -guint spi_timeout_add_seconds (gint interval, GSourceFunc function, gpointer data); -guint spi_timeout_add_full (gint priority, guint interval, GSourceFunc function, - gpointer data, GDestroyNotify notify); +guint spi_idle_add (GSourceFunc function, gpointer data); +guint spi_timeout_add_seconds (gint interval, GSourceFunc function, gpointer data); +guint spi_timeout_add_full (gint priority, guint interval, GSourceFunc function, gpointer data, GDestroyNotify notify); #endif /* EVENT_H */ diff --git a/atk-adaptor/gtk-2.0/module.c b/atk-adaptor/gtk-2.0/module.c index a932564b..6ba965ab 100644 --- a/atk-adaptor/gtk-2.0/module.c +++ b/atk-adaptor/gtk-2.0/module.c @@ -25,18 +25,18 @@ #define _GNU_SOURCE #include "config.h" -#include <gmodule.h> #include <atk-bridge.h> +#include <gmodule.h> /*---------------------------------------------------------------------------*/ int -gtk_module_init (gint * argc, gchar ** argv[]) +gtk_module_init (gint *argc, gchar **argv[]) { return atk_bridge_adaptor_init (argc, argv); } -gchar* +gchar * g_module_check_init (GModule *module) { g_module_make_resident (module); @@ -58,5 +58,5 @@ gnome_accessibility_module_init (void) void gnome_accessibility_module_shutdown (void) { - atk_bridge_adaptor_cleanup (); + atk_bridge_adaptor_cleanup (); } diff --git a/atk-adaptor/object.c b/atk-adaptor/object.c index 17417979..43d26ac4 100644 --- a/atk-adaptor/object.c +++ b/atk-adaptor/object.c @@ -29,13 +29,13 @@ * and supported interfaces to a D-Bus message. */ -#include <atk/atk.h> #include "atspi/atspi.h" #include "spi-dbus.h" +#include <atk/atk.h> -#include "accessible-register.h" #include "accessible-cache.h" #include "accessible-leasing.h" +#include "accessible-register.h" #include "bridge.h" @@ -74,7 +74,7 @@ spi_object_lease_if_needed (GObject *obj) */ void -spi_object_append_null_reference (DBusMessageIter * iter) +spi_object_append_null_reference (DBusMessageIter *iter) { DBusMessageIter iter_struct; const char *name; @@ -90,16 +90,17 @@ spi_object_append_null_reference (DBusMessageIter * iter) } void -spi_object_append_reference (DBusMessageIter * iter, AtkObject * obj) +spi_object_append_reference (DBusMessageIter *iter, AtkObject *obj) { DBusMessageIter iter_struct; const gchar *name; gchar *path; - if (!obj) { - spi_object_append_null_reference (iter); - return; - } + if (!obj) + { + spi_object_append_null_reference (iter); + return; + } spi_object_lease_if_needed (G_OBJECT (obj)); @@ -114,23 +115,24 @@ spi_object_append_reference (DBusMessageIter * iter, AtkObject * obj) dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_STRING, &name); dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_OBJECT_PATH, &path); dbus_message_iter_close_container (iter, &iter_struct); - + g_free (path); } /* TODO: Perhaps combine with spi_object_append_reference. Leaving separate * for now in case we want to use a different path for hyperlinks. */ void -spi_hyperlink_append_reference (DBusMessageIter * iter, AtkHyperlink * obj) +spi_hyperlink_append_reference (DBusMessageIter *iter, AtkHyperlink *obj) { DBusMessageIter iter_struct; const gchar *name; gchar *path; - if (!obj) { - spi_object_append_null_reference (iter); - return; - } + if (!obj) + { + spi_object_append_null_reference (iter); + return; + } spi_object_lease_if_needed (G_OBJECT (obj)); @@ -145,23 +147,23 @@ spi_hyperlink_append_reference (DBusMessageIter * iter, AtkHyperlink * obj) dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_STRING, &name); dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_OBJECT_PATH, &path); dbus_message_iter_close_container (iter, &iter_struct); - + g_free (path); } void -spi_object_append_v_reference (DBusMessageIter * iter, AtkObject * obj) +spi_object_append_v_reference (DBusMessageIter *iter, AtkObject *obj) { DBusMessageIter iter_variant; dbus_message_iter_open_container (iter, DBUS_TYPE_VARIANT, "(so)", &iter_variant); - spi_object_append_reference (&iter_variant, obj); + spi_object_append_reference (&iter_variant, obj); dbus_message_iter_close_container (iter, &iter_variant); } void -spi_object_append_desktop_reference (DBusMessageIter * iter) +spi_object_append_desktop_reference (DBusMessageIter *iter) { DBusMessageIter iter_struct; const char *name = spi_global_app_data->desktop_name; @@ -175,7 +177,7 @@ spi_object_append_desktop_reference (DBusMessageIter * iter) } DBusMessage * -spi_object_return_reference (DBusMessage * msg, AtkObject * obj) +spi_object_return_reference (DBusMessage *msg, AtkObject *obj) { DBusMessage *reply; @@ -191,7 +193,7 @@ spi_object_return_reference (DBusMessage * msg, AtkObject * obj) } DBusMessage * -spi_hyperlink_return_reference (DBusMessage * msg, AtkHyperlink * obj) +spi_hyperlink_return_reference (DBusMessage *msg, AtkHyperlink *obj) { DBusMessage *reply; @@ -211,7 +213,7 @@ spi_hyperlink_return_reference (DBusMessage * msg, AtkHyperlink * obj) /*---------------------------------------------------------------------------*/ void -spi_object_append_interfaces (DBusMessageIter * iter, AtkObject * obj) +spi_object_append_interfaces (DBusMessageIter *iter, AtkObject *obj) { const gchar *itf; @@ -314,7 +316,7 @@ spi_object_append_interfaces (DBusMessageIter * iter, AtkObject * obj) /*---------------------------------------------------------------------------*/ void -spi_object_append_attribute_set (DBusMessageIter * iter, AtkAttributeSet * attr) +spi_object_append_attribute_set (DBusMessageIter *iter, AtkAttributeSet *attr) { DBusMessageIter dictIter; @@ -327,7 +329,7 @@ spi_object_append_attribute_set (DBusMessageIter * iter, AtkAttributeSet * attr) const char *value = attribute->value; if (key == NULL) - key = ""; + key = ""; if (value == NULL) value = ""; @@ -346,7 +348,7 @@ spi_object_append_attribute_set (DBusMessageIter * iter, AtkAttributeSet * attr) /*---------------------------------------------------------------------------*/ static gboolean -init_role_lookup_table (AtspiRole * role_table) +init_role_lookup_table (AtspiRole *role_table) { int i; /* if it's not in the list below, dunno what it is */ @@ -412,10 +414,10 @@ init_role_lookup_table (AtspiRole * role_table) 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] = - ATSPI_ROLE_TABLE_COLUMN_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] = - ATSPI_ROLE_TEAROFF_MENU_ITEM; + 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; @@ -445,13 +447,13 @@ init_role_lookup_table (AtspiRole * role_table) 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] = - ATSPI_ROLE_INPUT_METHOD_WINDOW; + 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] = - ATSPI_ROLE_DOCUMENT_SPREADSHEET; + ATSPI_ROLE_DOCUMENT_SPREADSHEET; role_table[ATK_ROLE_DOCUMENT_PRESENTATION] = - ATSPI_ROLE_DOCUMENT_PRESENTATION; + 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; diff --git a/atk-adaptor/object.h b/atk-adaptor/object.h index ecb3d11b..b52d3ce2 100644 --- a/atk-adaptor/object.h +++ b/atk-adaptor/object.h @@ -31,31 +31,31 @@ void spi_object_lease_if_needed (GObject *obj); void -spi_object_append_reference (DBusMessageIter * iter, AtkObject * obj); +spi_object_append_reference (DBusMessageIter *iter, AtkObject *obj); void -spi_hyperlink_append_reference (DBusMessageIter * iter, AtkObject * obj); +spi_hyperlink_append_reference (DBusMessageIter *iter, AtkObject *obj); void -spi_object_append_v_reference (DBusMessageIter * iter, AtkObject * obj); +spi_object_append_v_reference (DBusMessageIter *iter, AtkObject *obj); void -spi_object_append_desktop_reference (DBusMessageIter * iter); +spi_object_append_desktop_reference (DBusMessageIter *iter); void -spi_object_append_null_reference (DBusMessageIter * iter); +spi_object_append_null_reference (DBusMessageIter *iter); DBusMessage * -spi_object_return_reference (DBusMessage * msg, AtkObject * obj); +spi_object_return_reference (DBusMessage *msg, AtkObject *obj); DBusMessage * -spi_hyperlink_return_reference (DBusMessage * msg, AtkHyperlink * obj); +spi_hyperlink_return_reference (DBusMessage *msg, AtkHyperlink *obj); void -spi_object_append_interfaces (DBusMessageIter * iter, AtkObject * obj); +spi_object_append_interfaces (DBusMessageIter *iter, AtkObject *obj); void -spi_object_append_attribute_set (DBusMessageIter * iter, AtkAttributeSet * attr); +spi_object_append_attribute_set (DBusMessageIter *iter, AtkAttributeSet *attr); AtspiRole spi_accessible_role_from_atk_role (AtkRole role); diff --git a/atk-adaptor/spi-dbus.c b/atk-adaptor/spi-dbus.c index 022ef137..81e18674 100644 --- a/atk-adaptor/spi-dbus.c +++ b/atk-adaptor/spi-dbus.c @@ -20,26 +20,25 @@ * Boston, MA 02110-1301, USA. */ +#include <dbus/dbus.h> +#include <glib-object.h> +#include <glib.h> #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <glib.h> -#include <glib-object.h> -#include <dbus/dbus.h> #include <atspi/atspi.h> DBusMessage * -spi_dbus_general_error (DBusMessage * message) +spi_dbus_general_error (DBusMessage *message) { return dbus_message_new_error (message, - "org.a11y.atspi.GeneralError", - "General error"); + "org.a11y.atspi.GeneralError", + "General error"); } DBusMessage * -spi_dbus_return_rect (DBusMessage * message, gint ix, gint iy, gint iwidth, - gint iheight) +spi_dbus_return_rect (DBusMessage *message, gint ix, gint iy, gint iwidth, gint iheight) { DBusMessage *reply; dbus_uint32_t x, y, width, height; @@ -53,15 +52,14 @@ spi_dbus_return_rect (DBusMessage * message, gint ix, gint iy, gint iwidth, { DBusMessageIter iter, sub; dbus_message_iter_init_append (reply, &iter); - if (!dbus_message_iter_open_container - (&iter, DBUS_TYPE_STRUCT, NULL, &sub)) - goto oom; + if (!dbus_message_iter_open_container (&iter, DBUS_TYPE_STRUCT, NULL, &sub)) + goto oom; dbus_message_iter_append_basic (&sub, DBUS_TYPE_INT32, &x); dbus_message_iter_append_basic (&sub, DBUS_TYPE_INT32, &y); dbus_message_iter_append_basic (&sub, DBUS_TYPE_INT32, &width); dbus_message_iter_append_basic (&sub, DBUS_TYPE_INT32, &height); if (!dbus_message_iter_close_container (&iter, &sub)) - goto oom; + goto oom; } return reply; oom: @@ -69,69 +67,78 @@ oom: return reply; } -dbus_bool_t spi_dbus_message_iter_get_struct(DBusMessageIter *iter, ...) +dbus_bool_t +spi_dbus_message_iter_get_struct (DBusMessageIter *iter, ...) { va_list args; DBusMessageIter iter_struct; int type; void *ptr; - dbus_message_iter_recurse(iter, &iter_struct); - va_start(args, iter); + dbus_message_iter_recurse (iter, &iter_struct); + va_start (args, iter); for (;;) - { - type = va_arg(args, int); - if (type == DBUS_TYPE_INVALID) break; - if (type != dbus_message_iter_get_arg_type(&iter_struct)) { - va_end(args); - return FALSE; + type = va_arg (args, int); + if (type == DBUS_TYPE_INVALID) + break; + if (type != dbus_message_iter_get_arg_type (&iter_struct)) + { + va_end (args); + return FALSE; + } + ptr = va_arg (args, void *); + dbus_message_iter_get_basic (&iter_struct, ptr); + dbus_message_iter_next (&iter_struct); } - ptr = va_arg(args, void *); - dbus_message_iter_get_basic(&iter_struct, ptr); - dbus_message_iter_next(&iter_struct); - } - dbus_message_iter_next(iter); - va_end(args); + dbus_message_iter_next (iter); + va_end (args); return TRUE; } -dbus_bool_t spi_dbus_message_iter_append_struct(DBusMessageIter *iter, ...) +dbus_bool_t +spi_dbus_message_iter_append_struct (DBusMessageIter *iter, ...) { va_list args; DBusMessageIter iter_struct; int type; void *ptr; - if (!dbus_message_iter_open_container(iter, DBUS_TYPE_STRUCT, NULL, &iter_struct)) return FALSE; - va_start(args, iter); + if (!dbus_message_iter_open_container (iter, DBUS_TYPE_STRUCT, NULL, &iter_struct)) + return FALSE; + va_start (args, iter); for (;;) - { - type = va_arg(args, int); - if (type == DBUS_TYPE_INVALID) break; - ptr = va_arg(args, void *); - dbus_message_iter_append_basic(&iter_struct, type, ptr); - } - va_end(args); - if (!dbus_message_iter_close_container(iter, &iter_struct)) return FALSE; + { + type = va_arg (args, int); + if (type == DBUS_TYPE_INVALID) + break; + ptr = va_arg (args, void *); + dbus_message_iter_append_basic (&iter_struct, type, ptr); + } + va_end (args); + if (!dbus_message_iter_close_container (iter, &iter_struct)) + return FALSE; return TRUE; } -dbus_bool_t spi_dbus_marshal_deviceEvent(DBusMessage *message, const AtspiDeviceEvent *e) +dbus_bool_t +spi_dbus_marshal_deviceEvent (DBusMessage *message, const AtspiDeviceEvent *e) { DBusMessageIter iter; - if (!message) return FALSE; - dbus_message_iter_init_append(message, &iter); - return spi_dbus_message_iter_append_struct(&iter, DBUS_TYPE_UINT32, &e->type, DBUS_TYPE_INT32, &e->id, DBUS_TYPE_INT16, &e->hw_code, DBUS_TYPE_INT16, &e->modifiers, DBUS_TYPE_INT32, &e->timestamp, DBUS_TYPE_STRING, &e->event_string, DBUS_TYPE_BOOLEAN, &e->is_text, DBUS_TYPE_INVALID); + if (!message) + return FALSE; + dbus_message_iter_init_append (message, &iter); + return spi_dbus_message_iter_append_struct (&iter, DBUS_TYPE_UINT32, &e->type, DBUS_TYPE_INT32, &e->id, DBUS_TYPE_INT16, &e->hw_code, DBUS_TYPE_INT16, &e->modifiers, DBUS_TYPE_INT32, &e->timestamp, DBUS_TYPE_STRING, &e->event_string, DBUS_TYPE_BOOLEAN, &e->is_text, DBUS_TYPE_INVALID); } -dbus_bool_t spi_dbus_demarshal_deviceEvent(DBusMessage *message, AtspiDeviceEvent *e) +dbus_bool_t +spi_dbus_demarshal_deviceEvent (DBusMessage *message, AtspiDeviceEvent *e) { DBusMessageIter iter; - dbus_message_iter_init(message, &iter); - return spi_dbus_message_iter_get_struct(&iter, DBUS_TYPE_UINT32, &e->type, DBUS_TYPE_INT32, &e->id, DBUS_TYPE_INT16, &e->hw_code, DBUS_TYPE_INT16, &e->modifiers, DBUS_TYPE_INT32, &e->timestamp, DBUS_TYPE_STRING, &e->event_string, DBUS_TYPE_BOOLEAN, &e->is_text, DBUS_TYPE_INVALID); + dbus_message_iter_init (message, &iter); + return spi_dbus_message_iter_get_struct (&iter, DBUS_TYPE_UINT32, &e->type, DBUS_TYPE_INT32, &e->id, DBUS_TYPE_INT16, &e->hw_code, DBUS_TYPE_INT16, &e->modifiers, DBUS_TYPE_INT32, &e->timestamp, DBUS_TYPE_STRING, &e->event_string, DBUS_TYPE_BOOLEAN, &e->is_text, DBUS_TYPE_INVALID); } /* @@ -140,19 +147,19 @@ dbus_bool_t spi_dbus_demarshal_deviceEvent(DBusMessage *message, AtspiDeviceEven * values can be created by the atk_object_get_name or text selection */ static const void * -provide_defaults(const gint type, - const void *val) +provide_defaults (const gint type, + const void *val) { switch (type) { - case DBUS_TYPE_STRING: - case DBUS_TYPE_OBJECT_PATH: - if (!val) - return ""; - else - return val; - default: - return val; + case DBUS_TYPE_STRING: + case DBUS_TYPE_OBJECT_PATH: + if (!val) + return ""; + else + return val; + default: + return val; } } @@ -171,79 +178,80 @@ spi_dbus_signal_new (const char *path, DBusMessageIter iter; gchar *cname, *t; - if (!klass) klass = ""; - if (!major) major = ""; - if (!minor) minor = ""; + if (!klass) + klass = ""; + if (!major) + major = ""; + if (!minor) + minor = ""; /* * This is very annoying, but as '-' isn't a legal signal * name in D-Bus (Why not??!?) The names need converting * on this side, and again on the client side. */ - cname = g_strdup(major); - while ((t = strchr(cname, '-')) != NULL) *t = '_'; + cname = g_strdup (major); + while ((t = strchr (cname, '-')) != NULL) + *t = '_'; - sig = dbus_message_new_signal(path, klass, cname); - g_free(cname); + sig = dbus_message_new_signal (path, klass, cname); + g_free (cname); - dbus_message_iter_init_append(sig, &iter); + dbus_message_iter_init_append (sig, &iter); - dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &minor); - dbus_message_iter_append_basic(&iter, DBUS_TYPE_INT32, &detail1); - dbus_message_iter_append_basic(&iter, DBUS_TYPE_INT32, &detail2); + dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &minor); + dbus_message_iter_append_basic (&iter, DBUS_TYPE_INT32, &detail1); + dbus_message_iter_append_basic (&iter, DBUS_TYPE_INT32, &detail2); } -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) +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) { gchar *cname, *t; DBusMessage *sig; DBusMessageIter iter, sub; - if (!klass) klass = ""; - if (!major) major = ""; - if (!minor) minor = ""; - if (!type) type = "u"; + if (!klass) + klass = ""; + if (!major) + major = ""; + if (!minor) + minor = ""; + if (!type) + type = "u"; /* * This is very annoying, but as '-' isn't a legal signal * name in D-Bus (Why not??!?) The names need converting * on this side, and again on the client side. */ - cname = g_strdup(major); - while ((t = strchr(cname, '-')) != NULL) *t = '_'; + cname = g_strdup (major); + while ((t = strchr (cname, '-')) != NULL) + *t = '_'; - sig = dbus_message_new_signal(path, klass, cname); - g_free(cname); + sig = dbus_message_new_signal (path, klass, cname); + g_free (cname); - dbus_message_iter_init_append(sig, &iter); + dbus_message_iter_init_append (sig, &iter); - dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &minor); - dbus_message_iter_append_basic(&iter, DBUS_TYPE_INT32, &detail1); - dbus_message_iter_append_basic(&iter, DBUS_TYPE_INT32, &detail2); + dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &minor); + dbus_message_iter_append_basic (&iter, DBUS_TYPE_INT32, &detail1); + dbus_message_iter_append_basic (&iter, DBUS_TYPE_INT32, &detail2); - dbus_message_iter_open_container(&iter, DBUS_TYPE_VARIANT, type, &sub); + dbus_message_iter_open_container (&iter, DBUS_TYPE_VARIANT, type, &sub); /* * I need to convert the string signature to an integer type signature. * DBUS_TYPE_INT32 is defined as 'i' whereas the string is "i". * I should just be able to cast the first character of the string to an * integer. */ - val = provide_defaults((int) *type, val); - dbus_message_iter_append_basic(&sub, (int) *type, &val); - dbus_message_iter_close_container(&iter, &sub); + val = provide_defaults ((int) *type, val); + dbus_message_iter_append_basic (&sub, (int) *type, &val); + dbus_message_iter_close_container (&iter, &sub); - dbus_connection_send(bus, sig, NULL); - dbus_message_unref(sig); + dbus_connection_send (bus, sig, NULL); + dbus_message_unref (sig); } - /* 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) { diff --git a/atk-adaptor/spi-dbus.h b/atk-adaptor/spi-dbus.h index 4828ab7b..08267746 100644 --- a/atk-adaptor/spi-dbus.h +++ b/atk-adaptor/spi-dbus.h @@ -24,10 +24,12 @@ #ifndef SPI_DBUS_H_ #define SPI_DBUS_H_ -#include <glib.h> #include <atspi/atspi.h> +#include <glib.h> -#define DBG(a,b) if(_dbg>=(a))b +#define DBG(a, b) \ + if (_dbg >= (a)) \ + b extern int _dbg; @@ -38,15 +40,15 @@ extern int _dbg; #define SPI_DBUS_PATH_NULL "/org/a11y/atspi/null" #define SPI_DBUS_PATH_ROOT "/org/a11y/atspi/accessible/root" -DBusMessage *spi_dbus_general_error(DBusMessage *message); -DBusMessage *spi_dbus_return_rect(DBusMessage *message, gint ix, gint iy, gint iwidth, gint iheight); +DBusMessage *spi_dbus_general_error (DBusMessage *message); +DBusMessage *spi_dbus_return_rect (DBusMessage *message, gint ix, gint iy, gint iwidth, gint iheight); -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 AtspiDeviceEvent *e); -dbus_bool_t spi_dbus_demarshal_deviceEvent(DBusMessage *message, AtspiDeviceEvent *e); +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 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); +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); /* void spi_dbus_add_disconnect_match (DBusConnection *bus, const char *name); void spi_dbus_remove_disconnect_match (DBusConnection *bus, const char *name); diff --git a/atk/atk-autocleanups.h b/atk/atk-autocleanups.h index f928f702..b8de1d54 100644 --- a/atk/atk-autocleanups.h +++ b/atk/atk-autocleanups.h @@ -15,7 +15,7 @@ * License along with this library. If not, see <http://www.gnu.org/licenses/>. */ -#if !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) +#if !defined(__ATK_H_INSIDE__) && !defined(ATK_COMPILATION) #error "Only <atk/atk.h> can be included directly." #endif @@ -22,19 +22,20 @@ #define __ATK_H_INSIDE__ -#include <atk/atkobject.h> +#include <atk/atk-enum-types.h> #include <atk/atkaction.h> #include <atk/atkcomponent.h> #include <atk/atkdocument.h> #include <atk/atkeditabletext.h> -#include <atk/atk-enum-types.h> #include <atk/atkgobjectaccessible.h> #include <atk/atkhyperlink.h> #include <atk/atkhyperlinkimpl.h> #include <atk/atkhypertext.h> #include <atk/atkimage.h> +#include <atk/atkmisc.h> #include <atk/atknoopobject.h> #include <atk/atknoopobjectfactory.h> +#include <atk/atkobject.h> #include <atk/atkobjectfactory.h> #include <atk/atkplug.h> #include <atk/atkrange.h> @@ -51,7 +52,6 @@ #include <atk/atktablecell.h> #include <atk/atktext.h> #include <atk/atkutil.h> -#include <atk/atkmisc.h> #include <atk/atkvalue.h> #include <atk/atkversion.h> #include <atk/atkwindow.h> diff --git a/atk/atkaction.c b/atk/atkaction.c index 03407aae..fa1d2284 100644 --- a/atk/atkaction.c +++ b/atk/atkaction.c @@ -23,7 +23,7 @@ /** * AtkAction: - * + * * The ATK interface provided by UI components * which the user can activate/interact with. * @@ -52,17 +52,17 @@ atk_action_get_type (void) { static GType type = 0; - if (!type) { - GTypeInfo tinfo = + if (!type) { - sizeof (AtkActionIface), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, + GTypeInfo tinfo = { + sizeof (AtkActionIface), + (GBaseInitFunc) NULL, + (GBaseFinalizeFunc) NULL, - }; + }; - type = g_type_register_static (G_TYPE_INTERFACE, "AtkAction", &tinfo, 0); - } + type = g_type_register_static (G_TYPE_INTERFACE, "AtkAction", &tinfo, 0); + } return type; } @@ -70,7 +70,7 @@ atk_action_get_type (void) /** * atk_action_do_action: * @action: a #GObject instance that implements AtkActionIface - * @i: the action index corresponding to the action to be performed + * @i: the action index corresponding to the action to be performed * * Perform the specified action on the object. * @@ -79,7 +79,7 @@ atk_action_get_type (void) **/ gboolean atk_action_do_action (AtkAction *obj, - gint i) + gint i) { AtkActionIface *iface; @@ -96,7 +96,7 @@ atk_action_do_action (AtkAction *obj, /** * atk_action_get_n_actions: * @action: a #GObject instance that implements AtkActionIface - * + * * Gets the number of accessible actions available on the object. * If there are more than one, the first one is considered the * "default" action of the object. @@ -105,7 +105,7 @@ atk_action_do_action (AtkAction *obj, * implement this interface. **/ gint -atk_action_get_n_actions (AtkAction *obj) +atk_action_get_n_actions (AtkAction *obj) { AtkActionIface *iface; @@ -122,16 +122,16 @@ atk_action_get_n_actions (AtkAction *obj) /** * atk_action_get_description: * @action: a #GObject instance that implements AtkActionIface - * @i: the action index corresponding to the action to be performed + * @i: the action index corresponding to the action to be performed * * Returns a description of the specified action of the object. * * Returns: (nullable): a description string, or %NULL if @action does * not implement this interface. **/ -const gchar* +const gchar * atk_action_get_description (AtkAction *obj, - gint i) + gint i) { AtkActionIface *iface; @@ -148,19 +148,19 @@ atk_action_get_description (AtkAction *obj, /** * atk_action_get_name: * @action: a #GObject instance that implements AtkActionIface - * @i: the action index corresponding to the action to be performed + * @i: the action index corresponding to the action to be performed * - * Returns a non-localized string naming the specified action of the - * object. This name is generally not descriptive of the end result - * of the action, but instead names the 'interaction type' which the - * object supports. By convention, the above strings should be used to - * represent the actions which correspond to the common point-and-click - * interaction techniques of the same name: i.e. + * Returns a non-localized string naming the specified action of the + * object. This name is generally not descriptive of the end result + * of the action, but instead names the 'interaction type' which the + * object supports. By convention, the above strings should be used to + * represent the actions which correspond to the common point-and-click + * interaction techniques of the same name: i.e. * "click", "press", "release", "drag", "drop", "popup", etc. - * The "popup" action should be used to pop up a context menu for the + * The "popup" action should be used to pop up a context menu for the * object, if one exists. * - * For technical reasons, some toolkits cannot guarantee that the + * For technical reasons, some toolkits cannot guarantee that the * reported action is actually 'bound' to a nontrivial user event; * i.e. the result of some actions via atk_action_do_action() may be * NIL. @@ -168,9 +168,9 @@ atk_action_get_description (AtkAction *obj, * Returns: (nullable): a name string, or %NULL if @action does not * implement this interface. **/ -const gchar* +const gchar * atk_action_get_name (AtkAction *obj, - gint i) + gint i) { AtkActionIface *iface; @@ -187,16 +187,16 @@ atk_action_get_name (AtkAction *obj, /** * atk_action_get_localized_name: * @action: a #GObject instance that implements AtkActionIface - * @i: the action index corresponding to the action to be performed + * @i: the action index corresponding to the action to be performed * * Returns the localized name of the specified action of the object. * * Returns: (nullable): a name string, or %NULL if @action does not * implement this interface. **/ -const gchar* +const gchar * atk_action_get_localized_name (AtkAction *obj, - gint i) + gint i) { AtkActionIface *iface; @@ -242,9 +242,9 @@ atk_action_get_localized_name (AtkAction *obj, * this action, or %NULL if there is no keybinding for this action. * **/ -const gchar* +const gchar * atk_action_get_keybinding (AtkAction *obj, - gint i) + gint i) { AtkActionIface *iface; @@ -261,7 +261,7 @@ atk_action_get_keybinding (AtkAction *obj, /** * atk_action_set_description: * @action: a #GObject instance that implements AtkActionIface - * @i: the action index corresponding to the action to be performed + * @i: the action index corresponding to the action to be performed * @desc: the description to be assigned to this action * * Sets a description of the specified action of the object. @@ -269,8 +269,8 @@ atk_action_get_keybinding (AtkAction *obj, * Returns: a gboolean representing if the description was successfully set; **/ gboolean -atk_action_set_description (AtkAction *obj, - gint i, +atk_action_set_description (AtkAction *obj, + gint i, const gchar *desc) { AtkActionIface *iface; diff --git a/atk/atkaction.h b/atk/atkaction.h index d2eba286..3ba0f6dd 100644 --- a/atk/atkaction.h +++ b/atk/atkaction.h @@ -20,7 +20,7 @@ #ifndef __ATK_ACTION_H__ #define __ATK_ACTION_H__ -#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) +#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined(__ATK_H_INSIDE__) && !defined(ATK_COMPILATION) #error "Only <atk/atk.h> can be included directly." #endif @@ -31,11 +31,10 @@ G_BEGIN_DECLS /* */ - -#define ATK_TYPE_ACTION (atk_action_get_type ()) -#define ATK_IS_ACTION(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_ACTION) -#define ATK_ACTION(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_ACTION, AtkAction) -#define ATK_ACTION_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_ACTION, AtkActionIface)) +#define ATK_TYPE_ACTION (atk_action_get_type ()) +#define ATK_IS_ACTION(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_ACTION) +#define ATK_ACTION(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_ACTION, AtkAction) +#define ATK_ACTION_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_ACTION, AtkActionIface)) #ifndef _TYPEDEF_ATK_ACTION_ #define _TYPEDEF_ATK_ACTION_ @@ -65,20 +64,20 @@ struct _AtkActionIface GTypeInterface parent; /*< public >*/ - gboolean (*do_action) (AtkAction *action, - gint i); - gint (*get_n_actions) (AtkAction *action); - const gchar* (*get_description) (AtkAction *action, - gint i); - const gchar* (*get_name) (AtkAction *action, - gint i); - const gchar* (*get_keybinding) (AtkAction *action, - gint i); - gboolean (*set_description) (AtkAction *action, - gint i, - const gchar *desc); - const gchar* (*get_localized_name)(AtkAction *action, - gint i); + gboolean (*do_action) (AtkAction *action, + gint i); + gint (*get_n_actions) (AtkAction *action); + const gchar *(*get_description) (AtkAction *action, + gint i); + const gchar *(*get_name) (AtkAction *action, + gint i); + const gchar *(*get_keybinding) (AtkAction *action, + gint i); + gboolean (*set_description) (AtkAction *action, + gint i, + const gchar *desc); + const gchar *(*get_localized_name) (AtkAction *action, + gint i); }; ATK_AVAILABLE_IN_ALL @@ -96,28 +95,28 @@ GType atk_action_get_type (void); */ ATK_AVAILABLE_IN_ALL -gboolean atk_action_do_action (AtkAction *action, - gint i); +gboolean atk_action_do_action (AtkAction *action, + gint i); ATK_AVAILABLE_IN_ALL -gint atk_action_get_n_actions (AtkAction *action); +gint atk_action_get_n_actions (AtkAction *action); ATK_AVAILABLE_IN_ALL -const gchar* atk_action_get_description (AtkAction *action, - gint i); +const gchar *atk_action_get_description (AtkAction *action, + gint i); ATK_AVAILABLE_IN_ALL -const gchar* atk_action_get_name (AtkAction *action, - gint i); +const gchar *atk_action_get_name (AtkAction *action, + gint i); ATK_AVAILABLE_IN_ALL -const gchar* atk_action_get_keybinding (AtkAction *action, - gint i); +const gchar *atk_action_get_keybinding (AtkAction *action, + gint i); ATK_AVAILABLE_IN_ALL -gboolean atk_action_set_description (AtkAction *action, - gint i, - const gchar *desc); +gboolean atk_action_set_description (AtkAction *action, + gint i, + const gchar *desc); /* NEW in ATK 1.1: */ ATK_AVAILABLE_IN_ALL -const gchar* atk_action_get_localized_name (AtkAction *action, - gint i); +const gchar *atk_action_get_localized_name (AtkAction *action, + gint i); /* * Additional GObject properties exported by AtkAction: diff --git a/atk/atkcomponent.c b/atk/atkcomponent.c index 271f1fa3..b900c72e 100644 --- a/atk/atkcomponent.c +++ b/atk/atkcomponent.c @@ -23,7 +23,7 @@ /** * AtkComponent: - * + * * The ATK interface provided by UI components * which occupy a physical area on the screen. * which the user can activate/interact with. @@ -40,31 +40,32 @@ * information is provided by #AtkText. */ -enum { +enum +{ BOUNDS_CHANGED, LAST_SIGNAL }; -static void atk_component_base_init (AtkComponentIface *class); +static void atk_component_base_init (AtkComponentIface *class); -static gboolean atk_component_real_contains (AtkComponent *component, - gint x, - gint y, - AtkCoordType coord_type); +static gboolean atk_component_real_contains (AtkComponent *component, + gint x, + gint y, + AtkCoordType coord_type); -static AtkObject* atk_component_real_ref_accessible_at_point (AtkComponent *component, - gint x, - gint y, +static AtkObject *atk_component_real_ref_accessible_at_point (AtkComponent *component, + gint x, + gint y, AtkCoordType coord_type); -static void atk_component_real_get_position (AtkComponent *component, - gint *x, - gint *y, - AtkCoordType coord_type); +static void atk_component_real_get_position (AtkComponent *component, + gint *x, + gint *y, + AtkCoordType coord_type); -static void atk_component_real_get_size (AtkComponent *component, - gint *width, - gint *height); +static void atk_component_real_get_size (AtkComponent *component, + gint *width, + gint *height); static guint atk_component_signals[LAST_SIGNAL] = { 0 }; @@ -73,17 +74,17 @@ atk_component_get_type (void) { static GType type = 0; - if (!type) { - static const GTypeInfo tinfo = + if (!type) { - sizeof (AtkComponentIface), - (GBaseInitFunc) atk_component_base_init, - (GBaseFinalizeFunc) NULL, + static const GTypeInfo tinfo = { + sizeof (AtkComponentIface), + (GBaseInitFunc) atk_component_base_init, + (GBaseFinalizeFunc) NULL, - }; + }; - type = g_type_register_static (G_TYPE_INTERFACE, "AtkComponent", &tinfo, 0); - } + type = g_type_register_static (G_TYPE_INTERFACE, "AtkComponent", &tinfo, 0); + } return type; } @@ -93,14 +94,13 @@ atk_component_base_init (AtkComponentIface *class) { static gboolean initialized = FALSE; - if (! initialized) + if (!initialized) { class->ref_accessible_at_point = atk_component_real_ref_accessible_at_point; class->contains = atk_component_real_contains; class->get_position = atk_component_real_get_position; class->get_size = atk_component_real_get_size; - /** * AtkComponent::bounds-changed: * @atkcomponent: the object which received the signal. @@ -110,26 +110,25 @@ atk_component_base_init (AtkComponentIface *class) * size of the component changes. */ atk_component_signals[BOUNDS_CHANGED] = - g_signal_new ("bounds_changed", - ATK_TYPE_COMPONENT, - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (AtkComponentIface, bounds_changed), - (GSignalAccumulator) NULL, NULL, - g_cclosure_marshal_VOID__BOXED, - G_TYPE_NONE, 1, - ATK_TYPE_RECTANGLE | G_SIGNAL_TYPE_STATIC_SCOPE); + g_signal_new ("bounds_changed", + ATK_TYPE_COMPONENT, + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (AtkComponentIface, bounds_changed), + (GSignalAccumulator) NULL, NULL, + g_cclosure_marshal_VOID__BOXED, + G_TYPE_NONE, 1, + ATK_TYPE_RECTANGLE | G_SIGNAL_TYPE_STATIC_SCOPE); initialized = TRUE; } } - /** * atk_component_add_focus_handler: (skip) * @component: The #AtkComponent to attach the @handler to * @handler: The #AtkFocusHandler to be attached to @component * - * Add the specified handler to the set of functions to be called + * Add the specified handler to the set of functions to be called * when this object receives focus events (in or out). If the handler is * already added it is not added again * @@ -140,7 +139,7 @@ atk_component_base_init (AtkComponentIface *class) * or zero if the handler was already added. **/ guint -atk_component_add_focus_handler (AtkComponent *component, +atk_component_add_focus_handler (AtkComponent *component, AtkFocusHandler handler) { AtkComponentIface *iface = NULL; @@ -161,7 +160,7 @@ atk_component_add_focus_handler (AtkComponent *component, * from @component * * Remove the handler specified by @handler_id from the list of - * functions to be executed when this object receives focus events + * functions to be executed when this object receives focus events * (in or out). * * Deprecated: 2.9.4: If you need to track when an object gains or @@ -169,8 +168,8 @@ atk_component_add_focus_handler (AtkComponent *component, * **/ void -atk_component_remove_focus_handler (AtkComponent *component, - guint handler_id) +atk_component_remove_focus_handler (AtkComponent *component, + guint handler_id) { AtkComponentIface *iface = NULL; g_return_if_fail (ATK_IS_COMPONENT (component)); @@ -199,10 +198,10 @@ atk_component_remove_focus_handler (AtkComponent *component, * the extent of the @component or not **/ gboolean -atk_component_contains (AtkComponent *component, - gint x, - gint y, - AtkCoordType coord_type) +atk_component_contains (AtkComponent *component, + gint x, + gint y, + AtkCoordType coord_type) { AtkComponentIface *iface = NULL; g_return_val_if_fail (ATK_IS_COMPONENT (component), FALSE); @@ -229,11 +228,11 @@ atk_component_contains (AtkComponent *component, * Returns: (nullable) (transfer full): a reference to the accessible * child, if one exists **/ -AtkObject* -atk_component_ref_accessible_at_point (AtkComponent *component, - gint x, - gint y, - AtkCoordType coord_type) +AtkObject * +atk_component_ref_accessible_at_point (AtkComponent *component, + gint x, + gint y, + AtkCoordType coord_type) { AtkComponentIface *iface = NULL; g_return_val_if_fail (ATK_IS_COMPONENT (component), NULL); @@ -263,12 +262,12 @@ atk_component_ref_accessible_at_point (AtkComponent *component, * **/ void -atk_component_get_extents (AtkComponent *component, - gint *x, - gint *y, - gint *width, - gint *height, - AtkCoordType coord_type) +atk_component_get_extents (AtkComponent *component, + gint *x, + gint *y, + gint *width, + gint *height, + AtkCoordType coord_type) { AtkComponentIface *iface = NULL; gint local_x, local_y, local_width, local_height; @@ -314,7 +313,7 @@ atk_component_get_extents (AtkComponent *component, * @coord_type: specifies whether the coordinates are relative to the screen * or to the components top level window * - * Gets the position of @component in the form of + * Gets the position of @component in the form of * a point specifying @component's top-left corner. * * If the position can not be obtained (e.g. a non-embedded plug or missing @@ -323,10 +322,10 @@ atk_component_get_extents (AtkComponent *component, * Deprecated: Since 2.12. Use atk_component_get_extents() instead. **/ void -atk_component_get_position (AtkComponent *component, - gint *x, - gint *y, - AtkCoordType coord_type) +atk_component_get_position (AtkComponent *component, + gint *x, + gint *y, + AtkCoordType coord_type) { AtkComponentIface *iface = NULL; gint local_x, local_y; @@ -368,9 +367,9 @@ atk_component_get_position (AtkComponent *component, * Deprecated: Since 2.12. Use atk_component_get_extents() instead. **/ void -atk_component_get_size (AtkComponent *component, - gint *width, - gint *height) +atk_component_get_size (AtkComponent *component, + gint *width, + gint *height) { AtkComponentIface *iface = NULL; gint local_width, local_height; @@ -409,7 +408,7 @@ atk_component_get_size (AtkComponent *component, * Returns: an #AtkLayer which is the layer of the component **/ AtkLayer -atk_component_get_layer (AtkComponent *component) +atk_component_get_layer (AtkComponent *component) { AtkComponentIface *iface; @@ -426,15 +425,15 @@ atk_component_get_layer (AtkComponent *component) * atk_component_get_mdi_zorder: * @component: an #AtkComponent * - * Gets the zorder of the component. The value G_MININT will be returned + * Gets the zorder of the component. The value G_MININT will be returned * if the layer of the component is not ATK_LAYER_MDI or ATK_LAYER_WINDOW. * - * Returns: a gint which is the zorder of the component, i.e. the depth at - * which the component is shown in relation to other components in the same + * Returns: a gint which is the zorder of the component, i.e. the depth at + * which the component is shown in relation to other components in the same * container. **/ gint -atk_component_get_mdi_zorder (AtkComponent *component) +atk_component_get_mdi_zorder (AtkComponent *component) { AtkComponentIface *iface; @@ -459,7 +458,7 @@ atk_component_get_mdi_zorder (AtkComponent *component) * Since: 1.12 **/ gdouble -atk_component_get_alpha (AtkComponent *component) +atk_component_get_alpha (AtkComponent *component) { AtkComponentIface *iface; @@ -481,7 +480,7 @@ atk_component_get_alpha (AtkComponent *component) * Returns: %TRUE if successful, %FALSE otherwise. **/ gboolean -atk_component_grab_focus (AtkComponent *component) +atk_component_grab_focus (AtkComponent *component) { AtkComponentIface *iface = NULL; g_return_val_if_fail (ATK_IS_COMPONENT (component), FALSE); @@ -509,12 +508,12 @@ atk_component_grab_focus (AtkComponent *component) * Returns: %TRUE or %FALSE whether the extents were set or not **/ gboolean -atk_component_set_extents (AtkComponent *component, - gint x, - gint y, - gint width, - gint height, - AtkCoordType coord_type) +atk_component_set_extents (AtkComponent *component, + gint x, + gint y, + gint width, + gint height, + AtkCoordType coord_type) { AtkComponentIface *iface = NULL; g_return_val_if_fail (ATK_IS_COMPONENT (component), FALSE); @@ -543,10 +542,10 @@ atk_component_set_extents (AtkComponent *component, * Returns: %TRUE or %FALSE whether or not the position was set or not **/ gboolean -atk_component_set_position (AtkComponent *component, - gint x, - gint y, - AtkCoordType coord_type) +atk_component_set_position (AtkComponent *component, + gint x, + gint y, + AtkCoordType coord_type) { AtkComponentIface *iface = NULL; g_return_val_if_fail (ATK_IS_COMPONENT (component), FALSE); @@ -570,9 +569,9 @@ atk_component_set_position (AtkComponent *component, * Returns: %TRUE or %FALSE whether the size was set or not **/ gboolean -atk_component_set_size (AtkComponent *component, - gint x, - gint y) +atk_component_set_size (AtkComponent *component, + gint x, + gint y) { AtkComponentIface *iface = NULL; g_return_val_if_fail (ATK_IS_COMPONENT (component), FALSE); @@ -601,8 +600,8 @@ atk_component_set_size (AtkComponent *component, * Since: 2.30 */ gboolean -atk_component_scroll_to (AtkComponent *component, - AtkScrollType type) +atk_component_scroll_to (AtkComponent *component, + AtkScrollType type) { AtkComponentIface *iface = NULL; g_return_val_if_fail (ATK_IS_COMPONENT (component), FALSE); @@ -632,9 +631,9 @@ atk_component_scroll_to (AtkComponent *component, */ gboolean atk_component_scroll_to_point (AtkComponent *component, - AtkCoordType coords, - gint x, - gint y) + AtkCoordType coords, + gint x, + gint y) { AtkComponentIface *iface = NULL; g_return_val_if_fail (ATK_IS_COMPONENT (component), FALSE); @@ -649,8 +648,8 @@ atk_component_scroll_to_point (AtkComponent *component, static gboolean atk_component_real_contains (AtkComponent *component, - gint x, - gint y, + gint x, + gint y, AtkCoordType coord_type) { gint real_x, real_y, width, height; @@ -668,10 +667,10 @@ atk_component_real_contains (AtkComponent *component, return FALSE; } -static AtkObject* +static AtkObject * atk_component_real_ref_accessible_at_point (AtkComponent *component, - gint x, - gint y, + gint x, + gint y, AtkCoordType coord_type) { gint count, i; @@ -679,30 +678,30 @@ atk_component_real_ref_accessible_at_point (AtkComponent *component, count = atk_object_get_n_accessible_children (ATK_OBJECT (component)); for (i = 0; i < count; i++) - { - AtkObject *obj; - - obj = atk_object_ref_accessible_child (ATK_OBJECT (component), i); - - if (obj != NULL) { - if (atk_component_contains (ATK_COMPONENT (obj), x, y, coord_type)) - { - return obj; - } - else - { - g_object_unref (obj); - } + AtkObject *obj; + + obj = atk_object_ref_accessible_child (ATK_OBJECT (component), i); + + if (obj != NULL) + { + if (atk_component_contains (ATK_COMPONENT (obj), x, y, coord_type)) + { + return obj; + } + else + { + g_object_unref (obj); + } + } } - } return NULL; } static void atk_component_real_get_position (AtkComponent *component, - gint *x, - gint *y, + gint *x, + gint *y, AtkCoordType coord_type) { gint width, height; @@ -712,8 +711,8 @@ atk_component_real_get_position (AtkComponent *component, static void atk_component_real_get_size (AtkComponent *component, - gint *width, - gint *height) + gint *width, + gint *height) { gint x, y; AtkCoordType coord_type; @@ -742,8 +741,7 @@ atk_rectangle_get_type (void) if (our_type == 0) our_type = g_boxed_type_register_static ("AtkRectangle", - (GBoxedCopyFunc)atk_rectangle_copy, - (GBoxedFreeFunc)g_free); + (GBoxedCopyFunc) atk_rectangle_copy, + (GBoxedFreeFunc) g_free); return our_type; } - diff --git a/atk/atkcomponent.h b/atk/atkcomponent.h index ae667724..59018349 100644 --- a/atk/atkcomponent.h +++ b/atk/atkcomponent.h @@ -20,7 +20,7 @@ #ifndef __ATK_COMPONENT_H__ #define __ATK_COMPONENT_H__ -#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) +#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined(__ATK_H_INSIDE__) && !defined(ATK_COMPILATION) #error "Only <atk/atk.h> can be included directly." #endif @@ -51,7 +51,8 @@ G_BEGIN_DECLS * * Since: 2.30 */ -typedef enum { +typedef enum +{ ATK_SCROLL_TOP_LEFT, ATK_SCROLL_BOTTOM_RIGHT, ATK_SCROLL_TOP_EDGE, @@ -61,16 +62,16 @@ typedef enum { ATK_SCROLL_ANYWHERE } AtkScrollType; -#define ATK_TYPE_COMPONENT (atk_component_get_type ()) -#define ATK_IS_COMPONENT(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_COMPONENT) -#define ATK_COMPONENT(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_COMPONENT, AtkComponent) -#define ATK_COMPONENT_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_COMPONENT, AtkComponentIface)) +#define ATK_TYPE_COMPONENT (atk_component_get_type ()) +#define ATK_IS_COMPONENT(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_COMPONENT) +#define ATK_COMPONENT(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_COMPONENT, AtkComponent) +#define ATK_COMPONENT_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_COMPONENT, AtkComponentIface)) #ifndef _TYPEDEF_ATK_COMPONENT_ #define _TYPEDEF_ATK_COMPONENT_ typedef struct _AtkComponent AtkComponent; #endif -typedef struct _AtkComponentIface AtkComponentIface; +typedef struct _AtkComponentIface AtkComponentIface; /** * AtkFocusHandler: @@ -85,9 +86,9 @@ typedef struct _AtkComponentIface AtkComponentIface; * and atk_component_remove_focus_handler(). See those * methods for more information. */ -typedef void (*AtkFocusHandler) (AtkObject* object, gboolean focus_in); +typedef void (*AtkFocusHandler) (AtkObject *object, gboolean focus_in); -typedef struct _AtkRectangle AtkRectangle; +typedef struct _AtkRectangle AtkRectangle; /** * AtkRectangle: @@ -149,57 +150,57 @@ struct _AtkComponentIface GTypeInterface parent; /*< public >*/ - guint (* add_focus_handler) (AtkComponent *component, - AtkFocusHandler handler); + guint (*add_focus_handler) (AtkComponent *component, + AtkFocusHandler handler); + + gboolean (*contains) (AtkComponent *component, + gint x, + gint y, + AtkCoordType coord_type); - gboolean (* contains) (AtkComponent *component, - gint x, - gint y, - AtkCoordType coord_type); + AtkObject *(*ref_accessible_at_point) (AtkComponent *component, + gint x, + gint y, + AtkCoordType coord_type); + void (*get_extents) (AtkComponent *component, + gint *x, + gint *y, + gint *width, + gint *height, + AtkCoordType coord_type); + void (*get_position) (AtkComponent *component, + gint *x, + gint *y, + AtkCoordType coord_type); + void (*get_size) (AtkComponent *component, + gint *width, + gint *height); + gboolean (*grab_focus) (AtkComponent *component); + void (*remove_focus_handler) (AtkComponent *component, + guint handler_id); + gboolean (*set_extents) (AtkComponent *component, + gint x, + gint y, + gint width, + gint height, + AtkCoordType coord_type); + gboolean (*set_position) (AtkComponent *component, + gint x, + gint y, + AtkCoordType coord_type); + gboolean (*set_size) (AtkComponent *component, + gint width, + gint height); - AtkObject* (* ref_accessible_at_point) (AtkComponent *component, - gint x, - gint y, - AtkCoordType coord_type); - void (* get_extents) (AtkComponent *component, - gint *x, - gint *y, - gint *width, - gint *height, - AtkCoordType coord_type); - void (* get_position) (AtkComponent *component, - gint *x, - gint *y, - AtkCoordType coord_type); - void (* get_size) (AtkComponent *component, - gint *width, - gint *height); - gboolean (* grab_focus) (AtkComponent *component); - void (* remove_focus_handler) (AtkComponent *component, - guint handler_id); - gboolean (* set_extents) (AtkComponent *component, - gint x, - gint y, - gint width, - gint height, - AtkCoordType coord_type); - gboolean (* set_position) (AtkComponent *component, - gint x, - gint y, - AtkCoordType coord_type); - gboolean (* set_size) (AtkComponent *component, - gint width, - gint height); - - AtkLayer (* get_layer) (AtkComponent *component); - gint (* get_mdi_zorder) (AtkComponent *component); + AtkLayer (*get_layer) (AtkComponent *component); + gint (*get_mdi_zorder) (AtkComponent *component); /* * signal handlers */ - void (* bounds_changed) (AtkComponent *component, - AtkRectangle *bounds); - gdouble (* get_alpha) (AtkComponent *component); + void (*bounds_changed) (AtkComponent *component, + AtkRectangle *bounds); + gdouble (*get_alpha) (AtkComponent *component); /* * Scrolls this object so it becomes visible on the screen. @@ -212,13 +213,13 @@ struct _AtkComponentIface * * Since ATK 2.30 */ - gboolean (*scroll_to) (AtkComponent *component, - AtkScrollType type); + gboolean (*scroll_to) (AtkComponent *component, + AtkScrollType type); - gboolean (*scroll_to_point) (AtkComponent *component, - AtkCoordType coords, - gint x, - gint y); + gboolean (*scroll_to_point) (AtkComponent *component, + AtkCoordType coords, + gint x, + gint y); }; ATK_AVAILABLE_IN_ALL @@ -226,71 +227,71 @@ GType atk_component_get_type (void); /* convenience functions */ ATK_DEPRECATED_IN_2_10 -guint atk_component_add_focus_handler (AtkComponent *component, - AtkFocusHandler handler); +guint atk_component_add_focus_handler (AtkComponent *component, + AtkFocusHandler handler); ATK_AVAILABLE_IN_ALL -gboolean atk_component_contains (AtkComponent *component, - gint x, - gint y, - AtkCoordType coord_type); +gboolean atk_component_contains (AtkComponent *component, + gint x, + gint y, + AtkCoordType coord_type); ATK_AVAILABLE_IN_ALL -AtkObject* atk_component_ref_accessible_at_point(AtkComponent *component, - gint x, - gint y, - AtkCoordType coord_type); +AtkObject *atk_component_ref_accessible_at_point (AtkComponent *component, + gint x, + gint y, + AtkCoordType coord_type); ATK_AVAILABLE_IN_ALL -void atk_component_get_extents (AtkComponent *component, - gint *x, - gint *y, - gint *width, - gint *height, - AtkCoordType coord_type); -ATK_DEPRECATED_IN_2_12_FOR(atk_component_get_extents) -void atk_component_get_position (AtkComponent *component, - gint *x, - gint *y, - AtkCoordType coord_type); -ATK_DEPRECATED_IN_2_12_FOR(atk_component_get_extents) -void atk_component_get_size (AtkComponent *component, - gint *width, - gint *height); +void atk_component_get_extents (AtkComponent *component, + gint *x, + gint *y, + gint *width, + gint *height, + AtkCoordType coord_type); +ATK_DEPRECATED_IN_2_12_FOR (atk_component_get_extents) +void atk_component_get_position (AtkComponent *component, + gint *x, + gint *y, + AtkCoordType coord_type); +ATK_DEPRECATED_IN_2_12_FOR (atk_component_get_extents) +void atk_component_get_size (AtkComponent *component, + gint *width, + gint *height); ATK_AVAILABLE_IN_ALL -AtkLayer atk_component_get_layer (AtkComponent *component); +AtkLayer atk_component_get_layer (AtkComponent *component); ATK_AVAILABLE_IN_ALL -gint atk_component_get_mdi_zorder (AtkComponent *component); +gint atk_component_get_mdi_zorder (AtkComponent *component); ATK_AVAILABLE_IN_ALL -gboolean atk_component_grab_focus (AtkComponent *component); +gboolean atk_component_grab_focus (AtkComponent *component); ATK_DEPRECATED_IN_2_10 -void atk_component_remove_focus_handler (AtkComponent *component, - guint handler_id); +void atk_component_remove_focus_handler (AtkComponent *component, + guint handler_id); ATK_AVAILABLE_IN_ALL -gboolean atk_component_set_extents (AtkComponent *component, - gint x, - gint y, - gint width, - gint height, - AtkCoordType coord_type); +gboolean atk_component_set_extents (AtkComponent *component, + gint x, + gint y, + gint width, + gint height, + AtkCoordType coord_type); ATK_AVAILABLE_IN_ALL -gboolean atk_component_set_position (AtkComponent *component, - gint x, - gint y, - AtkCoordType coord_type); +gboolean atk_component_set_position (AtkComponent *component, + gint x, + gint y, + AtkCoordType coord_type); ATK_AVAILABLE_IN_ALL -gboolean atk_component_set_size (AtkComponent *component, - gint width, - gint height); +gboolean atk_component_set_size (AtkComponent *component, + gint width, + gint height); ATK_AVAILABLE_IN_ALL -gdouble atk_component_get_alpha (AtkComponent *component); +gdouble atk_component_get_alpha (AtkComponent *component); ATK_AVAILABLE_IN_2_30 -gboolean atk_component_scroll_to (AtkComponent *component, - AtkScrollType type); +gboolean atk_component_scroll_to (AtkComponent *component, + AtkScrollType type); ATK_AVAILABLE_IN_2_30 -gboolean atk_component_scroll_to_point (AtkComponent *component, - AtkCoordType coords, - gint x, - gint y); +gboolean atk_component_scroll_to_point (AtkComponent *component, + AtkCoordType coords, + gint x, + gint y); G_END_DECLS diff --git a/atk/atkdocument.c b/atk/atkdocument.c index b4825ebd..e8910f3e 100644 --- a/atk/atkdocument.c +++ b/atk/atkdocument.c @@ -37,7 +37,8 @@ * */ -enum { +enum +{ LOAD_COMPLETE, RELOAD, LOAD_STOPPED, @@ -47,24 +48,24 @@ enum { static void atk_document_base_init (AtkDocumentIface *class); -static guint atk_document_signals[LAST_SIGNAL] = {0}; +static guint atk_document_signals[LAST_SIGNAL] = { 0 }; GType atk_document_get_type (void) { static GType type = 0; - if (!type) { - static const GTypeInfo tinfo = + if (!type) { - sizeof (AtkDocumentIface), - (GBaseInitFunc) atk_document_base_init, - (GBaseFinalizeFunc) NULL, + static const GTypeInfo tinfo = { + sizeof (AtkDocumentIface), + (GBaseInitFunc) atk_document_base_init, + (GBaseFinalizeFunc) NULL, - }; + }; - type = g_type_register_static (G_TYPE_INTERFACE, "AtkDocument", &tinfo, 0); - } + type = g_type_register_static (G_TYPE_INTERFACE, "AtkDocument", &tinfo, 0); + } return type; } @@ -90,13 +91,13 @@ atk_document_base_init (AtkDocumentIface *class) * signals.) */ atk_document_signals[LOAD_COMPLETE] = - g_signal_new ("load_complete", - ATK_TYPE_DOCUMENT, - G_SIGNAL_RUN_LAST, - 0, - (GSignalAccumulator) NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); + g_signal_new ("load_complete", + ATK_TYPE_DOCUMENT, + G_SIGNAL_RUN_LAST, + 0, + (GSignalAccumulator) NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); /** * AtkDocument::reload: * @atkdocument: the object which received the signal. @@ -108,13 +109,13 @@ atk_document_base_init (AtkDocumentIface *class) * interrogating ATK for the latest document content. */ atk_document_signals[RELOAD] = - g_signal_new ("reload", - ATK_TYPE_DOCUMENT, - G_SIGNAL_RUN_LAST, - 0, - (GSignalAccumulator) NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); + g_signal_new ("reload", + ATK_TYPE_DOCUMENT, + G_SIGNAL_RUN_LAST, + 0, + (GSignalAccumulator) NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); /** * AtkDocument::load-stopped: @@ -128,13 +129,13 @@ atk_document_base_init (AtkDocumentIface *class) * user-significant timeout has occurred. */ atk_document_signals[LOAD_STOPPED] = - g_signal_new ("load_stopped", - ATK_TYPE_DOCUMENT, - G_SIGNAL_RUN_LAST, - 0, - (GSignalAccumulator) NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); + g_signal_new ("load_stopped", + ATK_TYPE_DOCUMENT, + G_SIGNAL_RUN_LAST, + 0, + (GSignalAccumulator) NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); /** * AtkDocument::page-changed: @@ -149,13 +150,13 @@ atk_document_base_init (AtkDocumentIface *class) * Since: 2.12 */ atk_document_signals[PAGE_CHANGED] = - g_signal_new ("page_changed", - ATK_TYPE_DOCUMENT, - G_SIGNAL_RUN_LAST, - 0, - (GSignalAccumulator) NULL, NULL, - g_cclosure_marshal_VOID__INT, - G_TYPE_NONE, 1, G_TYPE_INT); + g_signal_new ("page_changed", + ATK_TYPE_DOCUMENT, + G_SIGNAL_RUN_LAST, + 0, + (GSignalAccumulator) NULL, NULL, + g_cclosure_marshal_VOID__INT, + G_TYPE_NONE, 1, G_TYPE_INT); initialized = TRUE; } @@ -172,7 +173,7 @@ atk_document_base_init (AtkDocumentIface *class) * * Returns: a string indicating the document type **/ -const gchar* +const gchar * atk_document_get_document_type (AtkDocument *document) { AtkDocumentIface *iface; @@ -205,7 +206,7 @@ atk_document_get_document_type (AtkDocument *document) * * Returns: (transfer none): a %gpointer that points to an instance of the DOM. **/ -gpointer +gpointer atk_document_get_document (AtkDocument *document) { AtkDocumentIface *iface; @@ -259,7 +260,6 @@ atk_document_get_locale (AtkDocument *document) } } - /** * atk_document_get_attributes: (virtual get_document_attributes) * @document: a #GObject instance that implements AtkDocumentIface @@ -307,8 +307,8 @@ atk_document_get_attributes (AtkDocument *document) * Since: 1.12 */ const gchar * -atk_document_get_attribute_value (AtkDocument *document, - const gchar *attribute_name) +atk_document_get_attribute_value (AtkDocument *document, + const gchar *attribute_name) { AtkDocumentIface *iface; @@ -342,9 +342,9 @@ atk_document_get_attribute_value (AtkDocument *document, * document does not allow the attribute to be modified */ gboolean -atk_document_set_attribute_value (AtkDocument *document, - const gchar *attribute_name, - const gchar *attribute_value) +atk_document_set_attribute_value (AtkDocument *document, + const gchar *attribute_name, + const gchar *attribute_value) { AtkDocumentIface *iface; diff --git a/atk/atkdocument.h b/atk/atkdocument.h index 0aed668f..71fa2a7d 100644 --- a/atk/atkdocument.h +++ b/atk/atkdocument.h @@ -20,7 +20,7 @@ #ifndef __ATK_DOCUMENT_H__ #define __ATK_DOCUMENT_H__ -#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) +#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined(__ATK_H_INSIDE__) && !defined(ATK_COMPILATION) #error "Only <atk/atk.h> can be included directly." #endif @@ -35,10 +35,10 @@ G_BEGIN_DECLS * */ -#define ATK_TYPE_DOCUMENT (atk_document_get_type ()) -#define ATK_IS_DOCUMENT(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_DOCUMENT) -#define ATK_DOCUMENT(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_DOCUMENT, AtkDocument) -#define ATK_DOCUMENT_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_DOCUMENT, AtkDocumentIface)) +#define ATK_TYPE_DOCUMENT (atk_document_get_type ()) +#define ATK_IS_DOCUMENT(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_DOCUMENT) +#define ATK_DOCUMENT(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_DOCUMENT, AtkDocument) +#define ATK_DOCUMENT_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_DOCUMENT, AtkDocumentIface)) #ifndef _TYPEDEF_ATK_DOCUMENT_ #define _TYPEDEF_ATK_DOCUMENT_ @@ -68,45 +68,45 @@ typedef struct _AtkDocumentIface AtkDocumentIface; struct _AtkDocumentIface { GTypeInterface parent; - const gchar* ( *get_document_type) (AtkDocument *document); - gpointer ( *get_document) (AtkDocument *document); - - const gchar* ( *get_document_locale) (AtkDocument *document); - AtkAttributeSet * ( *get_document_attributes) (AtkDocument *document); - const gchar* ( *get_document_attribute_value) (AtkDocument *document, - const gchar *attribute_name); - gboolean ( *set_document_attribute) (AtkDocument *document, - const gchar *attribute_name, - const gchar *attribute_value); - gint ( *get_current_page_number) (AtkDocument *document); - gint ( *get_page_count) (AtkDocument *document); + const gchar *(*get_document_type) (AtkDocument *document); + gpointer (*get_document) (AtkDocument *document); + + const gchar *(*get_document_locale) (AtkDocument *document); + AtkAttributeSet *(*get_document_attributes) (AtkDocument *document); + const gchar *(*get_document_attribute_value) (AtkDocument *document, + const gchar *attribute_name); + gboolean (*set_document_attribute) (AtkDocument *document, + const gchar *attribute_name, + const gchar *attribute_value); + gint (*get_current_page_number) (AtkDocument *document); + gint (*get_page_count) (AtkDocument *document); }; ATK_AVAILABLE_IN_ALL -GType atk_document_get_type (void); +GType atk_document_get_type (void); ATK_DEPRECATED_IN_2_12 -const gchar* atk_document_get_document_type (AtkDocument *document); +const gchar *atk_document_get_document_type (AtkDocument *document); ATK_DEPRECATED_IN_2_12 -gpointer atk_document_get_document (AtkDocument *document); +gpointer atk_document_get_document (AtkDocument *document); -ATK_DEPRECATED_IN_2_8_FOR(atk_object_get_object_locale) -const gchar* atk_document_get_locale (AtkDocument *document); +ATK_DEPRECATED_IN_2_8_FOR (atk_object_get_object_locale) +const gchar *atk_document_get_locale (AtkDocument *document); ATK_AVAILABLE_IN_ALL -AtkAttributeSet* atk_document_get_attributes (AtkDocument *document); +AtkAttributeSet *atk_document_get_attributes (AtkDocument *document); ATK_AVAILABLE_IN_ALL -const gchar* atk_document_get_attribute_value (AtkDocument *document, - const gchar *attribute_name); +const gchar *atk_document_get_attribute_value (AtkDocument *document, + const gchar *attribute_name); ATK_AVAILABLE_IN_ALL -gboolean atk_document_set_attribute_value (AtkDocument *document, - const gchar *attribute_name, - const gchar *attribute_value); +gboolean atk_document_set_attribute_value (AtkDocument *document, + const gchar *attribute_name, + const gchar *attribute_value); ATK_AVAILABLE_IN_2_12 -gint atk_document_get_current_page_number (AtkDocument *document); +gint atk_document_get_current_page_number (AtkDocument *document); ATK_AVAILABLE_IN_2_12 -gint atk_document_get_page_count (AtkDocument *document); +gint atk_document_get_page_count (AtkDocument *document); G_END_DECLS diff --git a/atk/atkeditabletext.c b/atk/atkeditabletext.c index 7085be36..f074a282 100644 --- a/atk/atkeditabletext.c +++ b/atk/atkeditabletext.c @@ -42,17 +42,17 @@ atk_editable_text_get_type (void) { static GType type = 0; - if (!type) { - static const GTypeInfo tinfo = + if (!type) { - sizeof (AtkEditableTextIface), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, + static const GTypeInfo tinfo = { + sizeof (AtkEditableTextIface), + (GBaseInitFunc) NULL, + (GBaseFinalizeFunc) NULL, - }; + }; - type = g_type_register_static (G_TYPE_INTERFACE, "AtkEditableText", &tinfo, 0); - } + type = g_type_register_static (G_TYPE_INTERFACE, "AtkEditableText", &tinfo, 0); + } return type; } @@ -65,7 +65,7 @@ atk_editable_text_get_type (void) *@end_offset: end of range in which to set attributes * *Sets the attributes for a specified range. See the ATK_ATTRIBUTE - *macros (such as #ATK_ATTRIBUTE_LEFT_MARGIN) for examples of attributes + *macros (such as #ATK_ATTRIBUTE_LEFT_MARGIN) for examples of attributes *that can be set. Note that other attributes that do not have corresponding *ATK_ATTRIBUTE macros may also be set for certain text widgets. * @@ -75,7 +75,7 @@ atk_editable_text_get_type (void) gboolean atk_editable_text_set_run_attributes (AtkEditableText *text, AtkAttributeSet *attrib_set, - gint start_offset, + gint start_offset, gint end_offset) { AtkEditableTextIface *iface; @@ -94,7 +94,6 @@ atk_editable_text_set_run_attributes (AtkEditableText *text, } } - /** * atk_editable_text_set_text_contents: * @text: an #AtkEditableText @@ -102,9 +101,9 @@ atk_editable_text_set_run_attributes (AtkEditableText *text, * * Set text contents of @text. **/ -void -atk_editable_text_set_text_contents (AtkEditableText *text, - const gchar *string) +void +atk_editable_text_set_text_contents (AtkEditableText *text, + const gchar *string) { AtkEditableTextIface *iface; @@ -121,17 +120,17 @@ atk_editable_text_set_text_contents (AtkEditableText *text, * @text: an #AtkEditableText * @string: the text to insert * @length: the length of text to insert, in bytes - * @position: The caller initializes this to + * @position: The caller initializes this to * the position at which to insert the text. After the call it * points at the position after the newly inserted text. * * Insert text at a given position. **/ -void -atk_editable_text_insert_text (AtkEditableText *text, - const gchar *string, - gint length, - gint *position) +void +atk_editable_text_insert_text (AtkEditableText *text, + const gchar *string, + gint length, + gint *position) { AtkEditableTextIface *iface; @@ -149,13 +148,13 @@ atk_editable_text_insert_text (AtkEditableText *text, * @start_pos: start position * @end_pos: end position * - * Copy text from @start_pos up to, but not including @end_pos + * Copy text from @start_pos up to, but not including @end_pos * to the clipboard. **/ -void -atk_editable_text_copy_text (AtkEditableText *text, - gint start_pos, - gint end_pos) +void +atk_editable_text_copy_text (AtkEditableText *text, + gint start_pos, + gint end_pos) { AtkEditableTextIface *iface; @@ -176,10 +175,10 @@ atk_editable_text_copy_text (AtkEditableText *text, * Copy text from @start_pos up to, but not including @end_pos * to the clipboard and then delete from the widget. **/ -void -atk_editable_text_cut_text (AtkEditableText *text, - gint start_pos, - gint end_pos) +void +atk_editable_text_cut_text (AtkEditableText *text, + gint start_pos, + gint end_pos) { AtkEditableTextIface *iface; @@ -199,10 +198,10 @@ atk_editable_text_cut_text (AtkEditableText *text, * * Delete text @start_pos up to, but not including @end_pos. **/ -void -atk_editable_text_delete_text (AtkEditableText *text, - gint start_pos, - gint end_pos) +void +atk_editable_text_delete_text (AtkEditableText *text, + gint start_pos, + gint end_pos) { AtkEditableTextIface *iface; @@ -221,9 +220,9 @@ atk_editable_text_delete_text (AtkEditableText *text, * * Paste text from clipboard to specified @position. **/ -void -atk_editable_text_paste_text (AtkEditableText *text, - gint position) +void +atk_editable_text_paste_text (AtkEditableText *text, + gint position) { AtkEditableTextIface *iface; diff --git a/atk/atkeditabletext.h b/atk/atkeditabletext.h index 3eebab2b..8e37365b 100644 --- a/atk/atkeditabletext.h +++ b/atk/atkeditabletext.h @@ -20,7 +20,7 @@ #ifndef __ATK_EDITABLE_TEXT_H__ #define __ATK_EDITABLE_TEXT_H__ -#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) +#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined(__ATK_H_INSIDE__) && !defined(ATK_COMPILATION) #error "Only <atk/atk.h> can be included directly." #endif @@ -34,10 +34,10 @@ G_BEGIN_DECLS * to editing features of editable text widgets. */ -#define ATK_TYPE_EDITABLE_TEXT (atk_editable_text_get_type ()) -#define ATK_IS_EDITABLE_TEXT(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_EDITABLE_TEXT) -#define ATK_EDITABLE_TEXT(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_EDITABLE_TEXT, AtkEditableText) -#define ATK_EDITABLE_TEXT_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_EDITABLE_TEXT, AtkEditableTextIface)) +#define ATK_TYPE_EDITABLE_TEXT (atk_editable_text_get_type ()) +#define ATK_IS_EDITABLE_TEXT(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_EDITABLE_TEXT) +#define ATK_EDITABLE_TEXT(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_EDITABLE_TEXT, AtkEditableText) +#define ATK_EDITABLE_TEXT_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_EDITABLE_TEXT, AtkEditableTextIface)) #ifndef _TYPEDEF_ATK_EDITABLE_TEXT_ #define _TYPEDEF_ATK_EDITABLE_TEXT_ @@ -49,60 +49,59 @@ struct _AtkEditableTextIface { GTypeInterface parent_interface; - gboolean (* set_run_attributes) (AtkEditableText *text, - AtkAttributeSet *attrib_set, - gint start_offset, - gint end_offset); - void (* set_text_contents) (AtkEditableText *text, - const gchar *string); - void (* insert_text) (AtkEditableText *text, - const gchar *string, - gint length, - gint *position); - void (* copy_text) (AtkEditableText *text, - gint start_pos, - gint end_pos); - void (* cut_text) (AtkEditableText *text, - gint start_pos, - gint end_pos); - void (* delete_text) (AtkEditableText *text, - gint start_pos, - gint end_pos); - void (* paste_text) (AtkEditableText *text, - gint position); + gboolean (*set_run_attributes) (AtkEditableText *text, + AtkAttributeSet *attrib_set, + gint start_offset, + gint end_offset); + void (*set_text_contents) (AtkEditableText *text, + const gchar *string); + void (*insert_text) (AtkEditableText *text, + const gchar *string, + gint length, + gint *position); + void (*copy_text) (AtkEditableText *text, + gint start_pos, + gint end_pos); + void (*cut_text) (AtkEditableText *text, + gint start_pos, + gint end_pos); + void (*delete_text) (AtkEditableText *text, + gint start_pos, + gint end_pos); + void (*paste_text) (AtkEditableText *text, + gint position); }; ATK_AVAILABLE_IN_ALL GType atk_editable_text_get_type (void); - ATK_AVAILABLE_IN_ALL -gboolean atk_editable_text_set_run_attributes (AtkEditableText *text, - AtkAttributeSet *attrib_set, - gint start_offset, - gint end_offset); +gboolean atk_editable_text_set_run_attributes (AtkEditableText *text, + AtkAttributeSet *attrib_set, + gint start_offset, + gint end_offset); ATK_AVAILABLE_IN_ALL -void atk_editable_text_set_text_contents (AtkEditableText *text, - const gchar *string); +void atk_editable_text_set_text_contents (AtkEditableText *text, + const gchar *string); ATK_AVAILABLE_IN_ALL -void atk_editable_text_insert_text (AtkEditableText *text, - const gchar *string, - gint length, - gint *position); +void atk_editable_text_insert_text (AtkEditableText *text, + const gchar *string, + gint length, + gint *position); ATK_AVAILABLE_IN_ALL -void atk_editable_text_copy_text (AtkEditableText *text, - gint start_pos, - gint end_pos); +void atk_editable_text_copy_text (AtkEditableText *text, + gint start_pos, + gint end_pos); ATK_AVAILABLE_IN_ALL -void atk_editable_text_cut_text (AtkEditableText *text, - gint start_pos, - gint end_pos); +void atk_editable_text_cut_text (AtkEditableText *text, + gint start_pos, + gint end_pos); ATK_AVAILABLE_IN_ALL -void atk_editable_text_delete_text (AtkEditableText *text, - gint start_pos, - gint end_pos); +void atk_editable_text_delete_text (AtkEditableText *text, + gint start_pos, + gint end_pos); ATK_AVAILABLE_IN_ALL -void atk_editable_text_paste_text (AtkEditableText *text, - gint position); +void atk_editable_text_paste_text (AtkEditableText *text, + gint position); G_END_DECLS diff --git a/atk/atkgobjectaccessible.c b/atk/atkgobjectaccessible.c index 83967c46..74eaecf6 100644 --- a/atk/atkgobjectaccessible.c +++ b/atk/atkgobjectaccessible.c @@ -33,10 +33,10 @@ * not derived from GtkWidget. One example of its use is in providing * an accessible object for GnomeCanvasItem in the GAIL library. */ -static void atk_gobject_accessible_class_init (AtkGObjectAccessibleClass *klass); -static void atk_real_gobject_accessible_initialize (AtkObject *atk_obj, - gpointer data); -static void atk_gobject_accessible_object_gone_cb (gpointer data); +static void atk_gobject_accessible_class_init (AtkGObjectAccessibleClass *klass); +static void atk_real_gobject_accessible_initialize (AtkObject *atk_obj, + gpointer data); +static void atk_gobject_accessible_object_gone_cb (gpointer data); static GQuark quark_accessible_object = 0; static GQuark quark_object = 0; @@ -49,18 +49,17 @@ atk_gobject_accessible_get_type (void) if (!type) { - static const GTypeInfo tinfo = - { + static const GTypeInfo tinfo = { sizeof (AtkGObjectAccessibleClass), - (GBaseInitFunc) NULL, /* base init */ + (GBaseInitFunc) NULL, /* base init */ (GBaseFinalizeFunc) NULL, /* base finalize */ (GClassInitFunc) atk_gobject_accessible_class_init, (GClassFinalizeFunc) NULL, /* class finalize */ - NULL, /* class data */ + NULL, /* class data */ sizeof (AtkGObjectAccessible), - 0, /* nb preallocs */ + 0, /* nb preallocs */ (GInstanceInitFunc) NULL, /* instance init */ - NULL /* value table */ + NULL /* value table */ }; type = g_type_register_static (ATK_TYPE_OBJECT, @@ -79,10 +78,10 @@ atk_gobject_accessible_get_type (void) * Returns: (transfer none): a #AtkObject which is the accessible object for * the @obj **/ -AtkObject* +AtkObject * atk_gobject_accessible_for_object (GObject *obj) { - AtkObject* accessible; + AtkObject *accessible; g_return_val_if_fail (G_IS_OBJECT (obj), NULL); /* See if we have a cached accessible for this object */ @@ -95,7 +94,7 @@ atk_gobject_accessible_for_object (GObject *obj) AtkRegistry *default_registry; default_registry = atk_get_default_registry (); - factory = atk_registry_get_factory (default_registry, + factory = atk_registry_get_factory (default_registry, G_OBJECT_TYPE (obj)); accessible = atk_object_factory_create_accessible (factory, obj); @@ -106,7 +105,7 @@ atk_gobject_accessible_for_object (GObject *obj) */ g_object_weak_ref (obj, (GWeakNotify) g_object_unref, - accessible); + accessible); if (!quark_accessible_object) quark_accessible_object = g_quark_from_static_string ("accessible-object"); } @@ -131,10 +130,10 @@ atk_gobject_accessible_get_object (AtkGObjectAccessible *obj) return g_object_get_qdata (G_OBJECT (obj), quark_object); } - + static void -atk_real_gobject_accessible_initialize (AtkObject *atk_obj, - gpointer data) +atk_real_gobject_accessible_initialize (AtkObject *atk_obj, + gpointer data) { AtkGObjectAccessible *atk_gobj; @@ -149,7 +148,7 @@ atk_real_gobject_accessible_initialize (AtkObject *atk_obj, } static void -atk_gobject_accessible_object_gone_cb (gpointer data) +atk_gobject_accessible_object_gone_cb (gpointer data) { GObject *object; @@ -157,20 +156,21 @@ atk_gobject_accessible_object_gone_cb (gpointer data) object = atk_gobject_accessible_get_object (data); if (object) - g_object_set_qdata (object, quark_accessible_object, NULL); + g_object_set_qdata (object, quark_accessible_object, NULL); g_object_set_qdata (G_OBJECT (data), quark_object, NULL); atk_object_notify_state_change (ATK_OBJECT (data), ATK_STATE_DEFUNCT, - TRUE); + TRUE); g_object_unref (data); } static void atk_gobject_accessible_dispose (GObject *atk_obj) { - GObject *obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (atk_obj)); + GObject *obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (atk_obj)); - if (obj) { + if (obj) + { g_object_set_qdata (obj, quark_accessible_object, NULL); g_object_weak_unref (obj, (GWeakNotify) atk_gobject_accessible_object_gone_cb, @@ -178,15 +178,15 @@ atk_gobject_accessible_dispose (GObject *atk_obj) g_object_set_qdata (atk_obj, quark_object, NULL); atk_object_notify_state_change (ATK_OBJECT (atk_obj), ATK_STATE_DEFUNCT, - TRUE); - } + TRUE); + } - G_OBJECT_CLASS (parent_class)->dispose (atk_obj); + G_OBJECT_CLASS (parent_class)->dispose (atk_obj); } static void atk_gobject_accessible_class_init (AtkGObjectAccessibleClass *klass) -{ +{ AtkObjectClass *class; GObjectClass *object_class; diff --git a/atk/atkgobjectaccessible.h b/atk/atkgobjectaccessible.h index 38066e50..50c69da0 100644 --- a/atk/atkgobjectaccessible.h +++ b/atk/atkgobjectaccessible.h @@ -20,7 +20,7 @@ #ifndef __ATK_GOBJECT_ACCESSIBLE_H__ #define __ATK_GOBJECT_ACCESSIBLE_H__ -#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) +#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined(__ATK_H_INSIDE__) && !defined(ATK_COMPILATION) #error "Only <atk/atk.h> can be included directly." #endif @@ -32,15 +32,15 @@ G_BEGIN_DECLS * The AtkGObjectAccessible class is provided as a basis for implementing * accessibility support for objects which are not GTK+ widgets */ -#define ATK_TYPE_GOBJECT_ACCESSIBLE (atk_gobject_accessible_get_type ()) -#define ATK_GOBJECT_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_GOBJECT_ACCESSIBLE, AtkGObjectAccessible)) -#define ATK_GOBJECT_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ATK_TYPE_GOBJECT_ACCESSIBLE, AtkGObjectAccessibleClass)) -#define ATK_IS_GOBJECT_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_GOBJECT_ACCESSIBLE)) +#define ATK_TYPE_GOBJECT_ACCESSIBLE (atk_gobject_accessible_get_type ()) +#define ATK_GOBJECT_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_GOBJECT_ACCESSIBLE, AtkGObjectAccessible)) +#define ATK_GOBJECT_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ATK_TYPE_GOBJECT_ACCESSIBLE, AtkGObjectAccessibleClass)) +#define ATK_IS_GOBJECT_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_GOBJECT_ACCESSIBLE)) #define ATK_IS_GOBJECT_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ATK_TYPE_GOBJECT_ACCESSIBLE)) -#define ATK_GOBJECT_ACCESSIBLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ATK_TYPE_GOBJECT_ACCESSIBLE, AtkGObjectAccessibleClass)) +#define ATK_GOBJECT_ACCESSIBLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ATK_TYPE_GOBJECT_ACCESSIBLE, AtkGObjectAccessibleClass)) -typedef struct _AtkGObjectAccessible AtkGObjectAccessible; -typedef struct _AtkGObjectAccessibleClass AtkGObjectAccessibleClass; +typedef struct _AtkGObjectAccessible AtkGObjectAccessible; +typedef struct _AtkGObjectAccessibleClass AtkGObjectAccessibleClass; struct _AtkGObjectAccessible { @@ -59,9 +59,9 @@ struct _AtkGObjectAccessibleClass }; ATK_AVAILABLE_IN_ALL -AtkObject *atk_gobject_accessible_for_object (GObject *obj); +AtkObject *atk_gobject_accessible_for_object (GObject *obj); ATK_AVAILABLE_IN_ALL -GObject *atk_gobject_accessible_get_object (AtkGObjectAccessible *obj); +GObject *atk_gobject_accessible_get_object (AtkGObjectAccessible *obj); G_END_DECLS diff --git a/atk/atkhyperlink.c b/atk/atkhyperlink.c index 4caa8d44..ea5d04b1 100644 --- a/atk/atkhyperlink.c +++ b/atk/atkhyperlink.c @@ -18,9 +18,11 @@ */ #include "config.h" -#include "atkhyperlink.h" + #include <glib/gi18n-lib.h> +#include "atkhyperlink.h" + /** * AtkHyperlink: * @@ -43,7 +45,7 @@ enum enum { - PROP_0, /* gobject convention */ + PROP_0, /* gobject convention */ PROP_SELECTED_LINK, PROP_NUMBER_ANCHORS, @@ -53,19 +55,21 @@ enum }; static void atk_hyperlink_class_init (AtkHyperlinkClass *klass); -static void atk_hyperlink_init (AtkHyperlink *link, - AtkHyperlinkClass *klass); +static void atk_hyperlink_init (AtkHyperlink *link, + AtkHyperlinkClass *klass); -static void atk_hyperlink_real_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec); +static void atk_hyperlink_real_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec); static void atk_hyperlink_action_iface_init (AtkActionIface *iface); -static guint atk_hyperlink_signals[LAST_SIGNAL] = { 0, }; +static guint atk_hyperlink_signals[LAST_SIGNAL] = { + 0, +}; -static gpointer parent_class = NULL; +static gpointer parent_class = NULL; GType atk_hyperlink_get_type (void) @@ -74,8 +78,7 @@ atk_hyperlink_get_type (void) if (!type) { - static const GTypeInfo typeInfo = - { + static const GTypeInfo typeInfo = { sizeof (AtkHyperlinkClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, @@ -85,16 +88,15 @@ atk_hyperlink_get_type (void) sizeof (AtkHyperlink), 0, (GInstanceInitFunc) atk_hyperlink_init, - } ; + }; - static const GInterfaceInfo action_info = - { + static const GInterfaceInfo action_info = { (GInterfaceInitFunc) atk_hyperlink_action_iface_init, (GInterfaceFinalizeFunc) NULL, NULL }; - type = g_type_register_static (G_TYPE_OBJECT, "AtkHyperlink", &typeInfo, 0) ; + type = g_type_register_static (G_TYPE_OBJECT, "AtkHyperlink", &typeInfo, 0); g_type_add_interface_static (type, ATK_TYPE_ACTION, &action_info); } return type; @@ -122,15 +124,15 @@ atk_hyperlink_class_init (AtkHyperlinkClass *klass) g_object_class_install_property (gobject_class, PROP_SELECTED_LINK, g_param_spec_boolean ("selected-link", - _("Selected Link"), - _("Specifies whether the AtkHyperlink object is selected"), + _ ("Selected Link"), + _ ("Specifies whether the AtkHyperlink object is selected"), FALSE, G_PARAM_READABLE)); g_object_class_install_property (gobject_class, PROP_NUMBER_ANCHORS, g_param_spec_int ("number-of-anchors", - _("Number of Anchors"), - _("The number of anchors associated with the AtkHyperlink object"), + _ ("Number of Anchors"), + _ ("The number of anchors associated with the AtkHyperlink object"), 0, G_MAXINT, 0, @@ -138,8 +140,8 @@ atk_hyperlink_class_init (AtkHyperlinkClass *klass) g_object_class_install_property (gobject_class, PROP_END_INDEX, g_param_spec_int ("end-index", - _("End index"), - _("The end index of the AtkHyperlink object"), + _ ("End index"), + _ ("The end index of the AtkHyperlink object"), 0, G_MAXINT, 0, @@ -147,8 +149,8 @@ atk_hyperlink_class_init (AtkHyperlinkClass *klass) g_object_class_install_property (gobject_class, PROP_START_INDEX, g_param_spec_int ("start-index", - _("Start index"), - _("The start index of the AtkHyperlink object"), + _ ("Start index"), + _ ("The start index of the AtkHyperlink object"), 0, G_MAXINT, 0, @@ -161,30 +163,29 @@ atk_hyperlink_class_init (AtkHyperlinkClass *klass) * The signal link-activated is emitted when a link is activated. */ atk_hyperlink_signals[LINK_ACTIVATED] = - g_signal_new ("link_activated", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (AtkHyperlinkClass, link_activated), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, - 0); - + g_signal_new ("link_activated", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (AtkHyperlinkClass, link_activated), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, + 0); } static void -atk_hyperlink_init (AtkHyperlink *link, - AtkHyperlinkClass *klass) +atk_hyperlink_init (AtkHyperlink *link, + AtkHyperlinkClass *klass) { } static void -atk_hyperlink_real_get_property (GObject *object, - guint prop_id, - GValue *value, +atk_hyperlink_real_get_property (GObject *object, + guint prop_id, + GValue *value, GParamSpec *pspec) { - AtkHyperlink* link; + AtkHyperlink *link; link = ATK_HYPERLINK (object); @@ -195,7 +196,7 @@ atk_hyperlink_real_get_property (GObject *object, g_value_set_boolean (value, FALSE); break; case PROP_NUMBER_ANCHORS: - g_value_set_int (value, atk_hyperlink_get_n_anchors (link)); + g_value_set_int (value, atk_hyperlink_get_n_anchors (link)); break; case PROP_END_INDEX: g_value_set_int (value, atk_hyperlink_get_end_index (link)); @@ -213,16 +214,16 @@ atk_hyperlink_real_get_property (GObject *object, * @link_: an #AtkHyperlink * @i: a (zero-index) integer specifying the desired anchor * - * Get a the URI associated with the anchor specified - * by @i of @link_. + * Get a the URI associated with the anchor specified + * by @i of @link_. * * Multiple anchors are primarily used by client-side image maps. * - * Returns: a string specifying the URI + * Returns: a string specifying the URI **/ -gchar* +gchar * atk_hyperlink_get_uri (AtkHyperlink *link, - gint i) + gint i) { AtkHyperlinkClass *klass; @@ -243,16 +244,16 @@ atk_hyperlink_get_uri (AtkHyperlink *link, * Returns the item associated with this hyperlinks nth anchor. * For instance, the returned #AtkObject will implement #AtkText * if @link_ is a text hyperlink, #AtkImage if @link_ is an image - * hyperlink etc. - * + * hyperlink etc. + * * Multiple anchors are primarily used by client-side image maps. * * Returns: (transfer none): an #AtkObject associated with this hyperlinks * i-th anchor **/ -AtkObject* +AtkObject * atk_hyperlink_get_object (AtkHyperlink *link, - gint i) + gint i) { AtkHyperlinkClass *klass; @@ -408,12 +409,13 @@ atk_hyperlink_is_selected_link (AtkHyperlink *link) return FALSE; } -static void atk_hyperlink_action_iface_init (AtkActionIface *iface) +static void +atk_hyperlink_action_iface_init (AtkActionIface *iface) { /* * We do nothing here * * When we come to derive a class from AtkHyperlink we will provide an - * implementation of the AtkAction interface. + * implementation of the AtkAction interface. */ } diff --git a/atk/atkhyperlink.h b/atk/atkhyperlink.h index 915118cc..f19de29c 100644 --- a/atk/atkhyperlink.h +++ b/atk/atkhyperlink.h @@ -20,7 +20,7 @@ #ifndef __ATK_HYPERLINK_H__ #define __ATK_HYPERLINK_H__ -#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) +#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined(__ATK_H_INSIDE__) && !defined(ATK_COMPILATION) #error "Only <atk/atk.h> can be included directly." #endif @@ -39,21 +39,21 @@ G_BEGIN_DECLS *@ATK_HYPERLINK_IS_INLINE: Link is inline * *Describes the type of link - **/ -typedef enum + **/ +typedef enum { ATK_HYPERLINK_IS_INLINE = 1 << 0 } AtkHyperlinkStateFlags; -#define ATK_TYPE_HYPERLINK (atk_hyperlink_get_type ()) -#define ATK_HYPERLINK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_HYPERLINK, AtkHyperlink)) -#define ATK_HYPERLINK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ATK_TYPE_HYPERLINK, AtkHyperlinkClass)) -#define ATK_IS_HYPERLINK(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_HYPERLINK)) -#define ATK_IS_HYPERLINK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ATK_TYPE_HYPERLINK)) -#define ATK_HYPERLINK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ATK_TYPE_HYPERLINK, AtkHyperlinkClass)) +#define ATK_TYPE_HYPERLINK (atk_hyperlink_get_type ()) +#define ATK_HYPERLINK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_HYPERLINK, AtkHyperlink)) +#define ATK_HYPERLINK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ATK_TYPE_HYPERLINK, AtkHyperlinkClass)) +#define ATK_IS_HYPERLINK(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_HYPERLINK)) +#define ATK_IS_HYPERLINK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ATK_TYPE_HYPERLINK)) +#define ATK_HYPERLINK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ATK_TYPE_HYPERLINK, AtkHyperlinkClass)) -typedef struct _AtkHyperlink AtkHyperlink; -typedef struct _AtkHyperlinkClass AtkHyperlinkClass; +typedef struct _AtkHyperlink AtkHyperlink; +typedef struct _AtkHyperlinkClass AtkHyperlinkClass; struct _AtkHyperlink { @@ -64,50 +64,50 @@ struct _AtkHyperlinkClass { GObjectClass parent; - gchar* (* get_uri) (AtkHyperlink *link_, - gint i); - AtkObject* (* get_object) (AtkHyperlink *link_, - gint i); - gint (* get_end_index) (AtkHyperlink *link_); - gint (* get_start_index) (AtkHyperlink *link_); - gboolean (* is_valid) (AtkHyperlink *link_); - gint (* get_n_anchors) (AtkHyperlink *link_); - guint (* link_state) (AtkHyperlink *link_); - gboolean (* is_selected_link) (AtkHyperlink *link_); + gchar *(*get_uri) (AtkHyperlink *link_, + gint i); + AtkObject *(*get_object) (AtkHyperlink *link_, + gint i); + gint (*get_end_index) (AtkHyperlink *link_); + gint (*get_start_index) (AtkHyperlink *link_); + gboolean (*is_valid) (AtkHyperlink *link_); + gint (*get_n_anchors) (AtkHyperlink *link_); + guint (*link_state) (AtkHyperlink *link_); + gboolean (*is_selected_link) (AtkHyperlink *link_); /* Signals */ - void ( *link_activated) (AtkHyperlink *link_); - AtkFunction pad1; + void (*link_activated) (AtkHyperlink *link_); + AtkFunction pad1; }; ATK_AVAILABLE_IN_ALL -GType atk_hyperlink_get_type (void); +GType atk_hyperlink_get_type (void); ATK_AVAILABLE_IN_ALL -gchar* atk_hyperlink_get_uri (AtkHyperlink *link_, - gint i); +gchar *atk_hyperlink_get_uri (AtkHyperlink *link_, + gint i); ATK_AVAILABLE_IN_ALL -AtkObject* atk_hyperlink_get_object (AtkHyperlink *link_, - gint i); +AtkObject *atk_hyperlink_get_object (AtkHyperlink *link_, + gint i); ATK_AVAILABLE_IN_ALL -gint atk_hyperlink_get_end_index (AtkHyperlink *link_); +gint atk_hyperlink_get_end_index (AtkHyperlink *link_); ATK_AVAILABLE_IN_ALL -gint atk_hyperlink_get_start_index (AtkHyperlink *link_); +gint atk_hyperlink_get_start_index (AtkHyperlink *link_); ATK_AVAILABLE_IN_ALL -gboolean atk_hyperlink_is_valid (AtkHyperlink *link_); +gboolean atk_hyperlink_is_valid (AtkHyperlink *link_); ATK_AVAILABLE_IN_ALL -gboolean atk_hyperlink_is_inline (AtkHyperlink *link_); +gboolean atk_hyperlink_is_inline (AtkHyperlink *link_); ATK_AVAILABLE_IN_ALL -gint atk_hyperlink_get_n_anchors (AtkHyperlink *link_); +gint atk_hyperlink_get_n_anchors (AtkHyperlink *link_); ATK_DEPRECATED -gboolean atk_hyperlink_is_selected_link (AtkHyperlink *link_); +gboolean atk_hyperlink_is_selected_link (AtkHyperlink *link_); G_END_DECLS diff --git a/atk/atkhyperlinkimpl.c b/atk/atkhyperlinkimpl.c index 0814fa61..e4ec413a 100644 --- a/atk/atkhyperlinkimpl.c +++ b/atk/atkhyperlinkimpl.c @@ -19,8 +19,8 @@ #include "config.h" -#include <string.h> #include "atkhyperlinkimpl.h" +#include <string.h> /** * AtkHyperlinImpl: @@ -63,17 +63,17 @@ atk_hyperlink_impl_get_type (void) { static GType type = 0; - if (!type) { - GTypeInfo tinfo = + if (!type) { - sizeof (AtkHyperlinkImplIface), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, + GTypeInfo tinfo = { + sizeof (AtkHyperlinkImplIface), + (GBaseInitFunc) NULL, + (GBaseFinalizeFunc) NULL, - }; + }; - type = g_type_register_static (G_TYPE_INTERFACE, "AtkHyperlinkImpl", &tinfo, 0); - } + type = g_type_register_static (G_TYPE_INTERFACE, "AtkHyperlinkImpl", &tinfo, 0); + } return type; } @@ -105,4 +105,3 @@ atk_hyperlink_impl_get_hyperlink (AtkHyperlinkImpl *impl) } return NULL; } - diff --git a/atk/atkhyperlinkimpl.h b/atk/atkhyperlinkimpl.h index 3b78fccb..8b95bc82 100644 --- a/atk/atkhyperlinkimpl.h +++ b/atk/atkhyperlinkimpl.h @@ -20,19 +20,19 @@ #ifndef __ATK_HYPERLINK_IMPL_H__ #define __ATK_HYPERLINK_IMPL_H__ -#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) +#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined(__ATK_H_INSIDE__) && !defined(ATK_COMPILATION) #error "Only <atk/atk.h> can be included directly." #endif -#include <atk/atkobject.h> #include <atk/atkhyperlink.h> +#include <atk/atkobject.h> G_BEGIN_DECLS -#define ATK_TYPE_HYPERLINK_IMPL (atk_hyperlink_impl_get_type ()) -#define ATK_IS_HYPERLINK_IMPL(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_HYPERLINK_IMPL) -#define ATK_HYPERLINK_IMPL(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_HYPERLINK_IMPL, AtkHyperlinkImpl) -#define ATK_HYPERLINK_IMPL_GET_IFACE(obj) G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_HYPERLINK_IMPL, AtkHyperlinkImplIface) +#define ATK_TYPE_HYPERLINK_IMPL (atk_hyperlink_impl_get_type ()) +#define ATK_IS_HYPERLINK_IMPL(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_HYPERLINK_IMPL) +#define ATK_HYPERLINK_IMPL(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_HYPERLINK_IMPL, AtkHyperlinkImpl) +#define ATK_HYPERLINK_IMPL_GET_IFACE(obj) G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_HYPERLINK_IMPL, AtkHyperlinkImplIface) #ifndef _TYPEDEF_ATK_HYPERLINK_IMPL_ #define _TYPEDEF_ATK_HYPERLINK_IMPL__ @@ -53,15 +53,15 @@ typedef struct _AtkHyperlinkImplIface AtkHyperlinkImplIface; struct _AtkHyperlinkImplIface { GTypeInterface parent; - - AtkHyperlink* (* get_hyperlink) (AtkHyperlinkImpl *impl); + + AtkHyperlink *(*get_hyperlink) (AtkHyperlinkImpl *impl); }; ATK_AVAILABLE_IN_ALL -GType atk_hyperlink_impl_get_type (void); +GType atk_hyperlink_impl_get_type (void); ATK_AVAILABLE_IN_ALL -AtkHyperlink *atk_hyperlink_impl_get_hyperlink (AtkHyperlinkImpl *impl); +AtkHyperlink *atk_hyperlink_impl_get_hyperlink (AtkHyperlinkImpl *impl); G_END_DECLS diff --git a/atk/atkhypertext.c b/atk/atkhypertext.c index 6a664db4..010a2a82 100644 --- a/atk/atkhypertext.c +++ b/atk/atkhypertext.c @@ -36,7 +36,8 @@ * as well, and Hyperlinks need not have non-zero text offsets. */ -enum { +enum +{ LINK_SELECTED, LAST_SIGNAL }; @@ -45,23 +46,22 @@ static void atk_hypertext_base_init (AtkHypertextIface *class); static guint atk_hypertext_signals[LAST_SIGNAL] = { 0 }; - GType atk_hypertext_get_type (void) { static GType type = 0; - if (!type) { - static const GTypeInfo tinfo = + if (!type) { - sizeof (AtkHypertextIface), - (GBaseInitFunc) atk_hypertext_base_init, - (GBaseFinalizeFunc) NULL, + static const GTypeInfo tinfo = { + sizeof (AtkHypertextIface), + (GBaseInitFunc) atk_hypertext_base_init, + (GBaseFinalizeFunc) NULL, - }; + }; - type = g_type_register_static (G_TYPE_INTERFACE, "AtkHypertext", &tinfo, 0); - } + type = g_type_register_static (G_TYPE_INTERFACE, "AtkHypertext", &tinfo, 0); + } return type; } @@ -83,14 +83,14 @@ atk_hypertext_base_init (AtkHypertextIface *class) * is selected. */ atk_hypertext_signals[LINK_SELECTED] = - g_signal_new ("link_selected", - ATK_TYPE_HYPERTEXT, - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (AtkHypertextIface, link_selected), - (GSignalAccumulator) NULL, NULL, - g_cclosure_marshal_VOID__INT, - G_TYPE_NONE, - 1, G_TYPE_INT); + g_signal_new ("link_selected", + ATK_TYPE_HYPERTEXT, + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (AtkHypertextIface, link_selected), + (GSignalAccumulator) NULL, NULL, + g_cclosure_marshal_VOID__INT, + G_TYPE_NONE, + 1, G_TYPE_INT); initialized = TRUE; } @@ -101,15 +101,15 @@ atk_hypertext_base_init (AtkHypertextIface *class) * @hypertext: an #AtkHypertext * @link_index: an integer specifying the desired link * - * Gets the link in this hypertext document at index + * Gets the link in this hypertext document at index * @link_index * * Returns: (transfer none): the link in this hypertext document at * index @link_index **/ -AtkHyperlink* -atk_hypertext_get_link (AtkHypertext *hypertext, - gint link_index) +AtkHyperlink * +atk_hypertext_get_link (AtkHypertext *hypertext, + gint link_index) { AtkHypertextIface *iface; @@ -134,8 +134,8 @@ atk_hypertext_get_link (AtkHypertext *hypertext, * * Returns: the number of links within this hypertext document **/ -gint -atk_hypertext_get_n_links (AtkHypertext *hypertext) +gint +atk_hypertext_get_n_links (AtkHypertext *hypertext) { AtkHypertextIface *iface; @@ -160,9 +160,9 @@ atk_hypertext_get_n_links (AtkHypertext *hypertext) * Returns: an index into the array of hyperlinks in @hypertext, * or -1 if there is no hyperlink associated with this character. **/ -gint -atk_hypertext_get_link_index (AtkHypertext *hypertext, - gint char_index) +gint +atk_hypertext_get_link_index (AtkHypertext *hypertext, + gint char_index) { AtkHypertextIface *iface; diff --git a/atk/atkhypertext.h b/atk/atkhypertext.h index 6a1ef9a6..44d0f114 100644 --- a/atk/atkhypertext.h +++ b/atk/atkhypertext.h @@ -20,24 +20,24 @@ #ifndef __ATK_HYPERTEXT_H__ #define __ATK_HYPERTEXT_H__ -#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) +#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined(__ATK_H_INSIDE__) && !defined(ATK_COMPILATION) #error "Only <atk/atk.h> can be included directly." #endif -#include <atk/atkobject.h> #include <atk/atkhyperlink.h> +#include <atk/atkobject.h> G_BEGIN_DECLS /* - * The AtkHypertext interface provides standard mechanisms for manipulating + * The AtkHypertext interface provides standard mechanisms for manipulating * hyperlinks. */ -#define ATK_TYPE_HYPERTEXT (atk_hypertext_get_type ()) -#define ATK_IS_HYPERTEXT(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_HYPERTEXT) -#define ATK_HYPERTEXT(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_HYPERTEXT, AtkHypertext) -#define ATK_HYPERTEXT_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_HYPERTEXT, AtkHypertextIface)) +#define ATK_TYPE_HYPERTEXT (atk_hypertext_get_type ()) +#define ATK_IS_HYPERTEXT(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_HYPERTEXT) +#define ATK_HYPERTEXT(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_HYPERTEXT, AtkHypertext) +#define ATK_HYPERTEXT_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_HYPERTEXT, AtkHypertextIface)) #ifndef _TYPEDEF_ATK_HYPERTEXT_ #define _TYPEDEF_ATK_HYPERTEXT_ @@ -49,29 +49,29 @@ struct _AtkHypertextIface { GTypeInterface parent; - AtkHyperlink*(* get_link) (AtkHypertext *hypertext, - gint link_index); - gint (* get_n_links) (AtkHypertext *hypertext); - gint (* get_link_index) (AtkHypertext *hypertext, - gint char_index); + AtkHyperlink *(*get_link) (AtkHypertext *hypertext, + gint link_index); + gint (*get_n_links) (AtkHypertext *hypertext); + gint (*get_link_index) (AtkHypertext *hypertext, + gint char_index); /* * signal handlers */ - void (* link_selected) (AtkHypertext *hypertext, - gint link_index); + void (*link_selected) (AtkHypertext *hypertext, + gint link_index); }; ATK_AVAILABLE_IN_ALL GType atk_hypertext_get_type (void); ATK_AVAILABLE_IN_ALL -AtkHyperlink* atk_hypertext_get_link (AtkHypertext *hypertext, - gint link_index); +AtkHyperlink *atk_hypertext_get_link (AtkHypertext *hypertext, + gint link_index); ATK_AVAILABLE_IN_ALL -gint atk_hypertext_get_n_links (AtkHypertext *hypertext); +gint atk_hypertext_get_n_links (AtkHypertext *hypertext); ATK_AVAILABLE_IN_ALL -gint atk_hypertext_get_link_index (AtkHypertext *hypertext, - gint char_index); +gint atk_hypertext_get_link_index (AtkHypertext *hypertext, + gint char_index); G_END_DECLS diff --git a/atk/atkimage.c b/atk/atkimage.c index 7ea9d163..baf90f72 100644 --- a/atk/atkimage.c +++ b/atk/atkimage.c @@ -47,16 +47,16 @@ atk_image_get_type (void) { static GType type = 0; - if (!type) { - static const GTypeInfo tinfo = + if (!type) { - sizeof (AtkImageIface), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL - }; + static const GTypeInfo tinfo = { + sizeof (AtkImageIface), + (GBaseInitFunc) NULL, + (GBaseFinalizeFunc) NULL + }; - type = g_type_register_static (G_TYPE_INTERFACE, "AtkImage", &tinfo, 0); - } + type = g_type_register_static (G_TYPE_INTERFACE, "AtkImage", &tinfo, 0); + } return type; } @@ -69,7 +69,7 @@ atk_image_get_type (void) * * Returns: a string representing the image description **/ -const gchar* +const gchar * atk_image_get_image_description (AtkImage *image) { AtkImageIface *iface; @@ -102,9 +102,9 @@ atk_image_get_image_description (AtkImage *image) * to -1. **/ void -atk_image_get_image_size (AtkImage *image, - int *width, - int *height) +atk_image_get_image_size (AtkImage *image, + int *width, + int *height) { AtkImageIface *iface; gint local_width, local_height; @@ -120,18 +120,18 @@ atk_image_get_image_size (AtkImage *image, real_height = height; else real_height = &local_height; - + iface = ATK_IMAGE_GET_IFACE (image); if (iface->get_image_size) - { - iface->get_image_size (image, real_width, real_height); - } + { + iface->get_image_size (image, real_width, real_height); + } else - { - *real_width = -1; - *real_height = -1; - } + { + *real_width = -1; + *real_height = -1; + } } /** @@ -145,8 +145,8 @@ atk_image_get_image_size (AtkImage *image, * not be completed. **/ gboolean -atk_image_set_image_description (AtkImage *image, - const gchar *description) +atk_image_set_image_description (AtkImage *image, + const gchar *description) { AtkImageIface *iface; @@ -171,18 +171,18 @@ atk_image_set_image_description (AtkImage *image, * @y: (out) (optional): address of #gint to put y coordinate position; otherwise, -1 if value cannot be obtained. * @coord_type: specifies whether the coordinates are relative to the screen * or to the components top level window - * + * * Gets the position of the image in the form of a point specifying the * images top-left corner. * * If the position can not be obtained (e.g. missing support), x and y are set * to -1. **/ -void +void atk_image_get_image_position (AtkImage *image, - gint *x, - gint *y, - AtkCoordType coord_type) + gint *x, + gint *y, + AtkCoordType coord_type) { AtkImageIface *iface; gint local_x, local_y; @@ -202,18 +202,18 @@ atk_image_get_image_position (AtkImage *image, iface = ATK_IMAGE_GET_IFACE (image); if (iface->get_image_position) - { - (iface->get_image_position) (image, real_x, real_y, coord_type); - } + { + (iface->get_image_position) (image, real_x, real_y, coord_type); + } else - { - *real_x = -1; - *real_y = -1; - } + { + *real_x = -1; + *real_y = -1; + } } /** - * atk_image_get_image_locale: + * atk_image_get_image_locale: * @image: An #AtkImage * * Retrieves the locale identifier associated to the #AtkImage. @@ -225,10 +225,10 @@ atk_image_get_image_position (AtkImage *image, * %NULL if the image does not specify a locale. * */ -const gchar* -atk_image_get_image_locale (AtkImage *image) +const gchar * +atk_image_get_image_locale (AtkImage *image) { - + AtkImageIface *iface; g_return_val_if_fail (ATK_IS_IMAGE (image), NULL); diff --git a/atk/atkimage.h b/atk/atkimage.h index f4b430c6..bc09e090 100644 --- a/atk/atkimage.h +++ b/atk/atkimage.h @@ -20,7 +20,7 @@ #ifndef __ATK_IMAGE_H__ #define __ATK_IMAGE_H__ -#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) +#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined(__ATK_H_INSIDE__) && !defined(ATK_COMPILATION) #error "Only <atk/atk.h> can be included directly." #endif @@ -30,15 +30,15 @@ G_BEGIN_DECLS /* - * The AtkImage interface should be supported by any object that has an - * associated image. This interface provides the standard mechanism for + * The AtkImage interface should be supported by any object that has an + * associated image. This interface provides the standard mechanism for * an assistive technology to get descriptive information about images. */ -#define ATK_TYPE_IMAGE (atk_image_get_type ()) -#define ATK_IS_IMAGE(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_IMAGE) -#define ATK_IMAGE(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_IMAGE, AtkImage) -#define ATK_IMAGE_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_IMAGE, AtkImageIface)) +#define ATK_TYPE_IMAGE (atk_image_get_type ()) +#define ATK_IS_IMAGE(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_IMAGE) +#define ATK_IMAGE(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_IMAGE, AtkImage) +#define ATK_IMAGE_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_IMAGE, AtkImageIface)) #ifndef _TYPEDEF_ATK_IMAGE_ #define _TYPEDEF_ATK_IMAGE_ @@ -49,41 +49,41 @@ typedef struct _AtkImageIface AtkImageIface; struct _AtkImageIface { GTypeInterface parent; - void ( *get_image_position) (AtkImage *image, - gint *x, - gint *y, - AtkCoordType coord_type); - const gchar* ( *get_image_description) (AtkImage *image); - void ( *get_image_size) (AtkImage *image, - gint *width, - gint *height); - gboolean ( *set_image_description) (AtkImage *image, - const gchar *description); - const gchar* ( *get_image_locale) (AtkImage *image); + void (*get_image_position) (AtkImage *image, + gint *x, + gint *y, + AtkCoordType coord_type); + const gchar *(*get_image_description) (AtkImage *image); + void (*get_image_size) (AtkImage *image, + gint *width, + gint *height); + gboolean (*set_image_description) (AtkImage *image, + const gchar *description); + const gchar *(*get_image_locale) (AtkImage *image); }; ATK_AVAILABLE_IN_ALL -GType atk_image_get_type (void); +GType atk_image_get_type (void); ATK_AVAILABLE_IN_ALL -const gchar* atk_image_get_image_description (AtkImage *image); +const gchar *atk_image_get_image_description (AtkImage *image); ATK_AVAILABLE_IN_ALL -void atk_image_get_image_size (AtkImage *image, - gint *width, - gint *height); +void atk_image_get_image_size (AtkImage *image, + gint *width, + gint *height); ATK_AVAILABLE_IN_ALL -gboolean atk_image_set_image_description (AtkImage *image, - const gchar *description); +gboolean atk_image_set_image_description (AtkImage *image, + const gchar *description); ATK_AVAILABLE_IN_ALL -void atk_image_get_image_position (AtkImage *image, - gint *x, - gint *y, - AtkCoordType coord_type); +void atk_image_get_image_position (AtkImage *image, + gint *x, + gint *y, + AtkCoordType coord_type); ATK_AVAILABLE_IN_ALL -const gchar* atk_image_get_image_locale (AtkImage *image); +const gchar *atk_image_get_image_locale (AtkImage *image); G_END_DECLS diff --git a/atk/atkmisc.c b/atk/atkmisc.c index beca3db2..f2f3a3b2 100644 --- a/atk/atkmisc.c +++ b/atk/atkmisc.c @@ -39,8 +39,7 @@ atk_misc_get_type (void) if (!type) { - static const GTypeInfo typeInfo = - { + static const GTypeInfo typeInfo = { sizeof (AtkMiscClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, @@ -50,8 +49,8 @@ atk_misc_get_type (void) sizeof (AtkMisc), 0, (GInstanceInitFunc) NULL, - } ; - type = g_type_register_static (G_TYPE_OBJECT, "AtkMisc", &typeInfo, 0) ; + }; + type = g_type_register_static (G_TYPE_OBJECT, "AtkMisc", &typeInfo, 0); } return type; } @@ -65,10 +64,10 @@ atk_misc_class_init (AtkMiscClass *klass) /** * atk_misc_threads_enter: - * @misc: an AtkMisc instance for this application. + * @misc: an AtkMisc instance for this application. * - * Take the thread mutex for the GUI toolkit, - * if one exists. + * Take the thread mutex for the GUI toolkit, + * if one exists. * (This method is implemented by the toolkit ATK implementation layer; * for instance, for GTK+, GAIL implements this via GDK_THREADS_ENTER). * @@ -95,11 +94,11 @@ atk_misc_threads_enter (AtkMisc *misc) /** * atk_misc_threads_leave: - * @misc: an AtkMisc instance for this application. + * @misc: an AtkMisc instance for this application. * - * Release the thread mutex for the GUI toolkit, - * if one exists. This method, and atk_misc_threads_enter, - * are needed in some situations by threaded application code which + * Release the thread mutex for the GUI toolkit, + * if one exists. This method, and atk_misc_threads_enter, + * are needed in some situations by threaded application code which * services ATK requests, since fulfilling ATK requests often * requires calling into the GUI toolkit. If a long-running or * potentially blocking call takes place inside such a block, it should @@ -134,7 +133,7 @@ AtkMisc *atk_misc_instance = NULL; * atk_misc_get_instance: * * Obtain the singleton instance of AtkMisc for this application. - * + * * Since: 1.13 * * Deprecated: Since 2.12. diff --git a/atk/atkmisc.h b/atk/atkmisc.h index 0707b049..24554397 100644 --- a/atk/atkmisc.h +++ b/atk/atkmisc.h @@ -20,49 +20,48 @@ #ifndef __ATK_MISC_H__ #define __ATK_MISC_H__ -#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) +#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined(__ATK_H_INSIDE__) && !defined(ATK_COMPILATION) #error "Only <atk/atk.h> can be included directly." #endif -#include <glib-object.h> #include <atk/atkversion.h> +#include <glib-object.h> /* We prefix variable declarations so they can * properly get exported in Windows DLLs. */ #ifndef ATK_VAR -# ifdef G_PLATFORM_WIN32 -# ifdef ATK_STATIC_COMPILATION -# define ATK_VAR extern -# else /* !ATK_STATIC_COMPILATION */ -# ifdef ATK_COMPILATION -# ifdef DLL_EXPORT -# define ATK_VAR _ATK_EXTERN -# else /* !DLL_EXPORT */ -# define ATK_VAR extern -# endif /* !DLL_EXPORT */ -# else /* !ATK_COMPILATION */ -# define ATK_VAR extern __declspec(dllimport) -# endif /* !ATK_COMPILATION */ -# endif /* !ATK_STATIC_COMPILATION */ -# else /* !G_PLATFORM_WIN32 */ -# define ATK_VAR _ATK_EXTERN -# endif /* !G_PLATFORM_WIN32 */ +#ifdef G_PLATFORM_WIN32 +#ifdef ATK_STATIC_COMPILATION +#define ATK_VAR extern +#else /* !ATK_STATIC_COMPILATION */ +#ifdef ATK_COMPILATION +#ifdef DLL_EXPORT +#define ATK_VAR _ATK_EXTERN +#else /* !DLL_EXPORT */ +#define ATK_VAR extern +#endif /* !DLL_EXPORT */ +#else /* !ATK_COMPILATION */ +#define ATK_VAR extern __declspec(dllimport) +#endif /* !ATK_COMPILATION */ +#endif /* !ATK_STATIC_COMPILATION */ +#else /* !G_PLATFORM_WIN32 */ +#define ATK_VAR _ATK_EXTERN +#endif /* !G_PLATFORM_WIN32 */ #endif /* ATK_VAR */ G_BEGIN_DECLS -#define ATK_TYPE_MISC (atk_misc_get_type ()) -#define ATK_IS_MISC(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_MISC) -#define ATK_MISC(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_MISC, AtkMisc) -#define ATK_MISC_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ATK_TYPE_MISC, AtkMiscClass)) -#define ATK_IS_MISC_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ATK_TYPE_MISC)) -#define ATK_MISC_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ATK_TYPE_MISC, AtkMiscClass)) - +#define ATK_TYPE_MISC (atk_misc_get_type ()) +#define ATK_IS_MISC(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_MISC) +#define ATK_MISC(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_MISC, AtkMisc) +#define ATK_MISC_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ATK_TYPE_MISC, AtkMiscClass)) +#define ATK_IS_MISC_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ATK_TYPE_MISC)) +#define ATK_MISC_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ATK_TYPE_MISC, AtkMiscClass)) #ifndef _TYPEDEF_ATK_MISC_ #define _TYPEDEF_ATK_MISC_ -typedef struct _AtkMisc AtkMisc; +typedef struct _AtkMisc AtkMisc; typedef struct _AtkMiscClass AtkMiscClass; #endif @@ -91,19 +90,19 @@ ATK_VAR AtkMisc *atk_misc_instance; */ struct _AtkMiscClass { - GObjectClass parent; - void (* threads_enter) (AtkMisc *misc); - void (* threads_leave) (AtkMisc *misc); - gpointer vfuncs[32]; /* future bincompat */ + GObjectClass parent; + void (*threads_enter) (AtkMisc *misc); + void (*threads_leave) (AtkMisc *misc); + gpointer vfuncs[32]; /* future bincompat */ }; ATK_DEPRECATED_IN_2_12 GType atk_misc_get_type (void); ATK_DEPRECATED_IN_2_12 -void atk_misc_threads_enter (AtkMisc *misc); +void atk_misc_threads_enter (AtkMisc *misc); ATK_DEPRECATED_IN_2_12 -void atk_misc_threads_leave (AtkMisc *misc); +void atk_misc_threads_leave (AtkMisc *misc); ATK_DEPRECATED_IN_2_12 const AtkMisc *atk_misc_get_instance (void); diff --git a/atk/atknoopobject.c b/atk/atknoopobject.c index 939bee83..41521732 100644 --- a/atk/atknoopobject.c +++ b/atk/atknoopobject.c @@ -34,144 +34,129 @@ * */ - static void atk_no_op_object_class_init (AtkNoOpObjectClass *klass); static gpointer parent_class = NULL; - GType atk_no_op_object_get_type (void) { static GType type = 0; if (!type) - { - static const GTypeInfo tinfo = - { - sizeof (AtkObjectClass), - (GBaseInitFunc) NULL, /* base init */ - (GBaseFinalizeFunc) NULL, /* base finalize */ - (GClassInitFunc) atk_no_op_object_class_init, /* class init */ - (GClassFinalizeFunc) NULL, /* class finalize */ - NULL, /* class data */ - sizeof (AtkNoOpObject), /* instance size */ - 0, /* nb preallocs */ - (GInstanceInitFunc) NULL, /* instance init */ - NULL /* value table */ - }; - - static const GInterfaceInfo atk_component_info = { + static const GTypeInfo tinfo = { + sizeof (AtkObjectClass), + (GBaseInitFunc) NULL, /* base init */ + (GBaseFinalizeFunc) NULL, /* base finalize */ + (GClassInitFunc) atk_no_op_object_class_init, /* class init */ + (GClassFinalizeFunc) NULL, /* class finalize */ + NULL, /* class data */ + sizeof (AtkNoOpObject), /* instance size */ + 0, /* nb preallocs */ + (GInstanceInitFunc) NULL, /* instance init */ + NULL /* value table */ + }; + + static const GInterfaceInfo atk_component_info = { (GInterfaceInitFunc) NULL, (GInterfaceFinalizeFunc) NULL, NULL - }; + }; - static const GInterfaceInfo atk_action_info = - { + static const GInterfaceInfo atk_action_info = { (GInterfaceInitFunc) NULL, (GInterfaceFinalizeFunc) NULL, NULL - }; + }; - static const GInterfaceInfo atk_editable_text_info = - { + static const GInterfaceInfo atk_editable_text_info = { (GInterfaceInitFunc) NULL, (GInterfaceFinalizeFunc) NULL, NULL - }; + }; - static const GInterfaceInfo atk_image_info = - { + static const GInterfaceInfo atk_image_info = { (GInterfaceInitFunc) NULL, (GInterfaceFinalizeFunc) NULL, NULL - }; + }; - static const GInterfaceInfo atk_selection_info = - { + static const GInterfaceInfo atk_selection_info = { (GInterfaceInitFunc) NULL, (GInterfaceFinalizeFunc) NULL, NULL - }; + }; - static const GInterfaceInfo atk_table_info = - { + static const GInterfaceInfo atk_table_info = { (GInterfaceInitFunc) NULL, (GInterfaceFinalizeFunc) NULL, NULL - }; + }; - static const GInterfaceInfo atk_table_cell_info = - { + static const GInterfaceInfo atk_table_cell_info = { (GInterfaceInitFunc) NULL, (GInterfaceFinalizeFunc) NULL, NULL - }; + }; - static const GInterfaceInfo atk_text_info = - { + static const GInterfaceInfo atk_text_info = { (GInterfaceInitFunc) NULL, (GInterfaceFinalizeFunc) NULL, NULL - }; + }; - static const GInterfaceInfo atk_hypertext_info = - { + static const GInterfaceInfo atk_hypertext_info = { (GInterfaceInitFunc) NULL, (GInterfaceFinalizeFunc) NULL, NULL - }; + }; - static const GInterfaceInfo atk_value_info = - { + static const GInterfaceInfo atk_value_info = { (GInterfaceInitFunc) NULL, (GInterfaceFinalizeFunc) NULL, NULL - }; + }; - static const GInterfaceInfo atk_document_info = - { + static const GInterfaceInfo atk_document_info = { (GInterfaceInitFunc) NULL, (GInterfaceFinalizeFunc) NULL, NULL - }; + }; - static const GInterfaceInfo atk_window_info = - { + static const GInterfaceInfo atk_window_info = { (GInterfaceInitFunc) NULL, (GInterfaceFinalizeFunc) NULL, NULL - }; - - type = g_type_register_static (ATK_TYPE_OBJECT, - "AtkNoOpObject", &tinfo, 0); - g_type_add_interface_static (type, ATK_TYPE_COMPONENT, - &atk_component_info); - g_type_add_interface_static (type, ATK_TYPE_ACTION, - &atk_action_info); - g_type_add_interface_static (type, ATK_TYPE_EDITABLE_TEXT, - &atk_editable_text_info); - g_type_add_interface_static (type, ATK_TYPE_IMAGE, - &atk_image_info); - g_type_add_interface_static (type, ATK_TYPE_SELECTION, - &atk_selection_info); - g_type_add_interface_static (type, ATK_TYPE_TABLE, - &atk_table_info); - g_type_add_interface_static (type, ATK_TYPE_TABLE_CELL, - &atk_table_cell_info); - g_type_add_interface_static (type, ATK_TYPE_TEXT, - &atk_text_info); - g_type_add_interface_static (type, ATK_TYPE_HYPERTEXT, - &atk_hypertext_info); - g_type_add_interface_static (type, ATK_TYPE_VALUE, - &atk_value_info); - g_type_add_interface_static (type, ATK_TYPE_DOCUMENT, - &atk_document_info); - g_type_add_interface_static (type, ATK_TYPE_WINDOW, - &atk_window_info); - } + }; + + type = g_type_register_static (ATK_TYPE_OBJECT, + "AtkNoOpObject", &tinfo, 0); + g_type_add_interface_static (type, ATK_TYPE_COMPONENT, + &atk_component_info); + g_type_add_interface_static (type, ATK_TYPE_ACTION, + &atk_action_info); + g_type_add_interface_static (type, ATK_TYPE_EDITABLE_TEXT, + &atk_editable_text_info); + g_type_add_interface_static (type, ATK_TYPE_IMAGE, + &atk_image_info); + g_type_add_interface_static (type, ATK_TYPE_SELECTION, + &atk_selection_info); + g_type_add_interface_static (type, ATK_TYPE_TABLE, + &atk_table_info); + g_type_add_interface_static (type, ATK_TYPE_TABLE_CELL, + &atk_table_cell_info); + g_type_add_interface_static (type, ATK_TYPE_TEXT, + &atk_text_info); + g_type_add_interface_static (type, ATK_TYPE_HYPERTEXT, + &atk_hypertext_info); + g_type_add_interface_static (type, ATK_TYPE_VALUE, + &atk_value_info); + g_type_add_interface_static (type, ATK_TYPE_DOCUMENT, + &atk_document_info); + g_type_add_interface_static (type, ATK_TYPE_WINDOW, + &atk_window_info); + } return type; } @@ -186,11 +171,11 @@ atk_no_op_object_class_init (AtkNoOpObjectClass *klass) * @obj: a #GObject * * Provides a default (non-functioning stub) #AtkObject. - * Application maintainers should not use this method. + * Application maintainers should not use this method. * * Returns: a default (non-functioning stub) #AtkObject **/ -AtkObject* +AtkObject * atk_no_op_object_new (GObject *obj) { AtkObject *accessible; @@ -205,4 +190,3 @@ atk_no_op_object_new (GObject *obj) return accessible; } - diff --git a/atk/atknoopobject.h b/atk/atknoopobject.h index 9c02a19c..3ccac0d5 100644 --- a/atk/atknoopobject.h +++ b/atk/atknoopobject.h @@ -17,7 +17,7 @@ * Boston, MA 02111-1307, USA. */ -#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) +#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined(__ATK_H_INSIDE__) && !defined(ATK_COMPILATION) #error "Only <atk/atk.h> can be included directly." #endif @@ -28,19 +28,19 @@ G_BEGIN_DECLS -#define ATK_TYPE_NO_OP_OBJECT (atk_no_op_object_get_type ()) -#define ATK_NO_OP_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_NO_OP_OBJECT, AtkNoOpObject)) -#define ATK_NO_OP_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ATK_TYPE_NO_OP_OBJECT, AtkNoOpObjectClass)) -#define ATK_IS_NO_OP_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_NO_OP_OBJECT)) -#define ATK_IS_NO_OP_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ATK_TYPE_NO_OP_OBJECT)) -#define ATK_NO_OP_OBJECT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ATK_TYPE_NO_OP_OBJECT, AtkNoOpObjectClass)) +#define ATK_TYPE_NO_OP_OBJECT (atk_no_op_object_get_type ()) +#define ATK_NO_OP_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_NO_OP_OBJECT, AtkNoOpObject)) +#define ATK_NO_OP_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ATK_TYPE_NO_OP_OBJECT, AtkNoOpObjectClass)) +#define ATK_IS_NO_OP_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_NO_OP_OBJECT)) +#define ATK_IS_NO_OP_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ATK_TYPE_NO_OP_OBJECT)) +#define ATK_NO_OP_OBJECT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ATK_TYPE_NO_OP_OBJECT, AtkNoOpObjectClass)) -typedef struct _AtkNoOpObject AtkNoOpObject; -typedef struct _AtkNoOpObjectClass AtkNoOpObjectClass; +typedef struct _AtkNoOpObject AtkNoOpObject; +typedef struct _AtkNoOpObjectClass AtkNoOpObjectClass; struct _AtkNoOpObject { - AtkObject parent; + AtkObject parent; }; ATK_AVAILABLE_IN_ALL @@ -52,7 +52,7 @@ struct _AtkNoOpObjectClass }; ATK_AVAILABLE_IN_ALL -AtkObject *atk_no_op_object_new (GObject *obj); +AtkObject *atk_no_op_object_new (GObject *obj); G_END_DECLS diff --git a/atk/atknoopobjectfactory.c b/atk/atknoopobjectfactory.c index 3026cac4..b7c10e02 100644 --- a/atk/atknoopobjectfactory.c +++ b/atk/atknoopobjectfactory.c @@ -20,6 +20,7 @@ #include "config.h" #include "atkobject.h" + #include "atknoopobject.h" #include "atknoopobjectfactory.h" @@ -33,43 +34,42 @@ * specified to create an accessible object of a particular type. */ static void atk_no_op_object_factory_class_init ( - AtkNoOpObjectFactoryClass *klass); + AtkNoOpObjectFactoryClass *klass); -static AtkObject* atk_no_op_object_factory_create_accessible ( - GObject *obj); -static GType atk_no_op_object_factory_get_accessible_type (void); +static AtkObject *atk_no_op_object_factory_create_accessible ( + GObject *obj); +static GType atk_no_op_object_factory_get_accessible_type (void); -static gpointer parent_class = NULL; +static gpointer parent_class = NULL; GType atk_no_op_object_factory_get_type (void) { static GType type = 0; - if (!type) - { - static const GTypeInfo tinfo = + if (!type) { - sizeof (AtkNoOpObjectFactoryClass), - (GBaseInitFunc) NULL, /* base init */ - (GBaseFinalizeFunc) NULL, /* base finalize */ - (GClassInitFunc) atk_no_op_object_factory_class_init, /* class init */ - (GClassFinalizeFunc) NULL, /* class finalize */ - NULL, /* class data */ - sizeof (AtkNoOpObjectFactory), /* instance size */ - 0, /* nb preallocs */ - (GInstanceInitFunc) NULL, /* instance init */ - NULL /* value table */ - }; - type = g_type_register_static ( - ATK_TYPE_OBJECT_FACTORY, - "AtkNoOpObjectFactory" , &tinfo, 0); - } + static const GTypeInfo tinfo = { + sizeof (AtkNoOpObjectFactoryClass), + (GBaseInitFunc) NULL, /* base init */ + (GBaseFinalizeFunc) NULL, /* base finalize */ + (GClassInitFunc) atk_no_op_object_factory_class_init, /* class init */ + (GClassFinalizeFunc) NULL, /* class finalize */ + NULL, /* class data */ + sizeof (AtkNoOpObjectFactory), /* instance size */ + 0, /* nb preallocs */ + (GInstanceInitFunc) NULL, /* instance init */ + NULL /* value table */ + }; + type = g_type_register_static ( + ATK_TYPE_OBJECT_FACTORY, + "AtkNoOpObjectFactory", &tinfo, 0); + } return type; } -static void +static void atk_no_op_object_factory_class_init (AtkNoOpObjectFactoryClass *klass) { AtkObjectFactoryClass *class = ATK_OBJECT_FACTORY_CLASS (klass); @@ -84,11 +84,11 @@ atk_no_op_object_factory_class_init (AtkNoOpObjectFactoryClass *klass) * atk_no_op_object_factory_new: * * Creates an instance of an #AtkObjectFactory which generates primitive - * (non-functioning) #AtkObjects. + * (non-functioning) #AtkObjects. * * Returns: an instance of an #AtkObjectFactory **/ -AtkObjectFactory* +AtkObjectFactory * atk_no_op_object_factory_new (void) { GObject *factory; @@ -97,12 +97,12 @@ atk_no_op_object_factory_new (void) g_return_val_if_fail (factory != NULL, NULL); return ATK_OBJECT_FACTORY (factory); -} +} -static AtkObject* -atk_no_op_object_factory_create_accessible (GObject *obj) +static AtkObject * +atk_no_op_object_factory_create_accessible (GObject *obj) { - AtkObject *accessible; + AtkObject *accessible; accessible = atk_no_op_object_new (obj); diff --git a/atk/atknoopobjectfactory.h b/atk/atknoopobjectfactory.h index 2cd69f41..f2da3420 100644 --- a/atk/atknoopobjectfactory.h +++ b/atk/atknoopobjectfactory.h @@ -20,7 +20,7 @@ #ifndef __ATK_NO_OP_OBJECT_FACTORY_H__ #define __ATK_NO_OP_OBJECT_FACTORY_H__ -#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) +#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined(__ATK_H_INSIDE__) && !defined(ATK_COMPILATION) #error "Only <atk/atk.h> can be included directly." #endif @@ -28,15 +28,15 @@ G_BEGIN_DECLS -#define ATK_TYPE_NO_OP_OBJECT_FACTORY (atk_no_op_object_factory_get_type ()) -#define ATK_NO_OP_OBJECT_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_NO_OP_OBJECT_FACTORY, AtkNoOpObjectFactory)) -#define ATK_NO_OP_OBJECT_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ATK_TYPE_NO_OP_OBJECT_FACTORY, AtkNoOpObjectFactoryClass)) -#define ATK_IS_NO_OP_OBJECT_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_NO_OP_OBJECT_FACTORY)) -#define ATK_IS_NO_OP_OBJECT_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ATK_TYPE_NO_OP_OBJECT_FACTORY)) -#define ATK_NO_OP_OBJECT_FACTORY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ( (obj), ATK_TYPE_NO_OP_OBJECT_FACTORY, AtkNoOpObjectFactoryClass)) +#define ATK_TYPE_NO_OP_OBJECT_FACTORY (atk_no_op_object_factory_get_type ()) +#define ATK_NO_OP_OBJECT_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_NO_OP_OBJECT_FACTORY, AtkNoOpObjectFactory)) +#define ATK_NO_OP_OBJECT_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ATK_TYPE_NO_OP_OBJECT_FACTORY, AtkNoOpObjectFactoryClass)) +#define ATK_IS_NO_OP_OBJECT_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_NO_OP_OBJECT_FACTORY)) +#define ATK_IS_NO_OP_OBJECT_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ATK_TYPE_NO_OP_OBJECT_FACTORY)) +#define ATK_NO_OP_OBJECT_FACTORY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ATK_TYPE_NO_OP_OBJECT_FACTORY, AtkNoOpObjectFactoryClass)) -typedef struct _AtkNoOpObjectFactory AtkNoOpObjectFactory; -typedef struct _AtkNoOpObjectFactoryClass AtkNoOpObjectFactoryClass; +typedef struct _AtkNoOpObjectFactory AtkNoOpObjectFactory; +typedef struct _AtkNoOpObjectFactoryClass AtkNoOpObjectFactoryClass; struct _AtkNoOpObjectFactory { @@ -49,10 +49,10 @@ struct _AtkNoOpObjectFactoryClass }; ATK_AVAILABLE_IN_ALL -GType atk_no_op_object_factory_get_type(void); +GType atk_no_op_object_factory_get_type (void); ATK_AVAILABLE_IN_ALL -AtkObjectFactory *atk_no_op_object_factory_new(void); +AtkObjectFactory *atk_no_op_object_factory_new (void); G_END_DECLS diff --git a/atk/atkobject.c b/atk/atkobject.c index fb96b730..8d75d53d 100644 --- a/atk/atkobject.c +++ b/atk/atkobject.c @@ -19,8 +19,8 @@ #include "config.h" -#include <string.h> #include <locale.h> +#include <string.h> #include <glib-object.h> #include <glib/gi18n-lib.h> @@ -61,11 +61,11 @@ static GPtrArray *role_names = NULL; enum { - PROP_0, /* gobject convention */ + PROP_0, /* gobject convention */ PROP_NAME, PROP_DESCRIPTION, - PROP_PARENT, /* ancestry has changed */ + PROP_PARENT, /* ancestry has changed */ PROP_VALUE, PROP_ROLE, PROP_LAYER, @@ -79,10 +79,11 @@ enum PROP_TABLE_CAPTION_OBJECT, PROP_HYPERTEXT_NUM_LINKS, PROP_ACCESSIBLE_ID, - PROP_LAST /* gobject convention */ + PROP_LAST /* gobject convention */ }; -enum { +enum +{ CHILDREN_CHANGED, FOCUS_EVENT, PROPERTY_CHANGE, @@ -90,7 +91,7 @@ enum { VISIBLE_DATA_CHANGED, ACTIVE_DESCENDANT_CHANGED, ANNOUNCEMENT, - + LAST_SIGNAL }; @@ -217,69 +218,67 @@ enum { N_("description value") #endif /* 0 */ -typedef struct { +typedef struct +{ gchar *accessible_id; } AtkObjectPrivate; static gint AtkObject_private_offset; -static void atk_object_class_init (AtkObjectClass *klass); -static void atk_object_init (AtkObject *accessible, - AtkObjectClass *klass); -static AtkRelationSet* atk_object_real_ref_relation_set - (AtkObject *accessible); -static void atk_object_real_initialize (AtkObject *accessible, - gpointer data); -static void atk_object_real_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec); -static void atk_object_real_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec); -static void atk_object_finalize (GObject *object); -static const gchar* atk_object_real_get_name (AtkObject *object); -static const gchar* atk_object_real_get_description - (AtkObject *object); -static AtkObject* atk_object_real_get_parent (AtkObject *object); -static AtkRole atk_object_real_get_role (AtkObject *object); -static AtkLayer atk_object_real_get_layer (AtkObject *object); -static AtkStateSet* atk_object_real_ref_state_set - (AtkObject *object); -static void atk_object_real_set_name (AtkObject *object, - const gchar *name); -static void atk_object_real_set_description - (AtkObject *object, - const gchar *description); -static void atk_object_real_set_parent (AtkObject *object, - AtkObject *parent); -static void atk_object_real_set_role (AtkObject *object, - AtkRole role); -static void atk_object_notify (GObject *obj, - GParamSpec *pspec); -static const gchar* atk_object_real_get_object_locale - (AtkObject *object); - -static guint atk_object_signals[LAST_SIGNAL] = { 0, }; +static void atk_object_class_init (AtkObjectClass *klass); +static void atk_object_init (AtkObject *accessible, + AtkObjectClass *klass); +static AtkRelationSet *atk_object_real_ref_relation_set (AtkObject *accessible); +static void atk_object_real_initialize (AtkObject *accessible, + gpointer data); +static void atk_object_real_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec); +static void atk_object_real_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec); +static void atk_object_finalize (GObject *object); +static const gchar *atk_object_real_get_name (AtkObject *object); +static const gchar *atk_object_real_get_description (AtkObject *object); +static AtkObject *atk_object_real_get_parent (AtkObject *object); +static AtkRole atk_object_real_get_role (AtkObject *object); +static AtkLayer atk_object_real_get_layer (AtkObject *object); +static AtkStateSet *atk_object_real_ref_state_set (AtkObject *object); +static void atk_object_real_set_name (AtkObject *object, + const gchar *name); +static void atk_object_real_set_description (AtkObject *object, + const gchar *description); +static void atk_object_real_set_parent (AtkObject *object, + AtkObject *parent); +static void atk_object_real_set_role (AtkObject *object, + AtkRole role); +static void atk_object_notify (GObject *obj, + GParamSpec *pspec); +static const gchar *atk_object_real_get_object_locale (AtkObject *object); + +static guint atk_object_signals[LAST_SIGNAL] = { + 0, +}; static gpointer parent_class = NULL; -static const gchar* const atk_object_name_property_name = "accessible-name"; -static const gchar* const atk_object_name_property_description = "accessible-description"; -static const gchar* const atk_object_name_property_parent = "accessible-parent"; -static const gchar* const atk_object_name_property_value = "accessible-value"; -static const gchar* const atk_object_name_property_role = "accessible-role"; -static const gchar* const atk_object_name_property_component_layer = "accessible-component-layer"; -static const gchar* const atk_object_name_property_component_mdi_zorder = "accessible-component-mdi-zorder"; -static const gchar* const atk_object_name_property_table_caption = "accessible-table-caption"; -static const gchar* const atk_object_name_property_table_column_description = "accessible-table-column-description"; -static const gchar* const atk_object_name_property_table_column_header = "accessible-table-column-header"; -static const gchar* const atk_object_name_property_table_row_description = "accessible-table-row-description"; -static const gchar* const atk_object_name_property_table_row_header = "accessible-table-row-header"; -static const gchar* const atk_object_name_property_table_summary = "accessible-table-summary"; -static const gchar* const atk_object_name_property_table_caption_object = "accessible-table-caption-object"; -static const gchar* const atk_object_name_property_hypertext_num_links = "accessible-hypertext-nlinks"; +static const gchar *const atk_object_name_property_name = "accessible-name"; +static const gchar *const atk_object_name_property_description = "accessible-description"; +static const gchar *const atk_object_name_property_parent = "accessible-parent"; +static const gchar *const atk_object_name_property_value = "accessible-value"; +static const gchar *const atk_object_name_property_role = "accessible-role"; +static const gchar *const atk_object_name_property_component_layer = "accessible-component-layer"; +static const gchar *const atk_object_name_property_component_mdi_zorder = "accessible-component-mdi-zorder"; +static const gchar *const atk_object_name_property_table_caption = "accessible-table-caption"; +static const gchar *const atk_object_name_property_table_column_description = "accessible-table-column-description"; +static const gchar *const atk_object_name_property_table_column_header = "accessible-table-column-header"; +static const gchar *const atk_object_name_property_table_row_description = "accessible-table-row-description"; +static const gchar *const atk_object_name_property_table_row_header = "accessible-table-row-header"; +static const gchar *const atk_object_name_property_table_summary = "accessible-table-summary"; +static const gchar *const atk_object_name_property_table_caption_object = "accessible-table-caption-object"; +static const gchar *const atk_object_name_property_hypertext_num_links = "accessible-hypertext-nlinks"; static void initialize_role_names () @@ -294,7 +293,7 @@ initialize_role_names () role_names = g_ptr_array_new (); enum_class = g_type_class_ref (ATK_TYPE_ROLE); - if (!G_IS_ENUM_CLASS(enum_class)) + if (!G_IS_ENUM_CLASS (enum_class)) return; for (i = 0; i < ATK_ROLE_LAST_DEFINED; i++) @@ -307,7 +306,6 @@ initialize_role_names () } g_type_class_unref (enum_class); - } GType @@ -317,8 +315,7 @@ atk_object_get_type (void) if (!type) { - static const GTypeInfo typeInfo = - { + static const GTypeInfo typeInfo = { sizeof (AtkObjectClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, @@ -328,11 +325,11 @@ atk_object_get_type (void) sizeof (AtkObject), 0, (GInstanceInitFunc) atk_object_init, - } ; - type = g_type_register_static (G_TYPE_OBJECT, "AtkObject", &typeInfo, 0) ; + }; + type = g_type_register_static (G_TYPE_OBJECT, "AtkObject", &typeInfo, 0); AtkObject_private_offset = - g_type_add_instance_private (type, sizeof (AtkObjectPrivate)); + g_type_add_instance_private (type, sizeof (AtkObjectPrivate)); } return type; } @@ -390,22 +387,22 @@ atk_object_class_init (AtkObjectClass *klass) g_object_class_install_property (gobject_class, PROP_NAME, g_param_spec_string (atk_object_name_property_name, - _("Accessible Name"), - _("Object instance’s name formatted for assistive technology access"), + _ ("Accessible Name"), + _ ("Object instance’s name formatted for assistive technology access"), NULL, G_PARAM_READWRITE)); g_object_class_install_property (gobject_class, PROP_DESCRIPTION, g_param_spec_string (atk_object_name_property_description, - _("Accessible Description"), - _("Description of an object, formatted for assistive technology access"), + _ ("Accessible Description"), + _ ("Description of an object, formatted for assistive technology access"), NULL, G_PARAM_READWRITE)); g_object_class_install_property (gobject_class, PROP_PARENT, g_param_spec_object (atk_object_name_property_parent, - _("Accessible Parent"), - _("Parent of the current accessible as returned by atk_object_get_parent()"), + _ ("Accessible Parent"), + _ ("Parent of the current accessible as returned by atk_object_get_parent()"), ATK_TYPE_OBJECT, G_PARAM_READWRITE)); @@ -421,38 +418,38 @@ atk_object_class_init (AtkObjectClass *klass) g_object_class_install_property (gobject_class, PROP_VALUE, g_param_spec_double (atk_object_name_property_value, - _("Accessible Value"), - _("Is used to notify that the value has changed"), + _ ("Accessible Value"), + _ ("Is used to notify that the value has changed"), 0.0, G_MAXDOUBLE, 0.0, G_PARAM_READWRITE)); g_object_class_install_property (gobject_class, PROP_ROLE, - g_param_spec_enum (atk_object_name_property_role, - _("Accessible Role"), - _("The accessible role of this object"), - ATK_TYPE_ROLE, - ATK_ROLE_UNKNOWN, - G_PARAM_READWRITE)); + g_param_spec_enum (atk_object_name_property_role, + _ ("Accessible Role"), + _ ("The accessible role of this object"), + ATK_TYPE_ROLE, + ATK_ROLE_UNKNOWN, + G_PARAM_READWRITE)); g_object_class_install_property (gobject_class, PROP_LAYER, - g_param_spec_int (atk_object_name_property_component_layer, - _("Accessible Layer"), - _("The accessible layer of this object"), - 0, - G_MAXINT, - 0, - G_PARAM_READABLE)); + g_param_spec_int (atk_object_name_property_component_layer, + _ ("Accessible Layer"), + _ ("The accessible layer of this object"), + 0, + G_MAXINT, + 0, + G_PARAM_READABLE)); g_object_class_install_property (gobject_class, PROP_MDI_ZORDER, - g_param_spec_int (atk_object_name_property_component_mdi_zorder, - _("Accessible MDI Value"), - _("The accessible MDI value of this object"), - G_MININT, - G_MAXINT, - G_MININT, - G_PARAM_READABLE)); + g_param_spec_int (atk_object_name_property_component_mdi_zorder, + _ ("Accessible MDI Value"), + _ ("The accessible MDI value of this object"), + G_MININT, + G_MAXINT, + G_MININT, + G_PARAM_READABLE)); /** * AtkObject:accessible-table-caption: @@ -464,8 +461,8 @@ atk_object_class_init (AtkObjectClass *klass) g_object_class_install_property (gobject_class, PROP_TABLE_CAPTION, g_param_spec_string (atk_object_name_property_table_caption, - _("Accessible Table Caption"), - _("Is used to notify that the table caption has changed; this property should not be used. accessible-table-caption-object should be used instead"), + _ ("Accessible Table Caption"), + _ ("Is used to notify that the table caption has changed; this property should not be used. accessible-table-caption-object should be used instead"), NULL, G_PARAM_READWRITE)); /** @@ -479,8 +476,8 @@ atk_object_class_init (AtkObjectClass *klass) g_object_class_install_property (gobject_class, PROP_TABLE_COLUMN_HEADER, g_param_spec_object (atk_object_name_property_table_column_header, - _("Accessible Table Column Header"), - _("Is used to notify that the table column header has changed"), + _ ("Accessible Table Column Header"), + _ ("Is used to notify that the table column header has changed"), ATK_TYPE_OBJECT, G_PARAM_READWRITE)); @@ -495,8 +492,8 @@ atk_object_class_init (AtkObjectClass *klass) g_object_class_install_property (gobject_class, PROP_TABLE_COLUMN_DESCRIPTION, g_param_spec_string (atk_object_name_property_table_column_description, - _("Accessible Table Column Description"), - _("Is used to notify that the table column description has changed"), + _ ("Accessible Table Column Description"), + _ ("Is used to notify that the table column description has changed"), NULL, G_PARAM_READWRITE)); @@ -511,8 +508,8 @@ atk_object_class_init (AtkObjectClass *klass) g_object_class_install_property (gobject_class, PROP_TABLE_ROW_HEADER, g_param_spec_object (atk_object_name_property_table_row_header, - _("Accessible Table Row Header"), - _("Is used to notify that the table row header has changed"), + _ ("Accessible Table Row Header"), + _ ("Is used to notify that the table row header has changed"), ATK_TYPE_OBJECT, G_PARAM_READWRITE)); /** @@ -526,33 +523,33 @@ atk_object_class_init (AtkObjectClass *klass) g_object_class_install_property (gobject_class, PROP_TABLE_ROW_DESCRIPTION, g_param_spec_string (atk_object_name_property_table_row_description, - _("Accessible Table Row Description"), - _("Is used to notify that the table row description has changed"), + _ ("Accessible Table Row Description"), + _ ("Is used to notify that the table row description has changed"), NULL, G_PARAM_READWRITE)); g_object_class_install_property (gobject_class, PROP_TABLE_SUMMARY, g_param_spec_object (atk_object_name_property_table_summary, - _("Accessible Table Summary"), - _("Is used to notify that the table summary has changed"), + _ ("Accessible Table Summary"), + _ ("Is used to notify that the table summary has changed"), ATK_TYPE_OBJECT, G_PARAM_READWRITE)); g_object_class_install_property (gobject_class, PROP_TABLE_CAPTION_OBJECT, g_param_spec_object (atk_object_name_property_table_caption_object, - _("Accessible Table Caption Object"), - _("Is used to notify that the table caption has changed"), + _ ("Accessible Table Caption Object"), + _ ("Is used to notify that the table caption has changed"), ATK_TYPE_OBJECT, G_PARAM_READWRITE)); g_object_class_install_property (gobject_class, PROP_HYPERTEXT_NUM_LINKS, - g_param_spec_int (atk_object_name_property_hypertext_num_links, - _("Number of Accessible Hypertext Links"), - _("The number of links which the current AtkHypertext has"), - 0, - G_MAXINT, - 0, - G_PARAM_READABLE)); + g_param_spec_int (atk_object_name_property_hypertext_num_links, + _ ("Number of Accessible Hypertext Links"), + _ ("The number of links which the current AtkHypertext has"), + 0, + G_MAXINT, + 0, + G_PARAM_READABLE)); /** * AtkObject::children-changed: @@ -570,14 +567,14 @@ atk_object_class_init (AtkObjectClass *klass) * "remove" */ atk_object_signals[CHILDREN_CHANGED] = - g_signal_new ("children_changed", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, - G_STRUCT_OFFSET (AtkObjectClass, children_changed), - NULL, NULL, - g_cclosure_marshal_VOID__UINT_POINTER, - G_TYPE_NONE, - 2, G_TYPE_UINT, G_TYPE_POINTER); + g_signal_new ("children_changed", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, + G_STRUCT_OFFSET (AtkObjectClass, children_changed), + NULL, NULL, + g_cclosure_marshal_VOID__UINT_POINTER, + G_TYPE_NONE, + 2, G_TYPE_UINT, G_TYPE_POINTER); /** * AtkObject::focus-event: @@ -591,14 +588,14 @@ atk_object_class_init (AtkObjectClass *klass) * Deprecated: 2.9.4: Use the #AtkObject::state-change signal instead. */ atk_object_signals[FOCUS_EVENT] = - g_signal_new ("focus_event", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (AtkObjectClass, focus_event), - NULL, NULL, - g_cclosure_marshal_VOID__BOOLEAN, - G_TYPE_NONE, - 1, G_TYPE_BOOLEAN); + g_signal_new ("focus_event", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (AtkObjectClass, focus_event), + NULL, NULL, + g_cclosure_marshal_VOID__BOOLEAN, + G_TYPE_NONE, + 1, G_TYPE_BOOLEAN); /** * AtkObject::property-change: * @atkobject: the object which received the signal. @@ -620,14 +617,14 @@ atk_object_class_init (AtkObjectClass *klass) * notify doesn't support emission hooks. */ atk_object_signals[PROPERTY_CHANGE] = - g_signal_new ("property_change", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, - G_STRUCT_OFFSET (AtkObjectClass, property_change), - (GSignalAccumulator) NULL, NULL, - g_cclosure_marshal_VOID__POINTER, - G_TYPE_NONE, 1, - G_TYPE_POINTER); + g_signal_new ("property_change", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, + G_STRUCT_OFFSET (AtkObjectClass, property_change), + (GSignalAccumulator) NULL, NULL, + g_cclosure_marshal_VOID__POINTER, + G_TYPE_NONE, 1, + G_TYPE_POINTER); /** * AtkObject::state-change: @@ -640,15 +637,15 @@ atk_object_class_init (AtkObjectClass *klass) * changed. */ atk_object_signals[STATE_CHANGE] = - g_signal_new ("state_change", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, - G_STRUCT_OFFSET (AtkObjectClass, state_change), - (GSignalAccumulator) NULL, NULL, - atk_marshal_VOID__STRING_BOOLEAN, - G_TYPE_NONE, 2, - G_TYPE_STRING, - G_TYPE_BOOLEAN); + g_signal_new ("state_change", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, + G_STRUCT_OFFSET (AtkObjectClass, state_change), + (GSignalAccumulator) NULL, NULL, + atk_marshal_VOID__STRING_BOOLEAN, + G_TYPE_NONE, 2, + G_TYPE_STRING, + G_TYPE_BOOLEAN); /** * AtkObject::visible-data-changed: @@ -658,13 +655,13 @@ atk_object_class_init (AtkObjectClass *klass) * appearance of the object changed. */ atk_object_signals[VISIBLE_DATA_CHANGED] = - g_signal_new ("visible_data_changed", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (AtkObjectClass, visible_data_changed), - (GSignalAccumulator) NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); + g_signal_new ("visible_data_changed", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (AtkObjectClass, visible_data_changed), + (GSignalAccumulator) NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); /** * AtkObject::active-descendant-changed: @@ -677,14 +674,14 @@ atk_object_class_init (AtkObjectClass *klass) * signal when the cell in the table which has focus changes. */ atk_object_signals[ACTIVE_DESCENDANT_CHANGED] = - g_signal_new ("active_descendant_changed", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, - G_STRUCT_OFFSET (AtkObjectClass, active_descendant_changed), - NULL, NULL, - g_cclosure_marshal_VOID__POINTER, - G_TYPE_NONE, - 1, G_TYPE_POINTER); + g_signal_new ("active_descendant_changed", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, + G_STRUCT_OFFSET (AtkObjectClass, active_descendant_changed), + NULL, NULL, + g_cclosure_marshal_VOID__POINTER, + G_TYPE_NONE, + 1, G_TYPE_POINTER); /** * AtkObject::announcement @@ -697,26 +694,26 @@ atk_object_class_init (AtkObjectClass *klass) * Since: 2.46 */ atk_object_signals[ANNOUNCEMENT] = - g_signal_new ("announcement", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - 0, /* no class handler in order to avoid breaking ABI */ - NULL, NULL, - g_cclosure_marshal_VOID__STRING, - G_TYPE_NONE, - 1, G_TYPE_STRING); + g_signal_new ("announcement", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, + 0, /* no class handler in order to avoid breaking ABI */ + NULL, NULL, + g_cclosure_marshal_VOID__STRING, + G_TYPE_NONE, + 1, G_TYPE_STRING); } static void -atk_object_init (AtkObject *accessible, - AtkObjectClass *klass) +atk_object_init (AtkObject *accessible, + AtkObjectClass *klass) { AtkObjectPrivate *private = atk_object_get_instance_private (accessible); accessible->name = NULL; accessible->description = NULL; accessible->accessible_parent = NULL; - accessible->relation_set = atk_relation_set_new(); + accessible->relation_set = atk_relation_set_new (); accessible->role = ATK_ROLE_UNKNOWN; private->accessible_id = NULL; } @@ -728,14 +725,13 @@ atk_implementor_get_type (void) if (!type) { - static const GTypeInfo typeInfo = - { + static const GTypeInfo typeInfo = { sizeof (AtkImplementorIface), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, - } ; + }; - type = g_type_register_static (G_TYPE_INTERFACE, "AtkImplementorIface", &typeInfo, 0) ; + type = g_type_register_static (G_TYPE_INTERFACE, "AtkImplementorIface", &typeInfo, 0); } return type; @@ -749,7 +745,7 @@ atk_implementor_get_type (void) * * Returns: a character string representing the accessible name of the object. **/ -const gchar* +const gchar * atk_object_get_name (AtkObject *accessible) { AtkObjectClass *klass; @@ -773,7 +769,7 @@ atk_object_get_name (AtkObject *accessible) * of the accessible. * **/ -const gchar* +const gchar * atk_object_get_description (AtkObject *accessible) { AtkObjectClass *klass; @@ -803,7 +799,7 @@ atk_object_get_description (AtkObject *accessible) * Returns: (transfer none): an #AtkObject representing the accessible * parent of the accessible **/ -AtkObject* +AtkObject * atk_object_get_parent (AtkObject *accessible) { AtkObjectClass *klass; @@ -832,7 +828,7 @@ atk_object_get_parent (AtkObject *accessible) * Returns: (transfer none): an #AtkObject representing the accessible * parent of the accessible if assigned **/ -AtkObject* +AtkObject * atk_object_peek_parent (AtkObject *accessible) { return accessible->accessible_parent; @@ -873,9 +869,9 @@ atk_object_get_n_accessible_children (AtkObject *accessible) * Returns: (transfer full): an #AtkObject representing the specified * accessible child of the accessible. **/ -AtkObject* -atk_object_ref_accessible_child (AtkObject *accessible, - gint i) +AtkObject * +atk_object_ref_accessible_child (AtkObject *accessible, + gint i) { AtkObjectClass *klass; @@ -897,7 +893,7 @@ atk_object_ref_accessible_child (AtkObject *accessible, * Returns: (transfer full): an #AtkRelationSet representing the relation set * of the object. **/ -AtkRelationSet* +AtkRelationSet * atk_object_ref_relation_set (AtkObject *accessible) { AtkObjectClass *klass; @@ -932,12 +928,14 @@ atk_role_register (const gchar *name) gint i = 0; glong length = g_utf8_strlen (name, -1); - for (i=0; i < length; i++) { - if (name[i]!=' ') { - valid = TRUE; - break; + for (i = 0; i < length; i++) + { + if (name[i] != ' ') + { + valid = TRUE; + break; + } } - } if (!valid) return ATK_ROLE_INVALID; @@ -958,7 +956,7 @@ atk_role_register (const gchar *name) * Returns: an #AtkRole which is the role of the accessible **/ AtkRole -atk_object_get_role (AtkObject *accessible) +atk_object_get_role (AtkObject *accessible) { AtkObjectClass *klass; @@ -982,7 +980,7 @@ atk_object_get_role (AtkObject *accessible) * Returns: an #AtkLayer which is the layer of the accessible **/ AtkLayer -atk_object_get_layer (AtkObject *accessible) +atk_object_get_layer (AtkObject *accessible) { AtkObjectClass *klass; @@ -999,18 +997,18 @@ atk_object_get_layer (AtkObject *accessible) * atk_object_get_mdi_zorder: * @accessible: an #AtkObject * - * Gets the zorder of the accessible. The value G_MININT will be returned + * Gets the zorder of the accessible. The value G_MININT will be returned * if the layer of the accessible is not ATK_LAYER_MDI. * * Deprecated: Use atk_component_get_mdi_zorder instead. * - * Returns: a gint which is the zorder of the accessible, i.e. the depth at - * which the component is shown in relation to other components in the same + * Returns: a gint which is the zorder of the accessible, i.e. the depth at + * which the component is shown in relation to other components in the same * container. * **/ gint -atk_object_get_mdi_zorder (AtkObject *accessible) +atk_object_get_mdi_zorder (AtkObject *accessible) { AtkObjectClass *klass; @@ -1033,8 +1031,8 @@ atk_object_get_mdi_zorder (AtkObject *accessible) * Returns: (transfer full): a reference to an #AtkStateSet which is the state * set of the accessible **/ -AtkStateSet* -atk_object_ref_state_set (AtkObject *accessible) +AtkStateSet * +atk_object_ref_state_set (AtkObject *accessible) { AtkObjectClass *klass; @@ -1081,8 +1079,8 @@ atk_object_get_index_in_parent (AtkObject *accessible) * a empty value you can use "". **/ void -atk_object_set_name (AtkObject *accessible, - const gchar *name) +atk_object_set_name (AtkObject *accessible, + const gchar *name) { AtkObjectClass *klass; gboolean notify = FALSE; @@ -1113,7 +1111,7 @@ atk_object_set_name (AtkObject *accessible, * the name to a empty value you can use "". **/ void -atk_object_set_description (AtkObject *accessible, +atk_object_set_description (AtkObject *accessible, const gchar *description) { AtkObjectClass *klass; @@ -1166,8 +1164,8 @@ atk_object_set_parent (AtkObject *accessible, * Sets the role of the accessible. **/ void -atk_object_set_role (AtkObject *accessible, - AtkRole role) +atk_object_set_role (AtkObject *accessible, + AtkRole role) { AtkObjectClass *klass; AtkRole old_role; @@ -1182,7 +1180,7 @@ atk_object_set_role (AtkObject *accessible, { (klass->set_role) (accessible, role); if (old_role != ATK_ROLE_UNKNOWN) - /* Do not notify for initial role setting */ + /* Do not notify for initial role setting */ g_object_notify (G_OBJECT (accessible), atk_object_name_property_role); } } @@ -1195,7 +1193,7 @@ atk_object_set_role (AtkObject *accessible, * * Calls @handler on property changes. * - * Returns: a #guint which is the handler id used in + * Returns: a #guint which is the handler id used in * atk_object_remove_property_change_handler() * * Deprecated: 2.12: Connect directly to #AtkObject::property-change or @@ -1227,8 +1225,8 @@ atk_object_connect_property_change_handler (AtkObject *accessible, * Deprecated: 2.12: See atk_object_connect_property_change_handler() */ void -atk_object_remove_property_change_handler (AtkObject *accessible, - guint handler_id) +atk_object_remove_property_change_handler (AtkObject *accessible, + guint handler_id) { AtkObjectClass *klass; @@ -1244,7 +1242,7 @@ atk_object_remove_property_change_handler (AtkObject *accessible, * @accessible: an #AtkObject * @state: an #AtkState whose state is changed * @value: a gboolean which indicates whether the state is being set on or off - * + * * Emits a state-change signal for the specified state. * * Note that as a general rule when the state of an existing object changes, @@ -1252,10 +1250,10 @@ atk_object_remove_property_change_handler (AtkObject *accessible, **/ void atk_object_notify_state_change (AtkObject *accessible, - AtkState state, - gboolean value) + AtkState state, + gboolean value) { - const gchar* name; + const gchar *name; g_return_if_fail (ATK_IS_OBJECT (accessible)); @@ -1269,7 +1267,7 @@ atk_object_notify_state_change (AtkObject *accessible, * atk_implementor_ref_accessible: * @implementor: The #GObject instance which should implement #AtkImplementorIface * if a non-null return value is required. - * + * * Gets a reference to an object's #AtkObject implementation, if * the object implements #AtkObjectIface * @@ -1280,27 +1278,26 @@ AtkObject * atk_implementor_ref_accessible (AtkImplementor *implementor) { AtkImplementorIface *iface; - AtkObject *accessible = NULL; + AtkObject *accessible = NULL; g_return_val_if_fail (ATK_IS_IMPLEMENTOR (implementor), NULL); iface = ATK_IMPLEMENTOR_GET_IFACE (implementor); - if (iface != NULL) - accessible = iface->ref_accessible (implementor); + if (iface != NULL) + accessible = iface->ref_accessible (implementor); g_return_val_if_fail ((accessible != NULL), NULL); return accessible; } - /** * atk_object_get_attributes: * @accessible: An #AtkObject. * - * Get a list of properties applied to this object as a whole, as an #AtkAttributeSet consisting of - * name-value pairs. As such these attributes may be considered weakly-typed properties or annotations, + * Get a list of properties applied to this object as a whole, as an #AtkAttributeSet consisting of + * name-value pairs. As such these attributes may be considered weakly-typed properties or annotations, * as distinct from strongly-typed object data available via other get/set methods. * Not all objects have explicit "name-value pair" #AtkAttributeSet properties. * @@ -1313,7 +1310,7 @@ atk_implementor_ref_accessible (AtkImplementor *implementor) * atk_attribute_set_free(). */ AtkAttributeSet * -atk_object_get_attributes (AtkObject *accessible) +atk_object_get_attributes (AtkObject *accessible) { AtkObjectClass *klass; @@ -1321,26 +1318,25 @@ atk_object_get_attributes (AtkObject *accessible) klass = ATK_OBJECT_GET_CLASS (accessible); if (klass->get_attributes) - return (klass->get_attributes) (accessible); - else + return (klass->get_attributes) (accessible); + else return NULL; - } -static AtkRelationSet* +static AtkRelationSet * atk_object_real_ref_relation_set (AtkObject *accessible) { g_return_val_if_fail (accessible->relation_set, NULL); - g_object_ref (accessible->relation_set); + g_object_ref (accessible->relation_set); return accessible->relation_set; } static void -atk_object_real_set_property (GObject *object, - guint prop_id, +atk_object_real_set_property (GObject *object, + guint prop_id, const GValue *value, - GParamSpec *pspec) + GParamSpec *pspec) { AtkObject *accessible; @@ -1381,10 +1377,10 @@ atk_object_real_set_property (GObject *object, } static void -atk_object_real_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) +atk_object_real_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) { AtkObject *accessible; @@ -1440,7 +1436,7 @@ atk_object_real_get_property (GObject *object, static void atk_object_finalize (GObject *object) { - AtkObject *accessible; + AtkObject *accessible; AtkObjectPrivate *private; g_return_if_fail (ATK_IS_OBJECT (object)); @@ -1460,43 +1456,43 @@ atk_object_finalize (GObject *object) if (accessible->accessible_parent) g_object_unref (accessible->accessible_parent); - g_free(private->accessible_id); + g_free (private->accessible_id); G_OBJECT_CLASS (parent_class)->finalize (object); } -static const gchar* +static const gchar * atk_object_real_get_name (AtkObject *object) { return object->name; } -static const gchar* +static const gchar * atk_object_real_get_description (AtkObject *object) { return object->description; } -static AtkObject* -atk_object_real_get_parent (AtkObject *object) +static AtkObject * +atk_object_real_get_parent (AtkObject *object) { return atk_object_peek_parent (object); } static AtkRole -atk_object_real_get_role (AtkObject *object) +atk_object_real_get_role (AtkObject *object) { return object->role; } static AtkLayer -atk_object_real_get_layer (AtkObject *object) +atk_object_real_get_layer (AtkObject *object) { return object->layer; } -static AtkStateSet* -atk_object_real_ref_state_set (AtkObject *accessible) +static AtkStateSet * +atk_object_real_ref_state_set (AtkObject *accessible) { AtkStateSet *state_set; AtkObject *focus_object; @@ -1507,28 +1503,28 @@ atk_object_real_ref_state_set (AtkObject *accessible) if (focus_object == accessible) atk_state_set_add_state (state_set, ATK_STATE_FOCUSED); - return state_set; + return state_set; } static void -atk_object_real_set_name (AtkObject *object, - const gchar *name) +atk_object_real_set_name (AtkObject *object, + const gchar *name) { g_free (object->name); object->name = g_strdup (name); } static void -atk_object_real_set_description (AtkObject *object, - const gchar *description) +atk_object_real_set_description (AtkObject *object, + const gchar *description) { g_free (object->description); object->description = g_strdup (description); } static void -atk_object_real_set_parent (AtkObject *object, - AtkObject *parent) +atk_object_real_set_parent (AtkObject *object, + AtkObject *parent) { if (object->accessible_parent) g_object_unref (object->accessible_parent); @@ -1540,7 +1536,7 @@ atk_object_real_set_parent (AtkObject *object, static void atk_object_real_set_role (AtkObject *object, - AtkRole role) + AtkRole role) { object->role = role; } @@ -1556,8 +1552,8 @@ atk_object_real_set_role (AtkObject *object, * to create an instance of a subclass of #AtkObject **/ void -atk_object_initialize (AtkObject *accessible, - gpointer data) +atk_object_initialize (AtkObject *accessible, + gpointer data) { AtkObjectClass *klass; @@ -1577,10 +1573,12 @@ atk_object_initialize (AtkObject *accessible, * to be called. */ static void -atk_object_notify (GObject *obj, - GParamSpec *pspec) +atk_object_notify (GObject *obj, + GParamSpec *pspec) { - AtkPropertyValues values = { NULL, }; + AtkPropertyValues values = { + NULL, + }; g_value_init (&values.new_value, pspec->value_type); g_object_get_property (obj, pspec->name, &values.new_value); @@ -1599,7 +1597,7 @@ atk_object_notify (GObject *obj, * * Returns: the string describing the AtkRole */ -const gchar* +const gchar * atk_role_get_name (AtkRole role) { g_return_val_if_fail (role >= 0, NULL); @@ -1621,7 +1619,7 @@ atk_role_get_name (AtkRole role) * * Returns: the localized string describing the AtkRole **/ -const gchar* +const gchar * atk_role_get_localized_name (AtkRole role) { _gettext_initialization (); @@ -1629,7 +1627,7 @@ atk_role_get_localized_name (AtkRole role) return dgettext (GETTEXT_PACKAGE, atk_role_get_name (role)); } -static const gchar* +static const gchar * atk_object_real_get_object_locale (AtkObject *object) { return setlocale (LC_MESSAGES, NULL); @@ -1647,7 +1645,7 @@ atk_object_real_get_object_locale (AtkObject *object) * Returns: a UTF-8 string indicating the POSIX-style LC_MESSAGES * locale of @accessible. **/ -const gchar* +const gchar * atk_object_get_object_locale (AtkObject *accessible) { AtkObjectClass *klass; @@ -1661,7 +1659,6 @@ atk_object_get_object_locale (AtkObject *accessible) return NULL; } - /** * atk_role_for_name: * @name: a string which is the (non-localized) name of an ATK role. @@ -1684,7 +1681,7 @@ atk_role_for_name (const gchar *name) for (i = 0; i < role_names->len; i++) { - gchar *role_name = (gchar *)g_ptr_array_index (role_names, i); + gchar *role_name = (gchar *) g_ptr_array_index (role_names, i); g_return_val_if_fail (role_name, ATK_ROLE_INVALID); @@ -1700,7 +1697,7 @@ atk_role_for_name (const gchar *name) /** * atk_object_add_relationship: - * @object: The #AtkObject to which an AtkRelation is to be added. + * @object: The #AtkObject to which an AtkRelation is to be added. * @relationship: The #AtkRelationType of the relation * @target: The #AtkObject which is to be the target of the relation. * @@ -1709,9 +1706,9 @@ atk_role_for_name (const gchar *name) * Returns: TRUE if the relationship is added. **/ gboolean -atk_object_add_relationship (AtkObject *object, +atk_object_add_relationship (AtkObject *object, AtkRelationType relationship, - AtkObject *target) + AtkObject *target) { AtkObject *array[1]; AtkRelation *relation; @@ -1733,7 +1730,7 @@ atk_object_add_relationship (AtkObject *object, /** * atk_object_remove_relationship: - * @object: The #AtkObject from which an AtkRelation is to be removed. + * @object: The #AtkObject from which an AtkRelation is to be removed. * @relationship: The #AtkRelationType of the relation * @target: The #AtkObject which is the target of the relation to be removed. * @@ -1742,9 +1739,9 @@ atk_object_add_relationship (AtkObject *object, * Returns: TRUE if the relationship is removed. **/ gboolean -atk_object_remove_relationship (AtkObject *object, +atk_object_remove_relationship (AtkObject *object, AtkRelationType relationship, - AtkObject *target) + AtkObject *target) { gboolean ret = FALSE; AtkRelation *relation; @@ -1776,7 +1773,7 @@ atk_object_remove_relationship (AtkObject *object, * Returns: a character string representing the accessible id of the object, or * NULL if no such string was set. **/ -const gchar* +const gchar * atk_object_get_accessible_id (AtkObject *accessible) { AtkObjectPrivate *private = atk_object_get_instance_private (accessible); @@ -1806,7 +1803,7 @@ atk_object_set_accessible_id (AtkObject *accessible, const gchar *id) static void atk_object_real_initialize (AtkObject *accessible, - gpointer data) + gpointer data) { return; } diff --git a/atk/atkobject.h b/atk/atkobject.h index 78e2464c..2f628a17 100644 --- a/atk/atkobject.h +++ b/atk/atkobject.h @@ -20,15 +20,15 @@ #ifndef __ATK_OBJECT_H__ #define __ATK_OBJECT_H__ -#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) +#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined(__ATK_H_INSIDE__) && !defined(ATK_COMPILATION) #error "Only <atk/atk.h> can be included directly." #endif #include <glib-object.h> -#include <atk/atkversion.h> -#include <atk/atkstate.h> #include <atk/atkrelationtype.h> +#include <atk/atkstate.h> +#include <atk/atkversion.h> G_BEGIN_DECLS @@ -64,14 +64,14 @@ G_BEGIN_DECLS *@ATK_ROLE_INTERNAL_FRAME: A frame-like object that is clipped by a desktop pane *@ATK_ROLE_LABEL: An object used to present an icon or short string in an interface *@ATK_ROLE_LAYERED_PANE: A specialized pane that allows its children to be drawn in layers, providing a form of stacking order - *@ATK_ROLE_LIST: An object that presents a list of objects to the user and allows the user to select one or more of them - *@ATK_ROLE_LIST_ITEM: An object that represents an element of a list + *@ATK_ROLE_LIST: An object that presents a list of objects to the user and allows the user to select one or more of them + *@ATK_ROLE_LIST_ITEM: An object that represents an element of a list *@ATK_ROLE_MENU: An object usually found inside a menu bar that contains a list of actions the user can choose from - *@ATK_ROLE_MENU_BAR: 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 + *@ATK_ROLE_MENU_BAR: 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 *@ATK_ROLE_MENU_ITEM: An object usually contained in a menu that presents an action the user can choose *@ATK_ROLE_OPTION_PANE: A specialized pane whose primary use is inside a DIALOG *@ATK_ROLE_PAGE_TAB: An object that is a child of a page tab list - *@ATK_ROLE_PAGE_TAB_LIST: An object that presents a series of panels (or page tabs), one at a time, through some mechanism provided by the object + *@ATK_ROLE_PAGE_TAB_LIST: An object that presents a series of panels (or page tabs), one at a time, through some mechanism provided by the object *@ATK_ROLE_PANEL: A generic container that is often used to group objects *@ATK_ROLE_PASSWORD_TEXT: A text object uses for passwords, or other places where the text content is not shown visibly to the user *@ATK_ROLE_POPUP_MENU: 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 @@ -125,16 +125,16 @@ G_BEGIN_DECLS *@ATK_ROLE_PAGE: The object is a containing instance which encapsulates a page of information. @ATK_ROLE_PAGE is used in documents and content which support a paginated navigation model. (Since: 1.11) *@ATK_ROLE_SECTION: 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. (Since: 1.11) *@ATK_ROLE_REDUNDANT_OBJECT: The object is redundant with another object in the hierarchy, and is exposed for purely technical reasons. Objects of this role should normally be ignored by clients. (Since: 1.11) - *@ATK_ROLE_FORM: The object is a container for form controls, for instance as part of a - * web form or user-input form within a document. This role is primarily a tag/convenience for - * clients when navigating complex documents, it is not expected that ordinary GUI containers will + *@ATK_ROLE_FORM: The object is a container for form controls, for instance as part of a + * web form or user-input form within a document. This role is primarily a tag/convenience for + * clients when navigating complex documents, it is not expected that ordinary GUI containers will * always have ATK_ROLE_FORM. (Since: 1.12.0) *@ATK_ROLE_LINK: 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. (Since: 1.12.1) - *@ATK_ROLE_INPUT_METHOD_WINDOW: The object is a window or similar viewport + *@ATK_ROLE_INPUT_METHOD_WINDOW: 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." (Since: 1.12.1) *@ATK_ROLE_TABLE_ROW: A row in a table. (Since: 2.1.0) @@ -248,7 +248,7 @@ G_BEGIN_DECLS typedef enum { ATK_ROLE_INVALID = 0, - ATK_ROLE_ACCEL_LABEL, /*<nick=accelerator-label>*/ + ATK_ROLE_ACCEL_LABEL, /*<nick=accelerator-label>*/ ATK_ROLE_ALERT, ATK_ROLE_ANIMATION, ATK_ROLE_ARROW, @@ -322,7 +322,7 @@ typedef enum ATK_ROLE_RULER, ATK_ROLE_APPLICATION, ATK_ROLE_AUTOCOMPLETE, - ATK_ROLE_EDITBAR, /*<nick=edit-bar>*/ + ATK_ROLE_EDITBAR, /*<nick=edit-bar>*/ ATK_ROLE_EMBEDDED, ATK_ROLE_ENTRY, ATK_ROLE_CHART, @@ -437,32 +437,31 @@ typedef GSList AtkAttributeSet; **/ typedef struct _AtkAttribute AtkAttribute; -struct _AtkAttribute { - gchar* name; - gchar* value; +struct _AtkAttribute +{ + gchar *name; + gchar *value; }; -#define ATK_TYPE_OBJECT (atk_object_get_type ()) -#define ATK_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_OBJECT, AtkObject)) -#define ATK_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ATK_TYPE_OBJECT, AtkObjectClass)) -#define ATK_IS_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_OBJECT)) -#define ATK_IS_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ATK_TYPE_OBJECT)) -#define ATK_OBJECT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ATK_TYPE_OBJECT, AtkObjectClass)) - -#define ATK_TYPE_IMPLEMENTOR (atk_implementor_get_type ()) -#define ATK_IS_IMPLEMENTOR(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_IMPLEMENTOR) -#define ATK_IMPLEMENTOR(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_IMPLEMENTOR, AtkImplementor) -#define ATK_IMPLEMENTOR_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_IMPLEMENTOR, AtkImplementorIface)) +#define ATK_TYPE_OBJECT (atk_object_get_type ()) +#define ATK_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_OBJECT, AtkObject)) +#define ATK_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ATK_TYPE_OBJECT, AtkObjectClass)) +#define ATK_IS_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_OBJECT)) +#define ATK_IS_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ATK_TYPE_OBJECT)) +#define ATK_OBJECT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ATK_TYPE_OBJECT, AtkObjectClass)) +#define ATK_TYPE_IMPLEMENTOR (atk_implementor_get_type ()) +#define ATK_IS_IMPLEMENTOR(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_IMPLEMENTOR) +#define ATK_IMPLEMENTOR(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_IMPLEMENTOR, AtkImplementor) +#define ATK_IMPLEMENTOR_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_IMPLEMENTOR, AtkImplementorIface)) -typedef struct _AtkImplementor AtkImplementor; /* dummy typedef */ -typedef struct _AtkImplementorIface AtkImplementorIface; +typedef struct _AtkImplementor AtkImplementor; /* dummy typedef */ +typedef struct _AtkImplementorIface AtkImplementorIface; - -typedef struct _AtkObject AtkObject; -typedef struct _AtkObjectClass AtkObjectClass; -typedef struct _AtkRelationSet AtkRelationSet; -typedef struct _AtkStateSet AtkStateSet; +typedef struct _AtkObject AtkObject; +typedef struct _AtkObjectClass AtkObjectClass; +typedef struct _AtkRelationSet AtkRelationSet; +typedef struct _AtkStateSet AtkStateSet; /** * AtkPropertyValues: @@ -477,12 +476,12 @@ typedef struct _AtkStateSet AtkStateSet; **/ struct _AtkPropertyValues { - const gchar *property_name; + const gchar *property_name; GValue old_value; GValue new_value; }; -typedef struct _AtkPropertyValues AtkPropertyValues; +typedef struct _AtkPropertyValues AtkPropertyValues; /** * AtkFunction: @@ -494,7 +493,7 @@ typedef struct _AtkPropertyValues AtkPropertyValues; * * Returns: not used */ -typedef gboolean (*AtkFunction) (gpointer user_data); +typedef gboolean (*AtkFunction) (gpointer user_data); /* * For most properties the old_value field of AtkPropertyValues will * not contain a valid value. @@ -519,8 +518,7 @@ typedef gboolean (*AtkFunction) (gpointer user_data); * * Deprecated: Since 2.12. */ -typedef void (*AtkPropertyChangeHandler) (AtkObject* obj, AtkPropertyValues* vals); - +typedef void (*AtkPropertyChangeHandler) (AtkObject *obj, AtkPropertyValues *vals); struct _AtkObject { @@ -534,7 +532,6 @@ struct _AtkObject AtkLayer layer; }; - /** * AtkObjectClass: * @connect_property_change_handler: specifies a function to be called @@ -556,136 +553,136 @@ struct _AtkObjectClass /* * Gets the accessible name of the object */ - const gchar* (* get_name) (AtkObject *accessible); + const gchar *(*get_name) (AtkObject *accessible); /* * Gets the accessible description of the object */ - const gchar* (* get_description) (AtkObject *accessible); + const gchar *(*get_description) (AtkObject *accessible); /* * Gets the accessible parent of the object */ - AtkObject* (*get_parent) (AtkObject *accessible); + AtkObject *(*get_parent) (AtkObject *accessible); /* * Gets the number of accessible children of the object */ - gint (* get_n_children) (AtkObject *accessible); + gint (*get_n_children) (AtkObject *accessible); /* * Returns a reference to the specified accessible child of the object. * The accessible children are 0-based so the first accessible child is * at index 0, the second at index 1 and so on. */ - AtkObject* (* ref_child) (AtkObject *accessible, - gint i); + AtkObject *(*ref_child) (AtkObject *accessible, + gint i); /* * Gets the 0-based index of this object in its parent; returns -1 if the * object does not have an accessible parent. */ - gint (* get_index_in_parent) (AtkObject *accessible); + gint (*get_index_in_parent) (AtkObject *accessible); /* * Gets the RelationSet associated with the object */ - AtkRelationSet* (* ref_relation_set) (AtkObject *accessible); + AtkRelationSet *(*ref_relation_set) (AtkObject *accessible); /* * Gets the role of the object */ - AtkRole (* get_role) (AtkObject *accessible); - AtkLayer (* get_layer) (AtkObject *accessible); - gint (* get_mdi_zorder) (AtkObject *accessible); + AtkRole (*get_role) (AtkObject *accessible); + AtkLayer (*get_layer) (AtkObject *accessible); + gint (*get_mdi_zorder) (AtkObject *accessible); /* * Gets the state set of the object */ - AtkStateSet* (* ref_state_set) (AtkObject *accessible); + AtkStateSet *(*ref_state_set) (AtkObject *accessible); /* * Sets the accessible name of the object */ - void (* set_name) (AtkObject *accessible, - const gchar *name); + void (*set_name) (AtkObject *accessible, + const gchar *name); /* * Sets the accessible description of the object */ - void (* set_description) (AtkObject *accessible, - const gchar *description); + void (*set_description) (AtkObject *accessible, + const gchar *description); /* * Sets the accessible parent of the object */ - void (* set_parent) (AtkObject *accessible, - AtkObject *parent); + void (*set_parent) (AtkObject *accessible, + AtkObject *parent); /* * Sets the accessible role of the object */ - void (* set_role) (AtkObject *accessible, - AtkRole role); + void (*set_role) (AtkObject *accessible, + AtkRole role); /* * Specifies a function to be called when a property changes value */ -guint (* connect_property_change_handler) (AtkObject - *accessible, - AtkPropertyChangeHandler *handler); + guint (*connect_property_change_handler) (AtkObject + *accessible, + AtkPropertyChangeHandler *handler); /* * Removes a property change handler which was specified using * connect_property_change_handler */ -void (* remove_property_change_handler) (AtkObject - *accessible, - guint - handler_id); -void (* initialize) (AtkObject *accessible, - gpointer data); + void (*remove_property_change_handler) (AtkObject + *accessible, + guint + handler_id); + void (*initialize) (AtkObject *accessible, + gpointer data); /* * The signal handler which is executed when there is a change in the * children of the object */ - void (* children_changed) (AtkObject *accessible, - guint change_index, - gpointer changed_child); + void (*children_changed) (AtkObject *accessible, + guint change_index, + gpointer changed_child); /* * The signal handler which is executed when there is a focus event * for an object. */ - void (* focus_event) (AtkObject *accessible, - gboolean focus_in); + void (*focus_event) (AtkObject *accessible, + gboolean focus_in); /* - * The signal handler which is executed when there is a property_change + * The signal handler which is executed when there is a property_change * signal for an object. */ - void (* property_change) (AtkObject *accessible, - AtkPropertyValues *values); + void (*property_change) (AtkObject *accessible, + AtkPropertyValues *values); /* - * The signal handler which is executed when there is a state_change + * The signal handler which is executed when there is a state_change * signal for an object. */ - void (* state_change) (AtkObject *accessible, - const gchar *name, - gboolean state_set); + void (*state_change) (AtkObject *accessible, + const gchar *name, + gboolean state_set); /* * The signal handler which is executed when there is a change in the * visible data for an object */ - void (*visible_data_changed) (AtkObject *accessible); + void (*visible_data_changed) (AtkObject *accessible); /* * The signal handler which is executed when there is a change in the - * 'active' child or children of the object, for instance when + * 'active' child or children of the object, for instance when * interior focus changes in a table or list. This signal should be emitted * by objects whose state includes ATK_STATE_MANAGES_DESCENDANTS. */ - void (*active_descendant_changed) (AtkObject *accessible, - gpointer *child); + void (*active_descendant_changed) (AtkObject *accessible, + gpointer *child); - /* - * Gets a list of properties applied to this object as a whole, as an #AtkAttributeSet consisting of name-value pairs. + /* + * Gets a list of properties applied to this object as a whole, as an #AtkAttributeSet consisting of name-value pairs. * Since ATK 1.12 */ - AtkAttributeSet* (*get_attributes) (AtkObject *accessible); + AtkAttributeSet *(*get_attributes) (AtkObject *accessible); - const gchar* (*get_object_locale) (AtkObject *accessible); + const gchar *(*get_object_locale) (AtkObject *accessible); - AtkFunction pad1; + AtkFunction pad1; }; ATK_AVAILABLE_IN_ALL -GType atk_object_get_type (void); +GType atk_object_get_type (void); /** * AtkImplementorIface: @@ -698,104 +695,102 @@ struct _AtkImplementorIface { GTypeInterface parent; - AtkObject* (*ref_accessible) (AtkImplementor *implementor); + AtkObject *(*ref_accessible) (AtkImplementor *implementor); }; ATK_AVAILABLE_IN_ALL GType atk_implementor_get_type (void); ATK_AVAILABLE_IN_ALL -AtkObject* atk_implementor_ref_accessible (AtkImplementor *implementor); +AtkObject *atk_implementor_ref_accessible (AtkImplementor *implementor); /* * Properties directly supported by AtkObject */ ATK_AVAILABLE_IN_ALL -const gchar* atk_object_get_name (AtkObject *accessible); +const gchar *atk_object_get_name (AtkObject *accessible); ATK_AVAILABLE_IN_ALL -const gchar* atk_object_get_description (AtkObject *accessible); +const gchar *atk_object_get_description (AtkObject *accessible); ATK_AVAILABLE_IN_ALL -AtkObject* atk_object_get_parent (AtkObject *accessible); +AtkObject *atk_object_get_parent (AtkObject *accessible); ATK_AVAILABLE_IN_ALL -AtkObject* atk_object_peek_parent (AtkObject *accessible); +AtkObject *atk_object_peek_parent (AtkObject *accessible); ATK_AVAILABLE_IN_ALL -gint atk_object_get_n_accessible_children (AtkObject *accessible); +gint atk_object_get_n_accessible_children (AtkObject *accessible); ATK_AVAILABLE_IN_ALL -AtkObject* atk_object_ref_accessible_child (AtkObject *accessible, - gint i); +AtkObject *atk_object_ref_accessible_child (AtkObject *accessible, + gint i); ATK_AVAILABLE_IN_ALL -AtkRelationSet* atk_object_ref_relation_set (AtkObject *accessible); +AtkRelationSet *atk_object_ref_relation_set (AtkObject *accessible); ATK_AVAILABLE_IN_ALL -AtkRole atk_object_get_role (AtkObject *accessible); +AtkRole atk_object_get_role (AtkObject *accessible); -ATK_DEPRECATED_FOR(atk_component_get_layer) -AtkLayer atk_object_get_layer (AtkObject *accessible); -ATK_DEPRECATED_FOR(atk_component_get_mdi_zorder) -gint atk_object_get_mdi_zorder (AtkObject *accessible); +ATK_DEPRECATED_FOR (atk_component_get_layer) +AtkLayer atk_object_get_layer (AtkObject *accessible); +ATK_DEPRECATED_FOR (atk_component_get_mdi_zorder) +gint atk_object_get_mdi_zorder (AtkObject *accessible); ATK_AVAILABLE_IN_ALL -AtkAttributeSet* atk_object_get_attributes (AtkObject *accessible); +AtkAttributeSet *atk_object_get_attributes (AtkObject *accessible); ATK_AVAILABLE_IN_ALL -AtkStateSet* atk_object_ref_state_set (AtkObject *accessible); +AtkStateSet *atk_object_ref_state_set (AtkObject *accessible); ATK_AVAILABLE_IN_ALL -gint atk_object_get_index_in_parent (AtkObject *accessible); +gint atk_object_get_index_in_parent (AtkObject *accessible); ATK_AVAILABLE_IN_ALL -void atk_object_set_name (AtkObject *accessible, - const gchar *name); +void atk_object_set_name (AtkObject *accessible, + const gchar *name); ATK_AVAILABLE_IN_ALL -void atk_object_set_description (AtkObject *accessible, - const gchar *description); +void atk_object_set_description (AtkObject *accessible, + const gchar *description); ATK_AVAILABLE_IN_ALL -void atk_object_set_parent (AtkObject *accessible, - AtkObject *parent); +void atk_object_set_parent (AtkObject *accessible, + AtkObject *parent); ATK_AVAILABLE_IN_ALL -void atk_object_set_role (AtkObject *accessible, - AtkRole role); - +void atk_object_set_role (AtkObject *accessible, + AtkRole role); ATK_DEPRECATED_IN_2_12 -guint atk_object_connect_property_change_handler (AtkObject *accessible, - AtkPropertyChangeHandler *handler); +guint atk_object_connect_property_change_handler (AtkObject *accessible, + AtkPropertyChangeHandler *handler); ATK_DEPRECATED_IN_2_12 -void atk_object_remove_property_change_handler (AtkObject *accessible, - guint handler_id); +void atk_object_remove_property_change_handler (AtkObject *accessible, + guint handler_id); ATK_AVAILABLE_IN_ALL -void atk_object_notify_state_change (AtkObject *accessible, - AtkState state, - gboolean value); +void atk_object_notify_state_change (AtkObject *accessible, + AtkState state, + gboolean value); ATK_AVAILABLE_IN_ALL -void atk_object_initialize (AtkObject *accessible, - gpointer data); +void atk_object_initialize (AtkObject *accessible, + gpointer data); ATK_AVAILABLE_IN_ALL -const gchar* atk_role_get_name (AtkRole role); +const gchar *atk_role_get_name (AtkRole role); ATK_AVAILABLE_IN_ALL -AtkRole atk_role_for_name (const gchar *name); - +AtkRole atk_role_for_name (const gchar *name); /* NEW in 1.1: convenience API */ ATK_AVAILABLE_IN_ALL -gboolean atk_object_add_relationship (AtkObject *object, - AtkRelationType relationship, - AtkObject *target); +gboolean atk_object_add_relationship (AtkObject *object, + AtkRelationType relationship, + AtkObject *target); ATK_AVAILABLE_IN_ALL -gboolean atk_object_remove_relationship (AtkObject *object, - AtkRelationType relationship, - AtkObject *target); +gboolean atk_object_remove_relationship (AtkObject *object, + AtkRelationType relationship, + AtkObject *target); ATK_AVAILABLE_IN_ALL -const gchar* atk_role_get_localized_name (AtkRole role); +const gchar *atk_role_get_localized_name (AtkRole role); ATK_DEPRECATED_IN_2_12 -AtkRole atk_role_register (const gchar *name); +AtkRole atk_role_register (const gchar *name); ATK_AVAILABLE_IN_2_8 -const gchar* atk_object_get_object_locale (AtkObject *accessible); +const gchar *atk_object_get_object_locale (AtkObject *accessible); ATK_AVAILABLE_IN_ALL -const gchar* atk_object_get_accessible_id (AtkObject *accessible); +const gchar *atk_object_get_accessible_id (AtkObject *accessible); ATK_AVAILABLE_IN_ALL -void atk_object_set_accessible_id (AtkObject *accessible, - const gchar *name); +void atk_object_set_accessible_id (AtkObject *accessible, + const gchar *name); G_END_DECLS diff --git a/atk/atkobjectfactory.c b/atk/atkobjectfactory.c index a49464c6..017b70c1 100644 --- a/atk/atkobjectfactory.c +++ b/atk/atkobjectfactory.c @@ -19,8 +19,8 @@ #include "config.h" -#include "atkobjectfactory.h" #include "atknoopobjectfactory.h" +#include "atkobjectfactory.h" /** * AtkObjectFactory: @@ -35,57 +35,56 @@ * particular GType. */ -static void atk_object_factory_class_init (AtkObjectFactoryClass *klass); +static void atk_object_factory_class_init (AtkObjectFactoryClass *klass); -static gpointer parent_class = NULL; +static gpointer parent_class = NULL; GType atk_object_factory_get_type (void) { static GType type = 0; - if (!type) { - GTypeInfo tinfo = + if (!type) { - sizeof (AtkObjectFactoryClass), - (GBaseInitFunc) NULL, /* base init */ - (GBaseFinalizeFunc) NULL, /* base finalize */ - (GClassInitFunc) atk_object_factory_class_init, /* class init */ - (GClassFinalizeFunc) NULL, /* class finalize */ - NULL, /* class data */ - sizeof (AtkObjectFactory), /* instance size */ - 0, /* nb preallocs */ - (GInstanceInitFunc) NULL, /* instance init */ - NULL /* value table */ - }; - - type = g_type_register_static (G_TYPE_OBJECT, "AtkObjectFactory", &tinfo, 0); - } + GTypeInfo tinfo = { + sizeof (AtkObjectFactoryClass), + (GBaseInitFunc) NULL, /* base init */ + (GBaseFinalizeFunc) NULL, /* base finalize */ + (GClassInitFunc) atk_object_factory_class_init, /* class init */ + (GClassFinalizeFunc) NULL, /* class finalize */ + NULL, /* class data */ + sizeof (AtkObjectFactory), /* instance size */ + 0, /* nb preallocs */ + (GInstanceInitFunc) NULL, /* instance init */ + NULL /* value table */ + }; + + type = g_type_register_static (G_TYPE_OBJECT, "AtkObjectFactory", &tinfo, 0); + } return type; } -static void +static void atk_object_factory_class_init (AtkObjectFactoryClass *klass) { parent_class = g_type_class_peek_parent (klass); - } /** * atk_object_factory_create_accessible: * @factory: The #AtkObjectFactory associated with @obj's * object type - * @obj: a #GObject - * - * Provides an #AtkObject that implements an accessibility interface + * @obj: a #GObject + * + * Provides an #AtkObject that implements an accessibility interface * on behalf of @obj * * Returns: (transfer full): an #AtkObject that implements an accessibility * interface on behalf of @obj **/ -AtkObject* +AtkObject * atk_object_factory_create_accessible (AtkObjectFactory *factory, - GObject *obj) + GObject *obj) { AtkObjectFactoryClass *klass; AtkObject *accessible = NULL; @@ -96,11 +95,11 @@ atk_object_factory_create_accessible (AtkObjectFactory *factory, klass = ATK_OBJECT_FACTORY_GET_CLASS (factory); if (klass->create_accessible) - { + { accessible = klass->create_accessible (obj); - } + } return accessible; -} +} /** * atk_object_factory_invalidate: @@ -112,7 +111,7 @@ atk_object_factory_create_accessible (AtkObjectFactory *factory, * Note: primarily used for runtime replacement of #AtkObjectFactorys * in object registries. **/ -void +void atk_object_factory_invalidate (AtkObjectFactory *factory) { AtkObjectFactoryClass *klass; @@ -121,14 +120,14 @@ atk_object_factory_invalidate (AtkObjectFactory *factory) klass = ATK_OBJECT_FACTORY_GET_CLASS (factory); if (klass->invalidate) - (klass->invalidate) (factory); + (klass->invalidate) (factory); } /** * atk_object_factory_get_accessible_type: - * @factory: an #AtkObjectFactory + * @factory: an #AtkObjectFactory * - * Gets the GType of the accessible which is created by the factory. + * Gets the GType of the accessible which is created by the factory. * Returns: the type of the accessible which is created by the @factory. * The value G_TYPE_INVALID is returned if no type if found. **/ @@ -141,7 +140,7 @@ atk_object_factory_get_accessible_type (AtkObjectFactory *factory) klass = ATK_OBJECT_FACTORY_GET_CLASS (factory); if (klass->get_accessible_type) - return (klass->get_accessible_type) (); + return (klass->get_accessible_type) (); else - return G_TYPE_INVALID; + return G_TYPE_INVALID; } diff --git a/atk/atkobjectfactory.h b/atk/atkobjectfactory.h index 75594f92..8d5188a1 100644 --- a/atk/atkobjectfactory.h +++ b/atk/atkobjectfactory.h @@ -20,24 +20,24 @@ #ifndef __ATK_OBJECT_FACTORY_H__ #define __ATK_OBJECT_FACTORY_H__ -#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) +#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined(__ATK_H_INSIDE__) && !defined(ATK_COMPILATION) #error "Only <atk/atk.h> can be included directly." #endif -#include <glib-object.h> #include <atk/atkobject.h> +#include <glib-object.h> G_BEGIN_DECLS -#define ATK_TYPE_OBJECT_FACTORY (atk_object_factory_get_type ()) -#define ATK_OBJECT_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_OBJECT_FACTORY, AtkObjectFactory)) -#define ATK_OBJECT_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ATK_TYPE_OBJECT_FACTORY, AtkObjectFactoryClass)) -#define ATK_IS_OBJECT_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_OBJECT_FACTORY)) -#define ATK_IS_OBJECT_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ATK_TYPE_OBJECT_FACTORY)) -#define ATK_OBJECT_FACTORY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ATK_TYPE_OBJECT_FACTORY, AtkObjectFactoryClass)) +#define ATK_TYPE_OBJECT_FACTORY (atk_object_factory_get_type ()) +#define ATK_OBJECT_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_OBJECT_FACTORY, AtkObjectFactory)) +#define ATK_OBJECT_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ATK_TYPE_OBJECT_FACTORY, AtkObjectFactoryClass)) +#define ATK_IS_OBJECT_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_OBJECT_FACTORY)) +#define ATK_IS_OBJECT_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ATK_TYPE_OBJECT_FACTORY)) +#define ATK_OBJECT_FACTORY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ATK_TYPE_OBJECT_FACTORY, AtkObjectFactoryClass)) -typedef struct _AtkObjectFactory AtkObjectFactory; -typedef struct _AtkObjectFactoryClass AtkObjectFactoryClass; +typedef struct _AtkObjectFactory AtkObjectFactory; +typedef struct _AtkObjectFactoryClass AtkObjectFactoryClass; struct _AtkObjectFactory { @@ -48,24 +48,23 @@ struct _AtkObjectFactoryClass { GObjectClass parent_class; - AtkObject* (* create_accessible) (GObject *obj); - void (* invalidate) (AtkObjectFactory *factory); - GType (* get_accessible_type) (void); + AtkObject *(*create_accessible) (GObject *obj); + void (*invalidate) (AtkObjectFactory *factory); + GType (*get_accessible_type) (void); AtkFunction pad1; AtkFunction pad2; }; ATK_AVAILABLE_IN_ALL -GType atk_object_factory_get_type(void); - +GType atk_object_factory_get_type (void); ATK_AVAILABLE_IN_ALL -AtkObject* atk_object_factory_create_accessible (AtkObjectFactory *factory, GObject *obj); +AtkObject *atk_object_factory_create_accessible (AtkObjectFactory *factory, GObject *obj); ATK_AVAILABLE_IN_ALL -void atk_object_factory_invalidate (AtkObjectFactory *factory); +void atk_object_factory_invalidate (AtkObjectFactory *factory); ATK_AVAILABLE_IN_ALL -GType atk_object_factory_get_accessible_type (AtkObjectFactory *factory); +GType atk_object_factory_get_accessible_type (AtkObjectFactory *factory); G_END_DECLS diff --git a/atk/atkplug.c b/atk/atkplug.c index 87a7aeee..0c5097c0 100644 --- a/atk/atkplug.c +++ b/atk/atkplug.c @@ -32,17 +32,16 @@ static void atk_component_interface_init (AtkComponentIface *iface); -typedef struct { +typedef struct +{ AtkObject *child; } AtkPlugPrivate; static gint AtkPlug_private_offset; -G_DEFINE_TYPE_WITH_CODE (AtkPlug, atk_plug, ATK_TYPE_OBJECT, - G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT, atk_component_interface_init) - G_ADD_PRIVATE(AtkPlug)) +G_DEFINE_TYPE_WITH_CODE (AtkPlug, atk_plug, ATK_TYPE_OBJECT, G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT, atk_component_interface_init) G_ADD_PRIVATE (AtkPlug)) -static AtkObject* +static AtkObject * atk_plug_ref_child (AtkObject *obj, int i) { AtkPlugPrivate *private = atk_plug_get_instance_private (ATK_PLUG (obj)); @@ -70,7 +69,7 @@ atk_plug_get_n_children (AtkObject *obj) return 1; } -static AtkStateSet* +static AtkStateSet * atk_plug_ref_state_set (AtkObject *obj) { AtkPlugPrivate *private = atk_plug_get_instance_private (ATK_PLUG (obj)); @@ -85,7 +84,7 @@ atk_plug_ref_state_set (AtkObject *obj) } static void -atk_plug_init (AtkPlug* obj) +atk_plug_init (AtkPlug *obj) { AtkObject *accessible = ATK_OBJECT (obj); @@ -94,7 +93,7 @@ atk_plug_init (AtkPlug* obj) } static void -atk_plug_class_init (AtkPlugClass* klass) +atk_plug_class_init (AtkPlugClass *klass) { AtkObjectClass *class = ATK_OBJECT_CLASS (klass); @@ -104,8 +103,8 @@ atk_plug_class_init (AtkPlugClass* klass) klass->get_object_id = NULL; class->get_n_children = atk_plug_get_n_children; - class->ref_child = atk_plug_ref_child; - class->ref_state_set = atk_plug_ref_state_set; + class->ref_child = atk_plug_ref_child; + class->ref_state_set = atk_plug_ref_state_set; } static void @@ -156,7 +155,7 @@ atk_plug_set_child (AtkPlug *plug, AtkObject *child) private->child = child; if (child) - atk_object_set_parent (child, ATK_OBJECT(plug)); + atk_object_set_parent (child, ATK_OBJECT (plug)); } /** @@ -176,8 +175,8 @@ atk_plug_set_child (AtkPlug *plug, AtkObject *child) * * Since: 1.30 **/ -gchar* -atk_plug_get_id (AtkPlug* plug) +gchar * +atk_plug_get_id (AtkPlug *plug) { AtkPlugClass *klass; diff --git a/atk/atkplug.h b/atk/atkplug.h index ec5bc59f..f54d571b 100644 --- a/atk/atkplug.h +++ b/atk/atkplug.h @@ -20,7 +20,7 @@ #ifndef __ATK_PLUG_H__ #define __ATK_PLUG_H__ -#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) +#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined(__ATK_H_INSIDE__) && !defined(ATK_COMPILATION) #error "Only <atk/atk.h> can be included directly." #endif @@ -28,15 +28,15 @@ G_BEGIN_DECLS -#define ATK_TYPE_PLUG (atk_plug_get_type ()) -#define ATK_PLUG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_PLUG, AtkPlug)) -#define ATK_IS_PLUG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_PLUG)) -#define ATK_PLUG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ATK_TYPE_PLUG, AtkPlugClass)) -#define ATK_IS_PLUG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ATK_TYPE_PLUG)) -#define ATK_PLUG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ATK_TYPE_PLUG, AtkPlugClass)) +#define ATK_TYPE_PLUG (atk_plug_get_type ()) +#define ATK_PLUG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_PLUG, AtkPlug)) +#define ATK_IS_PLUG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_PLUG)) +#define ATK_PLUG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ATK_TYPE_PLUG, AtkPlugClass)) +#define ATK_IS_PLUG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ATK_TYPE_PLUG)) +#define ATK_PLUG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ATK_TYPE_PLUG, AtkPlugClass)) -typedef struct _AtkPlug AtkPlug; -typedef struct _AtkPlugClass AtkPlugClass; +typedef struct _AtkPlug AtkPlug; +typedef struct _AtkPlugClass AtkPlugClass; struct _AtkPlug { @@ -49,19 +49,19 @@ GType atk_plug_get_type (void); struct _AtkPlugClass { AtkObjectClass parent_class; - + /* to be subscribed to by atk-bridge */ /*< protected >*/ - gchar* (* get_object_id) (AtkPlug* obj); + gchar *(*get_object_id) (AtkPlug *obj); }; ATK_AVAILABLE_IN_ALL -AtkObject* atk_plug_new (void); +AtkObject *atk_plug_new (void); ATK_AVAILABLE_IN_2_36 -void atk_plug_set_child (AtkPlug *plug, AtkObject *child); +void atk_plug_set_child (AtkPlug *plug, AtkObject *child); ATK_AVAILABLE_IN_ALL -gchar* atk_plug_get_id (AtkPlug* plug); +gchar *atk_plug_get_id (AtkPlug *plug); G_END_DECLS diff --git a/atk/atkprivate.c b/atk/atkprivate.c index e414bf20..9242e14d 100644 --- a/atk/atkprivate.c +++ b/atk/atkprivate.c @@ -22,8 +22,8 @@ #include "config.h" -#include <string.h> #include <locale.h> +#include <string.h> #include <glib-object.h> #include <glib/gi18n-lib.h> @@ -40,8 +40,8 @@ static HMODULE atk_dll; BOOL WINAPI DllMain (HINSTANCE hinstDLL, - DWORD fdwReason, - LPVOID lpvReserved) + DWORD fdwReason, + LPVOID lpvReserved) { switch (fdwReason) { @@ -62,15 +62,15 @@ get_atk_locale_dir (void) { const gchar *p; gchar *root, *temp; - + /* ATK_LOCALEDIR might end in either /lib/locale or * /share/locale. Scan for that slash. */ p = ATK_LOCALEDIR + strlen (ATK_LOCALEDIR); while (*--p != '/') - ; + ; while (*--p != '/') - ; + ; root = g_win32_get_package_installation_directory_of_module (atk_dll); temp = g_build_filename (root, p, NULL); @@ -87,7 +87,7 @@ get_atk_locale_dir (void) #undef ATK_LOCALEDIR -#define ATK_LOCALEDIR get_atk_locale_dir() +#define ATK_LOCALEDIR get_atk_locale_dir () #endif diff --git a/atk/atkprivate.h b/atk/atkprivate.h index 0c6f484c..de310c52 100644 --- a/atk/atkprivate.h +++ b/atk/atkprivate.h @@ -22,14 +22,14 @@ #ifndef __ATK_PRIVATE_H__ #define __ATK_PRIVATE_H__ -#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) +#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined(__ATK_H_INSIDE__) && !defined(ATK_COMPILATION) #error "Only <atk/atk.h> can be included directly." #endif G_BEGIN_DECLS -void _gettext_initialization (void); -void _compact_name (gchar *name); +void _gettext_initialization (void); +void _compact_name (gchar *name); G_END_DECLS diff --git a/atk/atkrange.c b/atk/atkrange.c index b8ae3422..ad8ceed6 100644 --- a/atk/atkrange.c +++ b/atk/atkrange.c @@ -35,7 +35,8 @@ * details. */ -struct _AtkRange { +struct _AtkRange +{ gdouble lower; gdouble upper; gchar *description; @@ -80,9 +81,7 @@ atk_range_free (AtkRange *range) g_slice_free (AtkRange, range); } -G_DEFINE_BOXED_TYPE (AtkRange, atk_range, atk_range_copy, - atk_range_free) - +G_DEFINE_BOXED_TYPE (AtkRange, atk_range, atk_range_copy, atk_range_free) /** * atk_range_new: @@ -97,10 +96,10 @@ G_DEFINE_BOXED_TYPE (AtkRange, atk_range, atk_range_copy, * Returns: (transfer full): a new #AtkRange * */ -AtkRange* -atk_range_new (gdouble lower_limit, - gdouble upper_limit, - const gchar *description) +AtkRange * +atk_range_new (gdouble lower_limit, + gdouble upper_limit, + const gchar *description) { AtkRange *range; @@ -125,7 +124,7 @@ atk_range_new (gdouble lower_limit, * Returns: the lower limit of @range */ gdouble -atk_range_get_lower_limit (AtkRange *range) +atk_range_get_lower_limit (AtkRange *range) { g_return_val_if_fail (range != NULL, 0); @@ -160,8 +159,8 @@ atk_range_get_upper_limit (AtkRange *range) * * Returns: the human-readable description of @range */ -const gchar* -atk_range_get_description (AtkRange *range) +const gchar * +atk_range_get_description (AtkRange *range) { g_return_val_if_fail (range != NULL, NULL); diff --git a/atk/atkrange.h b/atk/atkrange.h index 6a5eeef4..3a8a4cf4 100644 --- a/atk/atkrange.h +++ b/atk/atkrange.h @@ -21,16 +21,16 @@ #ifndef __ATK_RANGE_H__ #define __ATK_RANGE_H__ -#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) +#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined(__ATK_H_INSIDE__) && !defined(ATK_COMPILATION) #error "Only <atk/atk.h> can be included directly." #endif -#include <glib-object.h> #include <atk/atkversion.h> +#include <glib-object.h> G_BEGIN_DECLS -#define ATK_TYPE_RANGE (atk_range_get_type ()) +#define ATK_TYPE_RANGE (atk_range_get_type ()) typedef struct _AtkRange AtkRange; @@ -39,20 +39,20 @@ ATK_AVAILABLE_IN_2_12 GType atk_range_get_type (void); ATK_AVAILABLE_IN_2_12 -AtkRange* atk_range_copy (AtkRange *src); +AtkRange *atk_range_copy (AtkRange *src); ATK_AVAILABLE_IN_2_12 -void atk_range_free (AtkRange *range); +void atk_range_free (AtkRange *range); ATK_AVAILABLE_IN_2_12 -gdouble atk_range_get_lower_limit (AtkRange *range); +gdouble atk_range_get_lower_limit (AtkRange *range); ATK_AVAILABLE_IN_2_12 -gdouble atk_range_get_upper_limit (AtkRange *range); +gdouble atk_range_get_upper_limit (AtkRange *range); ATK_AVAILABLE_IN_2_12 -const gchar* atk_range_get_description (AtkRange *range); +const gchar *atk_range_get_description (AtkRange *range); ATK_AVAILABLE_IN_2_12 -AtkRange* atk_range_new (gdouble lower_limit, - gdouble upper_limit, - const gchar *description); +AtkRange *atk_range_new (gdouble lower_limit, + gdouble upper_limit, + const gchar *description); G_END_DECLS diff --git a/atk/atkregistry.c b/atk/atkregistry.c index efa9cb49..59bf2bba 100644 --- a/atk/atkregistry.c +++ b/atk/atkregistry.c @@ -19,8 +19,8 @@ #include "config.h" -#include "atkregistry.h" #include "atknoopobjectfactory.h" +#include "atkregistry.h" /** * AtkRegistry: @@ -39,11 +39,11 @@ static AtkRegistry *default_registry = NULL; -static void atk_registry_init (AtkRegistry *instance, - AtkRegistryClass *klass); -static void atk_registry_finalize (GObject *instance); -static void atk_registry_class_init (AtkRegistryClass *klass); -static AtkRegistry* atk_registry_new (void); +static void atk_registry_init (AtkRegistry *instance, + AtkRegistryClass *klass); +static void atk_registry_finalize (GObject *instance); +static void atk_registry_class_init (AtkRegistryClass *klass); +static AtkRegistry *atk_registry_new (void); static gpointer parent_class = NULL; @@ -54,18 +54,17 @@ atk_registry_get_type (void) if (!type) { - static const GTypeInfo info = - { + static const GTypeInfo info = { sizeof (AtkRegistryClass), - (GBaseInitFunc) NULL, /* base_init */ - (GBaseFinalizeFunc) NULL, /* base_finalize */ - (GClassInitFunc) atk_registry_class_init, /* class_init */ - (GClassFinalizeFunc) NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (AtkRegistry), /* instance size */ - 0, /* n_preallocs */ - (GInstanceInitFunc) atk_registry_init, /* instance init */ - NULL /* value table */ + (GBaseInitFunc) NULL, /* base_init */ + (GBaseFinalizeFunc) NULL, /* base_finalize */ + (GClassInitFunc) atk_registry_class_init, /* class_init */ + (GClassFinalizeFunc) NULL, /* class_finalize */ + NULL, /* class_data */ + sizeof (AtkRegistry), /* instance size */ + 0, /* n_preallocs */ + (GInstanceInitFunc) atk_registry_init, /* instance init */ + NULL /* value table */ }; type = g_type_register_static (G_TYPE_OBJECT, "AtkRegistry", &info, 0); @@ -87,9 +86,9 @@ atk_registry_class_init (AtkRegistryClass *klass) static void atk_registry_init (AtkRegistry *instance, AtkRegistryClass *klass) { - instance->factory_type_registry = g_hash_table_new ((GHashFunc) NULL, + instance->factory_type_registry = g_hash_table_new ((GHashFunc) NULL, (GEqualFunc) NULL); - instance->factory_singleton_cache = g_hash_table_new ((GHashFunc) NULL, + instance->factory_singleton_cache = g_hash_table_new ((GHashFunc) NULL, (GEqualFunc) NULL); } @@ -119,7 +118,7 @@ atk_registry_finalize (GObject *object) /** * atk_registry_set_factory_type: * @registry: the #AtkRegistry in which to register the type association - * @type: an #AtkObject type + * @type: an #AtkObject type * @factory_type: an #AtkObjectFactory type to associate with @type. Must * implement AtkObject appropriate for @type. * @@ -139,18 +138,18 @@ atk_registry_set_factory_type (AtkRegistry *registry, g_return_if_fail (ATK_IS_REGISTRY (registry)); - value = g_hash_table_lookup (registry->factory_type_registry, - (gpointer) type); + value = g_hash_table_lookup (registry->factory_type_registry, + (gpointer) type); old_type = (GType) value; if (old_type && old_type != factory_type) { - g_hash_table_remove (registry->factory_type_registry, + g_hash_table_remove (registry->factory_type_registry, (gpointer) type); /* * If the old factory was created, notify it that it has * been replaced, then free it. */ - old_factory = g_hash_table_lookup (registry->factory_singleton_cache, + old_factory = g_hash_table_lookup (registry->factory_singleton_cache, (gpointer) old_type); if (old_factory) { @@ -158,8 +157,8 @@ atk_registry_set_factory_type (AtkRegistry *registry, g_type_free_instance ((GTypeInstance *) old_factory); } } - g_hash_table_insert (registry->factory_type_registry, - (gpointer) type, + g_hash_table_insert (registry->factory_type_registry, + (gpointer) type, (gpointer) factory_type); } @@ -186,16 +185,18 @@ atk_registry_get_factory_type (AtkRegistry *registry, * if there isn't an explicitly registered factory type, * try inheriting one... */ - do { - value = - g_hash_table_lookup (registry->factory_type_registry, - (gpointer) type); - type = g_type_parent (type); - if (type == G_TYPE_INVALID) - { - break; - } - } while (value == NULL); + do + { + value = + g_hash_table_lookup (registry->factory_type_registry, + (gpointer) type); + type = g_type_parent (type); + if (type == G_TYPE_INVALID) + { + break; + } + } + while (value == NULL); factory_type = (GType) value; return factory_type; @@ -212,7 +213,7 @@ atk_registry_get_factory_type (AtkRegistry *registry, * Returns: (transfer none): an #AtkObjectFactory appropriate for creating * #AtkObjects appropriate for @type. **/ -AtkObjectFactory* +AtkObjectFactory * atk_registry_get_factory (AtkRegistry *registry, GType type) { @@ -222,20 +223,20 @@ atk_registry_get_factory (AtkRegistry *registry, factory_type = atk_registry_get_factory_type (registry, type); if (factory_type == G_TYPE_INVALID) - { - /* Factory type has not been specified for this object type */ - static AtkObjectFactory* default_factory = NULL; + { + /* Factory type has not been specified for this object type */ + static AtkObjectFactory *default_factory = NULL; - if (!default_factory) - default_factory = atk_no_op_object_factory_new (); + if (!default_factory) + default_factory = atk_no_op_object_factory_new (); - return default_factory; - } + return default_factory; + } /* ask second hashtable for instance of factory type */ factory_pointer = - g_hash_table_lookup (registry->factory_singleton_cache, - (gpointer) factory_type); + g_hash_table_lookup (registry->factory_singleton_cache, + (gpointer) factory_type); /* if there isn't one already, create one and save it */ if (factory_pointer == NULL) @@ -263,7 +264,7 @@ atk_registry_get_factory (AtkRegistry *registry, * Returns: (transfer full): a default implementation of the * #AtkObjectFactory/type registry **/ -AtkRegistry* +AtkRegistry * atk_get_default_registry (void) { if (!default_registry) diff --git a/atk/atkregistry.h b/atk/atkregistry.h index dff508a7..865ac66b 100644 --- a/atk/atkregistry.h +++ b/atk/atkregistry.h @@ -20,55 +20,53 @@ #ifndef __ATK_REGISTRY_H__ #define __ATK_REGISTRY_H__ -#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) +#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined(__ATK_H_INSIDE__) && !defined(ATK_COMPILATION) #error "Only <atk/atk.h> can be included directly." #endif -#include <glib-object.h> #include "atkobjectfactory.h" +#include <glib-object.h> G_BEGIN_DECLS -#define ATK_TYPE_REGISTRY (atk_registry_get_type ()) -#define ATK_REGISTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_REGISTRY, AtkRegistry)) -#define ATK_REGISTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ATK_TYPE_REGISTRY, AtkRegistryClass)) -#define ATK_IS_REGISTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_REGISTRY)) -#define ATK_IS_REGISTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ATK_TYPE_REGISTRY)) -#define ATK_REGISTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ATK_TYPE_REGISTRY, AtkRegistryClass)) +#define ATK_TYPE_REGISTRY (atk_registry_get_type ()) +#define ATK_REGISTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_REGISTRY, AtkRegistry)) +#define ATK_REGISTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ATK_TYPE_REGISTRY, AtkRegistryClass)) +#define ATK_IS_REGISTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_REGISTRY)) +#define ATK_IS_REGISTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ATK_TYPE_REGISTRY)) +#define ATK_REGISTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ATK_TYPE_REGISTRY, AtkRegistryClass)) struct _AtkRegistry { - GObject parent; + GObject parent; GHashTable *factory_type_registry; GHashTable *factory_singleton_cache; }; struct _AtkRegistryClass { - GObjectClass parent_class; + GObjectClass parent_class; }; -typedef struct _AtkRegistry AtkRegistry; -typedef struct _AtkRegistryClass AtkRegistryClass; - +typedef struct _AtkRegistry AtkRegistry; +typedef struct _AtkRegistryClass AtkRegistryClass; ATK_AVAILABLE_IN_ALL -GType atk_registry_get_type (void); +GType atk_registry_get_type (void); ATK_AVAILABLE_IN_ALL -void atk_registry_set_factory_type (AtkRegistry *registry, - GType type, - GType factory_type); +void atk_registry_set_factory_type (AtkRegistry *registry, + GType type, + GType factory_type); ATK_AVAILABLE_IN_ALL -GType atk_registry_get_factory_type (AtkRegistry *registry, - GType type); +GType atk_registry_get_factory_type (AtkRegistry *registry, + GType type); ATK_AVAILABLE_IN_ALL -AtkObjectFactory* atk_registry_get_factory (AtkRegistry *registry, - GType type); +AtkObjectFactory *atk_registry_get_factory (AtkRegistry *registry, + GType type); ATK_AVAILABLE_IN_ALL -AtkRegistry* atk_get_default_registry (void); +AtkRegistry *atk_get_default_registry (void); G_END_DECLS #endif /* __ATK_REGISTRY_H__ */ - diff --git a/atk/atkrelation.c b/atk/atkrelation.c index 4ea9de81..f490cfe7 100644 --- a/atk/atkrelation.c +++ b/atk/atkrelation.c @@ -19,9 +19,9 @@ #include "config.h" -#include <string.h> -#include <glib-object.h> #include "atk.h" +#include <glib-object.h> +#include <string.h> /** * AtkRelation: @@ -34,7 +34,8 @@ * other objects are defined as an AtkRelationSet, which is a set of * AtkRelations. */ -enum { +enum +{ PROP_0, PROP_RELATION_TYPE, @@ -45,20 +46,20 @@ enum { static GPtrArray *extra_names = NULL; static gpointer parent_class = NULL; - -static void atk_relation_class_init (AtkRelationClass *klass); -static void atk_relation_finalize (GObject *object); -static void atk_relation_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec); -static void atk_relation_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec); - -static GPtrArray* atk_relation_get_ptr_array_from_value_array (GValueArray *array); -static GValueArray* atk_relation_get_value_array_from_ptr_array (GPtrArray *array); + +static void atk_relation_class_init (AtkRelationClass *klass); +static void atk_relation_finalize (GObject *object); +static void atk_relation_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec); +static void atk_relation_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec); + +static GPtrArray *atk_relation_get_ptr_array_from_value_array (GValueArray *array); +static GValueArray *atk_relation_get_value_array_from_ptr_array (GPtrArray *array); GType atk_relation_get_type (void) @@ -67,8 +68,7 @@ atk_relation_get_type (void) if (!type) { - static const GTypeInfo typeInfo = - { + static const GTypeInfo typeInfo = { sizeof (AtkRelationClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, @@ -78,8 +78,8 @@ atk_relation_get_type (void) sizeof (AtkRelation), 0, (GInstanceInitFunc) NULL, - } ; - type = g_type_register_static (G_TYPE_OBJECT, "AtkRelation", &typeInfo, 0) ; + }; + type = g_type_register_static (G_TYPE_OBJECT, "AtkRelation", &typeInfo, 0); } return type; } @@ -90,7 +90,7 @@ atk_relation_class_init (AtkRelationClass *klass) GObjectClass *gobject_class = G_OBJECT_CLASS (klass); parent_class = g_type_class_peek_parent (klass); - + gobject_class->finalize = atk_relation_finalize; gobject_class->set_property = atk_relation_set_property; gobject_class->get_property = atk_relation_get_property; @@ -118,7 +118,7 @@ atk_relation_class_init (AtkRelationClass *klass) * @name: a name string * * Associate @name with a new #AtkRelationType - + * Returns: an #AtkRelationType associated with @name **/ AtkRelationType @@ -141,7 +141,7 @@ atk_relation_type_register (const gchar *name) * * Returns: the string describing the AtkRelationType */ -const gchar* +const gchar * atk_relation_type_get_name (AtkRelationType type) { GTypeClass *type_class; @@ -208,10 +208,10 @@ atk_relation_type_for_name (const gchar *name) { for (i = 0; i < extra_names->len; i++) { - gchar *extra_name = (gchar *)g_ptr_array_index (extra_names, i); + gchar *extra_name = (gchar *) g_ptr_array_index (extra_names, i); g_return_val_if_fail (extra_name, ATK_RELATION_NULL); - + if (strcmp (name, extra_name) == 0) { type = i + 1 + ATK_RELATION_LAST_DEFINED; @@ -221,11 +221,10 @@ atk_relation_type_for_name (const gchar *name) } } g_type_class_unref (type_class); - + return type; } - /** * atk_relation_new: * @targets: (array length=n_targets): an array of pointers to @@ -239,33 +238,33 @@ atk_relation_type_for_name (const gchar *name) * * Returns: a pointer to a new #AtkRelation **/ -AtkRelation* -atk_relation_new (AtkObject **targets, - gint n_targets, +AtkRelation * +atk_relation_new (AtkObject **targets, + gint n_targets, AtkRelationType relationship) { AtkRelation *relation; - int i; + int i; GValueArray *array; - GValue *value; + GValue *value; g_return_val_if_fail (targets != NULL, NULL); array = g_value_array_new (n_targets); for (i = 0; i < n_targets; i++) - { - value = g_new0 (GValue, 1); - g_value_init (value, ATK_TYPE_OBJECT); - g_value_set_object (value, targets[i]); - array = g_value_array_append (array, value); - g_value_unset (value); - g_free (value); - } - - relation = g_object_new (ATK_TYPE_RELATION, - "relation_type", relationship, - "target", array, - NULL); + { + value = g_new0 (GValue, 1); + g_value_init (value, ATK_TYPE_OBJECT); + g_value_set_object (value, targets[i]); + array = g_value_array_append (array, value); + g_value_unset (value); + g_free (value); + } + + relation = g_object_new (ATK_TYPE_RELATION, + "relation_type", relationship, + "target", array, + NULL); g_value_array_free (array); @@ -274,7 +273,7 @@ atk_relation_new (AtkObject **targets, /** * atk_relation_get_relation_type: - * @relation: an #AtkRelation + * @relation: an #AtkRelation * * Gets the type of @relation * @@ -284,7 +283,7 @@ AtkRelationType atk_relation_get_relation_type (AtkRelation *relation) { g_return_val_if_fail (ATK_IS_RELATION (relation), 0); - + return relation->relationship; } @@ -296,7 +295,7 @@ atk_relation_get_relation_type (AtkRelation *relation) * * Returns: (transfer none) (element-type Atk.Object): the target list of @relation **/ -GPtrArray* +GPtrArray * atk_relation_get_target (AtkRelation *relation) { g_return_val_if_fail (ATK_IS_RELATION (relation), NULL); @@ -329,7 +328,7 @@ delete_object_while_in_relation (gpointer callback_data, **/ void atk_relation_add_target (AtkRelation *relation, - AtkObject *target) + AtkObject *target) { guint i; @@ -338,7 +337,7 @@ atk_relation_add_target (AtkRelation *relation, /* first check if target occurs in array ... */ for (i = 0; i < relation->target->len; i++) - if (g_ptr_array_index(relation->target, i) == target) + if (g_ptr_array_index (relation->target, i) == target) return; g_ptr_array_add (relation->target, target); @@ -377,33 +376,33 @@ atk_relation_remove_target (AtkRelation *relation, static void atk_relation_finalize (GObject *object) { - AtkRelation *relation; + AtkRelation *relation; g_return_if_fail (ATK_IS_RELATION (object)); relation = ATK_RELATION (object); if (relation->target) - { - gint i; - - for (i = 0; i < relation->target->len; i++) { - g_object_weak_unref (G_OBJECT (g_ptr_array_index (relation->target, i)), - (GWeakNotify) delete_object_while_in_relation, - relation->target); + gint i; + + for (i = 0; i < relation->target->len; i++) + { + g_object_weak_unref (G_OBJECT (g_ptr_array_index (relation->target, i)), + (GWeakNotify) delete_object_while_in_relation, + relation->target); + } + g_ptr_array_free (relation->target, TRUE); } - g_ptr_array_free (relation->target, TRUE); - } G_OBJECT_CLASS (parent_class)->finalize (object); } -static void -atk_relation_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) +static void +atk_relation_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) { AtkRelation *relation; gpointer boxed; @@ -414,32 +413,32 @@ atk_relation_set_property (GObject *object, { case PROP_RELATION_TYPE: relation->relationship = g_value_get_enum (value); - break; + break; case PROP_TARGET: if (relation->target) - { - gint i; - - for (i = 0; i < relation->target->len; i++) { - g_object_weak_unref (G_OBJECT (g_ptr_array_index (relation->target, i)), - (GWeakNotify) delete_object_while_in_relation, - relation->target); + gint i; + + for (i = 0; i < relation->target->len; i++) + { + g_object_weak_unref (G_OBJECT (g_ptr_array_index (relation->target, i)), + (GWeakNotify) delete_object_while_in_relation, + relation->target); + } + g_ptr_array_free (relation->target, TRUE); } - g_ptr_array_free (relation->target, TRUE); - } boxed = g_value_get_boxed (value); - relation->target = atk_relation_get_ptr_array_from_value_array ( (GValueArray *) boxed); - break; + relation->target = atk_relation_get_ptr_array_from_value_array ((GValueArray *) boxed); + break; default: break; - } + } } static void -atk_relation_get_property (GObject *object, - guint prop_id, - GValue *value, +atk_relation_get_property (GObject *object, + guint prop_id, + GValue *value, GParamSpec *pspec) { AtkRelation *relation; @@ -459,10 +458,10 @@ atk_relation_get_property (GObject *object, default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; - } + } } -static GPtrArray* +static GPtrArray * atk_relation_get_ptr_array_from_value_array (GValueArray *array) { gint i; @@ -478,16 +477,16 @@ atk_relation_get_ptr_array_from_value_array (GValueArray *array) g_ptr_array_add (return_array, obj); g_object_weak_ref (obj, (GWeakNotify) delete_object_while_in_relation, return_array); } - + return return_array; } -static GValueArray* +static GValueArray * atk_relation_get_value_array_from_ptr_array (GPtrArray *array) { - int i; + int i; GValueArray *return_array; - GValue *value; + GValue *value; return_array = g_value_array_new (array->len); for (i = 0; i < array->len; i++) diff --git a/atk/atkrelation.h b/atk/atkrelation.h index a3f93a10..3c082ca3 100644 --- a/atk/atkrelation.h +++ b/atk/atkrelation.h @@ -20,37 +20,37 @@ #ifndef __ATK_RELATION_H__ #define __ATK_RELATION_H__ -#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) +#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined(__ATK_H_INSIDE__) && !defined(ATK_COMPILATION) #error "Only <atk/atk.h> can be included directly." #endif G_BEGIN_DECLS -#include <glib-object.h> #include <atk/atkrelationtype.h> #include <atk/atkversion.h> +#include <glib-object.h> /* - * An AtkRelation describes a relation between the object and one or more + * An AtkRelation describes a relation between the object and one or more * other objects. The actual relations that an object has with other objects - * are defined as an AtkRelationSet, which is a set of AtkRelations. + * are defined as an AtkRelationSet, which is a set of AtkRelations. */ -#define ATK_TYPE_RELATION (atk_relation_get_type ()) -#define ATK_RELATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_RELATION, AtkRelation)) -#define ATK_RELATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ATK_TYPE_RELATION, AtkRelationClass)) -#define ATK_IS_RELATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_RELATION)) -#define ATK_IS_RELATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ATK_TYPE_RELATION)) -#define ATK_RELATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ATK_TYPE_RELATION, AtkRelationClass)) +#define ATK_TYPE_RELATION (atk_relation_get_type ()) +#define ATK_RELATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_RELATION, AtkRelation)) +#define ATK_RELATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ATK_TYPE_RELATION, AtkRelationClass)) +#define ATK_IS_RELATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_RELATION)) +#define ATK_IS_RELATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ATK_TYPE_RELATION)) +#define ATK_RELATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ATK_TYPE_RELATION, AtkRelationClass)) -typedef struct _AtkRelation AtkRelation; -typedef struct _AtkRelationClass AtkRelationClass; +typedef struct _AtkRelation AtkRelation; +typedef struct _AtkRelationClass AtkRelationClass; struct _AtkRelation { GObject parent; - GPtrArray *target; + GPtrArray *target; AtkRelationType relationship; }; @@ -63,36 +63,36 @@ ATK_AVAILABLE_IN_ALL GType atk_relation_get_type (void); ATK_AVAILABLE_IN_ALL -AtkRelationType atk_relation_type_register (const gchar *name); +AtkRelationType atk_relation_type_register (const gchar *name); ATK_AVAILABLE_IN_ALL -const gchar* atk_relation_type_get_name (AtkRelationType type); +const gchar *atk_relation_type_get_name (AtkRelationType type); ATK_AVAILABLE_IN_ALL -AtkRelationType atk_relation_type_for_name (const gchar *name); +AtkRelationType atk_relation_type_for_name (const gchar *name); /* * Create a new relation for the specified key and the specified list * of targets. */ ATK_AVAILABLE_IN_ALL -AtkRelation* atk_relation_new (AtkObject **targets, - gint n_targets, - AtkRelationType relationship); +AtkRelation *atk_relation_new (AtkObject **targets, + gint n_targets, + AtkRelationType relationship); /* * Returns the type of a relation. */ ATK_AVAILABLE_IN_ALL -AtkRelationType atk_relation_get_relation_type (AtkRelation *relation); +AtkRelationType atk_relation_get_relation_type (AtkRelation *relation); /* * Returns the target list of a relation. */ ATK_AVAILABLE_IN_ALL -GPtrArray* atk_relation_get_target (AtkRelation *relation); +GPtrArray *atk_relation_get_target (AtkRelation *relation); ATK_AVAILABLE_IN_ALL -void atk_relation_add_target (AtkRelation *relation, - AtkObject *target); +void atk_relation_add_target (AtkRelation *relation, + AtkObject *target); ATK_AVAILABLE_IN_ALL -gboolean atk_relation_remove_target (AtkRelation *relation, - AtkObject *target); +gboolean atk_relation_remove_target (AtkRelation *relation, + AtkObject *target); G_END_DECLS diff --git a/atk/atkrelationset.c b/atk/atkrelationset.c index 476a8216..66ef0905 100644 --- a/atk/atkrelationset.c +++ b/atk/atkrelationset.c @@ -41,8 +41,8 @@ static gpointer parent_class = NULL; -static void atk_relation_set_class_init (AtkRelationSetClass *klass); -static void atk_relation_set_finalize (GObject *object); +static void atk_relation_set_class_init (AtkRelationSetClass *klass); +static void atk_relation_set_finalize (GObject *object); GType atk_relation_set_get_type (void) @@ -51,8 +51,7 @@ atk_relation_set_get_type (void) if (!type) { - static const GTypeInfo typeInfo = - { + static const GTypeInfo typeInfo = { sizeof (AtkRelationSetClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, @@ -62,8 +61,8 @@ atk_relation_set_get_type (void) sizeof (AtkRelationSet), 0, (GInstanceInitFunc) NULL, - } ; - type = g_type_register_static (G_TYPE_OBJECT, "AtkRelationSet", &typeInfo, 0) ; + }; + type = g_type_register_static (G_TYPE_OBJECT, "AtkRelationSet", &typeInfo, 0); } return type; } @@ -80,12 +79,12 @@ atk_relation_set_class_init (AtkRelationSetClass *klass) /** * atk_relation_set_new: - * + * * Creates a new empty relation set. - * - * Returns: a new #AtkRelationSet + * + * Returns: a new #AtkRelationSet **/ -AtkRelationSet* +AtkRelationSet * atk_relation_set_new (void) { AtkRelationSet *relation_set; @@ -106,12 +105,12 @@ atk_relation_set_new (void) * in @set, %FALSE otherwise **/ gboolean -atk_relation_set_contains (AtkRelationSet *set, - AtkRelationType relationship) +atk_relation_set_contains (AtkRelationSet *set, + AtkRelationType relationship) { GPtrArray *array_item; AtkRelation *item; - gint i; + gint i; g_return_val_if_fail (ATK_IS_RELATION_SET (set), FALSE); @@ -119,11 +118,11 @@ atk_relation_set_contains (AtkRelationSet *set, if (array_item == NULL) return FALSE; for (i = 0; i < array_item->len; i++) - { - item = g_ptr_array_index (array_item, i); - if (item->relationship == relationship) - return TRUE; - } + { + item = g_ptr_array_index (array_item, i); + if (item->relationship == relationship) + return TRUE; + } return FALSE; } @@ -138,7 +137,7 @@ atk_relation_set_contains (AtkRelationSet *set, **/ void atk_relation_set_remove (AtkRelationSet *set, - AtkRelation *relation) + AtkRelation *relation) { GPtrArray *array_item; AtkRelationType relationship; @@ -150,24 +149,24 @@ atk_relation_set_remove (AtkRelationSet *set, return; if (g_ptr_array_remove (array_item, relation)) - { - g_object_unref (relation); - } + { + g_object_unref (relation); + } else - { - relationship = atk_relation_get_relation_type (relation); - if (atk_relation_set_contains (set, relationship)) { - AtkRelation *exist_relation; - gint i; - exist_relation = atk_relation_set_get_relation_by_type (set, relationship); - for (i = 0; i < relation->target->len; i++) - { - AtkObject *target = g_ptr_array_index(relation->target, i); - atk_relation_remove_target (exist_relation, target); - } + relationship = atk_relation_get_relation_type (relation); + if (atk_relation_set_contains (set, relationship)) + { + AtkRelation *exist_relation; + gint i; + exist_relation = atk_relation_set_get_relation_by_type (set, relationship); + for (i = 0; i < relation->target->len; i++) + { + AtkObject *target = g_ptr_array_index (relation->target, i); + atk_relation_remove_target (exist_relation, target); + } + } } - } } /** @@ -183,7 +182,7 @@ atk_relation_set_remove (AtkRelationSet *set, **/ void atk_relation_set_add (AtkRelationSet *set, - AtkRelation *relation) + AtkRelation *relation) { AtkRelationType relationship; @@ -191,27 +190,27 @@ atk_relation_set_add (AtkRelationSet *set, g_return_if_fail (relation != NULL); if (set->relations == NULL) - { - set->relations = g_ptr_array_new (); - } + { + set->relations = g_ptr_array_new (); + } relationship = atk_relation_get_relation_type (relation); if (!atk_relation_set_contains (set, relationship)) - { - g_ptr_array_add (set->relations, relation); - g_object_ref (relation); - } + { + g_ptr_array_add (set->relations, relation); + g_object_ref (relation); + } else - { - AtkRelation *exist_relation; - gint i; - exist_relation = atk_relation_set_get_relation_by_type (set, relationship); - for (i = 0; i < relation->target->len; i++) { - AtkObject *target = g_ptr_array_index(relation->target, i); - atk_relation_add_target (exist_relation, target); + AtkRelation *exist_relation; + gint i; + exist_relation = atk_relation_set_get_relation_by_type (set, relationship); + for (i = 0; i < relation->target->len; i++) + { + AtkObject *target = g_ptr_array_index (relation->target, i); + atk_relation_add_target (exist_relation, target); + } } - } } /** @@ -243,12 +242,12 @@ atk_relation_set_get_n_relations (AtkRelationSet *set) * Returns: (transfer none): a #AtkRelation, which is the relation at * position i in the set. **/ -AtkRelation* +AtkRelation * atk_relation_set_get_relation (AtkRelationSet *set, - gint i) + gint i) { GPtrArray *array_item; - AtkRelation* item; + AtkRelation *item; g_return_val_if_fail (ATK_IS_RELATION_SET (set), NULL); g_return_val_if_fail (i >= 0, NULL); @@ -273,8 +272,8 @@ atk_relation_set_get_relation (AtkRelationSet *set, * Returns: (transfer none): an #AtkRelation, which is a relation matching the * specified type. **/ -AtkRelation* -atk_relation_set_get_relation_by_type (AtkRelationSet *set, +AtkRelation * +atk_relation_set_get_relation_by_type (AtkRelationSet *set, AtkRelationType relationship) { GPtrArray *array_item; @@ -287,20 +286,20 @@ atk_relation_set_get_relation_by_type (AtkRelationSet *set, if (array_item == NULL) return NULL; for (i = 0; i < array_item->len; i++) - { - item = g_ptr_array_index (array_item, i); - if (item->relationship == relationship) - return item; - } + { + item = g_ptr_array_index (array_item, i); + if (item->relationship == relationship) + return item; + } return NULL; } static void atk_relation_set_finalize (GObject *object) { - AtkRelationSet *relation_set; - GPtrArray *array; - gint i; + AtkRelationSet *relation_set; + GPtrArray *array; + gint i; g_return_if_fail (ATK_IS_RELATION_SET (object)); @@ -308,13 +307,13 @@ atk_relation_set_finalize (GObject *object) array = relation_set->relations; if (array) - { - for (i = 0; i < array->len; i++) { - g_object_unref (g_ptr_array_index (array, i)); + for (i = 0; i < array->len; i++) + { + g_object_unref (g_ptr_array_index (array, i)); + } + g_ptr_array_free (array, TRUE); } - g_ptr_array_free (array, TRUE); - } G_OBJECT_CLASS (parent_class)->finalize (object); } @@ -325,7 +324,7 @@ atk_relation_set_finalize (GObject *object) * @relationship: an #AtkRelationType * @target: an #AtkObject * - * Add a new relation of the specified type with the specified target to + * Add a new relation of the specified type with the specified target to * the current relation set if the relation set does not contain a relation * of that type. If it is does contain a relation of that typea the target * is added to the relation. @@ -333,9 +332,9 @@ atk_relation_set_finalize (GObject *object) * Since: 1.9 **/ void -atk_relation_set_add_relation_by_type (AtkRelationSet *set, +atk_relation_set_add_relation_by_type (AtkRelationSet *set, AtkRelationType relationship, - AtkObject *target) + AtkObject *target) { AtkRelation *relation; @@ -347,13 +346,13 @@ atk_relation_set_add_relation_by_type (AtkRelationSet *set, if (relation) { atk_relation_add_target (relation, target); - } - else + } + else { /* the relation hasn't been created yet ... */ relation = atk_relation_new (&target, 1, relationship); atk_relation_set_add (set, relation); - g_object_unref(relation); + g_object_unref (relation); } } @@ -372,9 +371,9 @@ atk_relation_set_add_relation_by_type (AtkRelationSet *set, **/ gboolean -atk_relation_set_contains_target (AtkRelationSet *set, +atk_relation_set_contains_target (AtkRelationSet *set, AtkRelationType relationship, - AtkObject *target) + AtkObject *target) { GPtrArray *array_relations; GPtrArray *array_target; @@ -391,19 +390,19 @@ atk_relation_set_contains_target (AtkRelationSet *set, return FALSE; for (i = 0; i < array_relations->len; i++) - { - relation = g_ptr_array_index (array_relations, i); - if (relation->relationship == relationship) - { - array_target = atk_relation_get_target (relation); - for (c = 0; c < array_target->len; c++) - { - current_target = g_ptr_array_index (array_target, c); - if (target == current_target) - return TRUE; - } - } - } + { + relation = g_ptr_array_index (array_relations, i); + if (relation->relationship == relationship) + { + array_target = atk_relation_get_target (relation); + for (c = 0; c < array_target->len; c++) + { + current_target = g_ptr_array_index (array_target, c); + if (target == current_target) + return TRUE; + } + } + } return FALSE; } diff --git a/atk/atkrelationset.h b/atk/atkrelationset.h index c84980a4..7853a6e7 100644 --- a/atk/atkrelationset.h +++ b/atk/atkrelationset.h @@ -20,25 +20,24 @@ #ifndef __ATK_RELATION_SET_H__ #define __ATK_RELATION_SET_H__ -#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) +#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined(__ATK_H_INSIDE__) && !defined(ATK_COMPILATION) #error "Only <atk/atk.h> can be included directly." #endif G_BEGIN_DECLS -#include <glib-object.h> #include <atk/atkobject.h> #include <atk/atkrelation.h> +#include <glib-object.h> -#define ATK_TYPE_RELATION_SET (atk_relation_set_get_type ()) -#define ATK_RELATION_SET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_RELATION_SET, AtkRelationSet)) -#define ATK_RELATION_SET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ATK_TYPE_RELATION_SET, AtkRelationSetClass)) -#define ATK_IS_RELATION_SET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_RELATION_SET)) -#define ATK_IS_RELATION_SET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ATK_TYPE_RELATION_SET)) -#define ATK_RELATION_SET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ATK_TYPE_RELATION_SET, AtkRelationSetClass)) - -typedef struct _AtkRelationSetClass AtkRelationSetClass; +#define ATK_TYPE_RELATION_SET (atk_relation_set_get_type ()) +#define ATK_RELATION_SET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_RELATION_SET, AtkRelationSet)) +#define ATK_RELATION_SET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ATK_TYPE_RELATION_SET, AtkRelationSetClass)) +#define ATK_IS_RELATION_SET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_RELATION_SET)) +#define ATK_IS_RELATION_SET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ATK_TYPE_RELATION_SET)) +#define ATK_RELATION_SET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ATK_TYPE_RELATION_SET, AtkRelationSetClass)) +typedef struct _AtkRelationSetClass AtkRelationSetClass; struct _AtkRelationSet { @@ -59,32 +58,32 @@ ATK_AVAILABLE_IN_ALL GType atk_relation_set_get_type (void); ATK_AVAILABLE_IN_ALL -AtkRelationSet* atk_relation_set_new (void); +AtkRelationSet *atk_relation_set_new (void); ATK_AVAILABLE_IN_ALL -gboolean atk_relation_set_contains (AtkRelationSet *set, - AtkRelationType relationship); +gboolean atk_relation_set_contains (AtkRelationSet *set, + AtkRelationType relationship); ATK_AVAILABLE_IN_ALL -gboolean atk_relation_set_contains_target (AtkRelationSet *set, - AtkRelationType relationship, - AtkObject *target); +gboolean atk_relation_set_contains_target (AtkRelationSet *set, + AtkRelationType relationship, + AtkObject *target); ATK_AVAILABLE_IN_ALL -void atk_relation_set_remove (AtkRelationSet *set, - AtkRelation *relation); +void atk_relation_set_remove (AtkRelationSet *set, + AtkRelation *relation); ATK_AVAILABLE_IN_ALL -void atk_relation_set_add (AtkRelationSet *set, - AtkRelation *relation); +void atk_relation_set_add (AtkRelationSet *set, + AtkRelation *relation); ATK_AVAILABLE_IN_ALL -gint atk_relation_set_get_n_relations (AtkRelationSet *set); +gint atk_relation_set_get_n_relations (AtkRelationSet *set); ATK_AVAILABLE_IN_ALL -AtkRelation* atk_relation_set_get_relation (AtkRelationSet *set, - gint i); +AtkRelation *atk_relation_set_get_relation (AtkRelationSet *set, + gint i); ATK_AVAILABLE_IN_ALL -AtkRelation* atk_relation_set_get_relation_by_type (AtkRelationSet *set, - AtkRelationType relationship); +AtkRelation *atk_relation_set_get_relation_by_type (AtkRelationSet *set, + AtkRelationType relationship); ATK_AVAILABLE_IN_ALL -void atk_relation_set_add_relation_by_type (AtkRelationSet *set, - AtkRelationType relationship, - AtkObject *target); +void atk_relation_set_add_relation_by_type (AtkRelationSet *set, + AtkRelationType relationship, + AtkObject *target); G_END_DECLS diff --git a/atk/atkrelationtype.h b/atk/atkrelationtype.h index da785a70..558fdc70 100644 --- a/atk/atkrelationtype.h +++ b/atk/atkrelationtype.h @@ -20,7 +20,7 @@ #ifndef __ATK_RELATION_TYPE_H__ #define __ATK_RELATION_TYPE_H__ -#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) +#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined(__ATK_H_INSIDE__) && !defined(ATK_COMPILATION) #error "Only <atk/atk.h> can be included directly." #endif @@ -42,8 +42,8 @@ G_BEGIN_DECLS *@ATK_RELATION_FLOWS_FROM: Indicates that the object has content that flows logically from * another AtkObject in a sequential way, (for instance text-flow). *@ATK_RELATION_SUBWINDOW_OF: Indicates a subwindow attached to a component but otherwise has no connection in the UI heirarchy to that component. - *@ATK_RELATION_EMBEDS: Indicates that the object visually embeds - * another object's content, i.e. this object's content flows around + *@ATK_RELATION_EMBEDS: Indicates that the object visually embeds + * another object's content, i.e. this object's content flows around * another's content. *@ATK_RELATION_EMBEDDED_BY: Reciprocal of %ATK_RELATION_EMBEDS, indicates that * this object's content is visualy embedded in another object. @@ -81,7 +81,7 @@ G_BEGIN_DECLS * contains an error message describing an invalid condition in the target object(s). @Since: * ATK_2.26. *@ATK_RELATION_LAST_DEFINED: Not used, this value indicates the end of the enumeration. - * + * *Describes the type of the relation **/ typedef enum @@ -95,11 +95,11 @@ typedef enum ATK_RELATION_NODE_CHILD_OF, ATK_RELATION_FLOWS_TO, ATK_RELATION_FLOWS_FROM, - ATK_RELATION_SUBWINDOW_OF, - ATK_RELATION_EMBEDS, - ATK_RELATION_EMBEDDED_BY, - ATK_RELATION_POPUP_FOR, - ATK_RELATION_PARENT_WINDOW_OF, + ATK_RELATION_SUBWINDOW_OF, + ATK_RELATION_EMBEDS, + ATK_RELATION_EMBEDDED_BY, + ATK_RELATION_POPUP_FOR, + ATK_RELATION_PARENT_WINDOW_OF, ATK_RELATION_DESCRIBED_BY, ATK_RELATION_DESCRIPTION_FOR, ATK_RELATION_NODE_PARENT_OF, diff --git a/atk/atkselection.c b/atk/atkselection.c index 34d6a5b7..8f8d96ee 100644 --- a/atk/atkselection.c +++ b/atk/atkselection.c @@ -38,8 +38,8 @@ * to the selection/deselection of children. */ - -enum { +enum +{ SELECTION_CHANGED, LAST_SIGNAL }; @@ -53,17 +53,17 @@ atk_selection_get_type (void) { static GType type = 0; - if (!type) { - GTypeInfo tinfo = + if (!type) { - sizeof (AtkSelectionIface), - (GBaseInitFunc)atk_selection_base_init, - (GBaseFinalizeFunc) NULL, + GTypeInfo tinfo = { + sizeof (AtkSelectionIface), + (GBaseInitFunc) atk_selection_base_init, + (GBaseFinalizeFunc) NULL, - }; + }; - type = g_type_register_static (G_TYPE_INTERFACE, "AtkSelection", &tinfo, 0); - } + type = g_type_register_static (G_TYPE_INTERFACE, "AtkSelection", &tinfo, 0); + } return type; } @@ -73,7 +73,7 @@ atk_selection_base_init (gpointer *g_class) { static gboolean initialized = FALSE; - if (! initialized) + if (!initialized) { /** * AtkSelection::selection-changed: @@ -83,14 +83,13 @@ atk_selection_base_init (gpointer *g_class) * implements AtkSelection interface when the selection changes. */ atk_selection_signals[SELECTION_CHANGED] = - g_signal_new ("selection_changed", - ATK_TYPE_SELECTION, - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (AtkSelectionIface, selection_changed), - (GSignalAccumulator) NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); - + g_signal_new ("selection_changed", + ATK_TYPE_SELECTION, + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (AtkSelectionIface, selection_changed), + (GSignalAccumulator) NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); initialized = TRUE; } @@ -108,7 +107,7 @@ atk_selection_base_init (gpointer *g_class) **/ gboolean atk_selection_add_selection (AtkSelection *obj, - gint i) + gint i) { AtkSelectionIface *iface; @@ -152,7 +151,7 @@ atk_selection_clear_selection (AtkSelection *obj) * @i: a #gint specifying the index in the selection set. (e.g. the * ith selection as opposed to the ith child). * - * Gets a reference to the accessible object representing the specified + * Gets a reference to the accessible object representing the specified * selected child of the object. * Note: callers should not rely on %NULL or on a zero value for * indication of whether AtkSelectionIface is implemented, they should @@ -163,9 +162,9 @@ atk_selection_clear_selection (AtkSelection *obj) * selected accessible, or %NULL if @selection does not implement this * interface. **/ -AtkObject* +AtkObject * atk_selection_ref_selection (AtkSelection *obj, - gint i) + gint i) { AtkSelectionIface *iface; @@ -223,7 +222,7 @@ atk_selection_get_selection_count (AtkSelection *obj) **/ gboolean atk_selection_is_child_selected (AtkSelection *obj, - gint i) + gint i) { AtkSelectionIface *iface; @@ -249,7 +248,7 @@ atk_selection_is_child_selected (AtkSelection *obj, **/ gboolean atk_selection_remove_selection (AtkSelection *obj, - gint i) + gint i) { AtkSelectionIface *iface; diff --git a/atk/atkselection.h b/atk/atkselection.h index df508bf4..69630fcb 100644 --- a/atk/atkselection.h +++ b/atk/atkselection.h @@ -20,7 +20,7 @@ #ifndef __ATK_SELECTION_H__ #define __ATK_SELECTION_H__ -#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) +#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined(__ATK_H_INSIDE__) && !defined(ATK_COMPILATION) #error "Only <atk/atk.h> can be included directly." #endif @@ -29,16 +29,16 @@ G_BEGIN_DECLS /* - * This AtkSelection interface provides the standard mechanism for an - * assistive technology to determine what the current selected children are, - * as well as modify the selection set. Any object that has children that + * This AtkSelection interface provides the standard mechanism for an + * assistive technology to determine what the current selected children are, + * as well as modify the selection set. Any object that has children that * can be selected should support the AtkSelection interface. */ -#define ATK_TYPE_SELECTION (atk_selection_get_type ()) -#define ATK_IS_SELECTION(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_SELECTION) -#define ATK_SELECTION(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_SELECTION, AtkSelection) -#define ATK_SELECTION_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_SELECTION, AtkSelectionIface)) +#define ATK_TYPE_SELECTION (atk_selection_get_type ()) +#define ATK_IS_SELECTION(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_SELECTION) +#define ATK_SELECTION(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_SELECTION, AtkSelection) +#define ATK_SELECTION_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_SELECTION, AtkSelectionIface)) #ifndef _TYPEDEF_ATK_SELECTION_ #define _TYPEDEF_ATK_SELECTION_ @@ -50,50 +50,50 @@ struct _AtkSelectionIface { GTypeInterface parent; - gboolean (* add_selection) (AtkSelection *selection, - gint i); - gboolean (* clear_selection) (AtkSelection *selection); - AtkObject* (* ref_selection) (AtkSelection *selection, - gint i); - gint (* get_selection_count) (AtkSelection *selection); - gboolean (* is_child_selected) (AtkSelection *selection, - gint i); - gboolean (* remove_selection) (AtkSelection *selection, - gint i); - gboolean (* select_all_selection) (AtkSelection *selection); + gboolean (*add_selection) (AtkSelection *selection, + gint i); + gboolean (*clear_selection) (AtkSelection *selection); + AtkObject *(*ref_selection) (AtkSelection *selection, + gint i); + gint (*get_selection_count) (AtkSelection *selection); + gboolean (*is_child_selected) (AtkSelection *selection, + gint i); + gboolean (*remove_selection) (AtkSelection *selection, + gint i); + gboolean (*select_all_selection) (AtkSelection *selection); /* signal handlers */ - - void (*selection_changed) (AtkSelection *selection); + + void (*selection_changed) (AtkSelection *selection); }; ATK_AVAILABLE_IN_ALL GType atk_selection_get_type (void); ATK_AVAILABLE_IN_ALL -gboolean atk_selection_add_selection (AtkSelection *selection, - gint i); +gboolean atk_selection_add_selection (AtkSelection *selection, + gint i); ATK_AVAILABLE_IN_ALL -gboolean atk_selection_clear_selection (AtkSelection *selection); +gboolean atk_selection_clear_selection (AtkSelection *selection); ATK_AVAILABLE_IN_ALL -AtkObject* atk_selection_ref_selection (AtkSelection *selection, - gint i); +AtkObject *atk_selection_ref_selection (AtkSelection *selection, + gint i); ATK_AVAILABLE_IN_ALL -gint atk_selection_get_selection_count (AtkSelection *selection); +gint atk_selection_get_selection_count (AtkSelection *selection); ATK_AVAILABLE_IN_ALL -gboolean atk_selection_is_child_selected (AtkSelection *selection, - gint i); +gboolean atk_selection_is_child_selected (AtkSelection *selection, + gint i); ATK_AVAILABLE_IN_ALL -gboolean atk_selection_remove_selection (AtkSelection *selection, - gint i); +gboolean atk_selection_remove_selection (AtkSelection *selection, + gint i); ATK_AVAILABLE_IN_ALL -gboolean atk_selection_select_all_selection (AtkSelection *selection); +gboolean atk_selection_select_all_selection (AtkSelection *selection); G_END_DECLS diff --git a/atk/atksocket.c b/atk/atksocket.c index 7cedba0c..80dc8d36 100644 --- a/atk/atksocket.c +++ b/atk/atksocket.c @@ -53,22 +53,21 @@ * See [class@AtkPlug] */ -static void atk_socket_finalize (GObject *obj); +static void atk_socket_finalize (GObject *obj); static void atk_component_interface_init (AtkComponentIface *iface); static void atk_socket_component_real_get_extents (AtkComponent *component, - gint *x, - gint *y, - gint *width, - gint *height, - AtkCoordType coord_type); + gint *x, + gint *y, + gint *width, + gint *height, + AtkCoordType coord_type); -G_DEFINE_TYPE_WITH_CODE (AtkSocket, atk_socket, ATK_TYPE_OBJECT, - G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT, atk_component_interface_init)) +G_DEFINE_TYPE_WITH_CODE (AtkSocket, atk_socket, ATK_TYPE_OBJECT, G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT, atk_component_interface_init)) static void -atk_socket_init (AtkSocket* obj) +atk_socket_init (AtkSocket *obj) { AtkObject *accessible = ATK_OBJECT (obj); @@ -79,7 +78,7 @@ atk_socket_init (AtkSocket* obj) } static void -atk_socket_class_init (AtkSocketClass* klass) +atk_socket_class_init (AtkSocketClass *klass) { GObjectClass *obj_class = G_OBJECT_CLASS (klass); @@ -112,7 +111,7 @@ atk_component_interface_init (AtkComponentIface *iface) * * Returns: (transfer full): the newly created #AtkSocket instance */ -AtkObject* +AtkObject * atk_socket_new (void) { return g_object_new (ATK_TYPE_SOCKET, NULL); @@ -137,7 +136,7 @@ atk_socket_new (void) * Since: 1.30 **/ void -atk_socket_embed (AtkSocket* obj, const gchar* plug_id) +atk_socket_embed (AtkSocket *obj, const gchar *plug_id) { AtkSocketClass *klass; @@ -165,7 +164,7 @@ atk_socket_embed (AtkSocket* obj, const gchar* plug_id) * Since: 1.30 **/ gboolean -atk_socket_is_occupied (AtkSocket* obj) +atk_socket_is_occupied (AtkSocket *obj) { g_return_val_if_fail (ATK_IS_SOCKET (obj), FALSE); @@ -174,27 +173,27 @@ atk_socket_is_occupied (AtkSocket* obj) static void atk_socket_component_real_get_extents (AtkComponent *component, - gint *x, - gint *y, - gint *width, - gint *height, - AtkCoordType coord_type) + gint *x, + gint *y, + gint *width, + gint *height, + AtkCoordType coord_type) { AtkObject *parent = atk_object_get_parent (ATK_OBJECT (component)); if (parent == NULL || !ATK_IS_COMPONENT (parent)) - { - if (x) - *x = -1; - if (y) - *y = -1; - if (width) - *width = -1; - if (height) - *height = -1; - - return; - } + { + if (x) + *x = -1; + if (y) + *y = -1; + if (width) + *width = -1; + if (height) + *height = -1; + + return; + } atk_component_get_extents (ATK_COMPONENT (parent), x, y, width, height, coord_type); } diff --git a/atk/atksocket.h b/atk/atksocket.h index fd248c18..3498a4f3 100644 --- a/atk/atksocket.h +++ b/atk/atksocket.h @@ -20,7 +20,7 @@ #ifndef __ATK_SOCKET_H__ #define __ATK_SOCKET_H__ -#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) +#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined(__ATK_H_INSIDE__) && !defined(ATK_COMPILATION) #error "Only <atk/atk.h> can be included directly." #endif @@ -28,22 +28,22 @@ G_BEGIN_DECLS -#define ATK_TYPE_SOCKET (atk_socket_get_type ()) -#define ATK_SOCKET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_SOCKET, AtkSocket)) -#define ATK_IS_SOCKET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_SOCKET)) -#define ATK_SOCKET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ATK_TYPE_SOCKET, AtkSocketClass)) -#define ATK_IS_SOCKET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ATK_TYPE_SOCKET)) -#define ATK_SOCKET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ATK_TYPE_SOCKET, AtkSocketClass)) +#define ATK_TYPE_SOCKET (atk_socket_get_type ()) +#define ATK_SOCKET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_SOCKET, AtkSocket)) +#define ATK_IS_SOCKET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_SOCKET)) +#define ATK_SOCKET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ATK_TYPE_SOCKET, AtkSocketClass)) +#define ATK_IS_SOCKET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ATK_TYPE_SOCKET)) +#define ATK_SOCKET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ATK_TYPE_SOCKET, AtkSocketClass)) -typedef struct _AtkSocket AtkSocket; -typedef struct _AtkSocketClass AtkSocketClass; +typedef struct _AtkSocket AtkSocket; +typedef struct _AtkSocketClass AtkSocketClass; struct _AtkSocket { AtkObject parent; /*< private >*/ - gchar* embedded_plug_id; + gchar *embedded_plug_id; }; ATK_AVAILABLE_IN_ALL @@ -52,19 +52,19 @@ GType atk_socket_get_type (void); struct _AtkSocketClass { AtkObjectClass parent_class; - + /* to be subscribed to by atk-bridge */ /*< protected >*/ - void (* embed) (AtkSocket *obj, const gchar* plug_id); + void (*embed) (AtkSocket *obj, const gchar *plug_id); }; ATK_AVAILABLE_IN_ALL -AtkObject* atk_socket_new (void); +AtkObject *atk_socket_new (void); ATK_AVAILABLE_IN_ALL -void atk_socket_embed (AtkSocket* obj, const gchar* plug_id); +void atk_socket_embed (AtkSocket *obj, const gchar *plug_id); ATK_AVAILABLE_IN_ALL -gboolean atk_socket_is_occupied (AtkSocket* obj); +gboolean atk_socket_is_occupied (AtkSocket *obj); G_END_DECLS diff --git a/atk/atkstate.c b/atk/atkstate.c index 369c6ab4..bcdce0b1 100644 --- a/atk/atkstate.c +++ b/atk/atkstate.c @@ -36,9 +36,9 @@ static guint last_type = ATK_STATE_LAST_DEFINED; -#define NUM_POSSIBLE_STATES (sizeof(AtkState)*8) +#define NUM_POSSIBLE_STATES (sizeof (AtkState) * 8) -static gchar* state_names[NUM_POSSIBLE_STATES]; +static gchar *state_names[NUM_POSSIBLE_STATES]; /** * atk_state_type_register: @@ -53,9 +53,9 @@ atk_state_type_register (const gchar *name) { g_return_val_if_fail (name, ATK_STATE_INVALID); - if (last_type < NUM_POSSIBLE_STATES -1) + if (last_type < NUM_POSSIBLE_STATES - 1) { - state_names[++last_type] = g_strdup (name); + state_names[++last_type] = g_strdup (name); return (last_type); } return ATK_STATE_INVALID; /* caller needs to check */ @@ -69,7 +69,7 @@ atk_state_type_register (const gchar *name) * * Returns: the string describing the AtkStateType */ -const gchar* +const gchar * atk_state_type_get_name (AtkStateType type) { GTypeClass *type_class; @@ -105,7 +105,7 @@ atk_state_type_get_name (AtkStateType type) * * Gets the #AtkStateType corresponding to the description string @name. * - * Returns: an #AtkStateType corresponding to @name + * Returns: an #AtkStateType corresponding to @name */ AtkStateType atk_state_type_for_name (const gchar *name) @@ -132,8 +132,8 @@ atk_state_type_for_name (const gchar *name) for (i = ATK_STATE_LAST_DEFINED + 1; i <= last_type; i++) { if (state_names[i] == NULL) - continue; - if (!strcmp(name, state_names[i])) + continue; + if (!strcmp (name, state_names[i])) { type = i; break; diff --git a/atk/atkstate.h b/atk/atkstate.h index 82be9c75..88f42e97 100644 --- a/atk/atkstate.h +++ b/atk/atkstate.h @@ -20,12 +20,12 @@ #ifndef __ATK_STATE_H__ #define __ATK_STATE_H__ -#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) +#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined(__ATK_H_INSIDE__) && !defined(ATK_COMPILATION) #error "Only <atk/atk.h> can be included directly." #endif -#include <glib-object.h> #include <atk/atkversion.h> +#include <glib-object.h> G_BEGIN_DECLS @@ -58,20 +58,20 @@ G_BEGIN_DECLS *@ATK_STATE_RESIZABLE: Indicates the size of this object is not fixed *@ATK_STATE_SELECTABLE: 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 *@ATK_STATE_SELECTED: 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 - *@ATK_STATE_SENSITIVE: Indicates this object is sensitive, e.g. to user interaction. + *@ATK_STATE_SENSITIVE: 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 + * 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 + * 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. - *@ATK_STATE_SHOWING: Indicates this object, the object's parent, the object's parent's parent, and so on, + *@ATK_STATE_SHOWING: 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. *@ATK_STATE_SINGLE_LINE: Indicates this (text) object can contain only a single line of text *@ATK_STATE_STALE: Indicates that the information returned for this object may no longer be * synchronized with the application state. This is implied if the object has STATE_TRANSIENT, - * and can also occur towards the end of the object peer's lifecycle. It can also be used to indicate that + * and can also occur towards the end of the object peer's lifecycle. It can also be used to indicate that * the index associated with this object has changed since the user accessed the object (in lieu of * "index-in-parent-changed" events). *@ATK_STATE_TRANSIENT: Indicates this object is transient, i.e. a snapshot which may not emit events when its @@ -80,7 +80,7 @@ G_BEGIN_DECLS *@ATK_STATE_VERTICAL: Indicates the orientation of this object is vertical *@ATK_STATE_VISIBLE: Indicates this object is visible, e.g. has been explicitly marked for exposure to the user. * **note**: %ATK_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 + * 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 %ATK_STATE_VISIBLE and %ATK_STATE_SHOWING. * The absence of %ATK_STATE_VISIBLE and %ATK_STATE_SHOWING is semantically equivalent to saying @@ -96,7 +96,7 @@ G_BEGIN_DECLS * 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 + * changes and activation of their contained child objects, without the client * having previously requested references to those children. *@ATK_STATE_INDETERMINATE: Indicates that the value, or some other quantifiable * property, of this AtkObject cannot be fully determined. In the case of a large @@ -108,12 +108,12 @@ G_BEGIN_DECLS *@ATK_STATE_TRUNCATED: Indicates that an object is truncated, e.g. a text value in a speradsheet cell. *@ATK_STATE_REQUIRED: Indicates that explicit user interaction with an object is required by the user interface, e.g. a required field in a "web-form" interface. *@ATK_STATE_INVALID_ENTRY: Indicates that the object has encountered 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. - *@ATK_STATE_SUPPORTS_AUTOCOMPLETION: Indicates that the object in question implements some form of ¨typeahead¨ or + *@ATK_STATE_SUPPORTS_AUTOCOMPLETION: Indicates that the object in question implements some form of ¨typeahead¨ 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 ¨completion¨ of + * In some cases the typeahead behavior may result in full or partial ¨completion¨ of * the data in the input field, in which case these input events may trigger text-changed * events from the AtkText interface. This state supplants @ATK_ROLE_AUTOCOMPLETE. *@ATK_STATE_SELECTABLE_TEXT: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 @ATK_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. @@ -195,15 +195,15 @@ typedef enum ATK_STATE_LAST_DEFINED } AtkStateType; -typedef guint64 AtkState; +typedef guint64 AtkState; ATK_AVAILABLE_IN_ALL -AtkStateType atk_state_type_register (const gchar *name); +AtkStateType atk_state_type_register (const gchar *name); ATK_AVAILABLE_IN_ALL -const gchar* atk_state_type_get_name (AtkStateType type); +const gchar *atk_state_type_get_name (AtkStateType type); ATK_AVAILABLE_IN_ALL -AtkStateType atk_state_type_for_name (const gchar *name); +AtkStateType atk_state_type_for_name (const gchar *name); G_END_DECLS diff --git a/atk/atkstateset.c b/atk/atkstateset.c index 957786d6..0d14b4a9 100644 --- a/atk/atkstateset.c +++ b/atk/atkstateset.c @@ -34,7 +34,7 @@ * modified, but rather created when #atk_object_ref_state_set() is called. */ -#define ATK_STATE(state_enum) ((AtkState)((guint64)1 << ((state_enum)%64))) +#define ATK_STATE(state_enum) ((AtkState) ((guint64) 1 << ((state_enum) % 64))) struct _AtkRealStateSet { @@ -43,9 +43,9 @@ struct _AtkRealStateSet AtkState state; }; -typedef struct _AtkRealStateSet AtkRealStateSet; +typedef struct _AtkRealStateSet AtkRealStateSet; -static void atk_state_set_class_init (AtkStateSetClass *klass); +static void atk_state_set_class_init (AtkStateSetClass *klass); GType atk_state_set_get_type (void) @@ -54,8 +54,7 @@ atk_state_set_get_type (void) if (!type) { - static const GTypeInfo typeInfo = - { + static const GTypeInfo typeInfo = { sizeof (AtkStateSetClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, @@ -65,8 +64,8 @@ atk_state_set_get_type (void) sizeof (AtkRealStateSet), 0, (GInstanceInitFunc) NULL, - } ; - type = g_type_register_static (G_TYPE_OBJECT, "AtkStateSet", &typeInfo, 0) ; + }; + type = g_type_register_static (G_TYPE_OBJECT, "AtkStateSet", &typeInfo, 0); } return type; } @@ -78,15 +77,15 @@ atk_state_set_class_init (AtkStateSetClass *klass) /** * atk_state_set_new: - * + * * Creates a new empty state set. - * - * Returns: a new #AtkStateSet + * + * Returns: a new #AtkStateSet **/ -AtkStateSet* +AtkStateSet * atk_state_set_new (void) { - return (AtkStateSet*) g_object_new (ATK_TYPE_STATE_SET, NULL); + return (AtkStateSet *) g_object_new (ATK_TYPE_STATE_SET, NULL); } /** @@ -98,12 +97,12 @@ atk_state_set_new (void) * Returns: %TRUE if @set has no states set, otherwise %FALSE **/ gboolean -atk_state_set_is_empty (AtkStateSet *set) +atk_state_set_is_empty (AtkStateSet *set) { AtkRealStateSet *real_set; g_return_val_if_fail (ATK_IS_STATE_SET (set), FALSE); - real_set = (AtkRealStateSet *)set; + real_set = (AtkRealStateSet *) set; if (real_set->state) return FALSE; @@ -127,21 +126,21 @@ atk_state_set_is_empty (AtkStateSet *set) * Returns: %TRUE if the state for @type is not already in @set. **/ gboolean -atk_state_set_add_state (AtkStateSet *set, - AtkStateType type) +atk_state_set_add_state (AtkStateSet *set, + AtkStateType type) { AtkRealStateSet *real_set; g_return_val_if_fail (ATK_IS_STATE_SET (set), FALSE); - real_set = (AtkRealStateSet *)set; + real_set = (AtkRealStateSet *) set; if (real_set->state & ATK_STATE (type)) return FALSE; else - { - real_set->state |= ATK_STATE (type); - return TRUE; - } + { + real_set->state |= ATK_STATE (type); + return TRUE; + } } /** * atk_state_set_add_states: @@ -157,20 +156,20 @@ atk_state_set_add_state (AtkStateSet *set, * of an object. See also #atk_object_notify_state_change. **/ void -atk_state_set_add_states (AtkStateSet *set, - AtkStateType *types, - gint n_types) +atk_state_set_add_states (AtkStateSet *set, + AtkStateType *types, + gint n_types) { AtkRealStateSet *real_set; - gint i; + gint i; g_return_if_fail (ATK_IS_STATE_SET (set)); - real_set = (AtkRealStateSet *)set; + real_set = (AtkRealStateSet *) set; for (i = 0; i < n_types; i++) - { - real_set->state |= ATK_STATE (types[i]); - } + { + real_set->state |= ATK_STATE (types[i]); + } } /** @@ -180,12 +179,12 @@ atk_state_set_add_states (AtkStateSet *set, * Removes all states from the state set. **/ void -atk_state_set_clear_states (AtkStateSet *set) +atk_state_set_clear_states (AtkStateSet *set) { AtkRealStateSet *real_set; g_return_if_fail (ATK_IS_STATE_SET (set)); - real_set = (AtkRealStateSet *)set; + real_set = (AtkRealStateSet *) set; real_set->state = 0; } @@ -200,13 +199,13 @@ atk_state_set_clear_states (AtkStateSet *set) * Returns: %TRUE if @type is the state type is in @set. **/ gboolean -atk_state_set_contains_state (AtkStateSet *set, - AtkStateType type) +atk_state_set_contains_state (AtkStateSet *set, + AtkStateType type) { AtkRealStateSet *real_set; g_return_val_if_fail (ATK_IS_STATE_SET (set), FALSE); - real_set = (AtkRealStateSet *)set; + real_set = (AtkRealStateSet *) set; if (real_set->state & ATK_STATE (type)) return TRUE; @@ -220,27 +219,27 @@ atk_state_set_contains_state (AtkStateSet *set, * @types: (array length=n_types): an array of #AtkStateType * @n_types: The number of elements in the array * - * Checks whether the states for all the specified types are in the + * Checks whether the states for all the specified types are in the * specified set. * * Returns: %TRUE if all the states for @type are in @set. **/ gboolean -atk_state_set_contains_states (AtkStateSet *set, - AtkStateType *types, - gint n_types) +atk_state_set_contains_states (AtkStateSet *set, + AtkStateType *types, + gint n_types) { AtkRealStateSet *real_set; gint i; g_return_val_if_fail (ATK_IS_STATE_SET (set), FALSE); - real_set = (AtkRealStateSet *)set; + real_set = (AtkRealStateSet *) set; for (i = 0; i < n_types; i++) - { - if (!(real_set->state & ATK_STATE (types[i]))) - return FALSE; - } + { + if (!(real_set->state & ATK_STATE (types[i]))) + return FALSE; + } return TRUE; } @@ -259,19 +258,19 @@ atk_state_set_contains_states (AtkStateSet *set, * Returns: %TRUE if @type was the state type is in @set. **/ gboolean -atk_state_set_remove_state (AtkStateSet *set, +atk_state_set_remove_state (AtkStateSet *set, AtkStateType type) { AtkRealStateSet *real_set; g_return_val_if_fail (ATK_IS_STATE_SET (set), FALSE); - real_set = (AtkRealStateSet *)set; + real_set = (AtkRealStateSet *) set; if (real_set->state & ATK_STATE (type)) - { - real_set->state ^= ATK_STATE (type); - return TRUE; - } + { + real_set->state ^= ATK_STATE (type); + return TRUE; + } else return FALSE; } @@ -287,9 +286,9 @@ atk_state_set_remove_state (AtkStateSet *set, * Returns: (transfer full): a new #AtkStateSet which is the intersection of * the two sets. **/ -AtkStateSet* -atk_state_set_and_sets (AtkStateSet *set, - AtkStateSet *compare_set) +AtkStateSet * +atk_state_set_and_sets (AtkStateSet *set, + AtkStateSet *compare_set) { AtkRealStateSet *real_set, *real_compare_set; AtkStateSet *return_set = NULL; @@ -298,15 +297,15 @@ atk_state_set_and_sets (AtkStateSet *set, g_return_val_if_fail (ATK_IS_STATE_SET (set), NULL); g_return_val_if_fail (ATK_IS_STATE_SET (compare_set), NULL); - real_set = (AtkRealStateSet *)set; - real_compare_set = (AtkRealStateSet *)compare_set; + real_set = (AtkRealStateSet *) set; + real_compare_set = (AtkRealStateSet *) compare_set; state = real_set->state & real_compare_set->state; if (state) - { - return_set = atk_state_set_new(); - ((AtkRealStateSet *) return_set)->state = state; - } + { + return_set = atk_state_set_new (); + ((AtkRealStateSet *) return_set)->state = state; + } return return_set; } @@ -320,9 +319,9 @@ atk_state_set_and_sets (AtkStateSet *set, * Returns: (nullable) (transfer full): a new #AtkStateSet which is * the union of the two sets, returning %NULL is empty. **/ -AtkStateSet* -atk_state_set_or_sets (AtkStateSet *set, - AtkStateSet *compare_set) +AtkStateSet * +atk_state_set_or_sets (AtkStateSet *set, + AtkStateSet *compare_set) { AtkRealStateSet *real_set, *real_compare_set; AtkStateSet *return_set = NULL; @@ -331,16 +330,16 @@ atk_state_set_or_sets (AtkStateSet *set, g_return_val_if_fail (ATK_IS_STATE_SET (set), NULL); g_return_val_if_fail (ATK_IS_STATE_SET (compare_set), NULL); - real_set = (AtkRealStateSet *)set; - real_compare_set = (AtkRealStateSet *)compare_set; + real_set = (AtkRealStateSet *) set; + real_compare_set = (AtkRealStateSet *) compare_set; state = real_set->state | real_compare_set->state; if (state) - { - return_set = atk_state_set_new(); - ((AtkRealStateSet *) return_set)->state = state; - } + { + return_set = atk_state_set_new (); + ((AtkRealStateSet *) return_set)->state = state; + } return return_set; } @@ -357,9 +356,9 @@ atk_state_set_or_sets (AtkStateSet *set, * Returns: (transfer full): a new #AtkStateSet which contains the states * which are in exactly one of the two sets. **/ -AtkStateSet* -atk_state_set_xor_sets (AtkStateSet *set, - AtkStateSet *compare_set) +AtkStateSet * +atk_state_set_xor_sets (AtkStateSet *set, + AtkStateSet *compare_set) { AtkRealStateSet *real_set, *real_compare_set; AtkStateSet *return_set = NULL; @@ -368,17 +367,17 @@ atk_state_set_xor_sets (AtkStateSet *set, g_return_val_if_fail (ATK_IS_STATE_SET (set), NULL); g_return_val_if_fail (ATK_IS_STATE_SET (compare_set), NULL); - real_set = (AtkRealStateSet *)set; - real_compare_set = (AtkRealStateSet *)compare_set; + real_set = (AtkRealStateSet *) set; + real_compare_set = (AtkRealStateSet *) compare_set; state1 = real_set->state & (~real_compare_set->state); state2 = (~real_set->state) & real_compare_set->state; state = state1 | state2; if (state) - { - return_set = atk_state_set_new(); - ((AtkRealStateSet *) return_set)->state = state; - } + { + return_set = atk_state_set_new (); + ((AtkRealStateSet *) return_set)->state = state; + } return return_set; } diff --git a/atk/atkstateset.h b/atk/atkstateset.h index bcb8946e..9392e2bc 100644 --- a/atk/atkstateset.h +++ b/atk/atkstateset.h @@ -20,30 +20,28 @@ #ifndef __ATK_STATE_SET_H__ #define __ATK_STATE_SET_H__ -#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) +#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined(__ATK_H_INSIDE__) && !defined(ATK_COMPILATION) #error "Only <atk/atk.h> can be included directly." #endif -#include <glib-object.h> #include <atk/atkobject.h> #include <atk/atkstate.h> +#include <glib-object.h> G_BEGIN_DECLS -#define ATK_TYPE_STATE_SET (atk_state_set_get_type ()) -#define ATK_STATE_SET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_STATE_SET, AtkStateSet)) -#define ATK_STATE_SET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ATK_TYPE_STATE_SET, AtkStateSetClass)) -#define ATK_IS_STATE_SET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_STATE_SET)) -#define ATK_IS_STATE_SET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ATK_TYPE_STATE_SET)) -#define ATK_STATE_SET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ATK_TYPE_STATE_SET, AtkStateSetClass)) - -typedef struct _AtkStateSetClass AtkStateSetClass; +#define ATK_TYPE_STATE_SET (atk_state_set_get_type ()) +#define ATK_STATE_SET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_STATE_SET, AtkStateSet)) +#define ATK_STATE_SET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ATK_TYPE_STATE_SET, AtkStateSetClass)) +#define ATK_IS_STATE_SET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_STATE_SET)) +#define ATK_IS_STATE_SET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ATK_TYPE_STATE_SET)) +#define ATK_STATE_SET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ATK_TYPE_STATE_SET, AtkStateSetClass)) +typedef struct _AtkStateSetClass AtkStateSetClass; struct _AtkStateSet { GObject parent; - }; struct _AtkStateSetClass @@ -55,37 +53,37 @@ ATK_AVAILABLE_IN_ALL GType atk_state_set_get_type (void); ATK_AVAILABLE_IN_ALL -AtkStateSet* atk_state_set_new (void); +AtkStateSet *atk_state_set_new (void); ATK_AVAILABLE_IN_ALL -gboolean atk_state_set_is_empty (AtkStateSet *set); +gboolean atk_state_set_is_empty (AtkStateSet *set); ATK_AVAILABLE_IN_ALL -gboolean atk_state_set_add_state (AtkStateSet *set, - AtkStateType type); +gboolean atk_state_set_add_state (AtkStateSet *set, + AtkStateType type); ATK_AVAILABLE_IN_ALL -void atk_state_set_add_states (AtkStateSet *set, - AtkStateType *types, - gint n_types); +void atk_state_set_add_states (AtkStateSet *set, + AtkStateType *types, + gint n_types); ATK_AVAILABLE_IN_ALL -void atk_state_set_clear_states (AtkStateSet *set); +void atk_state_set_clear_states (AtkStateSet *set); ATK_AVAILABLE_IN_ALL -gboolean atk_state_set_contains_state (AtkStateSet *set, - AtkStateType type); +gboolean atk_state_set_contains_state (AtkStateSet *set, + AtkStateType type); ATK_AVAILABLE_IN_ALL -gboolean atk_state_set_contains_states (AtkStateSet *set, - AtkStateType *types, - gint n_types); +gboolean atk_state_set_contains_states (AtkStateSet *set, + AtkStateType *types, + gint n_types); ATK_AVAILABLE_IN_ALL -gboolean atk_state_set_remove_state (AtkStateSet *set, - AtkStateType type); +gboolean atk_state_set_remove_state (AtkStateSet *set, + AtkStateType type); ATK_AVAILABLE_IN_ALL -AtkStateSet* atk_state_set_and_sets (AtkStateSet *set, - AtkStateSet *compare_set); +AtkStateSet *atk_state_set_and_sets (AtkStateSet *set, + AtkStateSet *compare_set); ATK_AVAILABLE_IN_ALL -AtkStateSet* atk_state_set_or_sets (AtkStateSet *set, - AtkStateSet *compare_set); +AtkStateSet *atk_state_set_or_sets (AtkStateSet *set, + AtkStateSet *compare_set); ATK_AVAILABLE_IN_ALL -AtkStateSet* atk_state_set_xor_sets (AtkStateSet *set, - AtkStateSet *compare_set); +AtkStateSet *atk_state_set_xor_sets (AtkStateSet *set, + AtkStateSet *compare_set); G_END_DECLS diff --git a/atk/atkstreamablecontent.c b/atk/atkstreamablecontent.c index 2ace98ed..081c4716 100644 --- a/atk/atkstreamablecontent.c +++ b/atk/atkstreamablecontent.c @@ -49,17 +49,17 @@ atk_streamable_content_get_type (void) { static GType type = 0; - if (!type) { - GTypeInfo tinfo = + if (!type) { - sizeof (AtkStreamableContentIface), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, + GTypeInfo tinfo = { + sizeof (AtkStreamableContentIface), + (GBaseInitFunc) NULL, + (GBaseFinalizeFunc) NULL, - }; + }; - type = g_type_register_static (G_TYPE_INTERFACE, "AtkStreamableContent", &tinfo, 0); - } + type = g_type_register_static (G_TYPE_INTERFACE, "AtkStreamableContent", &tinfo, 0); + } return type; } @@ -98,9 +98,9 @@ atk_streamable_content_get_n_mime_types (AtkStreamableContent *streamable) * Returns: a gchar* representing the specified mime type; the caller * should not free the character string. **/ -const gchar* +const gchar * atk_streamable_content_get_mime_type (AtkStreamableContent *streamable, - gint i) + gint i) { AtkStreamableContentIface *iface; @@ -125,9 +125,9 @@ atk_streamable_content_get_mime_type (AtkStreamableContent *streamable, * Returns: (transfer full): A #GIOChannel which contains the content in the * specified mime type. **/ -GIOChannel* +GIOChannel * atk_streamable_content_get_stream (AtkStreamableContent *streamable, - const gchar *mime_type) + const gchar *mime_type) { AtkStreamableContentIface *iface; @@ -145,14 +145,14 @@ atk_streamable_content_get_stream (AtkStreamableContent *streamable, /** * atk_streamable_content_get_uri: * @streamable: a GObject instance that implements AtkStreamableContentIface - * @mime_type: a gchar* representing the mime type, or NULL to request a URI + * @mime_type: a gchar* representing the mime type, or NULL to request a URI * for the default mime type. * * Get a string representing a URI in IETF standard format * (see http://www.ietf.org/rfc/rfc2396.txt) from which the object's content * may be streamed in the specified mime-type, if one is available. * If mime_type is NULL, the URI for the default (and possibly only) mime-type is - * returned. + * returned. * * Note that it is possible for get_uri to return NULL but for * get_stream to work nonetheless, since not all GIOChannels connect to URIs. @@ -162,9 +162,9 @@ atk_streamable_content_get_stream (AtkStreamableContent *streamable, * * Since: 1.12 **/ -const gchar* +const gchar * atk_streamable_content_get_uri (AtkStreamableContent *streamable, - const gchar *mime_type) + const gchar *mime_type) { AtkStreamableContentIface *iface; diff --git a/atk/atkstreamablecontent.h b/atk/atkstreamablecontent.h index a43d1b98..fac4b6a4 100644 --- a/atk/atkstreamablecontent.h +++ b/atk/atkstreamablecontent.h @@ -20,7 +20,7 @@ #ifndef __ATK_STREAMABLE_CONTENT_H__ #define __ATK_STREAMABLE_CONTENT_H__ -#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) +#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined(__ATK_H_INSIDE__) && !defined(ATK_COMPILATION) #error "Only <atk/atk.h> can be included directly." #endif @@ -28,9 +28,9 @@ G_BEGIN_DECLS -#define ATK_TYPE_STREAMABLE_CONTENT (atk_streamable_content_get_type ()) -#define ATK_IS_STREAMABLE_CONTENT(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_STREAMABLE_CONTENT) -#define ATK_STREAMABLE_CONTENT(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_STREAMABLE_CONTENT, AtkStreamableContent) +#define ATK_TYPE_STREAMABLE_CONTENT (atk_streamable_content_get_type ()) +#define ATK_IS_STREAMABLE_CONTENT(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_STREAMABLE_CONTENT) +#define ATK_STREAMABLE_CONTENT(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_STREAMABLE_CONTENT, AtkStreamableContent) #define ATK_STREAMABLE_CONTENT_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_STREAMABLE_CONTENT, AtkStreamableContentIface)) #ifndef _TYPEDEF_ATK_STREAMABLE_CONTENT @@ -46,10 +46,10 @@ struct _AtkStreamableContentIface /* * Get the number of mime types supported by this object */ - gint (* get_n_mime_types) (AtkStreamableContent *streamable); + gint (*get_n_mime_types) (AtkStreamableContent *streamable); /* * Gets the specified mime type supported by this object. - * The mime types are 0-based so the first mime type is + * The mime types are 0-based so the first mime type is * at index 0, the second at index 1 and so on. The mime-type * at index 0 should be considered the "default" data type for the stream. * @@ -58,52 +58,51 @@ struct _AtkStreamableContentIface * and the caller would be responsible for calling g_free() on the * returned value. */ - const gchar* (* get_mime_type) (AtkStreamableContent *streamable, - gint i); + const gchar *(*get_mime_type) (AtkStreamableContent *streamable, + gint i); /* * One possible implementation for this method is that it constructs the * content appropriate for the mime type and then creates a temporary * file containing the content, opens the file and then calls * g_io_channel_unix_new_fd(). */ - GIOChannel* (* get_stream) (AtkStreamableContent *streamable, - const gchar *mime_type); - -/* - * Returns a string representing a URI in IETF standard format - * (see http://www.ietf.org/rfc/rfc2396.txt) from which the object's content - * may be streamed in the specified mime-type. - * If mime_type is NULL, the URI for the default (and possibly only) mime-type is - * returned. - * - * returns NULL if the mime-type is not supported, or if no URI can be - * constructed. Note that it is possible for get_uri to return NULL but for - * get_stream to work nonetheless, since not all GIOChannels connect to URIs. - */ - const gchar* (* get_uri) (AtkStreamableContent *streamable, - const gchar *mime_type); + GIOChannel *(*get_stream) (AtkStreamableContent *streamable, + const gchar *mime_type); + /* + * Returns a string representing a URI in IETF standard format + * (see http://www.ietf.org/rfc/rfc2396.txt) from which the object's content + * may be streamed in the specified mime-type. + * If mime_type is NULL, the URI for the default (and possibly only) mime-type is + * returned. + * + * returns NULL if the mime-type is not supported, or if no URI can be + * constructed. Note that it is possible for get_uri to return NULL but for + * get_stream to work nonetheless, since not all GIOChannels connect to URIs. + */ + const gchar *(*get_uri) (AtkStreamableContent *streamable, + const gchar *mime_type); - AtkFunction pad1; - AtkFunction pad2; - AtkFunction pad3; + AtkFunction pad1; + AtkFunction pad2; + AtkFunction pad3; }; ATK_AVAILABLE_IN_ALL -GType atk_streamable_content_get_type (void); +GType atk_streamable_content_get_type (void); ATK_AVAILABLE_IN_ALL -gint atk_streamable_content_get_n_mime_types (AtkStreamableContent *streamable); +gint atk_streamable_content_get_n_mime_types (AtkStreamableContent *streamable); ATK_AVAILABLE_IN_ALL -const gchar* atk_streamable_content_get_mime_type (AtkStreamableContent *streamable, - gint i); +const gchar *atk_streamable_content_get_mime_type (AtkStreamableContent *streamable, + gint i); ATK_AVAILABLE_IN_ALL -GIOChannel* atk_streamable_content_get_stream (AtkStreamableContent *streamable, - const gchar *mime_type); +GIOChannel *atk_streamable_content_get_stream (AtkStreamableContent *streamable, + const gchar *mime_type); ATK_AVAILABLE_IN_ALL -const gchar* atk_streamable_content_get_uri (AtkStreamableContent *streamable, - const gchar *mime_type); +const gchar *atk_streamable_content_get_uri (AtkStreamableContent *streamable, + const gchar *mime_type); G_END_DECLS diff --git a/atk/atktable.c b/atk/atktable.c index dbdfca39..c1fa5260 100644 --- a/atk/atktable.c +++ b/atk/atktable.c @@ -19,8 +19,8 @@ #include "config.h" -#include "atktable.h" #include "atkmarshal.h" +#include "atktable.h" /** * AtkTable: @@ -57,7 +57,8 @@ * index-based methods are deprecated. */ -enum { +enum +{ ROW_INSERTED, ROW_DELETED, COLUMN_INSERTED, @@ -68,7 +69,7 @@ enum { LAST_SIGNAL }; -static void atk_table_base_init (gpointer *g_class); +static void atk_table_base_init (gpointer *g_class); static guint atk_table_signals[LAST_SIGNAL] = { 0 }; @@ -76,28 +77,27 @@ GType atk_table_get_type (void) { static GType type = 0; - - if (!type) { - GTypeInfo tinfo = + + if (!type) { - sizeof (AtkTableIface), - (GBaseInitFunc) atk_table_base_init, - (GBaseFinalizeFunc) NULL, - - }; - - type = g_type_register_static (G_TYPE_INTERFACE, "AtkTable", &tinfo, 0); - } - + GTypeInfo tinfo = { + sizeof (AtkTableIface), + (GBaseInitFunc) atk_table_base_init, + (GBaseFinalizeFunc) NULL, + + }; + + type = g_type_register_static (G_TYPE_INTERFACE, "AtkTable", &tinfo, 0); + } + return type; } - static void atk_table_base_init (gpointer *g_class) { static gboolean initialized = FALSE; - + if (!initialized) { /** @@ -110,14 +110,14 @@ atk_table_base_init (gpointer *g_class) * implements the AtkTable interface when a row is inserted. */ atk_table_signals[ROW_INSERTED] = - g_signal_new ("row_inserted", - ATK_TYPE_TABLE, - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (AtkTableIface, row_inserted), - (GSignalAccumulator) NULL, NULL, - atk_marshal_VOID__INT_INT, - G_TYPE_NONE, - 2, G_TYPE_INT, G_TYPE_INT); + g_signal_new ("row_inserted", + ATK_TYPE_TABLE, + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (AtkTableIface, row_inserted), + (GSignalAccumulator) NULL, NULL, + atk_marshal_VOID__INT_INT, + G_TYPE_NONE, + 2, G_TYPE_INT, G_TYPE_INT); /** * AtkTable::column-inserted: * @atktable: the object which received the signal. @@ -128,14 +128,14 @@ atk_table_base_init (gpointer *g_class) * implements the AtkTable interface when a column is inserted. */ atk_table_signals[COLUMN_INSERTED] = - g_signal_new ("column_inserted", - ATK_TYPE_TABLE, - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (AtkTableIface, column_inserted), - (GSignalAccumulator) NULL, NULL, - atk_marshal_VOID__INT_INT, - G_TYPE_NONE, - 2, G_TYPE_INT, G_TYPE_INT); + g_signal_new ("column_inserted", + ATK_TYPE_TABLE, + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (AtkTableIface, column_inserted), + (GSignalAccumulator) NULL, NULL, + atk_marshal_VOID__INT_INT, + G_TYPE_NONE, + 2, G_TYPE_INT, G_TYPE_INT); /** * AtkTable::row-deleted: * @atktable: the object which received the signal. @@ -146,14 +146,14 @@ atk_table_base_init (gpointer *g_class) * implements the AtkTable interface when a row is deleted. */ atk_table_signals[ROW_DELETED] = - g_signal_new ("row_deleted", - ATK_TYPE_TABLE, - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (AtkTableIface, row_deleted), - (GSignalAccumulator) NULL, NULL, - atk_marshal_VOID__INT_INT, - G_TYPE_NONE, - 2, G_TYPE_INT, G_TYPE_INT); + g_signal_new ("row_deleted", + ATK_TYPE_TABLE, + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (AtkTableIface, row_deleted), + (GSignalAccumulator) NULL, NULL, + atk_marshal_VOID__INT_INT, + G_TYPE_NONE, + 2, G_TYPE_INT, G_TYPE_INT); /** * AtkTable::column-deleted: * @atktable: the object which received the signal. @@ -164,14 +164,14 @@ atk_table_base_init (gpointer *g_class) * implements the AtkTable interface when a column is deleted. */ atk_table_signals[COLUMN_DELETED] = - g_signal_new ("column_deleted", - ATK_TYPE_TABLE, - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (AtkTableIface, column_deleted), - (GSignalAccumulator) NULL, NULL, - atk_marshal_VOID__INT_INT, - G_TYPE_NONE, - 2, G_TYPE_INT, G_TYPE_INT); + g_signal_new ("column_deleted", + ATK_TYPE_TABLE, + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (AtkTableIface, column_deleted), + (GSignalAccumulator) NULL, NULL, + atk_marshal_VOID__INT_INT, + G_TYPE_NONE, + 2, G_TYPE_INT, G_TYPE_INT); /** * AtkTable::row-reordered: * @atktable: the object which received the signal. @@ -181,14 +181,14 @@ atk_table_base_init (gpointer *g_class) * reordered. */ atk_table_signals[ROW_REORDERED] = - g_signal_new ("row_reordered", - ATK_TYPE_TABLE, - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (AtkTableIface, row_reordered), - (GSignalAccumulator) NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, - 0); + g_signal_new ("row_reordered", + ATK_TYPE_TABLE, + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (AtkTableIface, row_reordered), + (GSignalAccumulator) NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, + 0); /** * AtkTable::column-reordered: * @atktable: the object which received the signal. @@ -198,14 +198,14 @@ atk_table_base_init (gpointer *g_class) * reordered. */ atk_table_signals[COLUMN_REORDERED] = - g_signal_new ("column_reordered", - ATK_TYPE_TABLE, - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (AtkTableIface, column_reordered), - (GSignalAccumulator) NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, - 0); + g_signal_new ("column_reordered", + ATK_TYPE_TABLE, + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (AtkTableIface, column_reordered), + (GSignalAccumulator) NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, + 0); /** * AtkTable::model-changed: @@ -216,13 +216,13 @@ atk_table_base_init (gpointer *g_class) * the table changes. */ atk_table_signals[MODEL_CHANGED] = - g_signal_new ("model_changed", - ATK_TYPE_TABLE, - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (AtkTableIface, model_changed), - (GSignalAccumulator) NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); + g_signal_new ("model_changed", + ATK_TYPE_TABLE, + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (AtkTableIface, model_changed), + (GSignalAccumulator) NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); initialized = TRUE; } @@ -240,10 +240,10 @@ atk_table_base_init (gpointer *g_class) * Returns: (transfer full): an #AtkObject representing the referred * to accessible **/ -AtkObject* +AtkObject * atk_table_ref_at (AtkTable *table, - gint row, - gint column) + gint row, + gint column) { AtkTableIface *iface; @@ -277,8 +277,8 @@ atk_table_ref_at (AtkTable *table, **/ gint atk_table_get_index_at (AtkTable *table, - gint row, - gint column) + gint row, + gint column) { AtkTableIface *iface; @@ -308,7 +308,7 @@ atk_table_get_index_at (AtkTable *table, **/ gint atk_table_get_row_at_index (AtkTable *table, - gint index) + gint index) { AtkTableIface *iface; @@ -336,7 +336,7 @@ atk_table_get_row_at_index (AtkTable *table, **/ gint atk_table_get_column_at_index (AtkTable *table, - gint index) + gint index) { AtkTableIface *iface; @@ -359,7 +359,7 @@ atk_table_get_column_at_index (AtkTable *table, * Returns: (nullable) (transfer none): a AtkObject* representing the * table caption, or %NULL if value does not implement this interface. **/ -AtkObject* +AtkObject * atk_table_get_caption (AtkTable *table) { AtkTableIface *iface; @@ -408,9 +408,9 @@ atk_table_get_n_columns (AtkTable *table) * Returns: a gchar* representing the column description, or %NULL * if value does not implement this interface. **/ -const gchar* +const gchar * atk_table_get_column_description (AtkTable *table, - gint column) + gint column) { AtkTableIface *iface; @@ -438,8 +438,8 @@ atk_table_get_column_description (AtkTable *table, **/ gint atk_table_get_column_extent_at (AtkTable *table, - gint row, - gint column) + gint row, + gint column) { AtkTableIface *iface; @@ -464,7 +464,7 @@ atk_table_get_column_extent_at (AtkTable *table, * specified column header, or %NULL if value does not implement this * interface. **/ -AtkObject* +AtkObject * atk_table_get_column_header (AtkTable *table, gint column) { AtkTableIface *iface; @@ -513,9 +513,9 @@ atk_table_get_n_rows (AtkTable *table) * Returns: (nullable): a gchar* representing the row description, or * %NULL if value does not implement this interface. **/ -const gchar* +const gchar * atk_table_get_row_description (AtkTable *table, - gint row) + gint row) { AtkTableIface *iface; @@ -543,8 +543,8 @@ atk_table_get_row_description (AtkTable *table, **/ gint atk_table_get_row_extent_at (AtkTable *table, - gint row, - gint column) + gint row, + gint column) { AtkTableIface *iface; @@ -569,7 +569,7 @@ atk_table_get_row_extent_at (AtkTable *table, * specified row header, or %NULL if value does not implement this * interface. **/ -AtkObject* +AtkObject * atk_table_get_row_header (AtkTable *table, gint row) { AtkTableIface *iface; @@ -593,7 +593,7 @@ atk_table_get_row_header (AtkTable *table, gint row) * Returns: (transfer full): a AtkObject* representing a summary description * of the table, or zero if value does not implement this interface. **/ -AtkObject* +AtkObject * atk_table_get_summary (AtkTable *table) { AtkTableIface *iface; @@ -613,7 +613,7 @@ atk_table_get_summary (AtkTable *table) * @table: a GObject instance that implements AtkTableIface * @selected: a #gint** that is to contain the selected row numbers * - * Gets the selected rows of the table by initializing **selected with + * Gets the selected rows of the table by initializing **selected with * the selected row numbers. This array should be freed by the caller. * * Returns: a gint representing the number of selected rows, @@ -639,13 +639,13 @@ atk_table_get_selected_rows (AtkTable *table, gint **selected) * @table: a GObject instance that implements AtkTableIface * @selected: a #gint** that is to contain the selected columns numbers * - * Gets the selected columns of the table by initializing **selected with + * Gets the selected columns of the table by initializing **selected with * the selected column numbers. This array should be freed by the caller. * * Returns: a gint representing the number of selected columns, * or %0 if value does not implement this interface. **/ -gint +gint atk_table_get_selected_columns (AtkTable *table, gint **selected) { AtkTableIface *iface; @@ -673,7 +673,7 @@ atk_table_get_selected_columns (AtkTable *table, gint **selected) **/ gboolean atk_table_is_column_selected (AtkTable *table, - gint column) + gint column) { AtkTableIface *iface; @@ -700,7 +700,7 @@ atk_table_is_column_selected (AtkTable *table, **/ gboolean atk_table_is_row_selected (AtkTable *table, - gint row) + gint row) { AtkTableIface *iface; @@ -728,8 +728,8 @@ atk_table_is_row_selected (AtkTable *table, **/ gboolean atk_table_is_selected (AtkTable *table, - gint row, - gint column) + gint row, + gint column) { AtkTableIface *iface; @@ -748,14 +748,14 @@ atk_table_is_selected (AtkTable *table, * @table: a GObject instance that implements AtkTableIface * @row: a #gint representing a row in @table * - * Adds the specified @row to the selection. + * Adds the specified @row to the selection. * * Returns: a gboolean representing if row was successfully added to selection, * or 0 if value does not implement this interface. **/ gboolean atk_table_add_row_selection (AtkTable *table, - gint row) + gint row) { AtkTableIface *iface; @@ -773,14 +773,14 @@ atk_table_add_row_selection (AtkTable *table, * @table: a GObject instance that implements AtkTableIface * @row: a #gint representing a row in @table * - * Removes the specified @row from the selection. + * Removes the specified @row from the selection. * * Returns: a gboolean representing if the row was successfully removed from * the selection, or 0 if value does not implement this interface. **/ gboolean atk_table_remove_row_selection (AtkTable *table, - gint row) + gint row) { AtkTableIface *iface; @@ -798,14 +798,14 @@ atk_table_remove_row_selection (AtkTable *table, * @table: a GObject instance that implements AtkTableIface * @column: a #gint representing a column in @table * - * Adds the specified @column to the selection. + * Adds the specified @column to the selection. * - * Returns: a gboolean representing if the column was successfully added to + * Returns: a gboolean representing if the column was successfully added to * the selection, or 0 if value does not implement this interface. **/ gboolean atk_table_add_column_selection (AtkTable *table, - gint column) + gint column) { AtkTableIface *iface; @@ -823,14 +823,14 @@ atk_table_add_column_selection (AtkTable *table, * @table: a GObject instance that implements AtkTableIface * @column: a #gint representing a column in @table * - * Adds the specified @column to the selection. + * Adds the specified @column to the selection. * * Returns: a gboolean representing if the column was successfully removed from * the selection, or 0 if value does not implement this interface. **/ gboolean atk_table_remove_column_selection (AtkTable *table, - gint column) + gint column) { AtkTableIface *iface; @@ -852,8 +852,8 @@ atk_table_remove_column_selection (AtkTable *table, * Sets the caption for the table. **/ void -atk_table_set_caption (AtkTable *table, - AtkObject *caption) +atk_table_set_caption (AtkTable *table, + AtkObject *caption) { AtkTableIface *iface; @@ -875,9 +875,9 @@ atk_table_set_caption (AtkTable *table, * Sets the description text for the specified @column of the @table. **/ void -atk_table_set_column_description (AtkTable *table, - gint column, - const gchar *description) +atk_table_set_column_description (AtkTable *table, + gint column, + const gchar *description) { AtkTableIface *iface; @@ -898,8 +898,8 @@ atk_table_set_column_description (AtkTable *table, * Sets the specified column header to @header. **/ void -atk_table_set_column_header (AtkTable *table, - gint column, +atk_table_set_column_header (AtkTable *table, + gint column, AtkObject *header) { AtkTableIface *iface; @@ -922,9 +922,9 @@ atk_table_set_column_header (AtkTable *table, * Sets the description text for the specified @row of @table. **/ void -atk_table_set_row_description (AtkTable *table, - gint row, - const gchar *description) +atk_table_set_row_description (AtkTable *table, + gint row, + const gchar *description) { AtkTableIface *iface; @@ -940,13 +940,13 @@ atk_table_set_row_description (AtkTable *table, * atk_table_set_row_header: * @table: a GObject instance that implements AtkTableIface * @row: a #gint representing a row in @table - * @header: an #AtkTable + * @header: an #AtkTable * * Sets the specified row header to @header. **/ void -atk_table_set_row_header (AtkTable *table, - gint row, +atk_table_set_row_header (AtkTable *table, + gint row, AtkObject *header) { AtkTableIface *iface; @@ -968,8 +968,8 @@ atk_table_set_row_header (AtkTable *table, * Sets the summary description of the table. **/ void -atk_table_set_summary (AtkTable *table, - AtkObject *accessible) +atk_table_set_summary (AtkTable *table, + AtkObject *accessible) { AtkTableIface *iface; diff --git a/atk/atktable.h b/atk/atktable.h index 19b48aba..c6fafe7a 100644 --- a/atk/atktable.h +++ b/atk/atktable.h @@ -20,7 +20,7 @@ #ifndef __ATK_TABLE_H__ #define __ATK_TABLE_H__ -#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) +#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined(__ATK_H_INSIDE__) && !defined(ATK_COMPILATION) #error "Only <atk/atk.h> can be included directly." #endif @@ -28,10 +28,10 @@ G_BEGIN_DECLS -#define ATK_TYPE_TABLE (atk_table_get_type ()) -#define ATK_IS_TABLE(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_TABLE) -#define ATK_TABLE(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_TABLE, AtkTable) -#define ATK_TABLE_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_TABLE, AtkTableIface)) +#define ATK_TYPE_TABLE (atk_table_get_type ()) +#define ATK_IS_TABLE(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_TABLE) +#define ATK_TABLE(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_TABLE, AtkTable) +#define ATK_TABLE_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_TABLE, AtkTableIface)) #ifndef _TYPEDEF_ATK_TABLE_ #define _TYPEDEF_ATK_TABLE_ @@ -43,190 +43,186 @@ struct _AtkTableIface { GTypeInterface parent; - AtkObject* (* ref_at) (AtkTable *table, - gint row, - gint column); - gint (* get_index_at) (AtkTable *table, - gint row, - gint column); - gint (* get_column_at_index) (AtkTable *table, - gint index_); - gint (* get_row_at_index) (AtkTable *table, - gint index_); - gint (* get_n_columns) (AtkTable *table); - gint (* get_n_rows) (AtkTable *table); - gint (* get_column_extent_at) (AtkTable *table, - gint row, - gint column); - gint (* get_row_extent_at) (AtkTable *table, - gint row, - gint column); - AtkObject* - (* get_caption) (AtkTable *table); - const gchar* (* get_column_description) (AtkTable *table, - gint column); - AtkObject* (* get_column_header) (AtkTable *table, - gint column); - const gchar* (* get_row_description) (AtkTable *table, - gint row); - AtkObject* (* get_row_header) (AtkTable *table, - gint row); - AtkObject* (* get_summary) (AtkTable *table); - void (* set_caption) (AtkTable *table, - AtkObject *caption); - void (* set_column_description) (AtkTable *table, - gint column, - const gchar *description); - void (* set_column_header) (AtkTable *table, - gint column, - AtkObject *header); - void (* set_row_description) (AtkTable *table, - gint row, - const gchar *description); - void (* set_row_header) (AtkTable *table, - gint row, - AtkObject *header); - void (* set_summary) (AtkTable *table, - AtkObject *accessible); - gint (* get_selected_columns) (AtkTable *table, - gint **selected); - gint (* get_selected_rows) (AtkTable *table, - gint **selected); - gboolean (* is_column_selected) (AtkTable *table, - gint column); - gboolean (* is_row_selected) (AtkTable *table, - gint row); - gboolean (* is_selected) (AtkTable *table, - gint row, - gint column); - gboolean (* add_row_selection) (AtkTable *table, - gint row); - gboolean (* remove_row_selection) (AtkTable *table, - gint row); - gboolean (* add_column_selection) (AtkTable *table, - gint column); - gboolean (* remove_column_selection) (AtkTable *table, - gint column); + AtkObject *(*ref_at) (AtkTable *table, + gint row, + gint column); + gint (*get_index_at) (AtkTable *table, + gint row, + gint column); + gint (*get_column_at_index) (AtkTable *table, + gint index_); + gint (*get_row_at_index) (AtkTable *table, + gint index_); + gint (*get_n_columns) (AtkTable *table); + gint (*get_n_rows) (AtkTable *table); + gint (*get_column_extent_at) (AtkTable *table, + gint row, + gint column); + gint (*get_row_extent_at) (AtkTable *table, + gint row, + gint column); + AtkObject *(*get_caption) (AtkTable *table); + const gchar *(*get_column_description) (AtkTable *table, + gint column); + AtkObject *(*get_column_header) (AtkTable *table, + gint column); + const gchar *(*get_row_description) (AtkTable *table, + gint row); + AtkObject *(*get_row_header) (AtkTable *table, + gint row); + AtkObject *(*get_summary) (AtkTable *table); + void (*set_caption) (AtkTable *table, + AtkObject *caption); + void (*set_column_description) (AtkTable *table, + gint column, + const gchar *description); + void (*set_column_header) (AtkTable *table, + gint column, + AtkObject *header); + void (*set_row_description) (AtkTable *table, + gint row, + const gchar *description); + void (*set_row_header) (AtkTable *table, + gint row, + AtkObject *header); + void (*set_summary) (AtkTable *table, + AtkObject *accessible); + gint (*get_selected_columns) (AtkTable *table, + gint **selected); + gint (*get_selected_rows) (AtkTable *table, + gint **selected); + gboolean (*is_column_selected) (AtkTable *table, + gint column); + gboolean (*is_row_selected) (AtkTable *table, + gint row); + gboolean (*is_selected) (AtkTable *table, + gint row, + gint column); + gboolean (*add_row_selection) (AtkTable *table, + gint row); + gboolean (*remove_row_selection) (AtkTable *table, + gint row); + gboolean (*add_column_selection) (AtkTable *table, + gint column); + gboolean (*remove_column_selection) (AtkTable *table, + gint column); /* * signal handlers */ - void (* row_inserted) (AtkTable *table, - gint row, - gint num_inserted); - void (* column_inserted) (AtkTable *table, - gint column, - gint num_inserted); - void (* row_deleted) (AtkTable *table, - gint row, - gint num_deleted); - void (* column_deleted) (AtkTable *table, - gint column, - gint num_deleted); - void (* row_reordered) (AtkTable *table); - void (* column_reordered) (AtkTable *table); - void (* model_changed) (AtkTable *table); + void (*row_inserted) (AtkTable *table, + gint row, + gint num_inserted); + void (*column_inserted) (AtkTable *table, + gint column, + gint num_inserted); + void (*row_deleted) (AtkTable *table, + gint row, + gint num_deleted); + void (*column_deleted) (AtkTable *table, + gint column, + gint num_deleted); + void (*row_reordered) (AtkTable *table); + void (*column_reordered) (AtkTable *table); + void (*model_changed) (AtkTable *table); }; ATK_AVAILABLE_IN_ALL GType atk_table_get_type (void); ATK_AVAILABLE_IN_ALL -AtkObject* atk_table_ref_at (AtkTable *table, - gint row, - gint column); -ATK_DEPRECATED_IN_2_12_FOR(atk_table_ref_at) -gint atk_table_get_index_at (AtkTable *table, - gint row, - gint column); +AtkObject *atk_table_ref_at (AtkTable *table, + gint row, + gint column); +ATK_DEPRECATED_IN_2_12_FOR (atk_table_ref_at) +gint atk_table_get_index_at (AtkTable *table, + gint row, + gint column); ATK_DEPRECATED_IN_2_12 -gint atk_table_get_column_at_index (AtkTable *table, - gint index_); +gint atk_table_get_column_at_index (AtkTable *table, + gint index_); ATK_DEPRECATED_IN_2_12 -gint atk_table_get_row_at_index (AtkTable *table, - gint index_); +gint atk_table_get_row_at_index (AtkTable *table, + gint index_); ATK_AVAILABLE_IN_ALL -gint atk_table_get_n_columns (AtkTable *table); +gint atk_table_get_n_columns (AtkTable *table); ATK_AVAILABLE_IN_ALL -gint atk_table_get_n_rows (AtkTable *table); +gint atk_table_get_n_rows (AtkTable *table); ATK_AVAILABLE_IN_ALL -gint atk_table_get_column_extent_at (AtkTable *table, - gint row, - gint column); +gint atk_table_get_column_extent_at (AtkTable *table, + gint row, + gint column); ATK_AVAILABLE_IN_ALL -gint atk_table_get_row_extent_at (AtkTable *table, - gint row, - gint column); +gint atk_table_get_row_extent_at (AtkTable *table, + gint row, + gint column); ATK_AVAILABLE_IN_ALL -AtkObject* - atk_table_get_caption (AtkTable *table); +AtkObject * +atk_table_get_caption (AtkTable *table); ATK_AVAILABLE_IN_ALL -const gchar* atk_table_get_column_description - (AtkTable *table, - gint column); +const gchar *atk_table_get_column_description (AtkTable *table, + gint column); ATK_AVAILABLE_IN_ALL -AtkObject* atk_table_get_column_header (AtkTable *table, - gint column); +AtkObject *atk_table_get_column_header (AtkTable *table, + gint column); ATK_AVAILABLE_IN_ALL -const gchar* atk_table_get_row_description (AtkTable *table, - gint row); +const gchar *atk_table_get_row_description (AtkTable *table, + gint row); ATK_AVAILABLE_IN_ALL -AtkObject* atk_table_get_row_header (AtkTable *table, - gint row); +AtkObject *atk_table_get_row_header (AtkTable *table, + gint row); ATK_AVAILABLE_IN_ALL -AtkObject* atk_table_get_summary (AtkTable *table); +AtkObject *atk_table_get_summary (AtkTable *table); ATK_AVAILABLE_IN_ALL -void atk_table_set_caption (AtkTable *table, - AtkObject *caption); +void atk_table_set_caption (AtkTable *table, + AtkObject *caption); ATK_AVAILABLE_IN_ALL -void atk_table_set_column_description - (AtkTable *table, - gint column, - const gchar *description); +void atk_table_set_column_description (AtkTable *table, + gint column, + const gchar *description); ATK_AVAILABLE_IN_ALL -void atk_table_set_column_header (AtkTable *table, - gint column, - AtkObject *header); +void atk_table_set_column_header (AtkTable *table, + gint column, + AtkObject *header); ATK_AVAILABLE_IN_ALL -void atk_table_set_row_description (AtkTable *table, - gint row, - const gchar *description); +void atk_table_set_row_description (AtkTable *table, + gint row, + const gchar *description); ATK_AVAILABLE_IN_ALL -void atk_table_set_row_header (AtkTable *table, - gint row, - AtkObject *header); +void atk_table_set_row_header (AtkTable *table, + gint row, + AtkObject *header); ATK_AVAILABLE_IN_ALL -void atk_table_set_summary (AtkTable *table, - AtkObject *accessible); +void atk_table_set_summary (AtkTable *table, + AtkObject *accessible); ATK_AVAILABLE_IN_ALL -gint atk_table_get_selected_columns (AtkTable *table, - gint **selected); +gint atk_table_get_selected_columns (AtkTable *table, + gint **selected); ATK_AVAILABLE_IN_ALL -gint atk_table_get_selected_rows (AtkTable *table, - gint **selected); +gint atk_table_get_selected_rows (AtkTable *table, + gint **selected); ATK_AVAILABLE_IN_ALL -gboolean atk_table_is_column_selected (AtkTable *table, - gint column); +gboolean atk_table_is_column_selected (AtkTable *table, + gint column); ATK_AVAILABLE_IN_ALL -gboolean atk_table_is_row_selected (AtkTable *table, - gint row); +gboolean atk_table_is_row_selected (AtkTable *table, + gint row); ATK_AVAILABLE_IN_ALL -gboolean atk_table_is_selected (AtkTable *table, - gint row, - gint column); +gboolean atk_table_is_selected (AtkTable *table, + gint row, + gint column); ATK_AVAILABLE_IN_ALL -gboolean atk_table_add_row_selection (AtkTable *table, - gint row); +gboolean atk_table_add_row_selection (AtkTable *table, + gint row); ATK_AVAILABLE_IN_ALL -gboolean atk_table_remove_row_selection (AtkTable *table, - gint row); +gboolean atk_table_remove_row_selection (AtkTable *table, + gint row); ATK_AVAILABLE_IN_ALL -gboolean atk_table_add_column_selection (AtkTable *table, - gint column); +gboolean atk_table_add_column_selection (AtkTable *table, + gint column); ATK_AVAILABLE_IN_ALL -gboolean atk_table_remove_column_selection - (AtkTable *table, - gint column); +gboolean atk_table_remove_column_selection (AtkTable *table, + gint column); G_END_DECLS diff --git a/atk/atktablecell.c b/atk/atktablecell.c index 67bfdbfb..29b8f0f9 100644 --- a/atk/atktablecell.c +++ b/atk/atktablecell.c @@ -21,7 +21,6 @@ #include "atktablecell.h" - /** * AtkTableCell: * @@ -38,10 +37,10 @@ typedef AtkTableCellIface AtkTableCellInterface; G_DEFINE_INTERFACE (AtkTableCell, atk_table_cell, ATK_TYPE_OBJECT) static gboolean atk_table_cell_real_get_row_column_span (AtkTableCell *cell, - gint *row, - gint *column, - gint *row_span, - gint *column_span); + gint *row, + gint *column, + gint *row_span, + gint *column_span); static void atk_table_cell_default_init (AtkTableCellInterface *iface) @@ -115,8 +114,8 @@ atk_table_cell_get_column_header_cells (AtkTableCell *cell) */ gboolean atk_table_cell_get_position (AtkTableCell *cell, - gint *row, - gint *column) + gint *row, + gint *column) { AtkTableCellIface *iface; gint tmp_row, tmp_column; @@ -208,10 +207,10 @@ atk_table_cell_get_row_header_cells (AtkTableCell *cell) */ gboolean atk_table_cell_get_row_column_span (AtkTableCell *cell, - gint *row, - gint *column, - gint *row_span, - gint *column_span) + gint *row, + gint *column, + gint *row_span, + gint *column_span) { AtkTableCellIface *iface; gint local_row = 0, local_column = 0; @@ -230,8 +229,8 @@ atk_table_cell_get_row_column_span (AtkTableCell *cell, if (iface->get_row_column_span) return (iface->get_row_column_span) (cell, real_row, real_column, - real_row_span, - real_column_span); + real_row_span, + real_column_span); else return FALSE; } @@ -263,10 +262,10 @@ atk_table_cell_get_table (AtkTableCell *cell) static gboolean atk_table_cell_real_get_row_column_span (AtkTableCell *cell, - gint *row, - gint *column, - gint *row_span, - gint *column_span) + gint *row, + gint *column, + gint *row_span, + gint *column_span) { atk_table_cell_get_position (cell, row, column); *row_span = atk_table_cell_get_row_span (cell); diff --git a/atk/atktablecell.h b/atk/atktablecell.h index 5fd19d26..2aeaf06c 100644 --- a/atk/atktablecell.h +++ b/atk/atktablecell.h @@ -20,7 +20,7 @@ #ifndef __ATK_TABLE_CELL_H__ #define __ATK_TABLE_CELL_H__ -#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) +#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined(__ATK_H_INSIDE__) && !defined(ATK_COMPILATION) #error "Only <atk/atk.h> can be included directly." #endif @@ -28,10 +28,10 @@ G_BEGIN_DECLS -#define ATK_TYPE_TABLE_CELL (atk_table_cell_get_type ()) -#define ATK_IS_TABLE_CELL(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_TABLE_CELL) -#define ATK_TABLE_CELL(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_TABLE_CELL, AtkTableCell) -#define ATK_TABLE_CELL_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_TABLE_CELL, AtkTableCellIface)) +#define ATK_TYPE_TABLE_CELL (atk_table_cell_get_type ()) +#define ATK_IS_TABLE_CELL(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_TABLE_CELL) +#define ATK_TABLE_CELL(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_TABLE_CELL, AtkTableCell) +#define ATK_TABLE_CELL_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_TABLE_CELL, AtkTableCellIface)) #ifndef _TYPEDEF_ATK_TABLE_CELL_ #define _TYPEDEF_ATK_TABLE_CELL_ @@ -66,44 +66,44 @@ struct _AtkTableCellIface GTypeInterface parent; /*< public >*/ - gint (*get_column_span) (AtkTableCell *cell); - GPtrArray * (*get_column_header_cells) (AtkTableCell *cell); - gboolean (*get_position) (AtkTableCell *cell, - gint *row, - gint *column); - gint (*get_row_span) (AtkTableCell *cell); - GPtrArray * (*get_row_header_cells) (AtkTableCell *cell); - gboolean (*get_row_column_span) (AtkTableCell *cell, - gint *row, - gint *column, - gint *row_span, - gint *column_span); - AtkObject * (*get_table) (AtkTableCell *cell); + gint (*get_column_span) (AtkTableCell *cell); + GPtrArray *(*get_column_header_cells) (AtkTableCell *cell); + gboolean (*get_position) (AtkTableCell *cell, + gint *row, + gint *column); + gint (*get_row_span) (AtkTableCell *cell); + GPtrArray *(*get_row_header_cells) (AtkTableCell *cell); + gboolean (*get_row_column_span) (AtkTableCell *cell, + gint *row, + gint *column, + gint *row_span, + gint *column_span); + AtkObject *(*get_table) (AtkTableCell *cell); }; ATK_AVAILABLE_IN_2_12 GType atk_table_cell_get_type (void); ATK_AVAILABLE_IN_2_12 -gint atk_table_cell_get_column_span (AtkTableCell *cell); +gint atk_table_cell_get_column_span (AtkTableCell *cell); ATK_AVAILABLE_IN_2_12 -GPtrArray * atk_table_cell_get_column_header_cells (AtkTableCell *cell); +GPtrArray *atk_table_cell_get_column_header_cells (AtkTableCell *cell); ATK_AVAILABLE_IN_2_12 -gboolean atk_table_cell_get_position (AtkTableCell *cell, - gint *row, - gint *column); +gboolean atk_table_cell_get_position (AtkTableCell *cell, + gint *row, + gint *column); ATK_AVAILABLE_IN_2_12 -gint atk_table_cell_get_row_span (AtkTableCell *cell); +gint atk_table_cell_get_row_span (AtkTableCell *cell); ATK_AVAILABLE_IN_2_12 -GPtrArray * atk_table_cell_get_row_header_cells (AtkTableCell *cell); +GPtrArray *atk_table_cell_get_row_header_cells (AtkTableCell *cell); ATK_AVAILABLE_IN_2_12 -gboolean atk_table_cell_get_row_column_span (AtkTableCell *cell, - gint *row, - gint *column, - gint *row_span, - gint *column_span); +gboolean atk_table_cell_get_row_column_span (AtkTableCell *cell, + gint *row, + gint *column, + gint *row_span, + gint *column_span); ATK_AVAILABLE_IN_2_12 -AtkObject * atk_table_cell_get_table (AtkTableCell *cell); +AtkObject *atk_table_cell_get_table (AtkTableCell *cell); G_END_DECLS diff --git a/atk/atktext.c b/atk/atktext.c index a2da5989..072b2384 100644 --- a/atk/atktext.c +++ b/atk/atktext.c @@ -52,7 +52,8 @@ static GPtrArray *extra_attributes = NULL; -enum { +enum +{ TEXT_CHANGED, TEXT_CARET_MOVED, TEXT_SELECTION_CHANGED, @@ -63,98 +64,100 @@ enum { }; static const char boolean[] = - "false\0" - "true"; + "false\0" + "true"; static const guint8 boolean_offsets[] = { 0, 6 }; static const char style[] = - "normal\0" - "oblique\0" - "italic"; + "normal\0" + "oblique\0" + "italic"; static const guint8 style_offsets[] = { 0, 7, 15 }; static const char variant[] = - "normal\0" - "small_caps"; + "normal\0" + "small_caps"; static const guint8 variant_offsets[] = { 0, 7 }; static const char stretch[] = - "ultra_condensed\0" - "extra_condensed\0" - "condensed\0" - "semi_condensed\0" - "normal\0" - "semi_expanded\0" - "expanded\0" - "extra_expanded\0" - "ultra_expanded"; + "ultra_condensed\0" + "extra_condensed\0" + "condensed\0" + "semi_condensed\0" + "normal\0" + "semi_expanded\0" + "expanded\0" + "extra_expanded\0" + "ultra_expanded"; static const guint8 stretch_offsets[] = { 0, 16, 32, 42, 57, 64, 78, 87, 102 }; static const char justification[] = - "left\0" - "right\0" - "center\0" - "fill"; + "left\0" + "right\0" + "center\0" + "fill"; static const guint8 justification_offsets[] = { 0, 5, 11, 18 }; static const char direction[] = - "none\0" - "ltr\0" - "rtl"; + "none\0" + "ltr\0" + "rtl"; static const guint8 direction_offsets[] = { 0, 5, 9 }; static const char wrap_mode[] = - "none\0" - "char\0" - "word\0" - "word_char"; + "none\0" + "char\0" + "word\0" + "word_char"; static const guint8 wrap_mode_offsets[] = { 0, 5, 10, 15 }; static const char underline[] = - "none\0" - "single\0" - "double\0" - "low\0" - "error"; + "none\0" + "single\0" + "double\0" + "low\0" + "error"; static const guint8 underline_offsets[] = { 0, 5, 12, 19, 23 }; static const char text_position[] = - "baseline\0" - "super\0" - "sub\0"; + "baseline\0" + "super\0" + "sub\0"; static const guint8 text_position_offsets[] = { - 0, 9, 15, + 0, + 9, + 15, }; static void atk_text_base_init (AtkTextIface *class); -static void atk_text_real_get_range_extents (AtkText *text, - gint start_offset, - gint end_offset, - AtkCoordType coord_type, - AtkTextRectangle *rect); +static void atk_text_real_get_range_extents (AtkText *text, + gint start_offset, + gint end_offset, + AtkCoordType coord_type, + AtkTextRectangle *rect); -static AtkTextRange** atk_text_real_get_bounded_ranges (AtkText *text, +static AtkTextRange **atk_text_real_get_bounded_ranges (AtkText *text, AtkTextRectangle *rect, - AtkCoordType coord_type, - AtkTextClipType x_clip_type, - AtkTextClipType y_clip_type); + AtkCoordType coord_type, + AtkTextClipType x_clip_type, + AtkTextClipType y_clip_type); static guint atk_text_signals[LAST_SIGNAL] = { 0 }; @@ -163,14 +166,13 @@ atk_text_get_type (void) { static GType type = 0; - if (!type) + if (!type) { - static const GTypeInfo tinfo = - { + static const GTypeInfo tinfo = { sizeof (AtkTextIface), (GBaseInitFunc) atk_text_base_init, (GBaseFinalizeFunc) NULL, - (GClassInitFunc) NULL /* atk_text_interface_init */ , + (GClassInitFunc) NULL /* atk_text_interface_init */, (GClassFinalizeFunc) NULL, }; @@ -185,16 +187,16 @@ static void atk_text_base_init (AtkTextIface *class) { static gboolean initialized = FALSE; - - if (! initialized) + + if (!initialized) { - /* - * Note that text_changed signal supports details "insert", "delete", - * possibly "replace". + /* + * Note that text_changed signal supports details "insert", "delete", + * possibly "replace". */ - - class->get_range_extents = atk_text_real_get_range_extents; - class->get_bounded_ranges = atk_text_real_get_bounded_ranges; + + class->get_range_extents = atk_text_real_get_range_extents; + class->get_bounded_ranges = atk_text_real_get_bounded_ranges; /** * AtkText::text-changed: @@ -212,14 +214,14 @@ atk_text_base_init (AtkTextIface *class) * #AtkObject::text-remove instead. */ atk_text_signals[TEXT_CHANGED] = - g_signal_new ("text_changed", - ATK_TYPE_TEXT, - G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, - G_STRUCT_OFFSET (AtkTextIface, text_changed), - (GSignalAccumulator) NULL, NULL, - atk_marshal_VOID__INT_INT, - G_TYPE_NONE, - 2, G_TYPE_INT, G_TYPE_INT); + g_signal_new ("text_changed", + ATK_TYPE_TEXT, + G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, + G_STRUCT_OFFSET (AtkTextIface, text_changed), + (GSignalAccumulator) NULL, NULL, + atk_marshal_VOID__INT_INT, + G_TYPE_NONE, + 2, G_TYPE_INT, G_TYPE_INT); /** * AtkText::text-insert: @@ -234,14 +236,14 @@ atk_text_base_init (AtkTextIface *class) * included. */ atk_text_signals[TEXT_INSERT] = - g_signal_new ("text_insert", - ATK_TYPE_TEXT, - G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, - 0, - (GSignalAccumulator) NULL, NULL, - atk_marshal_VOID__INT_INT_STRING, - G_TYPE_NONE, - 3, G_TYPE_INT, G_TYPE_INT, G_TYPE_STRING); + g_signal_new ("text_insert", + ATK_TYPE_TEXT, + G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, + 0, + (GSignalAccumulator) NULL, NULL, + atk_marshal_VOID__INT_INT_STRING, + G_TYPE_NONE, + 3, G_TYPE_INT, G_TYPE_INT, G_TYPE_STRING); /** * AtkText::text-remove: @@ -256,14 +258,14 @@ atk_text_base_init (AtkTextIface *class) * included. */ atk_text_signals[TEXT_REMOVE] = - g_signal_new ("text_remove", - ATK_TYPE_TEXT, - G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, - 0, - (GSignalAccumulator) NULL, NULL, - atk_marshal_VOID__INT_INT_STRING, - G_TYPE_NONE, - 3, G_TYPE_INT, G_TYPE_INT, G_TYPE_STRING); + g_signal_new ("text_remove", + ATK_TYPE_TEXT, + G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, + 0, + (GSignalAccumulator) NULL, NULL, + atk_marshal_VOID__INT_INT_STRING, + G_TYPE_NONE, + 3, G_TYPE_INT, G_TYPE_INT, G_TYPE_STRING); /** * AtkText::text-caret-moved: @@ -275,14 +277,14 @@ atk_text_base_init (AtkTextIface *class) * changes. */ atk_text_signals[TEXT_CARET_MOVED] = - g_signal_new ("text_caret_moved", - ATK_TYPE_TEXT, - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (AtkTextIface, text_caret_moved), - (GSignalAccumulator) NULL, NULL, - g_cclosure_marshal_VOID__INT, - G_TYPE_NONE, - 1, G_TYPE_INT); + g_signal_new ("text_caret_moved", + ATK_TYPE_TEXT, + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (AtkTextIface, text_caret_moved), + (GSignalAccumulator) NULL, NULL, + g_cclosure_marshal_VOID__INT, + G_TYPE_NONE, + 1, G_TYPE_INT); /** * AtkText::text-selection-changed: @@ -292,13 +294,13 @@ atk_text_base_init (AtkTextIface *class) * selected text of an object which implements AtkText changes. */ atk_text_signals[TEXT_SELECTION_CHANGED] = - g_signal_new ("text_selection_changed", - ATK_TYPE_TEXT, - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (AtkTextIface, text_selection_changed), - (GSignalAccumulator) NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); + g_signal_new ("text_selection_changed", + ATK_TYPE_TEXT, + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (AtkTextIface, text_selection_changed), + (GSignalAccumulator) NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); /** * AtkText::text-attributes-changed: * @atktext: the object which received the signal. @@ -308,15 +310,14 @@ atk_text_base_init (AtkTextIface *class) * changes. */ atk_text_signals[TEXT_ATTRIBUTES_CHANGED] = - g_signal_new ("text_attributes_changed", - ATK_TYPE_TEXT, - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (AtkTextIface, text_attributes_changed), - (GSignalAccumulator) NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); - - + g_signal_new ("text_attributes_changed", + ATK_TYPE_TEXT, + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (AtkTextIface, text_attributes_changed), + (GSignalAccumulator) NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); + initialized = TRUE; } } @@ -333,13 +334,13 @@ atk_text_base_init (AtkTextIface *class) * to, but not including @end_offset. Use g_free() to free the returned * string. **/ -gchar* -atk_text_get_text (AtkText *text, - gint start_offset, - gint end_offset) +gchar * +atk_text_get_text (AtkText *text, + gint start_offset, + gint end_offset) { AtkTextIface *iface; - + g_return_val_if_fail (ATK_IS_TEXT (text), NULL); iface = ATK_TEXT_GET_IFACE (text); @@ -364,8 +365,8 @@ atk_text_get_text (AtkText *text, * Returns: the character at @offset or 0 in the case of failure. **/ gunichar -atk_text_get_character_at_offset (AtkText *text, - gint offset) +atk_text_get_character_at_offset (AtkText *text, + gint offset) { AtkTextIface *iface; @@ -396,12 +397,12 @@ atk_text_get_character_at_offset (AtkText *text, * by the specified @boundary_type. Use g_free() to free the returned * string. **/ -gchar* -atk_text_get_text_after_offset (AtkText *text, - gint offset, - AtkTextBoundary boundary_type, - gint *start_offset, - gint *end_offset) +gchar * +atk_text_get_text_after_offset (AtkText *text, + gint offset, + AtkTextBoundary boundary_type, + gint *start_offset, + gint *end_offset) { AtkTextIface *iface; gint local_start_offset, local_end_offset; @@ -470,12 +471,12 @@ atk_text_get_text_after_offset (AtkText *text, * by the specified @boundary_type. Use g_free() to free the returned * string. **/ -gchar* -atk_text_get_text_at_offset (AtkText *text, - gint offset, - AtkTextBoundary boundary_type, - gint *start_offset, - gint *end_offset) +gchar * +atk_text_get_text_at_offset (AtkText *text, + gint offset, + AtkTextBoundary boundary_type, + gint *start_offset, + gint *end_offset) { AtkTextIface *iface; gint local_start_offset, local_end_offset; @@ -517,12 +518,12 @@ atk_text_get_text_at_offset (AtkText *text, * by the specified @boundary_type. Use g_free() to free the returned * string. **/ -gchar* -atk_text_get_text_before_offset (AtkText *text, - gint offset, - AtkTextBoundary boundary_type, - gint *start_offset, - gint *end_offset) +gchar * +atk_text_get_text_before_offset (AtkText *text, + gint offset, + AtkTextBoundary boundary_type, + gint *start_offset, + gint *end_offset) { AtkTextIface *iface; gint local_start_offset, local_end_offset; @@ -598,11 +599,12 @@ atk_text_get_text_before_offset (AtkText *text, * to free the returned string. Returns %NULL if the offset is invalid * or no implementation is available. **/ -gchar* atk_text_get_string_at_offset (AtkText *text, - gint offset, - AtkTextGranularity granularity, - gint *start_offset, - gint *end_offset) +gchar * +atk_text_get_string_at_offset (AtkText *text, + gint offset, + AtkTextGranularity granularity, + gint *start_offset, + gint *end_offset) { AtkTextIface *iface; gint local_start_offset, local_end_offset; @@ -670,13 +672,13 @@ atk_text_get_caret_offset (AtkText *text) * @y: (out) (optional): Pointer for the y coordinate of the bounding box * @width: (out) (optional): Pointer for the width of the bounding box * @height: (out) (optional): Pointer for the height of the bounding box - * @coords: specify whether coordinates are relative to the screen or widget window + * @coords: specify whether coordinates are relative to the screen or widget window * * If the extent can not be obtained (e.g. missing support), all of x, y, width, * height are set to -1. * - * Get the bounding box containing the glyph representing the character at - * a particular text offset. + * Get the bounding box containing the glyph representing the character at + * a particular text offset. **/ void atk_text_get_character_extents (AtkText *text, @@ -717,13 +719,13 @@ atk_text_get_character_extents (AtkText *text, if (offset < 0) return; - + iface = ATK_TEXT_GET_IFACE (text); if (iface->get_character_extents) (*(iface->get_character_extents)) (text, offset, real_x, real_y, real_width, real_height, coords); - if (*real_width <0) + if (*real_width < 0) { *real_x = *real_x + *real_width; *real_width *= -1; @@ -742,19 +744,19 @@ atk_text_get_character_extents (AtkText *text, *set at the position @offset in the text. @start_offset and @end_offset are *set to the start and end of the range around @offset where the attributes are *invariant. Note that @end_offset is the offset of the first character - *after the range. See the enum AtkTextAttribute for types of text - *attributes that can be returned. Note that other attributes may also be + *after the range. See the enum AtkTextAttribute for types of text + *attributes that can be returned. Note that other attributes may also be *returned. * *Returns: (transfer full): an #AtkAttributeSet which contains the attributes * explicitly set at @offset. This #AtkAttributeSet should be freed by * a call to atk_attribute_set_free(). **/ -AtkAttributeSet* -atk_text_get_run_attributes (AtkText *text, - gint offset, - gint *start_offset, - gint *end_offset) +AtkAttributeSet * +atk_text_get_run_attributes (AtkText *text, + gint offset, + gint *start_offset, + gint *end_offset) { AtkTextIface *iface; gint local_start_offset, local_end_offset; @@ -787,16 +789,16 @@ atk_text_get_run_attributes (AtkText *text, *@text: an #AtkText * *Creates an #AtkAttributeSet which consists of the default values of - *attributes for the text. See the enum AtkTextAttribute for types of text - *attributes that can be returned. Note that other attributes may also be + *attributes for the text. See the enum AtkTextAttribute for types of text + *attributes that can be returned. Note that other attributes may also be *returned. * *Returns: (transfer full): an #AtkAttributeSet which contains the default text * attributes for this #AtkText. This #AtkAttributeSet should be freed by * a call to atk_attribute_set_free(). */ -AtkAttributeSet* -atk_text_get_default_attributes (AtkText *text) +AtkAttributeSet * +atk_text_get_default_attributes (AtkText *text) { AtkTextIface *iface; @@ -839,7 +841,7 @@ atk_text_get_character_count (AtkText *text) * @x: screen x-position of character * @y: screen y-position of character * @coords: specify whether coordinates are relative to the screen or - * widget window + * widget window * * Gets the offset of the character located at coordinates @x and @y. @x and @y * are interpreted as being relative to the screen or this widget's window @@ -852,7 +854,7 @@ gint atk_text_get_offset_at_point (AtkText *text, gint x, gint y, - AtkCoordType coords) + AtkCoordType coords) { AtkTextIface *iface; @@ -906,11 +908,11 @@ atk_text_get_n_selections (AtkText *text) * Returns: a newly allocated string containing the selected text. Use g_free() * to free the returned string. **/ -gchar* -atk_text_get_selection (AtkText *text, - gint selection_num, - gint *start_offset, - gint *end_offset) +gchar * +atk_text_get_selection (AtkText *text, + gint selection_num, + gint *start_offset, + gint *end_offset) { AtkTextIface *iface; gint local_start_offset, local_end_offset; @@ -930,10 +932,10 @@ atk_text_get_selection (AtkText *text, iface = ATK_TEXT_GET_IFACE (text); if (iface->get_selection) - { - return (*(iface->get_selection)) (text, selection_num, - real_start_offset, real_end_offset); - } + { + return (*(iface->get_selection)) (text, selection_num, + real_start_offset, real_end_offset); + } else return NULL; } @@ -949,9 +951,9 @@ atk_text_get_selection (AtkText *text, * Returns: %TRUE if successful, %FALSE otherwise **/ gboolean -atk_text_add_selection (AtkText *text, - gint start_offset, - gint end_offset) +atk_text_add_selection (AtkText *text, + gint start_offset, + gint end_offset) { AtkTextIface *iface; @@ -979,8 +981,8 @@ atk_text_add_selection (AtkText *text, * Returns: %TRUE if successful, %FALSE otherwise **/ gboolean -atk_text_remove_selection (AtkText *text, - gint selection_num) +atk_text_remove_selection (AtkText *text, + gint selection_num) { AtkTextIface *iface; @@ -1003,7 +1005,7 @@ atk_text_remove_selection (AtkText *text, * of the text region is assigned the number 0, etc. Note that adding, * moving or deleting a selected region can change the numbering. * @start_offset: the new starting character offset of the selection - * @end_offset: the new end position of (e.g. offset immediately past) + * @end_offset: the new end position of (e.g. offset immediately past) * the selection * * Changes the start and end offset of the specified selection. @@ -1011,10 +1013,10 @@ atk_text_remove_selection (AtkText *text, * Returns: %TRUE if successful, %FALSE otherwise **/ gboolean -atk_text_set_selection (AtkText *text, - gint selection_num, - gint start_offset, - gint end_offset) +atk_text_set_selection (AtkText *text, + gint selection_num, + gint start_offset, + gint end_offset) { AtkTextIface *iface; @@ -1023,10 +1025,10 @@ atk_text_set_selection (AtkText *text, iface = ATK_TEXT_GET_IFACE (text); if (iface->set_selection) - { - return (*(iface->set_selection)) (text, selection_num, - start_offset, end_offset); - } + { + return (*(iface->set_selection)) (text, selection_num, + start_offset, end_offset); + } else return FALSE; } @@ -1058,7 +1060,7 @@ atk_text_set_selection (AtkText *text, **/ gboolean atk_text_set_caret_offset (AtkText *text, - gint offset) + gint offset) { AtkTextIface *iface; @@ -1079,9 +1081,9 @@ atk_text_set_caret_offset (AtkText *text, /** * atk_text_get_range_extents: * @text: an #AtkText - * @start_offset: The offset of the first text character for which boundary + * @start_offset: The offset of the first text character for which boundary * information is required. - * @end_offset: The offset of the text character after the last character + * @end_offset: The offset of the text character after the last character * for which boundary information is required. * @coord_type: Specify whether coordinates are relative to the screen or widget window. * @rect: (out): A pointer to a AtkTextRectangle which is filled in by this function. @@ -1094,10 +1096,10 @@ atk_text_set_caret_offset (AtkText *text, * Since: 1.3 **/ void -atk_text_get_range_extents (AtkText *text, - gint start_offset, - gint end_offset, - AtkCoordType coord_type, +atk_text_get_range_extents (AtkText *text, + gint start_offset, + gint end_offset, + AtkCoordType coord_type, AtkTextRectangle *rect) { AtkTextIface *iface; @@ -1134,12 +1136,12 @@ atk_text_get_range_extents (AtkText *text, * Returns: (array zero-terminated=1): Array of AtkTextRange. The last * element of the array returned by this function will be NULL. **/ -AtkTextRange** -atk_text_get_bounded_ranges (AtkText *text, +AtkTextRange ** +atk_text_get_bounded_ranges (AtkText *text, AtkTextRectangle *rect, - AtkCoordType coord_type, - AtkTextClipType x_clip_type, - AtkTextClipType y_clip_type) + AtkCoordType coord_type, + AtkTextClipType x_clip_type, + AtkTextClipType y_clip_type) { AtkTextIface *iface; @@ -1210,7 +1212,7 @@ atk_text_attribute_register (const gchar *name) * * Returns: a string containing the name; this string should not be freed **/ -const gchar* +const gchar * atk_text_attribute_get_name (AtkTextAttribute attr) { GTypeClass *type_class; @@ -1279,7 +1281,7 @@ atk_text_attribute_for_name (const gchar *name) { for (i = 0; i < extra_attributes->len; i++) { - gchar *extra_attribute = (gchar *)g_ptr_array_index (extra_attributes, i); + gchar *extra_attribute = (gchar *) g_ptr_array_index (extra_attributes, i); g_return_val_if_fail (extra_attribute, ATK_TEXT_ATTR_INVALID); @@ -1307,9 +1309,9 @@ atk_text_attribute_for_name (const gchar *name) * should not be freed; %NULL is returned if there are no values * maintained for the attr value. **/ -const gchar* +const gchar * atk_text_attribute_get_value (AtkTextAttribute attr, - gint index) + gint index) { switch (attr) { @@ -1347,7 +1349,7 @@ atk_text_attribute_get_value (AtkTextAttribute attr, return text_position + text_position_offsets[index]; default: return NULL; - } + } } static void @@ -1385,8 +1387,8 @@ atk_text_rectangle_union (AtkTextRectangle *src1, static gboolean atk_text_rectangle_contain (AtkTextRectangle *clip, AtkTextRectangle *bounds, - AtkTextClipType x_clip_type, - AtkTextClipType y_clip_type) + AtkTextClipType x_clip_type, + AtkTextClipType y_clip_type) { gboolean x_min_ok, x_max_ok, y_min_ok, y_max_ok; @@ -1411,7 +1413,6 @@ atk_text_rectangle_contain (AtkTextRectangle *clip, (y_clip_type == ATK_TEXT_CLIP_MIN))); return (x_min_ok && x_max_ok && y_min_ok && y_max_ok); - } /** @@ -1428,9 +1429,9 @@ atk_text_rectangle_contain (AtkTextRectangle *clip, * Returns: whether scrolling was successful. */ gboolean -atk_text_scroll_substring_to (AtkText *text, - gint start_offset, - gint end_offset, +atk_text_scroll_substring_to (AtkText *text, + gint start_offset, + gint end_offset, AtkScrollType type) { AtkTextIface *iface = NULL; @@ -1462,12 +1463,12 @@ atk_text_scroll_substring_to (AtkText *text, * Returns: whether scrolling was successful. */ gboolean -atk_text_scroll_substring_to_point (AtkText *text, - gint start_offset, - gint end_offset, +atk_text_scroll_substring_to_point (AtkText *text, + gint start_offset, + gint end_offset, AtkCoordType coords, - gint x, - gint y) + gint x, + gint y) { AtkTextIface *iface = NULL; g_return_val_if_fail (ATK_IS_TEXT (text), FALSE); @@ -1480,12 +1481,12 @@ atk_text_scroll_substring_to_point (AtkText *text, return FALSE; } -static void -atk_text_real_get_range_extents (AtkText *text, - gint start_offset, - gint end_offset, - AtkCoordType coord_type, - AtkTextRectangle *rect) +static void +atk_text_real_get_range_extents (AtkText *text, + gint start_offset, + gint end_offset, + AtkCoordType coord_type, + AtkTextRectangle *rect) { gint i; AtkTextRectangle cbounds, bounds; @@ -1498,8 +1499,8 @@ atk_text_real_get_range_extents (AtkText *text, for (i = start_offset + 1; i < end_offset; i++) { atk_text_get_character_extents (text, i, - &cbounds.x, &cbounds.y, - &cbounds.width, &cbounds.height, + &cbounds.x, &cbounds.y, + &cbounds.width, &cbounds.height, coord_type); atk_text_rectangle_union (&bounds, &cbounds, &bounds); } @@ -1510,12 +1511,12 @@ atk_text_real_get_range_extents (AtkText *text, rect->height = bounds.height; } -static AtkTextRange** -atk_text_real_get_bounded_ranges (AtkText *text, +static AtkTextRange ** +atk_text_real_get_bounded_ranges (AtkText *text, AtkTextRectangle *rect, - AtkCoordType coord_type, - AtkTextClipType x_clip_type, - AtkTextClipType y_clip_type) + AtkCoordType coord_type, + AtkTextClipType x_clip_type, + AtkTextClipType y_clip_type) { gint bounds_min_offset, bounds_max_offset; gint min_line_start = 0, min_line_end = 0; @@ -1536,11 +1537,11 @@ atk_text_real_get_bounded_ranges (AtkText *text, bounds_min_offset == bounds_max_offset) return NULL; - line = atk_text_get_text_at_offset (text, bounds_min_offset, + line = atk_text_get_text_at_offset (text, bounds_min_offset, ATK_TEXT_BOUNDARY_LINE_START, &min_line_start, &min_line_end); g_free (line); - line = atk_text_get_text_at_offset (text, bounds_max_offset, + line = atk_text_get_text_at_offset (text, bounds_max_offset, ATK_TEXT_BOUNDARY_LINE_START, &max_line_start, &max_line_end); g_free (line); @@ -1559,7 +1560,7 @@ atk_text_real_get_bounded_ranges (AtkText *text, &cbounds.width, &cbounds.height, coord_type); if (!atk_text_rectangle_contain (rect, &cbounds, x_clip_type, y_clip_type)) - break; + break; curr_offset++; } if (curr_offset > offset) @@ -1577,8 +1578,8 @@ atk_text_real_get_bounded_ranges (AtkText *text, range = g_realloc (range, range_size * sizeof (gpointer)); } range[num_ranges] = one_range; - num_ranges++; - } + num_ranges++; + } curr_offset++; if (range) range[num_ranges] = NULL; @@ -1636,5 +1637,4 @@ atk_text_range_free (AtkTextRange *range) g_free (range); } -G_DEFINE_BOXED_TYPE (AtkTextRange, atk_text_range, atk_text_range_copy, - atk_text_range_free) +G_DEFINE_BOXED_TYPE (AtkTextRange, atk_text_range, atk_text_range_copy, atk_text_range_free) diff --git a/atk/atktext.h b/atk/atktext.h index 7d78ab5e..e9d328f8 100644 --- a/atk/atktext.h +++ b/atk/atktext.h @@ -20,14 +20,14 @@ #ifndef __ATK_TEXT_H__ #define __ATK_TEXT_H__ -#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) +#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined(__ATK_H_INSIDE__) && !defined(ATK_COMPILATION) #error "Only <atk/atk.h> can be included directly." #endif -#include <glib-object.h> +#include <atk/atkcomponent.h> #include <atk/atkobject.h> #include <atk/atkutil.h> -#include <atk/atkcomponent.h> +#include <glib-object.h> G_BEGIN_DECLS @@ -39,15 +39,15 @@ G_BEGIN_DECLS *@ATK_TEXT_ATTR_INDENT: The number of pixels that the text is indented *@ATK_TEXT_ATTR_INVISIBLE: Either "true" or "false" indicating whether text is visible or not *@ATK_TEXT_ATTR_EDITABLE: Either "true" or "false" indicating whether text is editable or not - *@ATK_TEXT_ATTR_PIXELS_ABOVE_LINES: Pixels of blank space to leave above each newline-terminated line. + *@ATK_TEXT_ATTR_PIXELS_ABOVE_LINES: Pixels of blank space to leave above each newline-terminated line. *@ATK_TEXT_ATTR_PIXELS_BELOW_LINES: Pixels of blank space to leave below each newline-terminated line. *@ATK_TEXT_ATTR_PIXELS_INSIDE_WRAP: Pixels of blank space to leave between wrapped lines inside the same newline-terminated line (paragraph). *@ATK_TEXT_ATTR_BG_FULL_HEIGHT: "true" or "false" whether to make the background color for each character the height of the highest font used on the current line, or the height of the font used for the current character. *@ATK_TEXT_ATTR_RISE: Number of pixels that the characters are risen above the baseline. See also ATK_TEXT_ATTR_TEXT_POSITION. *@ATK_TEXT_ATTR_UNDERLINE: "none", "single", "double", "low", or "error" - *@ATK_TEXT_ATTR_STRIKETHROUGH: "true" or "false" whether the text is strikethrough + *@ATK_TEXT_ATTR_STRIKETHROUGH: "true" or "false" whether the text is strikethrough *@ATK_TEXT_ATTR_SIZE: The size of the characters in points. eg: 10 - *@ATK_TEXT_ATTR_SCALE: The scale of the characters. The value is a string representation of a double + *@ATK_TEXT_ATTR_SCALE: The scale of the characters. The value is a string representation of a double *@ATK_TEXT_ATTR_WEIGHT: The weight of the characters. *@ATK_TEXT_ATTR_LANGUAGE: The language used *@ATK_TEXT_ATTR_FAMILY_NAME: The font family name @@ -56,8 +56,8 @@ G_BEGIN_DECLS *@ATK_TEXT_ATTR_BG_STIPPLE: "true" if a #GdkBitmap is set for stippling the background color. *@ATK_TEXT_ATTR_FG_STIPPLE: "true" if a #GdkBitmap is set for stippling the foreground color. *@ATK_TEXT_ATTR_WRAP_MODE: The wrap mode of the text, if any. Values are "none", "char", "word", or "word_char". - *@ATK_TEXT_ATTR_DIRECTION: The direction of the text, if set. Values are "none", "ltr" or "rtl" - *@ATK_TEXT_ATTR_JUSTIFICATION: The justification of the text, if set. Values are "left", "right", "center" or "fill" + *@ATK_TEXT_ATTR_DIRECTION: The direction of the text, if set. Values are "none", "ltr" or "rtl" + *@ATK_TEXT_ATTR_JUSTIFICATION: The justification of the text, if set. Values are "left", "right", "center" or "fill" *@ATK_TEXT_ATTR_STRETCH: The stretch of the text, if set. Values are "ultra_condensed", "extra_condensed", "condensed", "semi_condensed", "normal", "semi_expanded", "expanded", "extra_expanded" or "ultra_expanded" *@ATK_TEXT_ATTR_VARIANT: The capitalization variant of the text, if set. Values are "normal" or "small_caps" *@ATK_TEXT_ATTR_STYLE: The slant style of the text, if set. Values are "normal", "oblique" or "italic" @@ -101,13 +101,12 @@ typedef enum } AtkTextAttribute; ATK_AVAILABLE_IN_ALL -AtkTextAttribute atk_text_attribute_register (const gchar *name); +AtkTextAttribute atk_text_attribute_register (const gchar *name); - -#define ATK_TYPE_TEXT (atk_text_get_type ()) -#define ATK_IS_TEXT(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_TEXT) -#define ATK_TEXT(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_TEXT, AtkText) -#define ATK_TEXT_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_TEXT, AtkTextIface)) +#define ATK_TYPE_TEXT (atk_text_get_type ()) +#define ATK_IS_TEXT(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_TEXT) +#define ATK_TEXT(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_TEXT, AtkText) +#define ATK_TEXT_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_TEXT, AtkTextIface)) #ifndef _TYPEDEF_ATK_TEXT_ #define _TYPEDEF_ATK_TEXT_ @@ -115,7 +114,6 @@ typedef struct _AtkText AtkText; #endif typedef struct _AtkTextIface AtkTextIface; - /** *AtkTextBoundary: *@ATK_TEXT_BOUNDARY_CHAR: Boundary is the boundary between characters @@ -137,7 +135,8 @@ typedef struct _AtkTextIface AtkTextIface; * This enumeration is deprecated since 2.9.4 and should not be used. Use * AtkTextGranularity with #atk_text_get_string_at_offset instead. **/ -typedef enum { +typedef enum +{ ATK_TEXT_BOUNDARY_CHAR, ATK_TEXT_BOUNDARY_WORD_START, ATK_TEXT_BOUNDARY_WORD_END, @@ -167,7 +166,8 @@ typedef enum { * Text granularity types used for specifying the granularity of the region of * text we are interested in. **/ -typedef enum { +typedef enum +{ ATK_TEXT_GRANULARITY_CHAR, ATK_TEXT_GRANULARITY_WORD, ATK_TEXT_GRANULARITY_SENTENCE, @@ -187,7 +187,8 @@ typedef enum { typedef struct _AtkTextRectangle AtkTextRectangle; -struct _AtkTextRectangle { +struct _AtkTextRectangle +{ gint x; gint y; gint width; @@ -205,11 +206,12 @@ struct _AtkTextRectangle { **/ typedef struct _AtkTextRange AtkTextRange; -struct _AtkTextRange { +struct _AtkTextRange +{ AtkTextRectangle bounds; gint start_offset; gint end_offset; - gchar* content; + gchar *content; }; ATK_AVAILABLE_IN_ALL @@ -224,11 +226,12 @@ GType atk_text_range_get_type (void); * *Describes the type of clipping required. **/ -typedef enum { - ATK_TEXT_CLIP_NONE, - ATK_TEXT_CLIP_MIN, - ATK_TEXT_CLIP_MAX, - ATK_TEXT_CLIP_BOTH +typedef enum +{ + ATK_TEXT_CLIP_NONE, + ATK_TEXT_CLIP_MIN, + ATK_TEXT_CLIP_MAX, + ATK_TEXT_CLIP_BOTH } AtkTextClipType; /** @@ -251,91 +254,90 @@ struct _AtkTextIface { GTypeInterface parent; - gchar* (* get_text) (AtkText *text, - gint start_offset, - gint end_offset); - gchar* (* get_text_after_offset) (AtkText *text, - gint offset, - AtkTextBoundary boundary_type, - gint *start_offset, - gint *end_offset); - gchar* (* get_text_at_offset) (AtkText *text, - gint offset, - AtkTextBoundary boundary_type, - gint *start_offset, - gint *end_offset); - gunichar (* get_character_at_offset) (AtkText *text, - gint offset); - gchar* (* get_text_before_offset) (AtkText *text, - gint offset, - AtkTextBoundary boundary_type, - gint *start_offset, - gint *end_offset); - gint (* get_caret_offset) (AtkText *text); - AtkAttributeSet* (* get_run_attributes) (AtkText *text, - gint offset, - gint *start_offset, - gint *end_offset); - AtkAttributeSet* (* get_default_attributes) (AtkText *text); - void (* get_character_extents) (AtkText *text, - gint offset, - gint *x, - gint *y, - gint *width, - gint *height, - AtkCoordType coords); - gint (* get_character_count) (AtkText *text); - gint (* get_offset_at_point) (AtkText *text, - gint x, - gint y, - AtkCoordType coords); - gint (* get_n_selections) (AtkText *text); - gchar* (* get_selection) (AtkText *text, - gint selection_num, - gint *start_offset, - gint *end_offset); - gboolean (* add_selection) (AtkText *text, - gint start_offset, - gint end_offset); - gboolean (* remove_selection) (AtkText *text, - gint selection_num); - gboolean (* set_selection) (AtkText *text, - gint selection_num, - gint start_offset, - gint end_offset); - gboolean (* set_caret_offset) (AtkText *text, - gint offset); + gchar *(*get_text) (AtkText *text, + gint start_offset, + gint end_offset); + gchar *(*get_text_after_offset) (AtkText *text, + gint offset, + AtkTextBoundary boundary_type, + gint *start_offset, + gint *end_offset); + gchar *(*get_text_at_offset) (AtkText *text, + gint offset, + AtkTextBoundary boundary_type, + gint *start_offset, + gint *end_offset); + gunichar (*get_character_at_offset) (AtkText *text, + gint offset); + gchar *(*get_text_before_offset) (AtkText *text, + gint offset, + AtkTextBoundary boundary_type, + gint *start_offset, + gint *end_offset); + gint (*get_caret_offset) (AtkText *text); + AtkAttributeSet *(*get_run_attributes) (AtkText *text, + gint offset, + gint *start_offset, + gint *end_offset); + AtkAttributeSet *(*get_default_attributes) (AtkText *text); + void (*get_character_extents) (AtkText *text, + gint offset, + gint *x, + gint *y, + gint *width, + gint *height, + AtkCoordType coords); + gint (*get_character_count) (AtkText *text); + gint (*get_offset_at_point) (AtkText *text, + gint x, + gint y, + AtkCoordType coords); + gint (*get_n_selections) (AtkText *text); + gchar *(*get_selection) (AtkText *text, + gint selection_num, + gint *start_offset, + gint *end_offset); + gboolean (*add_selection) (AtkText *text, + gint start_offset, + gint end_offset); + gboolean (*remove_selection) (AtkText *text, + gint selection_num); + gboolean (*set_selection) (AtkText *text, + gint selection_num, + gint start_offset, + gint end_offset); + gboolean (*set_caret_offset) (AtkText *text, + gint offset); /* * signal handlers */ - void (* text_changed) (AtkText *text, - gint position, - gint length); - void (* text_caret_moved) (AtkText *text, - gint location); - void (* text_selection_changed) (AtkText *text); - - void (* text_attributes_changed) (AtkText *text); - - - void (* get_range_extents) (AtkText *text, - gint start_offset, - gint end_offset, - AtkCoordType coord_type, - AtkTextRectangle *rect); - - AtkTextRange** (* get_bounded_ranges) (AtkText *text, - AtkTextRectangle *rect, - AtkCoordType coord_type, - AtkTextClipType x_clip_type, - AtkTextClipType y_clip_type); - - gchar* (* get_string_at_offset) (AtkText *text, - gint offset, - AtkTextGranularity granularity, - gint *start_offset, - gint *end_offset); + void (*text_changed) (AtkText *text, + gint position, + gint length); + void (*text_caret_moved) (AtkText *text, + gint location); + void (*text_selection_changed) (AtkText *text); + + void (*text_attributes_changed) (AtkText *text); + + void (*get_range_extents) (AtkText *text, + gint start_offset, + gint end_offset, + AtkCoordType coord_type, + AtkTextRectangle *rect); + + AtkTextRange **(*get_bounded_ranges) (AtkText *text, + AtkTextRectangle *rect, + AtkCoordType coord_type, + AtkTextClipType x_clip_type, + AtkTextClipType y_clip_type); + + gchar *(*get_string_at_offset) (AtkText *text, + gint offset, + AtkTextGranularity granularity, + gint *start_offset, + gint *end_offset); /* * Scrolls this text range so it becomes visible on the screen. * @@ -347,21 +349,20 @@ struct _AtkTextIface * * Since ATK 2.32 */ - gboolean (* scroll_substring_to) (AtkText *text, - gint start_offset, - gint end_offset, - AtkScrollType type); - gboolean (* scroll_substring_to_point) (AtkText *text, - gint start_offset, - gint end_offset, - AtkCoordType coords, - gint x, - gint y); + gboolean (*scroll_substring_to) (AtkText *text, + gint start_offset, + gint end_offset, + AtkScrollType type); + gboolean (*scroll_substring_to_point) (AtkText *text, + gint start_offset, + gint end_offset, + AtkCoordType coords, + gint x, + gint y); }; ATK_AVAILABLE_IN_ALL -GType atk_text_get_type (void); - +GType atk_text_get_type (void); /* * Additional AtkObject properties used by AtkText: @@ -371,120 +372,120 @@ GType atk_text_get_type (void); */ ATK_AVAILABLE_IN_ALL -gchar* atk_text_get_text (AtkText *text, - gint start_offset, - gint end_offset); +gchar *atk_text_get_text (AtkText *text, + gint start_offset, + gint end_offset); ATK_AVAILABLE_IN_ALL -gunichar atk_text_get_character_at_offset (AtkText *text, - gint offset); -ATK_DEPRECATED_IN_2_10_FOR(atk_text_get_string_at_offset) -gchar* atk_text_get_text_after_offset (AtkText *text, - gint offset, - AtkTextBoundary boundary_type, - gint *start_offset, - gint *end_offset); -ATK_DEPRECATED_IN_2_10_FOR(atk_text_get_string_at_offset) -gchar* atk_text_get_text_at_offset (AtkText *text, - gint offset, - AtkTextBoundary boundary_type, - gint *start_offset, - gint *end_offset); -ATK_DEPRECATED_IN_2_10_FOR(atk_text_get_string_at_offset) -gchar* atk_text_get_text_before_offset (AtkText *text, - gint offset, - AtkTextBoundary boundary_type, - gint *start_offset, - gint *end_offset); +gunichar atk_text_get_character_at_offset (AtkText *text, + gint offset); +ATK_DEPRECATED_IN_2_10_FOR (atk_text_get_string_at_offset) +gchar *atk_text_get_text_after_offset (AtkText *text, + gint offset, + AtkTextBoundary boundary_type, + gint *start_offset, + gint *end_offset); +ATK_DEPRECATED_IN_2_10_FOR (atk_text_get_string_at_offset) +gchar *atk_text_get_text_at_offset (AtkText *text, + gint offset, + AtkTextBoundary boundary_type, + gint *start_offset, + gint *end_offset); +ATK_DEPRECATED_IN_2_10_FOR (atk_text_get_string_at_offset) +gchar *atk_text_get_text_before_offset (AtkText *text, + gint offset, + AtkTextBoundary boundary_type, + gint *start_offset, + gint *end_offset); ATK_AVAILABLE_IN_2_10 -gchar* atk_text_get_string_at_offset (AtkText *text, - gint offset, - AtkTextGranularity granularity, - gint *start_offset, - gint *end_offset); +gchar *atk_text_get_string_at_offset (AtkText *text, + gint offset, + AtkTextGranularity granularity, + gint *start_offset, + gint *end_offset); ATK_AVAILABLE_IN_ALL -gint atk_text_get_caret_offset (AtkText *text); +gint atk_text_get_caret_offset (AtkText *text); ATK_AVAILABLE_IN_ALL -void atk_text_get_character_extents (AtkText *text, - gint offset, - gint *x, - gint *y, - gint *width, - gint *height, - AtkCoordType coords); +void atk_text_get_character_extents (AtkText *text, + gint offset, + gint *x, + gint *y, + gint *width, + gint *height, + AtkCoordType coords); ATK_AVAILABLE_IN_ALL -AtkAttributeSet* atk_text_get_run_attributes (AtkText *text, - gint offset, - gint *start_offset, - gint *end_offset); +AtkAttributeSet *atk_text_get_run_attributes (AtkText *text, + gint offset, + gint *start_offset, + gint *end_offset); ATK_AVAILABLE_IN_ALL -AtkAttributeSet* atk_text_get_default_attributes (AtkText *text); +AtkAttributeSet *atk_text_get_default_attributes (AtkText *text); ATK_AVAILABLE_IN_ALL -gint atk_text_get_character_count (AtkText *text); +gint atk_text_get_character_count (AtkText *text); ATK_AVAILABLE_IN_ALL -gint atk_text_get_offset_at_point (AtkText *text, - gint x, - gint y, - AtkCoordType coords); +gint atk_text_get_offset_at_point (AtkText *text, + gint x, + gint y, + AtkCoordType coords); ATK_AVAILABLE_IN_ALL -gint atk_text_get_n_selections (AtkText *text); +gint atk_text_get_n_selections (AtkText *text); ATK_AVAILABLE_IN_ALL -gchar* atk_text_get_selection (AtkText *text, - gint selection_num, - gint *start_offset, - gint *end_offset); +gchar *atk_text_get_selection (AtkText *text, + gint selection_num, + gint *start_offset, + gint *end_offset); ATK_AVAILABLE_IN_ALL -gboolean atk_text_add_selection (AtkText *text, - gint start_offset, - gint end_offset); +gboolean atk_text_add_selection (AtkText *text, + gint start_offset, + gint end_offset); ATK_AVAILABLE_IN_ALL -gboolean atk_text_remove_selection (AtkText *text, - gint selection_num); +gboolean atk_text_remove_selection (AtkText *text, + gint selection_num); ATK_AVAILABLE_IN_ALL -gboolean atk_text_set_selection (AtkText *text, - gint selection_num, - gint start_offset, - gint end_offset); +gboolean atk_text_set_selection (AtkText *text, + gint selection_num, + gint start_offset, + gint end_offset); ATK_AVAILABLE_IN_ALL -gboolean atk_text_set_caret_offset (AtkText *text, - gint offset); +gboolean atk_text_set_caret_offset (AtkText *text, + gint offset); ATK_AVAILABLE_IN_ALL -void atk_text_get_range_extents (AtkText *text, +void atk_text_get_range_extents (AtkText *text, - gint start_offset, - gint end_offset, - AtkCoordType coord_type, - AtkTextRectangle *rect); + gint start_offset, + gint end_offset, + AtkCoordType coord_type, + AtkTextRectangle *rect); ATK_AVAILABLE_IN_ALL -AtkTextRange** atk_text_get_bounded_ranges (AtkText *text, - AtkTextRectangle *rect, - AtkCoordType coord_type, - AtkTextClipType x_clip_type, - AtkTextClipType y_clip_type); +AtkTextRange **atk_text_get_bounded_ranges (AtkText *text, + AtkTextRectangle *rect, + AtkCoordType coord_type, + AtkTextClipType x_clip_type, + AtkTextClipType y_clip_type); ATK_AVAILABLE_IN_ALL -void atk_text_free_ranges (AtkTextRange **ranges); +void atk_text_free_ranges (AtkTextRange **ranges); ATK_AVAILABLE_IN_ALL -void atk_attribute_set_free (AtkAttributeSet *attrib_set); +void atk_attribute_set_free (AtkAttributeSet *attrib_set); ATK_AVAILABLE_IN_ALL -const gchar* atk_text_attribute_get_name (AtkTextAttribute attr); +const gchar *atk_text_attribute_get_name (AtkTextAttribute attr); ATK_AVAILABLE_IN_ALL -AtkTextAttribute atk_text_attribute_for_name (const gchar *name); +AtkTextAttribute atk_text_attribute_for_name (const gchar *name); ATK_AVAILABLE_IN_ALL -const gchar* atk_text_attribute_get_value (AtkTextAttribute attr, - gint index_); +const gchar *atk_text_attribute_get_value (AtkTextAttribute attr, + gint index_); ATK_AVAILABLE_IN_ALL -gboolean atk_text_scroll_substring_to (AtkText *text, - gint start_offset, - gint end_offset, - AtkScrollType type); +gboolean atk_text_scroll_substring_to (AtkText *text, + gint start_offset, + gint end_offset, + AtkScrollType type); ATK_AVAILABLE_IN_ALL -gboolean atk_text_scroll_substring_to_point (AtkText *text, - gint start_offset, - gint end_offset, - AtkCoordType coords, - gint x, - gint y); +gboolean atk_text_scroll_substring_to_point (AtkText *text, + gint start_offset, + gint end_offset, + AtkCoordType coords, + gint x, + gint y); G_END_DECLS diff --git a/atk/atkutil.c b/atk/atkutil.c index 7e1870b6..db957c7a 100644 --- a/atk/atkutil.c +++ b/atk/atkutil.c @@ -19,8 +19,8 @@ #include "config.h" -#include "atkutil.h" #include "atkmarshal.h" +#include "atkutil.h" /** * AtkUtil: @@ -53,8 +53,7 @@ atk_util_get_type (void) if (!type) { - static const GTypeInfo typeInfo = - { + static const GTypeInfo typeInfo = { sizeof (AtkUtilClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, @@ -64,8 +63,8 @@ atk_util_get_type (void) sizeof (AtkUtil), 0, (GInstanceInitFunc) NULL, - } ; - type = g_type_register_static (G_TYPE_OBJECT, "AtkUtil", &typeInfo, 0) ; + }; + type = g_type_register_static (G_TYPE_OBJECT, "AtkUtil", &typeInfo, 0); } return type; } @@ -74,7 +73,7 @@ atk_util_get_type (void) * This file supports the addition and removal of multiple focus handlers * as long as they are all called in the same thread. */ -static AtkEventListenerInit focus_tracker_init = (AtkEventListenerInit) NULL; +static AtkEventListenerInit focus_tracker_init = (AtkEventListenerInit) NULL; static gboolean init_done = FALSE; @@ -82,11 +81,12 @@ static gboolean init_done = FALSE; * Array of FocusTracker structs */ static GArray *trackers = NULL; -static guint global_index = 0; +static guint global_index = 0; typedef struct _FocusTracker FocusTracker; -struct _FocusTracker { +struct _FocusTracker +{ guint index; AtkEventListener func; }; @@ -105,7 +105,7 @@ struct _FocusTracker { * **/ void -atk_focus_tracker_init (AtkEventListenerInit init) +atk_focus_tracker_init (AtkEventListenerInit init) { if (!focus_tracker_init) focus_tracker_init = init; @@ -126,32 +126,32 @@ atk_focus_tracker_init (AtkEventListenerInit init) * Returns: added focus tracker id, or 0 on failure. **/ guint -atk_add_focus_tracker (AtkEventListener focus_tracker) +atk_add_focus_tracker (AtkEventListener focus_tracker) { g_return_val_if_fail (focus_tracker, 0); if (!init_done) - { - if (focus_tracker_init) { - focus_tracker_init (); + if (focus_tracker_init) + { + focus_tracker_init (); + } + trackers = g_array_sized_new (FALSE, TRUE, sizeof (FocusTracker), 0); + init_done = TRUE; } - trackers = g_array_sized_new (FALSE, TRUE, sizeof (FocusTracker), 0); - init_done = TRUE; - } if (init_done) - { - FocusTracker item; - - item.index = ++global_index; - item.func = focus_tracker; - trackers = g_array_append_val (trackers, item); - return global_index; - } + { + FocusTracker item; + + item.index = ++global_index; + item.func = focus_tracker; + trackers = g_array_append_val (trackers, item); + return global_index; + } else - { - return 0; - } + { + return 0; + } } /** @@ -167,7 +167,7 @@ atk_add_focus_tracker (AtkEventListener focus_tracker) * signal. */ void -atk_remove_focus_tracker (guint tracker_id) +atk_remove_focus_tracker (guint tracker_id) { FocusTracker *item; guint i; @@ -179,14 +179,14 @@ atk_remove_focus_tracker (guint tracker_id) return; for (i = 0; i < trackers->len; i++) - { - item = &g_array_index (trackers, FocusTracker, i); - if (item->index == tracker_id) { - trackers = g_array_remove_index (trackers, i); - break; + item = &g_array_index (trackers, FocusTracker, i); + if (item->index == tracker_id) + { + trackers = g_array_remove_index (trackers, i); + break; + } } - } } /** @@ -203,7 +203,7 @@ atk_remove_focus_tracker (guint tracker_id) * atk_object_notify_state_change() instead. **/ void -atk_focus_tracker_notify (AtkObject *object) +atk_focus_tracker_notify (AtkObject *object) { FocusTracker *item; guint i; @@ -230,27 +230,26 @@ atk_focus_tracker_notify (AtkObject *object) item->func (object); } } - } } static guint add_listener (GSignalEmissionHook listener, - const gchar *object_type, - const gchar *signal_name, - const gchar *detail_string, - const gchar *hook_data) + const gchar *object_type, + const gchar *signal_name, + const gchar *detail_string, + const gchar *hook_data) { GType type; guint signal_id; - gint rc = 0; + gint rc = 0; static gint listener_idx = 1; GQuark detail_quark = 0; type = g_type_from_name (object_type); if (type) { - signal_id = g_signal_lookup (signal_name, type); + signal_id = g_signal_lookup (signal_name, type); detail_quark = g_quark_from_string (detail_string); if (signal_id > 0) @@ -262,12 +261,12 @@ add_listener (GSignalEmissionHook listener, listener_info = g_new (AtkUtilListenerInfo, 1); listener_info->key = listener_idx; listener_info->hook_id = - g_signal_add_emission_hook (signal_id, detail_quark, listener, - g_strdup (hook_data), - (GDestroyNotify) g_free); + g_signal_add_emission_hook (signal_id, detail_quark, listener, + g_strdup (hook_data), + (GDestroyNotify) g_free); listener_info->signal_id = signal_id; - g_hash_table_insert(listener_list, &(listener_info->key), listener_info); + g_hash_table_insert (listener_list, &(listener_info->key), listener_info); listener_idx++; } else @@ -277,7 +276,7 @@ add_listener (GSignalEmissionHook listener, } else { - g_warning("Invalid object type %s\n", object_type); + g_warning ("Invalid object type %s\n", object_type); } return rc; } @@ -311,7 +310,7 @@ atk_util_real_remove_global_event_listener (guint remove_listener) gint tmp_idx = remove_listener; listener_info = (AtkUtilListenerInfo *) - g_hash_table_lookup(listener_list, &tmp_idx); + g_hash_table_lookup (listener_list, &tmp_idx); if (listener_info != NULL) { @@ -319,31 +318,30 @@ atk_util_real_remove_global_event_listener (guint remove_listener) if (listener_info->hook_id != 0 && listener_info->signal_id != 0) { /* Remove the emission hook */ - g_signal_remove_emission_hook(listener_info->signal_id, - listener_info->hook_id); + g_signal_remove_emission_hook (listener_info->signal_id, + listener_info->hook_id); /* Remove the element from the hash */ - g_hash_table_remove(listener_list, &tmp_idx); + g_hash_table_remove (listener_list, &tmp_idx); } else { - g_warning("Invalid listener hook_id %ld or signal_id %d\n", - listener_info->hook_id, listener_info->signal_id); + g_warning ("Invalid listener hook_id %ld or signal_id %d\n", + listener_info->hook_id, listener_info->signal_id); } } else { - g_warning("No listener with the specified listener id %d", - remove_listener); + g_warning ("No listener with the specified listener id %d", + remove_listener); } } else { - g_warning("Invalid listener_id %d", remove_listener); + g_warning ("Invalid listener_id %d", remove_listener); } } - /** * atk_add_global_event_listener: (skip) * @listener: the listener to notify @@ -387,7 +385,7 @@ atk_util_real_remove_global_event_listener (guint remove_listener) **/ guint atk_add_global_event_listener (GSignalEmissionHook listener, - const gchar *event_type) + const gchar *event_type) { guint retval; AtkUtilClass *klass = g_type_class_ref (ATK_TYPE_UTIL); @@ -434,7 +432,7 @@ atk_remove_global_event_listener (guint listener_id) * atk_add_key_event_listener: (skip) * @listener: the listener to notify * @data: a #gpointer that points to a block of data that should be sent to the registered listeners, - * along with the event notification, when it occurs. + * along with the event notification, when it occurs. * * Adds the specified function to the list of functions to be called * when a key event occurs. The @data element will be passed to the @@ -485,11 +483,11 @@ atk_remove_key_event_listener (guint listener_id) * Returns: (transfer none): the root accessible container for the current * application **/ -AtkObject* +AtkObject * atk_get_root (void) { AtkUtilClass *klass = g_type_class_ref (ATK_TYPE_UTIL); - AtkObject *retval; + AtkObject *retval; if (klass->get_root) { retval = klass->get_root (); @@ -507,13 +505,13 @@ atk_get_root (void) * atk_get_focus_object: * * Gets the currently focused object. - * + * * Since: 1.6 * * Returns: (transfer none): the currently focused object for the current * application **/ -AtkObject* +AtkObject * atk_get_focus_object (void) { return previous_focus_object; @@ -526,7 +524,7 @@ atk_get_focus_object (void) * * Returns: name string for the GUI toolkit implementing ATK for this application **/ -const gchar* +const gchar * atk_get_toolkit_name (void) { const gchar *retval; @@ -551,7 +549,7 @@ atk_get_toolkit_name (void) * * Returns: version string for the GUI toolkit implementing ATK for this application **/ -const gchar* +const gchar * atk_get_toolkit_version (void) { const gchar *retval; diff --git a/atk/atkutil.h b/atk/atkutil.h index 28371d85..c7ad75ad 100644 --- a/atk/atkutil.h +++ b/atk/atkutil.h @@ -20,7 +20,7 @@ #ifndef __ATK_UTIL_H__ #define __ATK_UTIL_H__ -#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) +#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined(__ATK_H_INSIDE__) && !defined(ATK_COMPILATION) #error "Only <atk/atk.h> can be included directly." #endif @@ -28,63 +28,62 @@ G_BEGIN_DECLS -#define ATK_TYPE_UTIL (atk_util_get_type ()) -#define ATK_IS_UTIL(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_UTIL) -#define ATK_UTIL(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_UTIL, AtkUtil) -#define ATK_UTIL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ATK_TYPE_UTIL, AtkUtilClass)) -#define ATK_IS_UTIL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ATK_TYPE_UTIL)) -#define ATK_UTIL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ATK_TYPE_UTIL, AtkUtilClass)) - +#define ATK_TYPE_UTIL (atk_util_get_type ()) +#define ATK_IS_UTIL(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_UTIL) +#define ATK_UTIL(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_UTIL, AtkUtil) +#define ATK_UTIL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ATK_TYPE_UTIL, AtkUtilClass)) +#define ATK_IS_UTIL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ATK_TYPE_UTIL)) +#define ATK_UTIL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ATK_TYPE_UTIL, AtkUtilClass)) #ifndef _TYPEDEF_ATK_UTIL_ #define _TYPEDEF_ATK_UTIL_ -typedef struct _AtkUtil AtkUtil; +typedef struct _AtkUtil AtkUtil; typedef struct _AtkUtilClass AtkUtilClass; typedef struct _AtkKeyEventStruct AtkKeyEventStruct; #endif /** - * AtkEventListener: + * AtkEventListener: * @obj: An #AtkObject instance for whom the callback will be called when * the specified event (e.g. 'focus:') takes place. * * A function which is called when an object emits a matching event, * as used in #atk_add_focus_tracker. * Currently the only events for which object-specific handlers are - * supported are events of type "focus:". Most clients of ATK will prefer to + * supported are events of type "focus:". Most clients of ATK will prefer to * attach signal handlers for the various ATK signals instead. * * see [id@atk_add_focus_tracker] **/ -typedef void (*AtkEventListener) (AtkObject* obj); +typedef void (*AtkEventListener) (AtkObject *obj); /** * AtkEventListenerInit: * * An #AtkEventListenerInit function is a special function that is * called in order to initialize the per-object event registration system - * used by #AtkEventListener, if any preparation is required. + * used by #AtkEventListener, if any preparation is required. * * see [id@atk_focus_tracker_init] **/ -typedef void (*AtkEventListenerInit) (void); +typedef void (*AtkEventListenerInit) (void); /** * AtkKeySnoopFunc: * @event: an AtkKeyEventStruct containing information about the key event for which * notification is being given. * @user_data: a block of data which will be passed to the event listener, on notification. * - * An #AtkKeySnoopFunc is a type of callback which is called whenever a key event occurs, - * if registered via atk_add_key_event_listener. It allows for pre-emptive + * An #AtkKeySnoopFunc is a type of callback which is called whenever a key event occurs, + * if registered via atk_add_key_event_listener. It allows for pre-emptive * interception of key events via the return code as described below. * - * Returns: TRUE (nonzero) if the event emission should be stopped and the event - * discarded without being passed to the normal GUI recipient; FALSE (zero) if the + * Returns: TRUE (nonzero) if the event emission should be stopped and the event + * discarded without being passed to the normal GUI recipient; FALSE (zero) if the * event dispatch to the client application should proceed as normal. * * see [id@atk_add_key_event_listener] **/ -typedef gint (*AtkKeySnoopFunc) (AtkKeyEventStruct *event, - gpointer user_data); +typedef gint (*AtkKeySnoopFunc) (AtkKeyEventStruct *event, + gpointer user_data); /** * AtkKeyEventStruct: @@ -92,30 +91,31 @@ typedef gint (*AtkKeySnoopFunc) (AtkKeyEventStruct *event, * Encapsulates information about a key event. * * @type: An AtkKeyEventType, generally one of ATK_KEY_EVENT_PRESS or ATK_KEY_EVENT_RELEASE - * @state: A bitmask representing the state of the modifier keys immediately after the event takes place. + * @state: A bitmask representing the state of the modifier keys immediately after the event takes place. * The meaning of the bits is currently defined to match the bitmask used by GDK in - * GdkEventType.state, see + * GdkEventType.state, see * http://developer.gnome.org/doc/API/2.0/gdk/gdk-Event-Structures.html#GdkEventKey * @keyval: A guint representing a keysym value corresponding to those used by GDK and X11: see * /usr/X11/include/keysymdef.h. * @length: The length of member #string. - * @string: A string containing one of the following: either a string approximating the text that would + * @string: A string containing one of the following: either a string approximating the text that would * result from this keypress, if the key is a control or graphic character, or a symbolic name for this keypress. - * Alphanumeric and printable keys will have the symbolic key name in this string member, for instance "A". "0", + * Alphanumeric and printable keys will have the symbolic key name in this string member, for instance "A". "0", * "semicolon", "aacute". Keypad keys have the prefix "KP". * @keycode: The raw hardware code that generated the key event. This field is raraly useful. - * @timestamp: A timestamp in milliseconds indicating when the event occurred. - * These timestamps are relative to a starting point which should be considered arbitrary, + * @timestamp: A timestamp in milliseconds indicating when the event occurred. + * These timestamps are relative to a starting point which should be considered arbitrary, * and only used to compare the dispatch times of events to one another. **/ -struct _AtkKeyEventStruct { +struct _AtkKeyEventStruct +{ gint type; guint state; guint keyval; gint length; gchar *string; guint16 keycode; - guint32 timestamp; + guint32 timestamp; }; /** @@ -160,16 +160,16 @@ struct _AtkUtil */ struct _AtkUtilClass { - GObjectClass parent; - guint (* add_global_event_listener) (GSignalEmissionHook listener, - const gchar *event_type); - void (* remove_global_event_listener) (guint listener_id); - guint (* add_key_event_listener) (AtkKeySnoopFunc listener, - gpointer data); - void (* remove_key_event_listener) (guint listener_id); - AtkObject* (* get_root) (void); - const gchar* (* get_toolkit_name) (void); - const gchar* (* get_toolkit_version) (void); + GObjectClass parent; + guint (*add_global_event_listener) (GSignalEmissionHook listener, + const gchar *event_type); + void (*remove_global_event_listener) (guint listener_id); + guint (*add_key_event_listener) (AtkKeySnoopFunc listener, + gpointer data); + void (*remove_key_event_listener) (guint listener_id); + AtkObject *(*get_root) (void); + const gchar *(*get_toolkit_name) (void); + const gchar *(*get_toolkit_version) (void); }; ATK_AVAILABLE_IN_ALL GType atk_util_get_type (void); @@ -183,36 +183,37 @@ GType atk_util_get_type (void); * immediate parent. Since: 2.30 * *Specifies how xy coordinates are to be interpreted. Used by functions such - *as atk_component_get_position() and atk_text_get_character_extents() + *as atk_component_get_position() and atk_text_get_character_extents() **/ -typedef enum { +typedef enum +{ ATK_XY_SCREEN, ATK_XY_WINDOW, ATK_XY_PARENT -}AtkCoordType; +} AtkCoordType; ATK_DEPRECATED_IN_2_10 -guint atk_add_focus_tracker (AtkEventListener focus_tracker); +guint atk_add_focus_tracker (AtkEventListener focus_tracker); ATK_DEPRECATED_IN_2_10 -void atk_remove_focus_tracker (guint tracker_id); +void atk_remove_focus_tracker (guint tracker_id); ATK_DEPRECATED_IN_2_10 -void atk_focus_tracker_init (AtkEventListenerInit init); +void atk_focus_tracker_init (AtkEventListenerInit init); ATK_DEPRECATED_IN_2_10 -void atk_focus_tracker_notify (AtkObject *object); +void atk_focus_tracker_notify (AtkObject *object); ATK_AVAILABLE_IN_ALL -guint atk_add_global_event_listener (GSignalEmissionHook listener, - const gchar *event_type); +guint atk_add_global_event_listener (GSignalEmissionHook listener, + const gchar *event_type); ATK_AVAILABLE_IN_ALL -void atk_remove_global_event_listener (guint listener_id); +void atk_remove_global_event_listener (guint listener_id); ATK_AVAILABLE_IN_ALL -guint atk_add_key_event_listener (AtkKeySnoopFunc listener, gpointer data); +guint atk_add_key_event_listener (AtkKeySnoopFunc listener, gpointer data); ATK_AVAILABLE_IN_ALL -void atk_remove_key_event_listener (guint listener_id); +void atk_remove_key_event_listener (guint listener_id); ATK_AVAILABLE_IN_ALL -AtkObject* atk_get_root(void); +AtkObject *atk_get_root (void); ATK_AVAILABLE_IN_ALL -AtkObject* atk_get_focus_object (void); +AtkObject *atk_get_focus_object (void); ATK_AVAILABLE_IN_ALL const gchar *atk_get_toolkit_name (void); @@ -249,7 +250,7 @@ const gchar *atk_get_version (void); * * Since: 1.22 */ -#define ATK_DEFINE_TYPE(TN, t_n, T_P) ATK_DEFINE_TYPE_EXTENDED (TN, t_n, T_P, 0, {}) +#define ATK_DEFINE_TYPE(TN, t_n, T_P) ATK_DEFINE_TYPE_EXTENDED (TN, t_n, T_P, 0, {}) /** * ATK_DEFINE_TYPE_WITH_CODE: @@ -264,7 +265,9 @@ const gchar *atk_get_version (void); * * Since: 1.22 */ -#define ATK_DEFINE_TYPE_WITH_CODE(TN, t_n, T_P, _C_) _ATK_DEFINE_TYPE_EXTENDED_BEGIN (TN, t_n, T_P, 0) {_C_;} _ATK_DEFINE_TYPE_EXTENDED_END() +#define ATK_DEFINE_TYPE_WITH_CODE(TN, t_n, T_P, _C_) \ + _ATK_DEFINE_TYPE_EXTENDED_BEGIN (TN, t_n, T_P, 0) { _C_; } \ + _ATK_DEFINE_TYPE_EXTENDED_END () /** * ATK_DEFINE_ABSTRACT_TYPE: @@ -277,7 +280,7 @@ const gchar *atk_get_version (void); * * Since: 1.22 */ -#define ATK_DEFINE_ABSTRACT_TYPE(TN, t_n, T_P) ATK_DEFINE_TYPE_EXTENDED (TN, t_n, T_P, G_TYPE_FLAG_ABSTRACT, {}) +#define ATK_DEFINE_ABSTRACT_TYPE(TN, t_n, T_P) ATK_DEFINE_TYPE_EXTENDED (TN, t_n, T_P, G_TYPE_FLAG_ABSTRACT, {}) /** * ATK_DEFINE_ABSTRACT_TYPE_WITH_CODE: @@ -291,7 +294,9 @@ const gchar *atk_get_version (void); * * Since: 1.22 */ -#define ATK_DEFINE_ABSTRACT_TYPE_WITH_CODE(TN, t_n, T_P, _C_) _ATK_DEFINE_TYPE_EXTENDED_BEGIN (TN, t_n, T_P, G_TYPE_FLAG_ABSTRACT) {_C_;} _ATK_DEFINE_TYPE_EXTENDED_END() +#define ATK_DEFINE_ABSTRACT_TYPE_WITH_CODE(TN, t_n, T_P, _C_) \ + _ATK_DEFINE_TYPE_EXTENDED_BEGIN (TN, t_n, T_P, G_TYPE_FLAG_ABSTRACT) { _C_; } \ + _ATK_DEFINE_TYPE_EXTENDED_END () /** * ATK_DEFINE_TYPE_EXTENDED: @@ -306,55 +311,57 @@ const gchar *atk_get_version (void); * * Since: 1.22 */ -#define ATK_DEFINE_TYPE_EXTENDED(TN, t_n, T_P, _f_, _C_) _ATK_DEFINE_TYPE_EXTENDED_BEGIN (TN, t_n, T_P, _f_) {_C_;} _ATK_DEFINE_TYPE_EXTENDED_END() +#define ATK_DEFINE_TYPE_EXTENDED(TN, t_n, T_P, _f_, _C_) \ + _ATK_DEFINE_TYPE_EXTENDED_BEGIN (TN, t_n, T_P, _f_) { _C_; } \ + _ATK_DEFINE_TYPE_EXTENDED_END () -#define _ATK_DEFINE_TYPE_EXTENDED_BEGIN(TypeName, type_name, TYPE, flags) \ -\ -static void type_name##_init (TypeName *self); \ -static void type_name##_class_init (TypeName##Class *klass); \ -static gpointer type_name##_parent_class = NULL; \ -static void type_name##_class_intern_init (gpointer klass) \ -{ \ - type_name##_parent_class = g_type_class_peek_parent (klass); \ - type_name##_class_init ((TypeName##Class*) klass); \ -} \ -\ -ATK_AVAILABLE_IN_ALL \ -GType \ -type_name##_get_type (void) \ -{ \ - static volatile gsize g_define_type_id__volatile = 0; \ - if (g_once_init_enter (&g_define_type_id__volatile)) \ - { \ - AtkObjectFactory *factory; \ - GType derived_type; \ - GTypeQuery query; \ - GType derived_atk_type; \ - GType g_define_type_id; \ -\ - /* Figure out the size of the class and instance we are deriving from */ \ - derived_type = g_type_parent (TYPE); \ - factory = atk_registry_get_factory (atk_get_default_registry (), \ - derived_type); \ - derived_atk_type = atk_object_factory_get_accessible_type (factory); \ - g_type_query (derived_atk_type, &query); \ -\ - g_define_type_id = \ - g_type_register_static_simple (derived_atk_type, \ - g_intern_static_string (#TypeName), \ - query.class_size, \ - (GClassInitFunc) type_name##_class_intern_init, \ - query.instance_size, \ - (GInstanceInitFunc) type_name##_init, \ - (GTypeFlags) flags); \ - { /* custom code follows */ -#define _ATK_DEFINE_TYPE_EXTENDED_END() \ - /* following custom code */ \ - } \ - g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); \ - } \ - return g_define_type_id__volatile; \ -} /* closes type_name##_get_type() */ +#define _ATK_DEFINE_TYPE_EXTENDED_BEGIN(TypeName, type_name, TYPE, flags) \ + \ + static void type_name##_init (TypeName *self); \ + static void type_name##_class_init (TypeName##Class *klass); \ + static gpointer type_name##_parent_class = NULL; \ + static void type_name##_class_intern_init (gpointer klass) \ + { \ + type_name##_parent_class = g_type_class_peek_parent (klass); \ + type_name##_class_init ((TypeName##Class *) klass); \ + } \ + \ + ATK_AVAILABLE_IN_ALL \ + GType \ + type_name##_get_type (void) \ + { \ + static volatile gsize g_define_type_id__volatile = 0; \ + if (g_once_init_enter (&g_define_type_id__volatile)) \ + { \ + AtkObjectFactory *factory; \ + GType derived_type; \ + GTypeQuery query; \ + GType derived_atk_type; \ + GType g_define_type_id; \ + \ + /* Figure out the size of the class and instance we are deriving from */ \ + derived_type = g_type_parent (TYPE); \ + factory = atk_registry_get_factory (atk_get_default_registry (), \ + derived_type); \ + derived_atk_type = atk_object_factory_get_accessible_type (factory); \ + g_type_query (derived_atk_type, &query); \ + \ + g_define_type_id = \ + g_type_register_static_simple (derived_atk_type, \ + g_intern_static_string (#TypeName), \ + query.class_size, \ + (GClassInitFunc) type_name##_class_intern_init, \ + query.instance_size, \ + (GInstanceInitFunc) type_name##_init, \ + (GTypeFlags) flags); \ + { /* custom code follows */ +#define _ATK_DEFINE_TYPE_EXTENDED_END() \ + /* following custom code */ \ + } \ + g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); \ + } \ + return g_define_type_id__volatile; \ + } /* closes type_name##_get_type() */ G_END_DECLS diff --git a/atk/atkvalue.c b/atk/atkvalue.c index 2b352dd0..ecef4d90 100644 --- a/atk/atkvalue.c +++ b/atk/atkvalue.c @@ -19,13 +19,13 @@ #include "config.h" -#include <string.h> #include <glib/gi18n-lib.h> +#include <string.h> -#include "atkvalue.h" -#include "atkmarshal.h" #include "atk-enum-types.h" +#include "atkmarshal.h" #include "atkprivate.h" +#include "atkvalue.h" /** * AtkValue: @@ -176,7 +176,8 @@ static GPtrArray *value_type_names = NULL; -enum { +enum +{ VALUE_CHANGED, LAST_SIGNAL }; @@ -294,24 +295,24 @@ N_("best") static void atk_value_base_init (AtkValueIface *class); -static guint atk_value_signals[LAST_SIGNAL] = {0}; +static guint atk_value_signals[LAST_SIGNAL] = { 0 }; GType atk_value_get_type (void) { static GType type = 0; - if (!type) { - GTypeInfo tinfo = + if (!type) { - sizeof (AtkValueIface), - (GBaseInitFunc) atk_value_base_init, - (GBaseFinalizeFunc) NULL, + GTypeInfo tinfo = { + sizeof (AtkValueIface), + (GBaseInitFunc) atk_value_base_init, + (GBaseFinalizeFunc) NULL, - }; + }; - type = g_type_register_static (G_TYPE_INTERFACE, "AtkValue", &tinfo, 0); - } + type = g_type_register_static (G_TYPE_INTERFACE, "AtkValue", &tinfo, 0); + } return type; } @@ -345,14 +346,14 @@ atk_value_base_init (AtkValueIface *class) * Since: 2.12 */ atk_value_signals[VALUE_CHANGED] = - g_signal_new ("value_changed", - ATK_TYPE_VALUE, - G_SIGNAL_RUN_LAST, - 0, - (GSignalAccumulator) NULL, NULL, - atk_marshal_VOID__DOUBLE_STRING, - G_TYPE_NONE, - 2, G_TYPE_DOUBLE, G_TYPE_STRING); + g_signal_new ("value_changed", + ATK_TYPE_VALUE, + G_SIGNAL_RUN_LAST, + 0, + (GSignalAccumulator) NULL, NULL, + atk_marshal_VOID__DOUBLE_STRING, + G_TYPE_NONE, + 2, G_TYPE_DOUBLE, G_TYPE_STRING); initialized = TRUE; } @@ -370,7 +371,7 @@ atk_value_base_init (AtkValueIface *class) **/ void atk_value_get_current_value (AtkValue *obj, - GValue *value) + GValue *value) { AtkValueIface *iface; @@ -400,8 +401,8 @@ atk_value_get_current_value (AtkValue *obj, * Deprecated: Since 2.12. Use atk_value_get_range() instead. **/ void -atk_value_get_maximum_value (AtkValue *obj, - GValue *value) +atk_value_get_maximum_value (AtkValue *obj, + GValue *value) { AtkValueIface *iface; @@ -432,7 +433,7 @@ atk_value_get_maximum_value (AtkValue *obj, **/ void atk_value_get_minimum_value (AtkValue *obj, - GValue *value) + GValue *value) { AtkValueIface *iface; @@ -458,7 +459,7 @@ atk_value_get_minimum_value (AtkValue *obj, * @value: (out): a #GValue representing the minimum increment by which the accessible value may be changed * * Gets the minimum increment by which the value of this object may be changed. If zero, - * the minimum increment is undefined, which may mean that it is limited only by the + * the minimum increment is undefined, which may mean that it is limited only by the * floating point precision of the platform. * * Since: 1.12 @@ -467,7 +468,7 @@ atk_value_get_minimum_value (AtkValue *obj, **/ void atk_value_get_minimum_increment (AtkValue *obj, - GValue *value) + GValue *value) { AtkValueIface *iface; @@ -499,8 +500,8 @@ atk_value_get_minimum_increment (AtkValue *obj, * Deprecated: Since 2.12. Use atk_value_set_value() instead. **/ gboolean -atk_value_set_current_value (AtkValue *obj, - const GValue *value) +atk_value_set_current_value (AtkValue *obj, + const GValue *value) { AtkValueIface *iface; @@ -515,7 +516,6 @@ atk_value_set_current_value (AtkValue *obj, return FALSE; } - /** * atk_value_get_value_and_text: * @obj: a GObject instance that implements AtkValueIface @@ -533,7 +533,7 @@ atk_value_set_current_value (AtkValue *obj, void atk_value_get_value_and_text (AtkValue *obj, gdouble *value, - gchar **text) + gchar **text) { AtkValueIface *iface; @@ -565,7 +565,7 @@ atk_value_get_value_and_text (AtkValue *obj, * * Since: 2.12 **/ -AtkRange* +AtkRange * atk_value_get_range (AtkValue *obj) { AtkValueIface *iface; @@ -613,7 +613,6 @@ atk_value_get_increment (AtkValue *obj) return 0; } - /** * atk_value_get_sub_ranges: * @obj: a GObject instance that implements AtkValueIface @@ -627,7 +626,7 @@ atk_value_get_increment (AtkValue *obj) * * Since: 2.12 **/ -GSList* +GSList * atk_value_get_sub_ranges (AtkValue *obj) { AtkValueIface *iface; @@ -667,7 +666,7 @@ atk_value_get_sub_ranges (AtkValue *obj) * Since: 2.12 **/ void -atk_value_set_value (AtkValue *obj, +atk_value_set_value (AtkValue *obj, const gdouble new_value) { AtkValueIface *iface; @@ -695,7 +694,7 @@ initialize_value_type_names () value_type_names = g_ptr_array_new (); enum_class = g_type_class_ref (ATK_TYPE_VALUE_TYPE); - if (!G_IS_ENUM_CLASS(enum_class)) + if (!G_IS_ENUM_CLASS (enum_class)) return; for (i = 0; i < ATK_VALUE_LAST_DEFINED; i++) @@ -717,7 +716,7 @@ initialize_value_type_names () * * Returns: the string describing the #AtkValueType */ -const gchar* +const gchar * atk_value_type_get_name (AtkValueType value_type) { g_return_val_if_fail (value_type >= 0, NULL); @@ -739,7 +738,7 @@ atk_value_type_get_name (AtkValueType value_type) * * Returns: the localized string describing the #AtkValueType **/ -const gchar* +const gchar * atk_value_type_get_localized_name (AtkValueType value_type) { _gettext_initialization (); diff --git a/atk/atkvalue.h b/atk/atkvalue.h index d3e3ad5a..05a918e8 100644 --- a/atk/atkvalue.h +++ b/atk/atkvalue.h @@ -20,7 +20,7 @@ #ifndef __ATK_VALUE_H__ #define __ATK_VALUE_H__ -#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) +#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined(__ATK_H_INSIDE__) && !defined(ATK_COMPILATION) #error "Only <atk/atk.h> can be included directly." #endif @@ -29,10 +29,10 @@ G_BEGIN_DECLS -#define ATK_TYPE_VALUE (atk_value_get_type ()) -#define ATK_IS_VALUE(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_VALUE) -#define ATK_VALUE(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_VALUE, AtkValue) -#define ATK_VALUE_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_VALUE, AtkValueIface)) +#define ATK_TYPE_VALUE (atk_value_get_type ()) +#define ATK_IS_VALUE(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_VALUE) +#define ATK_VALUE(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_VALUE, AtkValue) +#define ATK_VALUE_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_VALUE, AtkValueIface)) #ifndef _TYPEDEF_ATK_VALUE_ #define _TYPEDEF_ATK_VALUE__ @@ -66,7 +66,7 @@ typedef enum ATK_VALUE_VERY_GOOD, ATK_VALUE_BEST, ATK_VALUE_LAST_DEFINED -}AtkValueType; +} AtkValueType; /** * AtkValueIface: @@ -97,66 +97,65 @@ struct _AtkValueIface GTypeInterface parent; /*<deprecated>*/ - void (* get_current_value) (AtkValue *obj, - GValue *value); - void (* get_maximum_value) (AtkValue *obj, - GValue *value); - void (* get_minimum_value) (AtkValue *obj, - GValue *value); - gboolean (* set_current_value) (AtkValue *obj, - const GValue *value); - void (* get_minimum_increment) (AtkValue *obj, - GValue *value); + void (*get_current_value) (AtkValue *obj, + GValue *value); + void (*get_maximum_value) (AtkValue *obj, + GValue *value); + void (*get_minimum_value) (AtkValue *obj, + GValue *value); + gboolean (*set_current_value) (AtkValue *obj, + const GValue *value); + void (*get_minimum_increment) (AtkValue *obj, + GValue *value); /*</deprecated>*/ - void (* get_value_and_text) (AtkValue *obj, - gdouble *value, - gchar **text); - AtkRange*(* get_range) (AtkValue *obj); - gdouble (* get_increment) (AtkValue *obj); - GSList* (* get_sub_ranges) (AtkValue *obj); - void (* set_value) (AtkValue *obj, - const gdouble new_value); - + void (*get_value_and_text) (AtkValue *obj, + gdouble *value, + gchar **text); + AtkRange *(*get_range) (AtkValue *obj); + gdouble (*get_increment) (AtkValue *obj); + GSList *(*get_sub_ranges) (AtkValue *obj); + void (*set_value) (AtkValue *obj, + const gdouble new_value); }; ATK_AVAILABLE_IN_ALL -GType atk_value_get_type (void); - -ATK_DEPRECATED_IN_2_12_FOR(atk_value_get_value_and_text) -void atk_value_get_current_value (AtkValue *obj, - GValue *value); - -ATK_DEPRECATED_IN_2_12_FOR(atk_value_get_range) -void atk_value_get_maximum_value (AtkValue *obj, - GValue *value); -ATK_DEPRECATED_IN_2_12_FOR(atk_value_get_range) -void atk_value_get_minimum_value (AtkValue *obj, - GValue *value); -ATK_DEPRECATED_IN_2_12_FOR(atk_value_set_value) -gboolean atk_value_set_current_value (AtkValue *obj, - const GValue *value); -ATK_DEPRECATED_IN_2_12_FOR(atk_value_get_increment) -void atk_value_get_minimum_increment (AtkValue *obj, - GValue *value); +GType atk_value_get_type (void); + +ATK_DEPRECATED_IN_2_12_FOR (atk_value_get_value_and_text) +void atk_value_get_current_value (AtkValue *obj, + GValue *value); + +ATK_DEPRECATED_IN_2_12_FOR (atk_value_get_range) +void atk_value_get_maximum_value (AtkValue *obj, + GValue *value); +ATK_DEPRECATED_IN_2_12_FOR (atk_value_get_range) +void atk_value_get_minimum_value (AtkValue *obj, + GValue *value); +ATK_DEPRECATED_IN_2_12_FOR (atk_value_set_value) +gboolean atk_value_set_current_value (AtkValue *obj, + const GValue *value); +ATK_DEPRECATED_IN_2_12_FOR (atk_value_get_increment) +void atk_value_get_minimum_increment (AtkValue *obj, + GValue *value); ATK_AVAILABLE_IN_2_12 -void atk_value_get_value_and_text (AtkValue *obj, - gdouble *value, - gchar **text); +void atk_value_get_value_and_text (AtkValue *obj, + gdouble *value, + gchar **text); ATK_AVAILABLE_IN_2_12 -AtkRange* atk_value_get_range (AtkValue *obj); +AtkRange *atk_value_get_range (AtkValue *obj); ATK_AVAILABLE_IN_2_12 -gdouble atk_value_get_increment (AtkValue *obj); +gdouble atk_value_get_increment (AtkValue *obj); ATK_AVAILABLE_IN_2_12 -GSList* atk_value_get_sub_ranges (AtkValue *obj); +GSList *atk_value_get_sub_ranges (AtkValue *obj); ATK_AVAILABLE_IN_2_12 -void atk_value_set_value (AtkValue *obj, - const gdouble new_value); +void atk_value_set_value (AtkValue *obj, + const gdouble new_value); /* AtkValueType methods */ ATK_AVAILABLE_IN_ALL -const gchar* atk_value_type_get_name (AtkValueType value_type); +const gchar *atk_value_type_get_name (AtkValueType value_type); ATK_AVAILABLE_IN_ALL -const gchar* atk_value_type_get_localized_name (AtkValueType value_type); +const gchar *atk_value_type_get_localized_name (AtkValueType value_type); G_END_DECLS diff --git a/atk/atkwindow.c b/atk/atkwindow.c index 8f6d06a1..7699b835 100644 --- a/atk/atkwindow.c +++ b/atk/atkwindow.c @@ -19,8 +19,8 @@ #include "config.h" -#include "atkwindow.h" #include "atkmarshal.h" +#include "atkwindow.h" /** * AtkWindow: @@ -34,7 +34,8 @@ * See [class@AtkObject] */ -enum { +enum +{ ACTIVATE, CREATE, DEACTIVATE, @@ -53,13 +54,13 @@ static guint atk_window_add_signal (const gchar *name) { return g_signal_new (name, - ATK_TYPE_WINDOW, - G_SIGNAL_RUN_LAST, - 0, - (GSignalAccumulator) NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, - 0); + ATK_TYPE_WINDOW, + G_SIGNAL_RUN_LAST, + 0, + (GSignalAccumulator) NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, + 0); } typedef AtkWindowIface AtkWindowInterface; diff --git a/atk/atkwindow.h b/atk/atkwindow.h index 36d7fbb9..446c4af1 100644 --- a/atk/atkwindow.h +++ b/atk/atkwindow.h @@ -20,7 +20,7 @@ #ifndef __ATK_WINDOW_H__ #define __ATK_WINDOW_H__ -#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION) +#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined(__ATK_H_INSIDE__) && !defined(ATK_COMPILATION) #error "Only <atk/atk.h> can be included directly." #endif @@ -32,11 +32,10 @@ G_BEGIN_DECLS * AtkWindow describes signals pertaining to on-screen windows. */ - -#define ATK_TYPE_WINDOW (atk_window_get_type ()) -#define ATK_IS_WINDOW(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_WINDOW) -#define ATK_WINDOW(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_WINDOW, AtkWindow) -#define ATK_WINDOW_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_WINDOW, AtkWindowIface)) +#define ATK_TYPE_WINDOW (atk_window_get_type ()) +#define ATK_IS_WINDOW(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_WINDOW) +#define ATK_WINDOW(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_WINDOW, AtkWindow) +#define ATK_WINDOW_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_WINDOW, AtkWindowIface)) typedef struct _AtkWindow AtkWindow; /* Dummy typedef */ typedef struct _AtkWindowIface AtkWindowIface; diff --git a/atspi/atspi-accessible-private.h b/atspi/atspi-accessible-private.h index e7e748b9..e92260ee 100644 --- a/atspi/atspi-accessible-private.h +++ b/atspi/atspi-accessible-private.h @@ -26,11 +26,13 @@ #ifndef _ATSPI_ACCESSIBLE_PRIVATE_H_ #define _ATSPI_ACCESSIBLE_PRIVATE_H_ -G_BEGIN_DECLS +#include <glib.h> #include "atspi-accessible.h" #include "atspimarshal.h" +G_BEGIN_DECLS + struct _AtspiAccessiblePrivate { GHashTable *cache; @@ -44,4 +46,4 @@ void _atspi_accessible_unref_cache (AtspiAccessible *accessible); G_END_DECLS -#endif /* _ATSPI_ACCESSIBLE_H_ */ +#endif /* _ATSPI_ACCESSIBLE_H_ */ diff --git a/atspi/atspi-accessible.c b/atspi/atspi-accessible.c index d7d3f833..e3587433 100644 --- a/atspi/atspi-accessible.c +++ b/atspi/atspi-accessible.c @@ -22,8 +22,8 @@ * Boston, MA 02110-1301, USA. */ -#include "atspi-private.h" #include "atspi-accessible-private.h" +#include "atspi-private.h" #include <string.h> /** @@ -36,7 +36,8 @@ * actually have children. */ -enum { +enum +{ REGION_CHANGED, MODE_CHANGED, LAST_SIGNAL @@ -45,13 +46,15 @@ enum { static gboolean enable_caching = FALSE; static guint quark_locale; -static guint atspi_accessible_signals[LAST_SIGNAL] = { 0, }; +static guint atspi_accessible_signals[LAST_SIGNAL] = { + 0, +}; static gboolean screen_reader_signal_watcher (GSignalInvocationHint *signal_hint, - guint n_param_values, - const GValue *param_values, - gpointer data) + guint n_param_values, + const GValue *param_values, + gpointer data) { GObject *object; AtspiAccessible *accessible; @@ -64,7 +67,7 @@ screen_reader_signal_watcher (GSignalInvocationHint *signal_hint, gchar *dbus_name; object = g_value_get_object (param_values + 0); - g_return_val_if_fail (ATSPI_IS_ACCESSIBLE(object), FALSE); + g_return_val_if_fail (ATSPI_IS_ACCESSIBLE (object), FALSE); g_signal_query (signal_hint->signal_id, &signal_query); name = signal_query.signal_name; @@ -98,7 +101,7 @@ screen_reader_signal_watcher (GSignalInvocationHint *signal_hint, dbus_message_iter_close_container (&iter, &iter_array); dbus_connection_send (_atspi_bus (), signal, NULL); dbus_message_unref (signal); - return TRUE; + return TRUE; } static void @@ -161,20 +164,7 @@ atspi_value_interface_init (AtspiValue *value) { } -G_DEFINE_TYPE_WITH_CODE (AtspiAccessible, atspi_accessible, ATSPI_TYPE_OBJECT, - G_ADD_PRIVATE (AtspiAccessible) - G_IMPLEMENT_INTERFACE (ATSPI_TYPE_ACTION, atspi_action_interface_init) - G_IMPLEMENT_INTERFACE (ATSPI_TYPE_COLLECTION, atspi_collection_interface_init) - G_IMPLEMENT_INTERFACE (ATSPI_TYPE_COMPONENT, atspi_component_interface_init) - G_IMPLEMENT_INTERFACE (ATSPI_TYPE_DOCUMENT, atspi_document_interface_init) - G_IMPLEMENT_INTERFACE (ATSPI_TYPE_EDITABLE_TEXT, atspi_editable_text_interface_init) - G_IMPLEMENT_INTERFACE (ATSPI_TYPE_HYPERTEXT, atspi_hypertext_interface_init) - G_IMPLEMENT_INTERFACE (ATSPI_TYPE_IMAGE, atspi_image_interface_init) - G_IMPLEMENT_INTERFACE (ATSPI_TYPE_SELECTION, atspi_selection_interface_init) - G_IMPLEMENT_INTERFACE (ATSPI_TYPE_TABLE, atspi_table_interface_init) - G_IMPLEMENT_INTERFACE (ATSPI_TYPE_TABLE_CELL, atspi_table_cell_interface_init) - G_IMPLEMENT_INTERFACE (ATSPI_TYPE_TEXT, atspi_text_interface_init) - G_IMPLEMENT_INTERFACE (ATSPI_TYPE_VALUE, atspi_value_interface_init)) +G_DEFINE_TYPE_WITH_CODE (AtspiAccessible, atspi_accessible, ATSPI_TYPE_OBJECT, G_ADD_PRIVATE (AtspiAccessible) G_IMPLEMENT_INTERFACE (ATSPI_TYPE_ACTION, atspi_action_interface_init) G_IMPLEMENT_INTERFACE (ATSPI_TYPE_COLLECTION, atspi_collection_interface_init) G_IMPLEMENT_INTERFACE (ATSPI_TYPE_COMPONENT, atspi_component_interface_init) G_IMPLEMENT_INTERFACE (ATSPI_TYPE_DOCUMENT, atspi_document_interface_init) G_IMPLEMENT_INTERFACE (ATSPI_TYPE_EDITABLE_TEXT, atspi_editable_text_interface_init) G_IMPLEMENT_INTERFACE (ATSPI_TYPE_HYPERTEXT, atspi_hypertext_interface_init) G_IMPLEMENT_INTERFACE (ATSPI_TYPE_IMAGE, atspi_image_interface_init) G_IMPLEMENT_INTERFACE (ATSPI_TYPE_SELECTION, atspi_selection_interface_init) G_IMPLEMENT_INTERFACE (ATSPI_TYPE_TABLE, atspi_table_interface_init) G_IMPLEMENT_INTERFACE (ATSPI_TYPE_TABLE_CELL, atspi_table_cell_interface_init) G_IMPLEMENT_INTERFACE (ATSPI_TYPE_TEXT, atspi_text_interface_init) G_IMPLEMENT_INTERFACE (ATSPI_TYPE_VALUE, atspi_value_interface_init)) #ifdef DEBUG_REF_COUNTS static gint accessible_count = 0; @@ -184,7 +174,7 @@ static void atspi_accessible_unref (GObject *accessible) { if (accessible != NULL) - g_object_unref(accessible); + g_object_unref (accessible); } static void @@ -193,7 +183,7 @@ atspi_accessible_init (AtspiAccessible *accessible) #ifdef DEBUG_REF_COUNTS accessible_count++; g_hash_table_insert (_atspi_get_live_refs (), accessible, NULL); - g_print("at-spi: init: %d objects\n", accessible_count); + g_print ("at-spi: init: %d objects\n", accessible_count); #endif accessible->priv = atspi_accessible_get_instance_private (accessible); @@ -221,30 +211,31 @@ atspi_accessible_dispose (GObject *object) parent = accessible->accessible_parent; if (parent) - { - accessible->accessible_parent = NULL; - if (parent->children) - g_ptr_array_remove (parent->children, accessible); - g_object_unref (parent); - } - - if (accessible->children) for (i = accessible->children->len - 1; i >= 0; i--) - { - AtspiAccessible *child = g_ptr_array_index (accessible->children, i); - if (child && child->accessible_parent == accessible) { - child->accessible_parent = NULL; - g_object_unref (accessible); + accessible->accessible_parent = NULL; + if (parent->children) + g_ptr_array_remove (parent->children, accessible); + g_object_unref (parent); } - } if (accessible->children) - { - g_ptr_array_free (accessible->children, TRUE); - accessible->children = NULL; - } + for (i = accessible->children->len - 1; i >= 0; i--) + { + AtspiAccessible *child = g_ptr_array_index (accessible->children, i); + if (child && child->accessible_parent == accessible) + { + child->accessible_parent = NULL; + g_object_unref (accessible); + } + } + + if (accessible->children) + { + g_ptr_array_free (accessible->children, TRUE); + accessible->children = NULL; + } - G_OBJECT_CLASS (atspi_accessible_parent_class) ->dispose (object); + G_OBJECT_CLASS (atspi_accessible_parent_class)->dispose (object); } static void @@ -296,14 +287,14 @@ atspi_accessible_class_init (AtspiAccessibleClass *klass) * needed to highlight the object that the screen reader is reading. */ atspi_accessible_signals[REGION_CHANGED] = - g_signal_new ("region_changed", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (AtspiAccessibleClass, region_changed), - NULL, NULL, - atspi_marshal_VOID__INT_INT, - G_TYPE_NONE, - 2, G_TYPE_INT, G_TYPE_INT); + g_signal_new ("region_changed", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (AtspiAccessibleClass, region_changed), + NULL, NULL, + atspi_marshal_VOID__INT_INT, + G_TYPE_NONE, + 2, G_TYPE_INT, G_TYPE_INT); /** * AtspiAccessible::mode-changed: @@ -318,16 +309,16 @@ atspi_accessible_class_init (AtspiAccessibleClass *klass) * mouse-review * say-all * caret-tracking - */ + */ atspi_accessible_signals[MODE_CHANGED] = - g_signal_new ("mode_changed", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, - G_STRUCT_OFFSET (AtspiAccessibleClass, mode_changed), - NULL, NULL, - atspi_marshal_VOID__INT_STRING, - G_TYPE_NONE, - 2, G_TYPE_INT, G_TYPE_STRING); + g_signal_new ("mode_changed", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, + G_STRUCT_OFFSET (AtspiAccessibleClass, mode_changed), + NULL, NULL, + atspi_marshal_VOID__INT_STRING, + G_TYPE_NONE, + 2, G_TYPE_INT, G_TYPE_STRING); g_signal_add_emission_hook (atspi_accessible_signals[REGION_CHANGED], 0, screen_reader_signal_watcher, NULL, @@ -343,7 +334,7 @@ atspi_accessible_class_init (AtspiAccessibleClass *klass) * * Gets the name of an #AtspiAccessible object. * - * Returns: a UTF-8 string indicating the name of the #AtspiAccessible object + * Returns: a UTF-8 string indicating the name of the #AtspiAccessible object * or NULL on exception. **/ gchar * @@ -352,14 +343,14 @@ atspi_accessible_get_name (AtspiAccessible *obj, GError **error) g_return_val_if_fail (obj != NULL, g_strdup ("")); if (!_atspi_accessible_test_cache (obj, ATSPI_CACHE_NAME)) - { - g_free (obj->name); - obj->name = NULL; - if (!_atspi_dbus_get_property (obj, atspi_interface_accessible, "Name", error, - "s", &obj->name)) - return g_strdup (""); - _atspi_accessible_add_cache (obj, ATSPI_CACHE_NAME); - } + { + g_free (obj->name); + obj->name = NULL; + if (!_atspi_dbus_get_property (obj, atspi_interface_accessible, "Name", error, + "s", &obj->name)) + return g_strdup (""); + _atspi_accessible_add_cache (obj, ATSPI_CACHE_NAME); + } return g_strdup (obj->name); } @@ -369,7 +360,7 @@ atspi_accessible_get_name (AtspiAccessible *obj, GError **error) * * Gets the description of an #AtspiAccessible object. * - * Returns: a UTF-8 string describing the #AtspiAccessible object + * Returns: a UTF-8 string describing the #AtspiAccessible object * or NULL on exception. **/ gchar * @@ -378,15 +369,15 @@ atspi_accessible_get_description (AtspiAccessible *obj, GError **error) g_return_val_if_fail (obj != NULL, g_strdup ("")); if (!_atspi_accessible_test_cache (obj, ATSPI_CACHE_DESCRIPTION)) - { - g_free (obj->description); - obj->description = NULL; - if (!_atspi_dbus_get_property (obj, atspi_interface_accessible, - "Description", error, "s", - &obj->description)) - return g_strdup (""); - _atspi_accessible_add_cache (obj, ATSPI_CACHE_DESCRIPTION); - } + { + g_free (obj->description); + obj->description = NULL; + if (!_atspi_dbus_get_property (obj, atspi_interface_accessible, + "Description", error, "s", + &obj->description)) + return g_strdup (""); + _atspi_accessible_add_cache (obj, ATSPI_CACHE_DESCRIPTION); + } return g_strdup (obj->description); } @@ -410,34 +401,34 @@ atspi_accessible_get_parent (AtspiAccessible *obj, GError **error) g_return_val_if_fail (obj != NULL, NULL); if (!_atspi_accessible_test_cache (obj, ATSPI_CACHE_PARENT)) - { - DBusMessage *message, *reply; - DBusMessageIter iter, iter_variant; - if (!obj->parent.app) - return NULL; - message = dbus_message_new_method_call (obj->parent.app->bus_name, - obj->parent.path, - DBUS_INTERFACE_PROPERTIES, "Get"); - if (!message) - return NULL; - dbus_message_append_args (message, DBUS_TYPE_STRING, &atspi_interface_accessible, - DBUS_TYPE_STRING, &str_parent, - DBUS_TYPE_INVALID); - reply = _atspi_dbus_send_with_reply_and_block (message, error); - if (!reply) - return NULL; - if (strcmp (dbus_message_get_signature (reply), "v") != 0) { + DBusMessage *message, *reply; + DBusMessageIter iter, iter_variant; + if (!obj->parent.app) + return NULL; + message = dbus_message_new_method_call (obj->parent.app->bus_name, + obj->parent.path, + DBUS_INTERFACE_PROPERTIES, "Get"); + if (!message) + return NULL; + dbus_message_append_args (message, DBUS_TYPE_STRING, &atspi_interface_accessible, + DBUS_TYPE_STRING, &str_parent, + DBUS_TYPE_INVALID); + reply = _atspi_dbus_send_with_reply_and_block (message, error); + if (!reply) + return NULL; + if (strcmp (dbus_message_get_signature (reply), "v") != 0) + { + dbus_message_unref (reply); + return NULL; + } + dbus_message_iter_init (reply, &iter); + dbus_message_iter_recurse (&iter, &iter_variant); + g_clear_object (&obj->accessible_parent); + obj->accessible_parent = _atspi_dbus_consume_accessible (&iter_variant); dbus_message_unref (reply); - return NULL; + _atspi_accessible_add_cache (obj, ATSPI_CACHE_PARENT); } - dbus_message_iter_init (reply, &iter); - dbus_message_iter_recurse (&iter, &iter_variant); - g_clear_object (&obj->accessible_parent); - obj->accessible_parent = _atspi_dbus_consume_accessible (&iter_variant); - dbus_message_unref (reply); - _atspi_accessible_add_cache (obj, ATSPI_CACHE_PARENT); - } if (!obj->accessible_parent) return NULL; return g_object_ref (obj->accessible_parent); @@ -459,16 +450,16 @@ atspi_accessible_get_child_count (AtspiAccessible *obj, GError **error) g_return_val_if_fail (obj != NULL, -1); if (!_atspi_accessible_test_cache (obj, ATSPI_CACHE_CHILDREN)) - { - dbus_int32_t ret; - if (!_atspi_dbus_get_property (obj, atspi_interface_accessible, - "ChildCount", error, "i", &ret)) - return -1; - return ret; - } + { + dbus_int32_t ret; + if (!_atspi_dbus_get_property (obj, atspi_interface_accessible, + "ChildCount", error, "i", &ret)) + return -1; + return ret; + } if (!obj->children) - return 0; /* assume it's disposed */ + return 0; /* assume it's disposed */ return obj->children->len; } @@ -485,8 +476,8 @@ atspi_accessible_get_child_count (AtspiAccessible *obj, GError **error) **/ AtspiAccessible * atspi_accessible_get_child_at_index (AtspiAccessible *obj, - gint child_index, - GError **error) + gint child_index, + GError **error) { AtspiAccessible *child; DBusMessage *reply; @@ -494,28 +485,28 @@ atspi_accessible_get_child_at_index (AtspiAccessible *obj, g_return_val_if_fail (obj != NULL, NULL); if (_atspi_accessible_test_cache (obj, ATSPI_CACHE_CHILDREN)) - { - if (!obj->children) - return NULL; /* assume disposed */ + { + if (!obj->children) + return NULL; /* assume disposed */ - child = g_ptr_array_index (obj->children, child_index); - if (child) - return g_object_ref (child); - } + child = g_ptr_array_index (obj->children, child_index); + if (child) + return g_object_ref (child); + } reply = _atspi_dbus_call_partial (obj, atspi_interface_accessible, - "GetChildAtIndex", error, "i", child_index); + "GetChildAtIndex", error, "i", child_index); child = _atspi_dbus_return_accessible_from_message (reply); if (!child) return NULL; if (_atspi_accessible_test_cache (obj, ATSPI_CACHE_CHILDREN)) - { + { if (child_index >= obj->children->len) g_ptr_array_set_size (obj->children, child_index + 1); - g_ptr_array_index (obj->children, child_index) = g_object_ref (child); - } + g_ptr_array_index (obj->children, child_index) = g_object_ref (child); + } return child; } @@ -523,7 +514,7 @@ atspi_accessible_get_child_at_index (AtspiAccessible *obj, * atspi_accessible_get_index_in_parent: * @obj: a pointer to the #AtspiAccessible object on which to operate. * - * Gets the index of an #AtspiAccessible object within its parent's + * Gets the index of an #AtspiAccessible object within its parent's * #AtspiAccessible children list. * * Returns: a #glong indicating the index of the #AtspiAccessible object @@ -538,17 +529,17 @@ atspi_accessible_get_index_in_parent (AtspiAccessible *obj, GError **error) g_return_val_if_fail (obj != NULL, -1); if (_atspi_accessible_test_cache (obj, ATSPI_CACHE_PARENT)) - { - if (!obj->accessible_parent) - return -1; + { + if (!obj->accessible_parent) + return -1; - if (!_atspi_accessible_test_cache (obj->accessible_parent, ATSPI_CACHE_CHILDREN) || !obj->accessible_parent->children) + if (!_atspi_accessible_test_cache (obj->accessible_parent, ATSPI_CACHE_CHILDREN) || !obj->accessible_parent->children) goto dbus; - for (i = 0; i < obj->accessible_parent->children->len; i++) - if (g_ptr_array_index (obj->accessible_parent->children, i) == obj) - return i; - } + for (i = 0; i < obj->accessible_parent->children->len; i++) + if (g_ptr_array_index (obj->accessible_parent->children, i) == obj) + return i; + } dbus: _atspi_dbus_call (obj, atspi_interface_accessible, @@ -590,12 +581,12 @@ atspi_accessible_get_relation_set (AtspiAccessible *obj, GError **error) dbus_message_iter_init (reply, &iter); dbus_message_iter_recurse (&iter, &iter_array); while (dbus_message_iter_get_arg_type (&iter_array) != DBUS_TYPE_INVALID) - { - AtspiRelation *relation; - relation = _atspi_relation_new_from_iter (&iter_array); - ret = g_array_append_val (ret, relation); - dbus_message_iter_next (&iter_array); - } + { + AtspiRelation *relation; + relation = _atspi_relation_new_from_iter (&iter_array); + ret = g_array_append_val (ret, relation); + dbus_message_iter_next (&iter_array); + } dbus_message_unref (reply); return ret; } @@ -616,15 +607,15 @@ atspi_accessible_get_role (AtspiAccessible *obj, GError **error) g_return_val_if_fail (obj != NULL, ATSPI_ROLE_INVALID); if (!_atspi_accessible_test_cache (obj, ATSPI_CACHE_ROLE)) - { - dbus_uint32_t role; - /* TODO: Make this a property */ - if (_atspi_dbus_call (obj, atspi_interface_accessible, "GetRole", error, "=>u", &role)) { - obj->role = role; - _atspi_accessible_add_cache (obj, ATSPI_CACHE_ROLE); + dbus_uint32_t role; + /* TODO: Make this a property */ + if (_atspi_dbus_call (obj, atspi_interface_accessible, "GetRole", error, "=>u", &role)) + { + obj->role = role; + _atspi_accessible_add_cache (obj, ATSPI_CACHE_ROLE); + } } - } return obj->role; } @@ -664,12 +655,12 @@ atspi_accessible_get_role_name (AtspiAccessible *obj, GError **error) * atspi_accessible_get_localized_role_name: * @obj: a pointer to the #AtspiAccessible object on which to operate. * - * Gets a UTF-8 string corresponding to the name of the role played by an + * Gets a UTF-8 string corresponding to the name of the role played by an * object, translated to the current locale. * This method will return useful values for roles that fall outside the * enumeration used in atspi_accessible_getRole (). * - * Returns: a localized, UTF-8 string specifying the type of UI role played + * Returns: a localized, UTF-8 string specifying the type of UI role played * by an #AtspiAccessible object. * **/ @@ -713,17 +704,17 @@ atspi_accessible_get_state_set (AtspiAccessible *obj) return defunct_set (); if (!_atspi_accessible_test_cache (obj, ATSPI_CACHE_STATES)) - { - DBusMessage *reply; - DBusMessageIter iter; - reply = _atspi_dbus_call_partial (obj, atspi_interface_accessible, - "GetState", NULL, ""); - _ATSPI_DBUS_CHECK_SIG (reply, "au", NULL, defunct_set ()); - dbus_message_iter_init (reply, &iter); - _atspi_dbus_set_state (obj, &iter); - dbus_message_unref (reply); - _atspi_accessible_add_cache (obj, ATSPI_CACHE_STATES); - } + { + DBusMessage *reply; + DBusMessageIter iter; + reply = _atspi_dbus_call_partial (obj, atspi_interface_accessible, + "GetState", NULL, ""); + _ATSPI_DBUS_CHECK_SIG (reply, "au", NULL, defunct_set ()); + dbus_message_iter_init (reply, &iter); + _atspi_dbus_set_state (obj, &iter); + dbus_message_unref (reply); + _atspi_accessible_add_cache (obj, ATSPI_CACHE_STATES); + } return g_object_ref (obj->states); } @@ -732,7 +723,7 @@ atspi_accessible_get_state_set (AtspiAccessible *obj) * atspi_accessible_get_attributes: * @obj: The #AtspiAccessible being queried. * - * Gets the #AttributeSet representing any assigned + * Gets the #AttributeSet representing any assigned * name-value pair attributes or annotations for this object. * For typographic, textual, or textually-semantic attributes, see * atspi_text_get_attributes instead. @@ -745,24 +736,24 @@ atspi_accessible_get_attributes (AtspiAccessible *obj, GError **error) { DBusMessage *message; - g_return_val_if_fail (obj != NULL, NULL); + g_return_val_if_fail (obj != NULL, NULL); if (obj->priv->cache) - { - GValue *val = g_hash_table_lookup (obj->priv->cache, "Attributes"); - if (val) - return g_value_dup_boxed (val); - } + { + GValue *val = g_hash_table_lookup (obj->priv->cache, "Attributes"); + if (val) + return g_value_dup_boxed (val); + } if (!_atspi_accessible_test_cache (obj, ATSPI_CACHE_ATTRIBUTES)) - { - message = _atspi_dbus_call_partial (obj, atspi_interface_accessible, - "GetAttributes", error, ""); - g_clear_pointer (&(obj->attributes), g_hash_table_unref); + { + message = _atspi_dbus_call_partial (obj, atspi_interface_accessible, + "GetAttributes", error, ""); + g_clear_pointer (&(obj->attributes), g_hash_table_unref); - obj->attributes = _atspi_dbus_return_hash_from_message (message); - _atspi_accessible_add_cache (obj, ATSPI_CACHE_ATTRIBUTES); - } + obj->attributes = _atspi_dbus_return_hash_from_message (message); + _atspi_accessible_add_cache (obj, ATSPI_CACHE_ATTRIBUTES); + } if (!obj->attributes) return NULL; @@ -772,7 +763,7 @@ atspi_accessible_get_attributes (AtspiAccessible *obj, GError **error) static void add_to_attribute_array (gpointer key, gpointer value, gpointer data) { - GArray **array = (GArray **)data; + GArray **array = (GArray **) data; gchar *str = g_strconcat (key, ":", value, NULL); *array = g_array_append_val (*array, str); } @@ -781,7 +772,7 @@ add_to_attribute_array (gpointer key, gpointer value, gpointer data) * atspi_accessible_get_attributes_as_array: * @obj: The #AtspiAccessible being queried. * - * Gets a #GArray representing any assigned + * Gets a #GArray representing any assigned * name-value pair attributes or annotations for this object. * For typographic, textual, or textually-semantic attributes, see * atspi_text_get_attributes_as_array instead. @@ -794,19 +785,19 @@ atspi_accessible_get_attributes_as_array (AtspiAccessible *obj, GError **error) { DBusMessage *message; - g_return_val_if_fail (obj != NULL, NULL); + g_return_val_if_fail (obj != NULL, NULL); if (obj->priv->cache) - { - GValue *val = g_hash_table_lookup (obj->priv->cache, "Attributes"); - if (val) { - GArray *array = g_array_new (TRUE, TRUE, sizeof (gchar *)); - GHashTable *attributes = g_value_get_boxed (val); - g_hash_table_foreach (attributes, add_to_attribute_array, &array); - return array; + GValue *val = g_hash_table_lookup (obj->priv->cache, "Attributes"); + if (val) + { + GArray *array = g_array_new (TRUE, TRUE, sizeof (gchar *)); + GHashTable *attributes = g_value_get_boxed (val); + g_hash_table_foreach (attributes, add_to_attribute_array, &array); + return array; + } } - } message = _atspi_dbus_call_partial (obj, atspi_interface_accessible, "GetAttributes", error, ""); return _atspi_dbus_return_attribute_array_from_message (message); @@ -828,33 +819,33 @@ atspi_accessible_get_application (AtspiAccessible *obj, GError **error) g_object_ref (obj); for (;;) - { - parent = atspi_accessible_get_parent (obj, NULL); - if (!parent && obj->parent.app && - atspi_accessible_get_role (obj, NULL) != ATSPI_ROLE_APPLICATION) { - AtspiAccessible *root = g_object_ref (obj->parent.app->root); - if (root) - { - g_object_unref (obj); - if (atspi_accessible_get_role (root, NULL) == ATSPI_ROLE_DESKTOP_FRAME) + parent = atspi_accessible_get_parent (obj, NULL); + if (!parent && obj->parent.app && + atspi_accessible_get_role (obj, NULL) != ATSPI_ROLE_APPLICATION) { - g_object_unref (root); - return NULL; + AtspiAccessible *root = g_object_ref (obj->parent.app->root); + if (root) + { + g_object_unref (obj); + if (atspi_accessible_get_role (root, NULL) == ATSPI_ROLE_DESKTOP_FRAME) + { + g_object_unref (root); + return NULL; + } + return root; + } } - return root; - } + if (!parent || parent == obj || + atspi_accessible_get_role (parent, NULL) == ATSPI_ROLE_DESKTOP_FRAME) + { + if (parent) + g_object_unref (parent); + return obj; + } + g_object_unref (obj); + obj = parent; } - if (!parent || parent == obj || - atspi_accessible_get_role (parent, NULL) == ATSPI_ROLE_DESKTOP_FRAME) - { - if (parent) - g_object_unref (parent); - return obj; - } - g_object_unref (obj); - obj = parent; - } } /* Application-specific methods */ @@ -939,7 +930,7 @@ atspi_accessible_get_atspi_version (AtspiAccessible *obj, GError **error) * Gets the application id for a #AtspiAccessible object. * Only works on application root objects. * - * Returns: a positive #gint indicating the id for the #AtspiAccessible object + * Returns: a positive #gint indicating the id for the #AtspiAccessible object * or -1 on exception. **/ gint @@ -950,16 +941,15 @@ atspi_accessible_get_id (AtspiAccessible *obj, GError **error) g_return_val_if_fail (obj != NULL, -1); if (!_atspi_dbus_get_property (obj, atspi_interface_application, "Id", error, "i", &ret)) - return -1; + return -1; return ret; } - /* Interface query methods */ static gboolean _atspi_accessible_is_a (AtspiAccessible *accessible, - const char *interface_name) + const char *interface_name) { int n; @@ -969,27 +959,28 @@ _atspi_accessible_is_a (AtspiAccessible *accessible, } if (!_atspi_accessible_test_cache (accessible, ATSPI_CACHE_INTERFACES)) - { - DBusMessage *reply; - DBusMessageIter iter; - reply = _atspi_dbus_call_partial (accessible, atspi_interface_accessible, - "GetInterfaces", NULL, ""); - _ATSPI_DBUS_CHECK_SIG (reply, "as", NULL, FALSE); - dbus_message_iter_init (reply, &iter); - _atspi_dbus_set_interfaces (accessible, &iter); - dbus_message_unref (reply); - } + { + DBusMessage *reply; + DBusMessageIter iter; + reply = _atspi_dbus_call_partial (accessible, atspi_interface_accessible, + "GetInterfaces", NULL, ""); + _ATSPI_DBUS_CHECK_SIG (reply, "as", NULL, FALSE); + dbus_message_iter_init (reply, &iter); + _atspi_dbus_set_interfaces (accessible, &iter); + dbus_message_unref (reply); + } n = _atspi_get_iface_num (interface_name); - if (n == -1) return FALSE; - return (gboolean) ((accessible->interfaces & (1 << n))? TRUE: FALSE); + if (n == -1) + return FALSE; + return (gboolean) ((accessible->interfaces & (1 << n)) ? TRUE : FALSE); } /** * atspi_accessible_is_action: * @obj: a pointer to the #AtspiAccessible instance to query. * - * Query whether the specified #AtspiAccessible implements the + * Query whether the specified #AtspiAccessible implements the * #AtspiAction interface. * * Returns: #TRUE if @obj implements the #AtspiAction interface, @@ -999,7 +990,7 @@ gboolean atspi_accessible_is_action (AtspiAccessible *obj) { return _atspi_accessible_is_a (obj, - atspi_interface_action); + atspi_interface_action); } /** @@ -1016,10 +1007,10 @@ gboolean atspi_accessible_is_application (AtspiAccessible *obj) { return _atspi_accessible_is_a (obj, - atspi_interface_application); + atspi_interface_application); } -/** +/** * atspi_accessible_is_collection: * @obj: a pointer to the #AtspiAccessible instance to query. * @@ -1032,8 +1023,8 @@ atspi_accessible_is_application (AtspiAccessible *obj) gboolean atspi_accessible_is_collection (AtspiAccessible *obj) { - return _atspi_accessible_is_a (obj, - atspi_interface_collection); + return _atspi_accessible_is_a (obj, + atspi_interface_collection); } /** @@ -1049,7 +1040,7 @@ gboolean atspi_accessible_is_component (AtspiAccessible *obj) { return _atspi_accessible_is_a (obj, - atspi_interface_component); + atspi_interface_component); } /** @@ -1066,7 +1057,7 @@ gboolean atspi_accessible_is_document (AtspiAccessible *obj) { return _atspi_accessible_is_a (obj, - atspi_interface_document); + atspi_interface_document); } /** @@ -1083,9 +1074,9 @@ gboolean atspi_accessible_is_editable_text (AtspiAccessible *obj) { return _atspi_accessible_is_a (obj, - atspi_interface_editable_text); + atspi_interface_editable_text); } - + /** * atspi_accessible_is_hypertext: * @obj: a pointer to the #AtspiAccessible instance to query. @@ -1100,14 +1091,14 @@ gboolean atspi_accessible_is_hypertext (AtspiAccessible *obj) { return _atspi_accessible_is_a (obj, - atspi_interface_hypertext); + atspi_interface_hypertext); } /** * atspi_accessible_is_hyperlink: * @obj: a pointer to the #AtspiAccessible instance to query. * - * Query whether the specified #AtspiAccessible implements the + * Query whether the specified #AtspiAccessible implements the * #AtspiHyperlink interface. * * Returns: #TRUE if @obj implements the #AtspiHypertext interface, @@ -1117,7 +1108,7 @@ gboolean atspi_accessible_is_hyperlink (AtspiAccessible *obj) { return _atspi_accessible_is_a (obj, - atspi_interface_hyperlink); + atspi_interface_hyperlink); } /** @@ -1129,12 +1120,12 @@ atspi_accessible_is_hyperlink (AtspiAccessible *obj) * * Returns: #TRUE if @obj implements the #AtspiImage interface, * #FALSE otherwise. -**/ + **/ gboolean atspi_accessible_is_image (AtspiAccessible *obj) { return _atspi_accessible_is_a (obj, - atspi_interface_image); + atspi_interface_image); } /** @@ -1146,12 +1137,12 @@ atspi_accessible_is_image (AtspiAccessible *obj) * * Returns: #TRUE if @obj implements the #AtspiSelection interface, * #FALSE otherwise. -**/ + **/ gboolean atspi_accessible_is_selection (AtspiAccessible *obj) { return _atspi_accessible_is_a (obj, - atspi_interface_selection); + atspi_interface_selection); } /** @@ -1163,12 +1154,12 @@ atspi_accessible_is_selection (AtspiAccessible *obj) * * Returns: #TRUE if @obj implements the #AtspiTable interface, * #FALSE otherwise. -**/ + **/ gboolean atspi_accessible_is_table (AtspiAccessible *obj) { return _atspi_accessible_is_a (obj, - atspi_interface_table); + atspi_interface_table); } /** @@ -1180,12 +1171,12 @@ atspi_accessible_is_table (AtspiAccessible *obj) * * Returns: #TRUE if @obj implements the #AtspiTable interface, * #FALSE otherwise. -**/ + **/ gboolean atspi_accessible_is_table_cell (AtspiAccessible *obj) { return _atspi_accessible_is_a (obj, - atspi_interface_table_cell); + atspi_interface_table_cell); } /** @@ -1197,7 +1188,7 @@ atspi_accessible_is_table_cell (AtspiAccessible *obj) * * Returns: #TRUE if @obj implements the #AtspiStreamableContent interface, * #FALSE otherwise. -**/ + **/ gboolean atspi_accessible_is_streamable_content (AtspiAccessible *obj) { @@ -1214,17 +1205,17 @@ atspi_accessible_is_streamable_content (AtspiAccessible *obj) * atspi_accessible_is_text: * @obj: a pointer to the #AtspiAccessible instance to query. * - * Query whether the specified #AtspiAccessible implements the + * Query whether the specified #AtspiAccessible implements the * #AtspiText interface. * * Returns: #TRUE if @obj implements the #AtspiText interface, * #FALSE otherwise. -**/ + **/ gboolean atspi_accessible_is_text (AtspiAccessible *obj) { return _atspi_accessible_is_a (obj, - atspi_interface_text); + atspi_interface_text); } /** @@ -1236,12 +1227,12 @@ atspi_accessible_is_text (AtspiAccessible *obj) * * Returns: #TRUE if @obj implements the #AtspiValue interface, * #FALSE otherwise. -**/ + **/ gboolean atspi_accessible_is_value (AtspiAccessible *obj) { return _atspi_accessible_is_a (obj, - atspi_interface_value); + atspi_interface_value); } /** @@ -1258,8 +1249,7 @@ atspi_accessible_is_value (AtspiAccessible *obj) AtspiAction * atspi_accessible_get_action (AtspiAccessible *accessible) { - return (_atspi_accessible_is_a (accessible, atspi_interface_action) ? - g_object_ref (ATSPI_ACTION (accessible)) : NULL); + return (_atspi_accessible_is_a (accessible, atspi_interface_action) ? g_object_ref (ATSPI_ACTION (accessible)) : NULL); } /** @@ -1274,8 +1264,7 @@ atspi_accessible_get_action (AtspiAccessible *accessible) AtspiAction * atspi_accessible_get_action_iface (AtspiAccessible *accessible) { - return (_atspi_accessible_is_a (accessible, atspi_interface_action) ? - g_object_ref (ATSPI_ACTION (accessible)) : NULL); + return (_atspi_accessible_is_a (accessible, atspi_interface_action) ? g_object_ref (ATSPI_ACTION (accessible)) : NULL); } /** @@ -1292,8 +1281,7 @@ atspi_accessible_get_action_iface (AtspiAccessible *accessible) AtspiCollection * atspi_accessible_get_collection (AtspiAccessible *accessible) { - return (_atspi_accessible_is_a (accessible, atspi_interface_collection) ? - g_object_ref (ATSPI_COLLECTION (accessible)) : NULL); + return (_atspi_accessible_is_a (accessible, atspi_interface_collection) ? g_object_ref (ATSPI_COLLECTION (accessible)) : NULL); } /** @@ -1308,8 +1296,7 @@ atspi_accessible_get_collection (AtspiAccessible *accessible) AtspiCollection * atspi_accessible_get_collection_iface (AtspiAccessible *accessible) { - return (_atspi_accessible_is_a (accessible, atspi_interface_collection) ? - g_object_ref (ATSPI_COLLECTION (accessible)) : NULL); + return (_atspi_accessible_is_a (accessible, atspi_interface_collection) ? g_object_ref (ATSPI_COLLECTION (accessible)) : NULL); } /** @@ -1326,8 +1313,7 @@ atspi_accessible_get_collection_iface (AtspiAccessible *accessible) AtspiComponent * atspi_accessible_get_component (AtspiAccessible *obj) { - return (_atspi_accessible_is_a (obj, atspi_interface_component) ? - g_object_ref (ATSPI_COMPONENT (obj)) : NULL); + return (_atspi_accessible_is_a (obj, atspi_interface_component) ? g_object_ref (ATSPI_COMPONENT (obj)) : NULL); } /** @@ -1342,8 +1328,7 @@ atspi_accessible_get_component (AtspiAccessible *obj) AtspiComponent * atspi_accessible_get_component_iface (AtspiAccessible *obj) { - return (_atspi_accessible_is_a (obj, atspi_interface_component) ? - g_object_ref (ATSPI_COMPONENT (obj)) : NULL); + return (_atspi_accessible_is_a (obj, atspi_interface_component) ? g_object_ref (ATSPI_COMPONENT (obj)) : NULL); } /** @@ -1360,8 +1345,7 @@ atspi_accessible_get_component_iface (AtspiAccessible *obj) AtspiDocument * atspi_accessible_get_document (AtspiAccessible *accessible) { - return (_atspi_accessible_is_a (accessible, atspi_interface_document) ? - g_object_ref (ATSPI_DOCUMENT (accessible)) : NULL); + return (_atspi_accessible_is_a (accessible, atspi_interface_document) ? g_object_ref (ATSPI_DOCUMENT (accessible)) : NULL); } /** @@ -1376,8 +1360,7 @@ atspi_accessible_get_document (AtspiAccessible *accessible) AtspiDocument * atspi_accessible_get_document_iface (AtspiAccessible *accessible) { - return (_atspi_accessible_is_a (accessible, atspi_interface_document) ? - g_object_ref (ATSPI_DOCUMENT (accessible)) : NULL); + return (_atspi_accessible_is_a (accessible, atspi_interface_document) ? g_object_ref (ATSPI_DOCUMENT (accessible)) : NULL); } /** @@ -1394,8 +1377,7 @@ atspi_accessible_get_document_iface (AtspiAccessible *accessible) AtspiEditableText * atspi_accessible_get_editable_text (AtspiAccessible *accessible) { - return (_atspi_accessible_is_a (accessible, atspi_interface_editable_text) ? - g_object_ref (ATSPI_EDITABLE_TEXT (accessible)) : NULL); + return (_atspi_accessible_is_a (accessible, atspi_interface_editable_text) ? g_object_ref (ATSPI_EDITABLE_TEXT (accessible)) : NULL); } /** @@ -1410,8 +1392,7 @@ atspi_accessible_get_editable_text (AtspiAccessible *accessible) AtspiEditableText * atspi_accessible_get_editable_text_iface (AtspiAccessible *accessible) { - return (_atspi_accessible_is_a (accessible, atspi_interface_editable_text) ? - g_object_ref (ATSPI_EDITABLE_TEXT (accessible)) : NULL); + return (_atspi_accessible_is_a (accessible, atspi_interface_editable_text) ? g_object_ref (ATSPI_EDITABLE_TEXT (accessible)) : NULL); } /** @@ -1426,8 +1407,7 @@ atspi_accessible_get_editable_text_iface (AtspiAccessible *accessible) AtspiHyperlink * atspi_accessible_get_hyperlink (AtspiAccessible *accessible) { - return (_atspi_accessible_is_a (accessible, atspi_interface_hyperlink) ? - _atspi_hyperlink_new (accessible->parent.app, accessible->parent.path) : NULL); + return (_atspi_accessible_is_a (accessible, atspi_interface_hyperlink) ? _atspi_hyperlink_new (accessible->parent.app, accessible->parent.path) : NULL); } /** @@ -1444,8 +1424,7 @@ atspi_accessible_get_hyperlink (AtspiAccessible *accessible) AtspiHypertext * atspi_accessible_get_hypertext (AtspiAccessible *accessible) { - return (_atspi_accessible_is_a (accessible, atspi_interface_hypertext) ? - g_object_ref (ATSPI_HYPERTEXT (accessible)) : NULL); + return (_atspi_accessible_is_a (accessible, atspi_interface_hypertext) ? g_object_ref (ATSPI_HYPERTEXT (accessible)) : NULL); } /** @@ -1460,8 +1439,7 @@ atspi_accessible_get_hypertext (AtspiAccessible *accessible) AtspiHypertext * atspi_accessible_get_hypertext_iface (AtspiAccessible *accessible) { - return (_atspi_accessible_is_a (accessible, atspi_interface_hypertext) ? - g_object_ref (ATSPI_HYPERTEXT (accessible)) : NULL); + return (_atspi_accessible_is_a (accessible, atspi_interface_hypertext) ? g_object_ref (ATSPI_HYPERTEXT (accessible)) : NULL); } /** @@ -1478,8 +1456,7 @@ atspi_accessible_get_hypertext_iface (AtspiAccessible *accessible) AtspiImage * atspi_accessible_get_image (AtspiAccessible *accessible) { - return (_atspi_accessible_is_a (accessible, atspi_interface_image) ? - g_object_ref (ATSPI_IMAGE (accessible)) : NULL); + return (_atspi_accessible_is_a (accessible, atspi_interface_image) ? g_object_ref (ATSPI_IMAGE (accessible)) : NULL); } /** @@ -1494,8 +1471,7 @@ atspi_accessible_get_image (AtspiAccessible *accessible) AtspiImage * atspi_accessible_get_image_iface (AtspiAccessible *accessible) { - return (_atspi_accessible_is_a (accessible, atspi_interface_image) ? - g_object_ref (ATSPI_IMAGE (accessible)) : NULL); + return (_atspi_accessible_is_a (accessible, atspi_interface_image) ? g_object_ref (ATSPI_IMAGE (accessible)) : NULL); } /** @@ -1512,8 +1488,7 @@ atspi_accessible_get_image_iface (AtspiAccessible *accessible) AtspiSelection * atspi_accessible_get_selection (AtspiAccessible *accessible) { - return (_atspi_accessible_is_a (accessible, atspi_interface_selection) ? - g_object_ref (ATSPI_SELECTION (accessible)) : NULL); + return (_atspi_accessible_is_a (accessible, atspi_interface_selection) ? g_object_ref (ATSPI_SELECTION (accessible)) : NULL); } /** @@ -1528,8 +1503,7 @@ atspi_accessible_get_selection (AtspiAccessible *accessible) AtspiSelection * atspi_accessible_get_selection_iface (AtspiAccessible *accessible) { - return (_atspi_accessible_is_a (accessible, atspi_interface_selection) ? - g_object_ref (ATSPI_SELECTION (accessible)) : NULL); + return (_atspi_accessible_is_a (accessible, atspi_interface_selection) ? g_object_ref (ATSPI_SELECTION (accessible)) : NULL); } #if 0 @@ -1564,8 +1538,7 @@ atspi_accessible_get_streamable_content (AtspiAccessible *accessible) AtspiTable * atspi_accessible_get_table (AtspiAccessible *obj) { - return (_atspi_accessible_is_a (obj, atspi_interface_table) ? - g_object_ref (ATSPI_TABLE (obj)) : NULL); + return (_atspi_accessible_is_a (obj, atspi_interface_table) ? g_object_ref (ATSPI_TABLE (obj)) : NULL); } /** @@ -1580,8 +1553,7 @@ atspi_accessible_get_table (AtspiAccessible *obj) AtspiTable * atspi_accessible_get_table_iface (AtspiAccessible *obj) { - return (_atspi_accessible_is_a (obj, atspi_interface_table) ? - g_object_ref (ATSPI_TABLE (obj)) : NULL); + return (_atspi_accessible_is_a (obj, atspi_interface_table) ? g_object_ref (ATSPI_TABLE (obj)) : NULL); } /** @@ -1596,8 +1568,7 @@ atspi_accessible_get_table_iface (AtspiAccessible *obj) AtspiTableCell * atspi_accessible_get_table_cell (AtspiAccessible *obj) { - return (_atspi_accessible_is_a (obj, atspi_interface_table_cell) ? - g_object_ref (ATSPI_TABLE_CELL (obj)) : NULL); + return (_atspi_accessible_is_a (obj, atspi_interface_table_cell) ? g_object_ref (ATSPI_TABLE_CELL (obj)) : NULL); } /** @@ -1614,8 +1585,7 @@ atspi_accessible_get_table_cell (AtspiAccessible *obj) AtspiText * atspi_accessible_get_text (AtspiAccessible *obj) { - return (_atspi_accessible_is_a (obj, atspi_interface_text) ? - g_object_ref (ATSPI_TEXT (obj)) : NULL); + return (_atspi_accessible_is_a (obj, atspi_interface_text) ? g_object_ref (ATSPI_TEXT (obj)) : NULL); } /** @@ -1630,8 +1600,7 @@ atspi_accessible_get_text (AtspiAccessible *obj) AtspiText * atspi_accessible_get_text_iface (AtspiAccessible *obj) { - return (_atspi_accessible_is_a (obj, atspi_interface_text) ? - g_object_ref (ATSPI_TEXT (obj)) : NULL); + return (_atspi_accessible_is_a (obj, atspi_interface_text) ? g_object_ref (ATSPI_TEXT (obj)) : NULL); } /** @@ -1648,8 +1617,7 @@ atspi_accessible_get_text_iface (AtspiAccessible *obj) AtspiValue * atspi_accessible_get_value (AtspiAccessible *accessible) { - return (_atspi_accessible_is_a (accessible, atspi_interface_value) ? - g_object_ref (ATSPI_VALUE (accessible)) : NULL); + return (_atspi_accessible_is_a (accessible, atspi_interface_value) ? g_object_ref (ATSPI_VALUE (accessible)) : NULL); } /** @@ -1664,8 +1632,7 @@ atspi_accessible_get_value (AtspiAccessible *accessible) AtspiValue * atspi_accessible_get_value_iface (AtspiAccessible *accessible) { - return (_atspi_accessible_is_a (accessible, atspi_interface_value) ? - g_object_ref (ATSPI_VALUE (accessible)) : NULL); + return (_atspi_accessible_is_a (accessible, atspi_interface_value) ? g_object_ref (ATSPI_VALUE (accessible)) : NULL); } static void @@ -1725,11 +1692,11 @@ atspi_accessible_get_interfaces (AtspiAccessible *obj) return ret; } -AtspiAccessible * +AtspiAccessible * _atspi_accessible_new (AtspiApplication *app, const gchar *path) { AtspiAccessible *accessible; - + accessible = g_object_new (ATSPI_TYPE_ACCESSIBLE, NULL); g_return_val_if_fail (accessible != NULL, NULL); @@ -1776,12 +1743,12 @@ atspi_accessible_clear_cache (AtspiAccessible *obj) gint i; if (obj) - { - obj->cached_properties = ATSPI_CACHE_NONE; - if (obj->children) - for (i = 0; i < obj->children->len; i++) - atspi_accessible_clear_cache (g_ptr_array_index (obj->children, i)); - } + { + obj->cached_properties = ATSPI_CACHE_NONE; + if (obj->children) + for (i = 0; i < obj->children->len; i++) + atspi_accessible_clear_cache (g_ptr_array_index (obj->children, i)); + } } /** @@ -1805,7 +1772,7 @@ atspi_accessible_get_process_id (AtspiAccessible *accessible, GError **error) if (!accessible->parent.app || !accessible->parent.app->bus_name) { - g_set_error_literal(error, ATSPI_ERROR, ATSPI_ERROR_IPC, "Process is defunct"); + g_set_error_literal (error, ATSPI_ERROR, ATSPI_ERROR_IPC, "Process is defunct"); return -1; } @@ -1820,14 +1787,14 @@ atspi_accessible_get_process_id (AtspiAccessible *accessible, GError **error) reply = dbus_connection_send_with_reply_and_block (bus, message, -1, &d_error); dbus_message_unref (message); if (reply) - { - if (!strcmp (dbus_message_get_signature (reply), "u")) - dbus_message_get_args (reply, NULL, DBUS_TYPE_UINT32, &pid, DBUS_TYPE_INVALID); - dbus_message_unref (reply); - } + { + if (!strcmp (dbus_message_get_signature (reply), "u")) + dbus_message_get_args (reply, NULL, DBUS_TYPE_UINT32, &pid, DBUS_TYPE_INVALID); + dbus_message_unref (reply); + } if (dbus_error_is_set (&d_error)) { - g_set_error_literal(error, ATSPI_ERROR, ATSPI_ERROR_IPC, "Process is defunct"); + g_set_error_literal (error, ATSPI_ERROR, ATSPI_ERROR_IPC, "Process is defunct"); dbus_error_free (&d_error); } return pid; @@ -1841,15 +1808,15 @@ _atspi_accessible_get_cache_mask (AtspiAccessible *accessible) if (!accessible->parent.app) return ATSPI_CACHE_NONE; - mask = accessible->parent.app->cache; + mask = accessible->parent.app->cache; if (mask == ATSPI_CACHE_UNDEFINED && accessible->parent.app->root && accessible->parent.app->root->accessible_parent) - { - AtspiAccessible *desktop = atspi_get_desktop (0); - mask = desktop->parent.app->cache; - g_object_unref (desktop); - } + { + AtspiAccessible *desktop = atspi_get_desktop (0); + mask = desktop->parent.app->cache; + g_object_unref (desktop); + } if (mask == ATSPI_CACHE_UNDEFINED) mask = ATSPI_CACHE_DEFAULT; @@ -1864,8 +1831,7 @@ _atspi_accessible_test_cache (AtspiAccessible *accessible, AtspiCache flag) AtspiCache result = accessible->cached_properties & mask & flag; if (accessible->states && atspi_state_set_contains (accessible->states, ATSPI_STATE_TRANSIENT)) return FALSE; - return (result != 0 && (atspi_main_loop || enable_caching || - flag == ATSPI_CACHE_INTERFACES) && + return (result != 0 && (atspi_main_loop || enable_caching || flag == ATSPI_CACHE_INTERFACES) && !atspi_no_cache); } @@ -1889,7 +1855,7 @@ _atspi_accessible_add_cache (AtspiAccessible *accessible, AtspiCache flag) * Returns: a UTF-8 string indicating the POSIX-style LC_MESSAGES * locale of @accessible. **/ -const gchar* +const gchar * atspi_accessible_get_object_locale (AtspiAccessible *accessible, GError **error) { gchar *locale; @@ -1898,14 +1864,14 @@ atspi_accessible_get_object_locale (AtspiAccessible *accessible, GError **error) locale = g_object_get_qdata (G_OBJECT (accessible), quark_locale); if (!locale) - { - if (!_atspi_dbus_get_property (accessible, atspi_interface_accessible, - "Locale", error, "s", &locale)) - return NULL; - if (locale) - g_object_set_qdata_full (G_OBJECT (accessible), quark_locale, locale, - g_free); - } + { + if (!_atspi_dbus_get_property (accessible, atspi_interface_accessible, + "Locale", error, "s", &locale)) + return NULL; + if (locale) + g_object_set_qdata_full (G_OBJECT (accessible), quark_locale, locale, + g_free); + } return locale; } @@ -1922,7 +1888,7 @@ atspi_accessible_get_object_locale (AtspiAccessible *accessible, GError **error) * Returns: a character string representing the accessible id of the * #AtspiAccessible object or NULL on exception. **/ -gchar* +gchar * atspi_accessible_get_accessible_id (AtspiAccessible *obj, GError **error) { gchar *accessible_id; @@ -1930,7 +1896,7 @@ atspi_accessible_get_accessible_id (AtspiAccessible *obj, GError **error) g_return_val_if_fail (obj != NULL, NULL); if (!_atspi_dbus_get_property (obj, atspi_interface_accessible, - "AccessibleId", error, "s", &accessible_id)) + "AccessibleId", error, "s", &accessible_id)) return NULL; return accessible_id; @@ -1964,9 +1930,9 @@ _atspi_accessible_unref_cache (AtspiAccessible *accessible) AtspiAccessiblePrivate *priv = accessible->priv; if (priv->cache) - { - g_hash_table_unref (priv->cache); - if (--priv->cache_ref_count == 0) - priv->cache = NULL; - } + { + g_hash_table_unref (priv->cache); + if (--priv->cache_ref_count == 0) + priv->cache = NULL; + } } diff --git a/atspi/atspi-accessible.h b/atspi/atspi-accessible.h index 35c0d5b2..6d35ee84 100644 --- a/atspi/atspi-accessible.h +++ b/atspi/atspi-accessible.h @@ -5,7 +5,7 @@ * Copyright 2002 Ximian, Inc. * 2002 Sun Microsystems Inc. * Copyright 2010, 2011 Novell, Inc. - * + * * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -36,12 +36,12 @@ G_BEGIN_DECLS #include "atspi-stateset.h" #include "atspi-types.h" -#define ATSPI_TYPE_ACCESSIBLE (atspi_accessible_get_type ()) -#define ATSPI_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATSPI_TYPE_ACCESSIBLE, AtspiAccessible)) -#define ATSPI_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ATSPI_TYPE_ACCESSIBLE, AtspiAccessibleClass)) -#define ATSPI_IS_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATSPI_TYPE_ACCESSIBLE)) -#define ATSPI_IS_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ATSPI_TYPE_ACCESSIBLE)) -#define ATSPI_ACCESSIBLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ATSPI_TYPE_ACCESSIBLE, AtspiAccessibleClass)) +#define ATSPI_TYPE_ACCESSIBLE (atspi_accessible_get_type ()) +#define ATSPI_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATSPI_TYPE_ACCESSIBLE, AtspiAccessible)) +#define ATSPI_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ATSPI_TYPE_ACCESSIBLE, AtspiAccessibleClass)) +#define ATSPI_IS_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATSPI_TYPE_ACCESSIBLE)) +#define ATSPI_IS_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ATSPI_TYPE_ACCESSIBLE)) +#define ATSPI_ACCESSIBLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ATSPI_TYPE_ACCESSIBLE, AtspiAccessibleClass)) typedef struct _AtspiAccessiblePrivate AtspiAccessiblePrivate; @@ -69,100 +69,100 @@ struct _AtspiAccessibleClass void (*mode_changed) (AtspiAccessible *accessible, gboolean enabled); }; -GType atspi_accessible_get_type (void); +GType atspi_accessible_get_type (void); AtspiAccessible * _atspi_accessible_new (AtspiApplication *app, const gchar *path); -gchar * atspi_accessible_get_name (AtspiAccessible *obj, GError **error); +gchar *atspi_accessible_get_name (AtspiAccessible *obj, GError **error); -gchar * atspi_accessible_get_description (AtspiAccessible *obj, GError **error); +gchar *atspi_accessible_get_description (AtspiAccessible *obj, GError **error); -AtspiAccessible * atspi_accessible_get_parent (AtspiAccessible *obj, GError **error); +AtspiAccessible *atspi_accessible_get_parent (AtspiAccessible *obj, GError **error); gint atspi_accessible_get_child_count (AtspiAccessible *obj, GError **error); -AtspiAccessible * atspi_accessible_get_child_at_index (AtspiAccessible *obj, gint child_index, GError **error); +AtspiAccessible *atspi_accessible_get_child_at_index (AtspiAccessible *obj, gint child_index, GError **error); gint atspi_accessible_get_index_in_parent (AtspiAccessible *obj, GError **error); -GArray * atspi_accessible_get_relation_set (AtspiAccessible *obj, GError **error); +GArray *atspi_accessible_get_relation_set (AtspiAccessible *obj, GError **error); AtspiRole atspi_accessible_get_role (AtspiAccessible *obj, GError **error); -gchar * atspi_accessible_get_role_name (AtspiAccessible *obj, GError **error); +gchar *atspi_accessible_get_role_name (AtspiAccessible *obj, GError **error); -gchar * atspi_accessible_get_localized_role_name (AtspiAccessible *obj, GError **error); +gchar *atspi_accessible_get_localized_role_name (AtspiAccessible *obj, GError **error); -AtspiStateSet * atspi_accessible_get_state_set (AtspiAccessible *obj); +AtspiStateSet *atspi_accessible_get_state_set (AtspiAccessible *obj); -GHashTable * atspi_accessible_get_attributes (AtspiAccessible *obj, GError **error); +GHashTable *atspi_accessible_get_attributes (AtspiAccessible *obj, GError **error); -GArray * atspi_accessible_get_attributes_as_array (AtspiAccessible *obj, GError **error); +GArray *atspi_accessible_get_attributes_as_array (AtspiAccessible *obj, GError **error); -gchar * atspi_accessible_get_toolkit_name (AtspiAccessible *obj, GError **error); +gchar *atspi_accessible_get_toolkit_name (AtspiAccessible *obj, GError **error); -gchar * atspi_accessible_get_toolkit_version (AtspiAccessible *obj, GError **error); +gchar *atspi_accessible_get_toolkit_version (AtspiAccessible *obj, GError **error); -gchar * atspi_accessible_get_atspi_version (AtspiAccessible *obj, GError **error); +gchar *atspi_accessible_get_atspi_version (AtspiAccessible *obj, GError **error); gint atspi_accessible_get_id (AtspiAccessible *obj, GError **error); -AtspiAccessible * atspi_accessible_get_application (AtspiAccessible *obj, GError **error); +AtspiAccessible *atspi_accessible_get_application (AtspiAccessible *obj, GError **error); #ifndef ATSPI_DISABLE_DEPRECATED -AtspiAction * atspi_accessible_get_action (AtspiAccessible *obj); +AtspiAction *atspi_accessible_get_action (AtspiAccessible *obj); -AtspiCollection * atspi_accessible_get_collection (AtspiAccessible *obj); +AtspiCollection *atspi_accessible_get_collection (AtspiAccessible *obj); -AtspiComponent * atspi_accessible_get_component (AtspiAccessible *obj); +AtspiComponent *atspi_accessible_get_component (AtspiAccessible *obj); -AtspiDocument * atspi_accessible_get_document (AtspiAccessible *obj); +AtspiDocument *atspi_accessible_get_document (AtspiAccessible *obj); -AtspiEditableText * atspi_accessible_get_editable_text (AtspiAccessible *obj); +AtspiEditableText *atspi_accessible_get_editable_text (AtspiAccessible *obj); -AtspiHyperlink * atspi_accessible_get_hyperlink (AtspiAccessible *obj); +AtspiHyperlink *atspi_accessible_get_hyperlink (AtspiAccessible *obj); -AtspiHypertext * atspi_accessible_get_hypertext (AtspiAccessible *obj); +AtspiHypertext *atspi_accessible_get_hypertext (AtspiAccessible *obj); -AtspiImage * atspi_accessible_get_image (AtspiAccessible *obj); +AtspiImage *atspi_accessible_get_image (AtspiAccessible *obj); -AtspiSelection * atspi_accessible_get_selection (AtspiAccessible *obj); +AtspiSelection *atspi_accessible_get_selection (AtspiAccessible *obj); -AtspiTable * atspi_accessible_get_table (AtspiAccessible *obj); +AtspiTable *atspi_accessible_get_table (AtspiAccessible *obj); -AtspiTableCell * atspi_accessible_get_table_cell (AtspiAccessible *obj); +AtspiTableCell *atspi_accessible_get_table_cell (AtspiAccessible *obj); -AtspiText * atspi_accessible_get_text (AtspiAccessible *obj); +AtspiText *atspi_accessible_get_text (AtspiAccessible *obj); -AtspiValue * atspi_accessible_get_value (AtspiAccessible *obj); +AtspiValue *atspi_accessible_get_value (AtspiAccessible *obj); #endif -AtspiAction * atspi_accessible_get_action_iface (AtspiAccessible *obj); +AtspiAction *atspi_accessible_get_action_iface (AtspiAccessible *obj); -AtspiCollection * atspi_accessible_get_collection_iface (AtspiAccessible *obj); +AtspiCollection *atspi_accessible_get_collection_iface (AtspiAccessible *obj); -AtspiComponent * atspi_accessible_get_component_iface (AtspiAccessible *obj); +AtspiComponent *atspi_accessible_get_component_iface (AtspiAccessible *obj); -AtspiDocument * atspi_accessible_get_document_iface (AtspiAccessible *obj); +AtspiDocument *atspi_accessible_get_document_iface (AtspiAccessible *obj); -AtspiEditableText * atspi_accessible_get_editable_text_iface (AtspiAccessible *obj); +AtspiEditableText *atspi_accessible_get_editable_text_iface (AtspiAccessible *obj); -AtspiHypertext * atspi_accessible_get_hypertext_iface (AtspiAccessible *obj); +AtspiHypertext *atspi_accessible_get_hypertext_iface (AtspiAccessible *obj); -AtspiImage * atspi_accessible_get_image_iface (AtspiAccessible *obj); +AtspiImage *atspi_accessible_get_image_iface (AtspiAccessible *obj); -AtspiSelection * atspi_accessible_get_selection_iface (AtspiAccessible *obj); +AtspiSelection *atspi_accessible_get_selection_iface (AtspiAccessible *obj); -AtspiTable * atspi_accessible_get_table_iface (AtspiAccessible *obj); +AtspiTable *atspi_accessible_get_table_iface (AtspiAccessible *obj); -AtspiText * atspi_accessible_get_text_iface (AtspiAccessible *obj); +AtspiText *atspi_accessible_get_text_iface (AtspiAccessible *obj); -AtspiValue * atspi_accessible_get_value_iface (AtspiAccessible *obj); +AtspiValue *atspi_accessible_get_value_iface (AtspiAccessible *obj); -GArray * atspi_accessible_get_interfaces (AtspiAccessible *obj); +GArray *atspi_accessible_get_interfaces (AtspiAccessible *obj); -const gchar* atspi_accessible_get_object_locale (AtspiAccessible *accessible, GError **error); +const gchar *atspi_accessible_get_object_locale (AtspiAccessible *accessible, GError **error); void atspi_accessible_set_cache_mask (AtspiAccessible *accessible, AtspiCache mask); @@ -170,7 +170,7 @@ void atspi_accessible_clear_cache (AtspiAccessible *obj); guint atspi_accessible_get_process_id (AtspiAccessible *accessible, GError **error); -gchar * atspi_accessible_get_accessible_id (AtspiAccessible *obj, GError **error); +gchar *atspi_accessible_get_accessible_id (AtspiAccessible *obj, GError **error); /* private */ void _atspi_accessible_add_cache (AtspiAccessible *accessible, AtspiCache flag); @@ -179,4 +179,4 @@ gboolean _atspi_accessible_test_cache (AtspiAccessible *accessible, AtspiCache f G_END_DECLS -#endif /* _ATSPI_ACCESSIBLE_H_ */ +#endif /* _ATSPI_ACCESSIBLE_H_ */ diff --git a/atspi/atspi-action.c b/atspi/atspi-action.c index bc9cb7b7..fee13f03 100644 --- a/atspi/atspi-action.c +++ b/atspi/atspi-action.c @@ -95,7 +95,7 @@ atspi_action_get_action_description (AtspiAction *obj, int i, GError **error) * there are multiple parts to a keybinding string (typically 3). * They are delimited with ";". The first is the action's * keybinding which is usable if the object implementing the action - * is currently posted to the screen, e.g. if a menu is posted + * is currently posted to the screen, e.g. if a menu is posted * then these keybindings for the corresponding menu-items are * available. The second keybinding substring is the full key sequence * necessary to post the action's widget and activate it, e.g. for @@ -104,11 +104,11 @@ atspi_action_get_action_description (AtspiAction *obj, int i, GError **error) * during the lifetime of the containing toplevel window as a whole, * whereas the first keybinding string only works while the object * implementing AtkAction is posted. The third (and optional) - * keybinding string is the "keyboard shortcut" which invokes the - * action without posting any menus. + * keybinding string is the "keyboard shortcut" which invokes the + * action without posting any menus. * Meta-keys are indicated by the conventional strings * "<Control>", "<Alt>", "<Shift>", "<Mod2>", - * etc. (we use the same string as gtk_accelerator_name() in + * etc. (we use the same string as gtk_accelerator_name() in * gtk+-2.X. * * Returns: a UTF-8 string which can be parsed to determine the @i-th @@ -224,16 +224,15 @@ atspi_action_get_type (void) { static GType type = 0; - if (!type) { - static const GTypeInfo tinfo = + if (!type) { - sizeof (AtspiAction), - (GBaseInitFunc) atspi_action_base_init, - (GBaseFinalizeFunc) NULL, - }; - - type = g_type_register_static (G_TYPE_INTERFACE, "AtspiAction", &tinfo, 0); - - } + static const GTypeInfo tinfo = { + sizeof (AtspiAction), + (GBaseInitFunc) atspi_action_base_init, + (GBaseFinalizeFunc) NULL, + }; + + type = g_type_register_static (G_TYPE_INTERFACE, "AtspiAction", &tinfo, 0); + } return type; } diff --git a/atspi/atspi-action.h b/atspi/atspi-action.h index e1056e7b..2f6501c4 100644 --- a/atspi/atspi-action.h +++ b/atspi/atspi-action.h @@ -4,7 +4,7 @@ * * Copyright 2002 Ximian, Inc. * 2002 Sun Microsystems Inc. - * + * * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -33,10 +33,10 @@ G_BEGIN_DECLS -#define ATSPI_TYPE_ACTION (atspi_action_get_type ()) -#define ATSPI_IS_ACTION(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATSPI_TYPE_ACTION) -#define ATSPI_ACTION(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATSPI_TYPE_ACTION, AtspiAction) -#define ATSPI_ACTION_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATSPI_TYPE_ACTION, AtspiAction)) +#define ATSPI_TYPE_ACTION (atspi_action_get_type ()) +#define ATSPI_IS_ACTION(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATSPI_TYPE_ACTION) +#define ATSPI_ACTION(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATSPI_TYPE_ACTION, AtspiAction) +#define ATSPI_ACTION_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATSPI_TYPE_ACTION, AtspiAction)) GType atspi_action_get_type (); @@ -45,23 +45,22 @@ struct _AtspiAction GTypeInterface parent; }; -gchar * atspi_action_get_action_description (AtspiAction *obj, int i, GError **error); +gchar *atspi_action_get_action_description (AtspiAction *obj, int i, GError **error); -gchar * atspi_action_get_action_name (AtspiAction *obj, gint i, GError **error); +gchar *atspi_action_get_action_name (AtspiAction *obj, gint i, GError **error); gint atspi_action_get_n_actions (AtspiAction *obj, GError **error); -gchar * atspi_action_get_key_binding (AtspiAction *obj, gint i, GError **error); - +gchar *atspi_action_get_key_binding (AtspiAction *obj, gint i, GError **error); -gchar * atspi_action_get_localized_name (AtspiAction *obj, gint i, GError **error); +gchar *atspi_action_get_localized_name (AtspiAction *obj, gint i, GError **error); gboolean atspi_action_do_action (AtspiAction *obj, gint i, GError **error); #ifndef ATSPI_DISABLE_DEPRECATED -gchar * atspi_action_get_description (AtspiAction *obj, gint i, GError **error); -gchar * atspi_action_get_name (AtspiAction *obj, gint i, GError **error); +gchar *atspi_action_get_description (AtspiAction *obj, gint i, GError **error); +gchar *atspi_action_get_name (AtspiAction *obj, gint i, GError **error); #endif G_END_DECLS -#endif /* _ATSPI_ACTION_H_ */ +#endif /* _ATSPI_ACTION_H_ */ diff --git a/atspi/atspi-application.c b/atspi/atspi-application.c index 8045a819..d9abac12 100644 --- a/atspi/atspi-application.c +++ b/atspi/atspi-application.c @@ -52,26 +52,26 @@ atspi_application_dispose (GObject *object) AtspiApplication *application = ATSPI_APPLICATION (object); if (application->bus) - { - if (application->bus != _atspi_bus ()) - dbus_connection_close (application->bus); - dbus_connection_unref (application->bus); - application->bus = NULL; - } + { + if (application->bus != _atspi_bus ()) + dbus_connection_close (application->bus); + dbus_connection_unref (application->bus); + application->bus = NULL; + } if (application->hash) - { - g_hash_table_foreach (application->hash, dispose_accessible, NULL); - g_hash_table_unref (application->hash); - application->hash = NULL; - } + { + g_hash_table_foreach (application->hash, dispose_accessible, NULL); + g_hash_table_unref (application->hash); + application->hash = NULL; + } if (application->root) - { - g_clear_object (&application->root->parent.app); - g_object_unref (application->root); - application->root = NULL; - } + { + g_clear_object (&application->root->parent.app); + g_object_unref (application->root); + application->root = NULL; + } G_OBJECT_CLASS (atspi_application_parent_class)->dispose (object); } @@ -102,7 +102,7 @@ AtspiApplication * _atspi_application_new (const gchar *bus_name) { AtspiApplication *application; - + application = g_object_new (ATSPI_TYPE_APPLICATION, NULL); application->bus_name = g_strdup (bus_name); application->root = NULL; diff --git a/atspi/atspi-application.h b/atspi/atspi-application.h index 0662031f..691e1c40 100644 --- a/atspi/atspi-application.h +++ b/atspi/atspi-application.h @@ -4,7 +4,7 @@ * * Copyright 2002 Ximian, Inc. * 2002 Sun Microsystems Inc. - * + * * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -27,18 +27,18 @@ #include <dbus/dbus.h> -#include "atspi-types.h" #include "atspi-accessible.h" +#include "atspi-types.h" #include <sys/time.h> G_BEGIN_DECLS -#define ATSPI_TYPE_APPLICATION (atspi_application_get_type ()) -#define ATSPI_APPLICATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATSPI_TYPE_APPLICATION, AtspiApplication)) -#define ATSPI_APPLICATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ATSPI_TYPE_APPLICATION, AtspiAccessibleClass)) -#define ATSPI_IS_APPLICATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATSPI_TYPE_APPLICATION)) -#define ATSPI_IS_APPLICATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ATSPI_TYPE_APPLICATION)) -#define ATSPI_APPLICATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ATSPI_TYPE_APPLICATION, AtspiAccessibleClass)) +#define ATSPI_TYPE_APPLICATION (atspi_application_get_type ()) +#define ATSPI_APPLICATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATSPI_TYPE_APPLICATION, AtspiApplication)) +#define ATSPI_APPLICATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ATSPI_TYPE_APPLICATION, AtspiAccessibleClass)) +#define ATSPI_IS_APPLICATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATSPI_TYPE_APPLICATION)) +#define ATSPI_IS_APPLICATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ATSPI_TYPE_APPLICATION)) +#define ATSPI_APPLICATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ATSPI_TYPE_APPLICATION, AtspiAccessibleClass)) typedef struct _AtspiApplication AtspiApplication; struct _AtspiApplication @@ -68,4 +68,4 @@ GType atspi_application_get_type (void); G_END_DECLS -#endif /* _ATSPI_APPLICATION_H_ */ +#endif /* _ATSPI_APPLICATION_H_ */ diff --git a/atspi/atspi-collection.c b/atspi/atspi-collection.c index caf335be..a21810b7 100644 --- a/atspi/atspi-collection.c +++ b/atspi/atspi-collection.c @@ -85,7 +85,7 @@ append_accessible (DBusMessage *message, AtspiAccessible *accessible) dbus_message_iter_init_append (message, &iter); dbus_message_iter_append_basic (&iter, DBUS_TYPE_OBJECT_PATH, &accessible->parent.path); - return TRUE; /* TODO: Check for out-of-memory */ + return TRUE; /* TODO: Check for out-of-memory */ } static GArray * @@ -100,12 +100,12 @@ return_accessibles (DBusMessage *message) dbus_message_iter_recurse (&iter, &iter_array); while (dbus_message_iter_get_arg_type (&iter_array) != DBUS_TYPE_INVALID) - { - AtspiAccessible *accessible; - accessible = _atspi_dbus_consume_accessible (&iter_array); - ret = g_array_append_val (ret, accessible); - /* Iter was moved already, so no need to call dbus_message_iter_next */ - } + { + AtspiAccessible *accessible; + accessible = _atspi_dbus_consume_accessible (&iter_array); + ret = g_array_append_val (ret, accessible); + /* Iter was moved already, so no need to call dbus_message_iter_next */ + } dbus_message_unref (message); return ret; } @@ -120,9 +120,9 @@ return_accessibles (DBusMessage *message) * @traverse: Not supported. * * Gets all #AtspiAccessible objects from the @collection matching a given - * @rule. + * @rule. * - * Returns: (element-type AtspiAccessible*) (transfer full): All + * Returns: (element-type AtspiAccessible*) (transfer full): All * #AtspiAccessible objects matching the given match rule. **/ GArray * @@ -170,8 +170,8 @@ atspi_collection_get_matches (AtspiCollection *collection, * @count: The maximum number of results to return, or 0 for no limit. * @traverse: Not supported. * - * Gets all #AtspiAccessible objects from the @collection, after - * @current_object, matching a given @rule. + * Gets all #AtspiAccessible objects from the @collection, after + * @current_object, matching a given @rule. * * Returns: (element-type AtspiAccessible*) (transfer full): All * #AtspiAccessible objects matching the given match rule after @@ -179,14 +179,14 @@ atspi_collection_get_matches (AtspiCollection *collection, **/ GArray * atspi_collection_get_matches_to (AtspiCollection *collection, - AtspiAccessible *current_object, - AtspiMatchRule *rule, - AtspiCollectionSortOrder sortby, - AtspiCollectionTreeTraversalType tree, - gboolean limit_scope, - gint count, - gboolean traverse, - GError **error) + AtspiAccessible *current_object, + AtspiMatchRule *rule, + AtspiCollectionSortOrder sortby, + AtspiCollectionTreeTraversalType tree, + gboolean limit_scope, + gint count, + gboolean traverse, + GError **error) { DBusMessage *message = new_message (collection, "GetMatchesTo"); DBusMessage *reply; @@ -204,7 +204,7 @@ atspi_collection_get_matches_to (AtspiCollection *collection, if (!append_match_rule (message, rule)) return NULL; dbus_message_append_args (message, DBUS_TYPE_UINT32, &d_sortby, - DBUS_TYPE_UINT32, &d_tree, + DBUS_TYPE_UINT32, &d_tree, DBUS_TYPE_BOOLEAN, &d_limit_scope, DBUS_TYPE_INT32, &d_count, DBUS_TYPE_BOOLEAN, &d_traverse, @@ -227,22 +227,22 @@ atspi_collection_get_matches_to (AtspiCollection *collection, * @count: The maximum number of results to return, or 0 for no limit. * @traverse: Not supported. * - * Gets all #AtspiAccessible objects from the @collection, before - * @current_object, matching a given @rule. + * Gets all #AtspiAccessible objects from the @collection, before + * @current_object, matching a given @rule. * - * Returns: (element-type AtspiAccessible*) (transfer full): All + * Returns: (element-type AtspiAccessible*) (transfer full): All * #AtspiAccessible objects matching the given match rule that preceed * @current_object. **/ GArray * atspi_collection_get_matches_from (AtspiCollection *collection, - AtspiAccessible *current_object, - AtspiMatchRule *rule, - AtspiCollectionSortOrder sortby, - AtspiCollectionTreeTraversalType tree, - gint count, - gboolean traverse, - GError **error) + AtspiAccessible *current_object, + AtspiMatchRule *rule, + AtspiCollectionSortOrder sortby, + AtspiCollectionTreeTraversalType tree, + gint count, + gboolean traverse, + GError **error) { DBusMessage *message = new_message (collection, "GetMatchesFrom"); DBusMessage *reply; @@ -272,7 +272,7 @@ atspi_collection_get_matches_from (AtspiCollection *collection, /** * atspi_collection_get_active_descendant: * -* Returns: (transfer full): The active descendant of the given object. + * Returns: (transfer full): The active descendant of the given object. * Not yet implemented. **/ AtspiAccessible * @@ -292,16 +292,15 @@ atspi_collection_get_type (void) { static GType type = 0; - if (!type) { - static const GTypeInfo tinfo = + if (!type) { - sizeof (AtspiCollection), - (GBaseInitFunc) atspi_collection_base_init, - (GBaseFinalizeFunc) NULL, - }; - - type = g_type_register_static (G_TYPE_INTERFACE, "AtspiCollection", &tinfo, 0); + static const GTypeInfo tinfo = { + sizeof (AtspiCollection), + (GBaseInitFunc) atspi_collection_base_init, + (GBaseFinalizeFunc) NULL, + }; - } + type = g_type_register_static (G_TYPE_INTERFACE, "AtspiCollection", &tinfo, 0); + } return type; } diff --git a/atspi/atspi-collection.h b/atspi/atspi-collection.h index 9b564c51..a0d0cdc5 100644 --- a/atspi/atspi-collection.h +++ b/atspi/atspi-collection.h @@ -5,7 +5,7 @@ * Copyright 2002 Ximian, Inc. * 2002 Sun Microsystems Inc. * Copyright 2010, 2011 Novell, Inc. - * + * * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -30,15 +30,15 @@ #include "atspi-constants.h" -#include "atspi-types.h" #include "atspi-matchrule.h" +#include "atspi-types.h" G_BEGIN_DECLS -#define ATSPI_TYPE_COLLECTION (atspi_collection_get_type ()) -#define ATSPI_IS_COLLECTION(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATSPI_TYPE_COLLECTION) -#define ATSPI_COLLECTION(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATSPI_TYPE_COLLECTION, AtspiCollection) -#define ATSPI_COLLECTION_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATSPI_TYPE_COLLECTION, AtspiCollection)) +#define ATSPI_TYPE_COLLECTION (atspi_collection_get_type ()) +#define ATSPI_IS_COLLECTION(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATSPI_TYPE_COLLECTION) +#define ATSPI_COLLECTION(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATSPI_TYPE_COLLECTION, AtspiCollection) +#define ATSPI_COLLECTION_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATSPI_TYPE_COLLECTION, AtspiCollection)) GType atspi_collection_get_type (); @@ -49,14 +49,14 @@ struct _AtspiCollection gboolean atspi_collection_is_ancestor_of (AtspiCollection *collection, AtspiAccessible *test, GError **error); -GArray * atspi_collection_get_matches (AtspiCollection *collection, AtspiMatchRule *rule, AtspiCollectionSortOrder sortby, gint count, gboolean traverse, GError **error); +GArray *atspi_collection_get_matches (AtspiCollection *collection, AtspiMatchRule *rule, AtspiCollectionSortOrder sortby, gint count, gboolean traverse, GError **error); -GArray * atspi_collection_get_matches_to (AtspiCollection *collection, AtspiAccessible *current_object, AtspiMatchRule *rule, AtspiCollectionSortOrder sortby, AtspiCollectionTreeTraversalType tree, gboolean limit_scope, gint count, gboolean traverse, GError **error); +GArray *atspi_collection_get_matches_to (AtspiCollection *collection, AtspiAccessible *current_object, AtspiMatchRule *rule, AtspiCollectionSortOrder sortby, AtspiCollectionTreeTraversalType tree, gboolean limit_scope, gint count, gboolean traverse, GError **error); -GArray * atspi_collection_get_matches_from (AtspiCollection *collection, AtspiAccessible *current_object, AtspiMatchRule *rule, AtspiCollectionSortOrder sortby, AtspiCollectionTreeTraversalType tree, gint count, gboolean traverse, GError **error); +GArray *atspi_collection_get_matches_from (AtspiCollection *collection, AtspiAccessible *current_object, AtspiMatchRule *rule, AtspiCollectionSortOrder sortby, AtspiCollectionTreeTraversalType tree, gint count, gboolean traverse, GError **error); -AtspiAccessible * atspi_collection_get_active_descendant (AtspiCollection *collection, GError **error); +AtspiAccessible *atspi_collection_get_active_descendant (AtspiCollection *collection, GError **error); G_END_DECLS -#endif /* _ATSPI_COLLECTION_H_ */ +#endif /* _ATSPI_COLLECTION_H_ */ diff --git a/atspi/atspi-component.c b/atspi/atspi-component.c index 7c825691..5a5dac1b 100644 --- a/atspi/atspi-component.c +++ b/atspi/atspi-component.c @@ -27,8 +27,8 @@ * */ -#include "atspi-private.h" #include "atspi-accessible-private.h" +#include "atspi-private.h" /** * AtspiComponent @@ -91,9 +91,10 @@ G_DEFINE_BOXED_TYPE (AtspiPoint, atspi_point, atspi_point_copy, g_free) **/ gboolean atspi_component_contains (AtspiComponent *obj, - gint x, - gint y, - AtspiCoordType ctype, GError **error) + gint x, + gint y, + AtspiCoordType ctype, + GError **error) { dbus_bool_t retval = FALSE; dbus_int32_t d_x = x, d_y = y; @@ -123,9 +124,10 @@ atspi_component_contains (AtspiComponent *obj, **/ AtspiAccessible * atspi_component_get_accessible_at_point (AtspiComponent *obj, - gint x, - gint y, - AtspiCoordType ctype, GError **error) + gint x, + gint y, + AtspiCoordType ctype, + GError **error) { dbus_int32_t d_x = x, d_y = y; dbus_uint32_t d_ctype = ctype; @@ -152,7 +154,8 @@ atspi_component_get_accessible_at_point (AtspiComponent *obj, **/ AtspiRect * atspi_component_get_extents (AtspiComponent *obj, - AtspiCoordType ctype, GError **error) + AtspiCoordType ctype, + GError **error) { dbus_uint32_t d_ctype = ctype; AtspiRect bbox; @@ -163,13 +166,13 @@ atspi_component_get_extents (AtspiComponent *obj, accessible = ATSPI_ACCESSIBLE (obj); if (accessible->priv->cache && ctype == ATSPI_COORD_TYPE_SCREEN) - { - GValue *val = g_hash_table_lookup (accessible->priv->cache, "Component.ScreenExtents"); - if (val) { - return g_value_dup_boxed (val); + GValue *val = g_hash_table_lookup (accessible->priv->cache, "Component.ScreenExtents"); + if (val) + { + return g_value_dup_boxed (val); + } } - } _atspi_dbus_call (obj, atspi_interface_component, "GetExtents", error, "u=>(iiii)", d_ctype, &bbox); return atspi_rect_copy (&bbox); @@ -189,7 +192,8 @@ atspi_component_get_extents (AtspiComponent *obj, **/ AtspiPoint * atspi_component_get_position (AtspiComponent *obj, - AtspiCoordType ctype, GError **error) + AtspiCoordType ctype, + GError **error) { dbus_int32_t d_x, d_y; dbus_uint32_t d_ctype = ctype; @@ -237,7 +241,7 @@ atspi_component_get_size (AtspiComponent *obj, GError **error) * atspi_component_get_layer: * @obj: a pointer to the #AtspiComponent to query. * - * Queries which layer the component is painted into, to help determine its + * Queries which layer the component is painted into, to help determine its * visibility in terms of stacking order. * * Returns: the #AtspiComponentLayer into which this component is painted. @@ -259,7 +263,7 @@ atspi_component_get_layer (AtspiComponent *obj, GError **error) * Queries the z stacking order of a component which is in the MDI or window * layer. (Bigger z-order numbers mean nearer the top) * - * Returns: a #gshort indicating the stacking order of the component + * Returns: a #gshort indicating the stacking order of the component * in the MDI layer, or -1 if the component is not in the MDI layer. **/ gshort @@ -298,10 +302,10 @@ atspi_component_grab_focus (AtspiComponent *obj, GError **error) * * Gets the opacity/alpha value of a component, if alpha blending is in use. * - * Returns: the opacity value of a component, as a #gdouble between 0.0 and 1.0. + * Returns: the opacity value of a component, as a #gdouble between 0.0 and 1.0. **/ -gdouble -atspi_component_get_alpha (AtspiComponent *obj, GError **error) +gdouble +atspi_component_get_alpha (AtspiComponent *obj, GError **error) { double retval = 1; @@ -343,11 +347,11 @@ atspi_component_set_extents (AtspiComponent *obj, g_return_val_if_fail (obj != NULL, FALSE); if (!aobj->parent.app || !aobj->parent.app->bus_name) - { - g_set_error_literal (error, ATSPI_ERROR, ATSPI_ERROR_APPLICATION_GONE, - _("The application no longer exists")); - return FALSE; - } + { + g_set_error_literal (error, ATSPI_ERROR, ATSPI_ERROR_APPLICATION_GONE, + _ ("The application no longer exists")); + return FALSE; + } message = dbus_message_new_method_call (aobj->parent.app->bus_name, aobj->parent.path, @@ -358,10 +362,10 @@ atspi_component_set_extents (AtspiComponent *obj, dbus_message_iter_init_append (message, &iter); if (!dbus_message_iter_open_container (&iter, DBUS_TYPE_STRUCT, NULL, &iter_struct)) - { - dbus_message_unref (message); - return FALSE; - } + { + dbus_message_unref (message); + return FALSE; + } dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_INT32, &d_x); dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_INT32, &d_y); dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_INT32, &d_width); @@ -371,7 +375,7 @@ atspi_component_set_extents (AtspiComponent *obj, reply = _atspi_dbus_send_with_reply_and_block (message, error); dbus_message_get_args (reply, NULL, DBUS_TYPE_BOOLEAN, &retval, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID); dbus_message_unref (reply); return retval; } @@ -501,16 +505,15 @@ atspi_component_get_type (void) { static GType type = 0; - if (!type) { - static const GTypeInfo tinfo = + if (!type) { - sizeof (AtspiComponent), - (GBaseInitFunc) atspi_component_base_init, - (GBaseFinalizeFunc) NULL, - }; + static const GTypeInfo tinfo = { + sizeof (AtspiComponent), + (GBaseInitFunc) atspi_component_base_init, + (GBaseFinalizeFunc) NULL, + }; - type = g_type_register_static (G_TYPE_INTERFACE, "AtspiComponent", &tinfo, 0); - - } + type = g_type_register_static (G_TYPE_INTERFACE, "AtspiComponent", &tinfo, 0); + } return type; } diff --git a/atspi/atspi-component.h b/atspi/atspi-component.h index 4e8f0add..b23d4362 100644 --- a/atspi/atspi-component.h +++ b/atspi/atspi-component.h @@ -4,7 +4,7 @@ * * Copyright 2002 Ximian, Inc. * 2002 Sun Microsystems Inc. - * + * * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -44,10 +44,10 @@ struct _AtspiRect /** * ATSPI_TYPE_RECT: - * + * * The #GType for a boxed type holding a #AtspiRect. */ -#define ATSPI_TYPE_RECT (atspi_rect_get_type ()) +#define ATSPI_TYPE_RECT (atspi_rect_get_type ()) GType atspi_rect_get_type (); @@ -62,19 +62,19 @@ struct _AtspiPoint /** * ATSPI_TYPE_POINT: - * + * * The #GType for a boxed type holding a #AtspiPoint. */ -#define ATSPI_TYPE_POINT (atspi_point_get_type ()) +#define ATSPI_TYPE_POINT (atspi_point_get_type ()) GType atspi_point_get_type (); AtspiPoint *atspi_point_copy (AtspiPoint *src); -#define ATSPI_TYPE_COMPONENT (atspi_component_get_type ()) -#define ATSPI_IS_COMPONENT(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATSPI_TYPE_COMPONENT) -#define ATSPI_COMPONENT(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATSPI_TYPE_COMPONENT, AtspiComponent) -#define ATSPI_COMPONENT_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATSPI_TYPE_COMPONENT, AtspiComponent)) +#define ATSPI_TYPE_COMPONENT (atspi_component_get_type ()) +#define ATSPI_IS_COMPONENT(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATSPI_TYPE_COMPONENT) +#define ATSPI_COMPONENT(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATSPI_TYPE_COMPONENT, AtspiComponent) +#define ATSPI_COMPONENT_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATSPI_TYPE_COMPONENT, AtspiComponent)) GType atspi_component_get_type (); @@ -99,7 +99,7 @@ gshort atspi_component_get_mdi_z_order (AtspiComponent *obj, GError **error); gboolean atspi_component_grab_focus (AtspiComponent *obj, GError **error); -gdouble atspi_component_get_alpha (AtspiComponent *obj, GError **error); +gdouble atspi_component_get_alpha (AtspiComponent *obj, GError **error); gboolean atspi_component_set_extents (AtspiComponent *obj, gint x, gint y, gint width, gint height, AtspiCoordType ctype, GError **error); @@ -113,4 +113,4 @@ gboolean atspi_component_scroll_to_point (AtspiComponent *obj, AtspiCoordType co G_END_DECLS -#endif /* _ATSPI_COMPONENT_H_ */ +#endif /* _ATSPI_COMPONENT_H_ */ diff --git a/atspi/atspi-constants.h b/atspi/atspi-constants.h index 9c0eb34f..bb9ae543 100644 --- a/atspi/atspi-constants.h +++ b/atspi/atspi-constants.h @@ -93,85 +93,89 @@ #ifndef _ATSPI_CONSTANTS_H_ #define _ATSPI_CONSTANTS_H_ #ifdef __cplusplus -extern "C" { +extern "C" +{ #endif -/** - * AtspiLocaleType: - * @ATSPI_LOCALE_TYPE_MESSAGES: For localizable natural-language messages. - * @ATSPI_LOCALE_TYPE_COLLATE: For regular expression matching and string - * collation. - * @ATSPI_LOCALE_TYPE_CTYPE: For regular expression matching, character - * classification, conversion, case-sensitive comparison, and wide character - * functions. - * @ATSPI_LOCALE_TYPE_MONETARY: For monetary formatting. - * @ATSPI_LOCALE_TYPE_NUMERIC: For number formatting (such as the decimal - * point and the thousands separator). - * @ATSPI_LOCALE_TYPE_TIME: For time and date formatting. - * - * Used by interfaces #AtspiText and #AtspiDocument, this - * enumeration corresponds to the POSIX 'setlocale' enum values. - * - **/ -typedef enum { + /** + * AtspiLocaleType: + * @ATSPI_LOCALE_TYPE_MESSAGES: For localizable natural-language messages. + * @ATSPI_LOCALE_TYPE_COLLATE: For regular expression matching and string + * collation. + * @ATSPI_LOCALE_TYPE_CTYPE: For regular expression matching, character + * classification, conversion, case-sensitive comparison, and wide character + * functions. + * @ATSPI_LOCALE_TYPE_MONETARY: For monetary formatting. + * @ATSPI_LOCALE_TYPE_NUMERIC: For number formatting (such as the decimal + * point and the thousands separator). + * @ATSPI_LOCALE_TYPE_TIME: For time and date formatting. + * + * Used by interfaces #AtspiText and #AtspiDocument, this + * enumeration corresponds to the POSIX 'setlocale' enum values. + * + **/ + typedef enum + { ATSPI_LOCALE_TYPE_MESSAGES, ATSPI_LOCALE_TYPE_COLLATE, ATSPI_LOCALE_TYPE_CTYPE, ATSPI_LOCALE_TYPE_MONETARY, ATSPI_LOCALE_TYPE_NUMERIC, ATSPI_LOCALE_TYPE_TIME, -} AtspiLocaleType; + } AtspiLocaleType; /** * ATSPI_LOCALE_TYPE_COUNT: * * One higher than the highest valid value of #AtspiLocaleType. **/ -#define ATSPI_LOCALE_TYPE_COUNT (5+1) +#define ATSPI_LOCALE_TYPE_COUNT (5 + 1) -/** - * AtspiCoordType: - * @ATSPI_COORD_TYPE_SCREEN: Specifies xy coordinates relative to the screen. - * @ATSPI_COORD_TYPE_WINDOW: Specifies xy coordinates relative to the widget's - * top-level window. - * @ATSPI_COORD_TYPE_PARENT: Specifies xy coordinates relative to the widget's - * immediate parent. - * - * Enumeration used by #AtspiComponent, #AtspiImage, and #AtspiText interfaces - * to specify whether coordinates are relative to the window or the screen. - * - **/ -typedef enum { + /** + * AtspiCoordType: + * @ATSPI_COORD_TYPE_SCREEN: Specifies xy coordinates relative to the screen. + * @ATSPI_COORD_TYPE_WINDOW: Specifies xy coordinates relative to the widget's + * top-level window. + * @ATSPI_COORD_TYPE_PARENT: Specifies xy coordinates relative to the widget's + * immediate parent. + * + * Enumeration used by #AtspiComponent, #AtspiImage, and #AtspiText interfaces + * to specify whether coordinates are relative to the window or the screen. + * + **/ + typedef enum + { ATSPI_COORD_TYPE_SCREEN, ATSPI_COORD_TYPE_WINDOW, ATSPI_COORD_TYPE_PARENT, -} AtspiCoordType; + } AtspiCoordType; /** * ATSPI_COORD_TYPE_COUNT: * * One higher than the highest valid value of #AtspiCoordType. **/ -#define ATSPI_COORD_TYPE_COUNT (2+1) +#define ATSPI_COORD_TYPE_COUNT (2 + 1) -/** - * AtspiCollectionSortOrder: - * @ATSPI_Collection_SORT_ORDER_INVALID: Invalid sort order - * @ATSPI_Collection_SORT_ORDER_CANONICAL: Canonical sort order - * @ATSPI_Collection_SORT_ORDER_FLOW: Flow sort order - * @ATSPI_Collection_SORT_ORDER_TAB: Tab sort order - * @ATSPI_Collection_SORT_ORDER_REVERSE_CANONICAL: Reverse canonical sort order - * @ATSPI_Collection_SORT_ORDER_REVERSE_FLOW: Reverse flow sort order - * @ATSPI_Collection_SORT_ORDER_REVERSE_TAB: Reverse tab sort order - * @ATSPI_Collection_SORT_ORDER_LAST_DEFINED: Used only to determine the end of the - * enumeration. + /** + * AtspiCollectionSortOrder: + * @ATSPI_Collection_SORT_ORDER_INVALID: Invalid sort order + * @ATSPI_Collection_SORT_ORDER_CANONICAL: Canonical sort order + * @ATSPI_Collection_SORT_ORDER_FLOW: Flow sort order + * @ATSPI_Collection_SORT_ORDER_TAB: Tab sort order + * @ATSPI_Collection_SORT_ORDER_REVERSE_CANONICAL: Reverse canonical sort order + * @ATSPI_Collection_SORT_ORDER_REVERSE_FLOW: Reverse flow sort order + * @ATSPI_Collection_SORT_ORDER_REVERSE_TAB: Reverse tab sort order + * @ATSPI_Collection_SORT_ORDER_LAST_DEFINED: Used only to determine the end of the + * enumeration. - * - * Enumeration used by interface #AtspiCollection to specify - * the way #AtspiAccesible objects should be sorted. - * - **/ -typedef enum { + * + * Enumeration used by interface #AtspiCollection to specify + * the way #AtspiAccesible objects should be sorted. + * + **/ + typedef enum + { ATSPI_Collection_SORT_ORDER_INVALID, ATSPI_Collection_SORT_ORDER_CANONICAL, ATSPI_Collection_SORT_ORDER_FLOW, @@ -180,66 +184,68 @@ typedef enum { ATSPI_Collection_SORT_ORDER_REVERSE_FLOW, ATSPI_Collection_SORT_ORDER_REVERSE_TAB, ATSPI_Collection_SORT_ORDER_LAST_DEFINED, -} AtspiCollectionSortOrder; + } AtspiCollectionSortOrder; /** * ATSPI_SORTORDER_COUNT: * * One higher than the highest valid value of #AtspiCollectionSortOrder. */ -#define ATSPI_SORTORDER_COUNT (7+1) +#define ATSPI_SORTORDER_COUNT (7 + 1) -/** - * AtspiCollectionMatchType: - * @ATSPI_Collection_MATCH_INVALID: Indicates an error condition or - * uninitialized value. - * @ATSPI_Collection_MATCH_ALL: #TRUE if all of the criteria are met. - * @ATSPI_Collection_MATCH_ANY: #TRUE if any of the criteria are met. - * @ATSPI_Collection_MATCH_NONE: #TRUE if none of the criteria are met. - * @ATSPI_Collection_MATCH_EMPTY: Same as @ATSPI_Collection_MATCH_ALL if - * the criteria is non-empty; for empty criteria this rule requires returned - * value to also have empty set. - * @ATSPI_Collection_MATCH_LAST_DEFINED: Used only to determine the end of the - * enumeration. - * - * Enumeration used by #AtspiMatchRule to specify - * how to interpret #AtspiAccessible objects. - * - **/ -typedef enum { + /** + * AtspiCollectionMatchType: + * @ATSPI_Collection_MATCH_INVALID: Indicates an error condition or + * uninitialized value. + * @ATSPI_Collection_MATCH_ALL: #TRUE if all of the criteria are met. + * @ATSPI_Collection_MATCH_ANY: #TRUE if any of the criteria are met. + * @ATSPI_Collection_MATCH_NONE: #TRUE if none of the criteria are met. + * @ATSPI_Collection_MATCH_EMPTY: Same as @ATSPI_Collection_MATCH_ALL if + * the criteria is non-empty; for empty criteria this rule requires returned + * value to also have empty set. + * @ATSPI_Collection_MATCH_LAST_DEFINED: Used only to determine the end of the + * enumeration. + * + * Enumeration used by #AtspiMatchRule to specify + * how to interpret #AtspiAccessible objects. + * + **/ + typedef enum + { ATSPI_Collection_MATCH_INVALID, ATSPI_Collection_MATCH_ALL, ATSPI_Collection_MATCH_ANY, ATSPI_Collection_MATCH_NONE, ATSPI_Collection_MATCH_EMPTY, ATSPI_Collection_MATCH_LAST_DEFINED, -} AtspiCollectionMatchType; + } AtspiCollectionMatchType; /** * ATSPI_MATCHTYPE_COUNT: * * One higher than the highest valid value of #AtspiCollectionMatchType. **/ -#define ATSPI_MATCHTYPES_COUNT (5+1) +#define ATSPI_MATCHTYPES_COUNT (5 + 1) -/** - * AtspiCollectionTreeTraversalType: - * @ATSPI_Collection_TREE_RESTRICT_CHILDREN: Restrict children tree traveral - * @ATSPI_Collection_TREE_RESTRICT_SIBLING: Restrict sibling tree traversal - * @ATSPI_Collection_TREE_INORDER: In-order tree traversal. - * @ATSPI_Collection_TREE_LAST_DEFINED: Used only to determine the end of the - * enumeration. - * - * Enumeration used by interface #AtspiCollection to specify - * restrictions on #AtspiAccesible objects to be traversed. - * - **/ -typedef enum { + /** + * AtspiCollectionTreeTraversalType: + * @ATSPI_Collection_TREE_RESTRICT_CHILDREN: Restrict children tree traveral + * @ATSPI_Collection_TREE_RESTRICT_SIBLING: Restrict sibling tree traversal + * @ATSPI_Collection_TREE_INORDER: In-order tree traversal. + * @ATSPI_Collection_TREE_LAST_DEFINED: Used only to determine the end of the + * enumeration. + * + * Enumeration used by interface #AtspiCollection to specify + * restrictions on #AtspiAccesible objects to be traversed. + * + **/ + typedef enum + { ATSPI_Collection_TREE_RESTRICT_CHILDREN, ATSPI_Collection_TREE_RESTRICT_SIBLING, ATSPI_Collection_TREE_INORDER, ATSPI_Collection_TREE_LAST_DEFINED, -} AtspiCollectionTreeTraversalType; + } AtspiCollectionTreeTraversalType; /** * ATSPI_TREETRAVERSALTYPE_COUNT: @@ -247,49 +253,50 @@ typedef enum { * One higher than the highest valid value of * #AtspiCollection_TreeTraversalType. */ -#define ATSPI_TREETRAVERSALTYPE_COUNT (3+1) +#define ATSPI_TREETRAVERSALTYPE_COUNT (3 + 1) -/** - * AtspiComponentLayer: - * @ATSPI_LAYER_INVALID: Indicates an error condition or uninitialized value. - * @ATSPI_LAYER_BACKGROUND: The bottom-most layer, over which everything else - * is painted. The 'desktop background' is generally in this layer. - * @ATSPI_LAYER_CANVAS: The 'background' layer for most content renderers and - * UI #AtspiComponent containers. - * @ATSPI_LAYER_WIDGET: The layer in which the majority of ordinary - * 'foreground' widgets reside. - * @ATSPI_LAYER_MDI: A special layer between @ATSPI_LAYER_CANVAS and - * @ATSPI_LAYER_WIDGET, in which the 'pseudo windows' (e.g. the MDI frames) - * reside. See #atspi_component_get_mdi_z_order. - * @ATSPI_LAYER_POPUP: A layer for popup window content, above - * @ATSPI_LAYER_WIDGET. - * @ATSPI_LAYER_OVERLAY: The topmost layer. - * @ATSPI_LAYER_WINDOW: The layer in which a toplevel window background usually - * resides. - * @ATSPI_LAYER_LAST_DEFINED: Used only to determine the end of the - * enumeration. - * - * The #AtspiComponentLayer of an #AtspiComponent instance indicates its - * relative stacking order with respect to the onscreen visual representation - * of the UI. #AtspiComponentLayer, in combination with #AtspiComponent 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 - * flat screen review models of the screen, as well as - * for other uses. Objects residing in two of the #AtspiComponentLayer - * categories support further z-ordering information, with respect to their - * peers in the same layer: namely, @ATSPI_LAYER_WINDOW and - * @ATSPI_LAYER_MDI. Relative stacking order for other objects within the - * same layer is not available; the recommended heuristic is - * first child paints first. 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: @ATSPI_LAYER_BACKGROUND, @ATSPI_LAYER_WINDOW, @ATSPI_LAYER_MDI, - * @ATSPI_LAYER_CANVAS, @ATSPI_LAYER_WIDGET, @ATSPI_LAYER_POPUP, and - * @ATSPI_LAYER_OVERLAY. - * - */ -typedef enum { + /** + * AtspiComponentLayer: + * @ATSPI_LAYER_INVALID: Indicates an error condition or uninitialized value. + * @ATSPI_LAYER_BACKGROUND: The bottom-most layer, over which everything else + * is painted. The 'desktop background' is generally in this layer. + * @ATSPI_LAYER_CANVAS: The 'background' layer for most content renderers and + * UI #AtspiComponent containers. + * @ATSPI_LAYER_WIDGET: The layer in which the majority of ordinary + * 'foreground' widgets reside. + * @ATSPI_LAYER_MDI: A special layer between @ATSPI_LAYER_CANVAS and + * @ATSPI_LAYER_WIDGET, in which the 'pseudo windows' (e.g. the MDI frames) + * reside. See #atspi_component_get_mdi_z_order. + * @ATSPI_LAYER_POPUP: A layer for popup window content, above + * @ATSPI_LAYER_WIDGET. + * @ATSPI_LAYER_OVERLAY: The topmost layer. + * @ATSPI_LAYER_WINDOW: The layer in which a toplevel window background usually + * resides. + * @ATSPI_LAYER_LAST_DEFINED: Used only to determine the end of the + * enumeration. + * + * The #AtspiComponentLayer of an #AtspiComponent instance indicates its + * relative stacking order with respect to the onscreen visual representation + * of the UI. #AtspiComponentLayer, in combination with #AtspiComponent 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 + * flat screen review models of the screen, as well as + * for other uses. Objects residing in two of the #AtspiComponentLayer + * categories support further z-ordering information, with respect to their + * peers in the same layer: namely, @ATSPI_LAYER_WINDOW and + * @ATSPI_LAYER_MDI. Relative stacking order for other objects within the + * same layer is not available; the recommended heuristic is + * first child paints first. 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: @ATSPI_LAYER_BACKGROUND, @ATSPI_LAYER_WINDOW, @ATSPI_LAYER_MDI, + * @ATSPI_LAYER_CANVAS, @ATSPI_LAYER_WIDGET, @ATSPI_LAYER_POPUP, and + * @ATSPI_LAYER_OVERLAY. + * + */ + typedef enum + { ATSPI_LAYER_INVALID, ATSPI_LAYER_BACKGROUND, ATSPI_LAYER_CANVAS, @@ -299,56 +306,57 @@ typedef enum { ATSPI_LAYER_OVERLAY, ATSPI_LAYER_WINDOW, ATSPI_LAYER_LAST_DEFINED, -} AtspiComponentLayer; + } AtspiComponentLayer; /** * ATSPI_COMPONENTLAYER_COUNT: * * One higher than the highest valid value of #AtspiComponentLayer. **/ -#define ATSPI_COMPONENTLAYER_COUNT (8+1) +#define ATSPI_COMPONENTLAYER_COUNT (8 + 1) -/** - * AtspiTextBoundaryType: - * @ATSPI_TEXT_BOUNDARY_CHAR: An #AtspiText instance is bounded by this - * character only. Start and end offsets differ by one, by definition, - * for this value. - * @ATSPI_TEXT_BOUNDARY_WORD_START: Boundary condition is start of a word; i.e. - * range is from start of one word to the start of another word. - * @ATSPI_TEXT_BOUNDARY_WORD_END: 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. - * @ATSPI_TEXT_BOUNDARY_SENTENCE_START: 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. - * @ATSPI_TEXT_BOUNDARY_SENTENCE_END: 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. - * @ATSPI_TEXT_BOUNDARY_LINE_START: 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. - * @ATSPI_TEXT_BOUNDARY_LINE_END: 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. - * - * Specifies the boundary conditions determining a run of text as returned from - * #atspi_text_get_text_at_offset, #atspi_text_get_text_after_offset, and - * #atspi_text_get_text_before_offset. - * - * This enumerationis deprecated since 2.9.90 and should not be used. Use - * AtspiTextGranularity with #atspi_text_get_string_at_offset instead. - **/ -typedef enum { + /** + * AtspiTextBoundaryType: + * @ATSPI_TEXT_BOUNDARY_CHAR: An #AtspiText instance is bounded by this + * character only. Start and end offsets differ by one, by definition, + * for this value. + * @ATSPI_TEXT_BOUNDARY_WORD_START: Boundary condition is start of a word; i.e. + * range is from start of one word to the start of another word. + * @ATSPI_TEXT_BOUNDARY_WORD_END: 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. + * @ATSPI_TEXT_BOUNDARY_SENTENCE_START: 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. + * @ATSPI_TEXT_BOUNDARY_SENTENCE_END: 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. + * @ATSPI_TEXT_BOUNDARY_LINE_START: 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. + * @ATSPI_TEXT_BOUNDARY_LINE_END: 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. + * + * Specifies the boundary conditions determining a run of text as returned from + * #atspi_text_get_text_at_offset, #atspi_text_get_text_after_offset, and + * #atspi_text_get_text_before_offset. + * + * This enumerationis deprecated since 2.9.90 and should not be used. Use + * AtspiTextGranularity with #atspi_text_get_string_at_offset instead. + **/ + typedef enum + { ATSPI_TEXT_BOUNDARY_CHAR, ATSPI_TEXT_BOUNDARY_WORD_START, ATSPI_TEXT_BOUNDARY_WORD_END, @@ -356,244 +364,247 @@ typedef enum { ATSPI_TEXT_BOUNDARY_SENTENCE_END, ATSPI_TEXT_BOUNDARY_LINE_START, ATSPI_TEXT_BOUNDARY_LINE_END, -} AtspiTextBoundaryType; + } AtspiTextBoundaryType; -/** - *AtspiTextGranularity: - *@ATSPI_TEXT_GRANULARITY_CHAR: Granularity is defined by the boundaries between characters - * (including non-printing characters) - *@ATSPI_TEXT_GRANULARITY_WORD: Granularity is defined by the boundaries of a word, - * starting at the beginning of the current word and finishing at the beginning of - * the following one, if present. - *@ATSPI_TEXT_GRANULARITY_SENTENCE: Granularity is defined by the boundaries of a sentence, - * starting at the beginning of the current sentence and finishing at the beginning of - * the following one, if present. - *@ATSPI_TEXT_GRANULARITY_LINE: Granularity is defined by the boundaries of a line, - * starting at the beginning of the current line and finishing at the beginning of - * the following one, if present. - *@ATSPI_TEXT_GRANULARITY_PARAGRAPH: Granularity is defined by the boundaries of a paragraph, - * starting at the beginning of the current paragraph and finishing at the beginning of - * the following one, if present. - * - * Text granularity types used for specifying the granularity of the region of - * text we are interested in. - **/ -typedef enum { - ATSPI_TEXT_GRANULARITY_CHAR, - ATSPI_TEXT_GRANULARITY_WORD, - ATSPI_TEXT_GRANULARITY_SENTENCE, - ATSPI_TEXT_GRANULARITY_LINE, - ATSPI_TEXT_GRANULARITY_PARAGRAPH -} AtspiTextGranularity; + /** + *AtspiTextGranularity: + *@ATSPI_TEXT_GRANULARITY_CHAR: Granularity is defined by the boundaries between characters + * (including non-printing characters) + *@ATSPI_TEXT_GRANULARITY_WORD: Granularity is defined by the boundaries of a word, + * starting at the beginning of the current word and finishing at the beginning of + * the following one, if present. + *@ATSPI_TEXT_GRANULARITY_SENTENCE: Granularity is defined by the boundaries of a sentence, + * starting at the beginning of the current sentence and finishing at the beginning of + * the following one, if present. + *@ATSPI_TEXT_GRANULARITY_LINE: Granularity is defined by the boundaries of a line, + * starting at the beginning of the current line and finishing at the beginning of + * the following one, if present. + *@ATSPI_TEXT_GRANULARITY_PARAGRAPH: Granularity is defined by the boundaries of a paragraph, + * starting at the beginning of the current paragraph and finishing at the beginning of + * the following one, if present. + * + * Text granularity types used for specifying the granularity of the region of + * text we are interested in. + **/ + typedef enum + { + ATSPI_TEXT_GRANULARITY_CHAR, + ATSPI_TEXT_GRANULARITY_WORD, + ATSPI_TEXT_GRANULARITY_SENTENCE, + ATSPI_TEXT_GRANULARITY_LINE, + ATSPI_TEXT_GRANULARITY_PARAGRAPH + } AtspiTextGranularity; /** * ATSPI_TEXT_BOUNDARY_TYPE_COUNT: * * One higher than the highest valid value of #AtspiTextBoundaryType. */ -#define ATSPI_TEXT_BOUNDARY_TYPE_COUNT (6+1) +#define ATSPI_TEXT_BOUNDARY_TYPE_COUNT (6 + 1) -/** - * AtspiTextClipType: - * @ATSPI_TEXT_CLIP_NONE: No characters/glyphs are omitted. - * @ATSPI_TEXT_CLIP_MIN: Characters/glyphs clipped by the minimum coordinate - * are omitted. - * @ATSPI_TEXT_CLIP_MAX: Characters/glyphs which intersect the maximum - * coordinate are omitted. - * @ATSPI_TEXT_CLIP_BOTH: Only glyphs falling entirely within the region - * bounded by min and max are retained. - * - * Enumeration used by interface #AtspiText to indicate - * how to treat characters intersecting bounding boxes. - * - **/ -typedef enum { + /** + * AtspiTextClipType: + * @ATSPI_TEXT_CLIP_NONE: No characters/glyphs are omitted. + * @ATSPI_TEXT_CLIP_MIN: Characters/glyphs clipped by the minimum coordinate + * are omitted. + * @ATSPI_TEXT_CLIP_MAX: Characters/glyphs which intersect the maximum + * coordinate are omitted. + * @ATSPI_TEXT_CLIP_BOTH: Only glyphs falling entirely within the region + * bounded by min and max are retained. + * + * Enumeration used by interface #AtspiText to indicate + * how to treat characters intersecting bounding boxes. + * + **/ + typedef enum + { ATSPI_TEXT_CLIP_NONE, ATSPI_TEXT_CLIP_MIN, ATSPI_TEXT_CLIP_MAX, ATSPI_TEXT_CLIP_BOTH, -} AtspiTextClipType; + } AtspiTextClipType; /** * ATSPI_TEXT_CLIP_TYPE_COUNT: * * One higher than the highest valid value of #AtspiTextClipType. */ -#define ATSPI_TEXT_CLIP_TYPE_COUNT (3+1) +#define ATSPI_TEXT_CLIP_TYPE_COUNT (3 + 1) -/** - * AtspiStateType: - * @ATSPI_STATE_INVALID: Indicates an invalid state - probably an error - * condition. - * @ATSPI_STATE_ACTIVE: Indicates a window is currently the active window, or - * an object is the active subelement within a container or table. - * @ATSPI_STATE_ACTIVE should not be used for objects which have - * #ATSPI_STATE_FOCUSABLE or #ATSPI_STATE_SELECTABLE: Those objects should use - * @ATSPI_STATE_FOCUSED and @ATSPI_STATE_SELECTED respectively. - * @ATSPI_STATE_ACTIVE is a means to indicate that an object which is not - * focusable and not selectable is the currently-active item within its - * parent container. - * @ATSPI_STATE_ARMED: Indicates that the object is armed. - * @ATSPI_STATE_BUSY: 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. - * @ATSPI_STATE_CHECKED: Indicates this object is currently checked. - * @ATSPI_STATE_COLLAPSED: Indicates this object is collapsed. - * @ATSPI_STATE_DEFUNCT: Indicates that this object no longer has a valid - * backing widget (for instance, if its peer object has been destroyed). - * @ATSPI_STATE_EDITABLE: Indicates the user can change the contents of this - * object. - * @ATSPI_STATE_ENABLED: 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 @ATSPI_STATE_SENSITIVE if direct - * user interaction cannot cause them to acquire @ATSPI_STATE_ENABLED. - * See @ATSPI_STATE_SENSITIVE. - * @ATSPI_STATE_EXPANDABLE: Indicates this object allows progressive - * disclosure of its children. - * @ATSPI_STATE_EXPANDED: Indicates this object is expanded. - * @ATSPI_STATE_FOCUSABLE: 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. - * @ATSPI_STATE_FOCUSED: Indicates this object currently has the keyboard - * focus. - * @ATSPI_STATE_HAS_TOOLTIP: Indicates that the object has an associated - * tooltip. - * @ATSPI_STATE_HORIZONTAL: Indicates the orientation of this object is - * horizontal. - * @ATSPI_STATE_ICONIFIED: Indicates this object is minimized and is - * represented only by an icon. - * @ATSPI_STATE_MODAL: Indicates something must be done with this object - * before the user can interact with an object in a different window. - * @ATSPI_STATE_MULTI_LINE: Indicates this (text) object can contain multiple - * lines of text. - * @ATSPI_STATE_MULTISELECTABLE: 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. - * @ATSPI_STATE_OPAQUE: Indicates this object paints every pixel within its - * rectangular region. It also indicates an alpha value of unity, if it - * supports alpha blending. - * @ATSPI_STATE_PRESSED: Indicates this object is currently pressed. - * @ATSPI_STATE_RESIZABLE: Indicates the size of this object's size is not - * fixed. - * @ATSPI_STATE_SELECTABLE: 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. - * @ATSPI_STATE_SELECTED: 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. - * @ATSPI_STATE_SENSITIVE: Indicates this object is sensitive, e.g. to user - * interaction. @ATSPI_STATE_SENSITIVE usually accompanies. - * @ATSPI_STATE_ENABLED for user-actionable controls, but may be found in the - * absence of @ATSPI_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 @ATSPI_STATE_SENSITIVE, - * for instance if a user makes an explicit selection using an object whose - * current state is ambiguous or undefined. See @ATSPI_STATE_ENABLED, - * @ATSPI_STATE_INDETERMINATE. - * @ATSPI_STATE_SHOWING: 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. - * @ATSPI_STATE_SINGLE_LINE: Indicates this (text) object can contain only a - * single line of text. - * @ATSPI_STATE_STALE: Indicates that the information returned for this object - * may no longer be synchronized with the application state. This can occur - * if the object has @ATSPI_STATE_TRANSIENT, and can also occur towards the - * end of the object peer's lifecycle. - * @ATSPI_STATE_TRANSIENT: Indicates this object is transient. - * @ATSPI_STATE_VERTICAL: 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. - * @ATSPI_STATE_VISIBLE: Indicates this object is visible, e.g. has been - * explicitly marked for exposure to the user. @ATSPI_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 - * @ATSPI_STATE_VISIBLE and @ATSPI_STATE_SHOWING. The absence of - * @ATSPI_STATE_VISIBLE and @ATSPI_STATE_SHOWING is - * semantically equivalent to saying that an object is 'hidden'. - * @ATSPI_STATE_MANAGES_DESCENDANTS: 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 - * @ATSPI_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. - * @ATSPI_STATE_INDETERMINATE: 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 - * @ATSPI_STATE_INDETERMINATE if the currently selected text contains a mixture - * of weight attributes. In many cases interacting with a - * @ATSPI_STATE_INDETERMINATE object will cause the context's corresponding - * boolean attribute to be homogenized, whereupon the object will lose - * @ATSPI_STATE_INDETERMINATE and a corresponding state-changed event will be - * fired. - * @ATSPI_STATE_REQUIRED: Indicates that user interaction with this object is - * 'required' from the user, for instance before completing the - * processing of a form. - * @ATSPI_STATE_TRUNCATED: Indicates that an object's onscreen content - * is truncated, e.g. a text value in a spreadsheet cell. - * @ATSPI_STATE_ANIMATED: 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. - * @ATSPI_STATE_INVALID_ENTRY: 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. - * @ATSPI_STATE_SUPPORTS_AUTOCOMPLETION: This state indicates that the object - * in question implements some form of typeahead 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 #AtspiSelection. - * In some cases the typeahead behavior may result in full or partial - * completion of the data in the input field, in which case - * these input events may trigger text-changed events from the source. - * @ATSPI_STATE_SELECTABLE_TEXT: This state indicates that the object in - * question supports text selection. It should only be exposed on objects - * which implement the #AtspiText interface, in order to distinguish this state - * from @ATSPI_STATE_SELECTABLE, which infers that the object in question is a - * selectable child of an object which implements #AtspiSelection. While - * similar, text selection and subelement selection are distinct operations. - * @ATSPI_STATE_IS_DEFAULT: 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. - * @ATSPI_STATE_VISITED: 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. - *@ATSPI_STATE_CHECKABLE: Indicates this object has the potential to - * be checked, such as a checkbox or toggle-able table cell. @Since: - * 2.12 - *@ATSPI_STATE_HAS_POPUP: Indicates that the object has a popup - * context menu or sub-level menu which may or may not be - * showing. This means that activation renders conditional content. - * Note that ordinary tooltips are not considered popups in this - * context. @Since: 2.12 - * @ATSPI_STATE_READ_ONLY: Indicates that an object which is ENABLED and - * SENSITIVE has a value which can be read, but not modified, by the - * user. @Since: 2.16 - * @ATSPI_STATE_LAST_DEFINED: This value of the enumeration should not be used - * as a parameter, it indicates the number of items in the #AtspiStateType - * enumeration. - * - * - * Enumeration used by various interfaces indicating every possible state - * an #AtspiAccesible object can assume. - * - **/ -typedef enum { + /** + * AtspiStateType: + * @ATSPI_STATE_INVALID: Indicates an invalid state - probably an error + * condition. + * @ATSPI_STATE_ACTIVE: Indicates a window is currently the active window, or + * an object is the active subelement within a container or table. + * @ATSPI_STATE_ACTIVE should not be used for objects which have + * #ATSPI_STATE_FOCUSABLE or #ATSPI_STATE_SELECTABLE: Those objects should use + * @ATSPI_STATE_FOCUSED and @ATSPI_STATE_SELECTED respectively. + * @ATSPI_STATE_ACTIVE is a means to indicate that an object which is not + * focusable and not selectable is the currently-active item within its + * parent container. + * @ATSPI_STATE_ARMED: Indicates that the object is armed. + * @ATSPI_STATE_BUSY: 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. + * @ATSPI_STATE_CHECKED: Indicates this object is currently checked. + * @ATSPI_STATE_COLLAPSED: Indicates this object is collapsed. + * @ATSPI_STATE_DEFUNCT: Indicates that this object no longer has a valid + * backing widget (for instance, if its peer object has been destroyed). + * @ATSPI_STATE_EDITABLE: Indicates the user can change the contents of this + * object. + * @ATSPI_STATE_ENABLED: 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 @ATSPI_STATE_SENSITIVE if direct + * user interaction cannot cause them to acquire @ATSPI_STATE_ENABLED. + * See @ATSPI_STATE_SENSITIVE. + * @ATSPI_STATE_EXPANDABLE: Indicates this object allows progressive + * disclosure of its children. + * @ATSPI_STATE_EXPANDED: Indicates this object is expanded. + * @ATSPI_STATE_FOCUSABLE: 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. + * @ATSPI_STATE_FOCUSED: Indicates this object currently has the keyboard + * focus. + * @ATSPI_STATE_HAS_TOOLTIP: Indicates that the object has an associated + * tooltip. + * @ATSPI_STATE_HORIZONTAL: Indicates the orientation of this object is + * horizontal. + * @ATSPI_STATE_ICONIFIED: Indicates this object is minimized and is + * represented only by an icon. + * @ATSPI_STATE_MODAL: Indicates something must be done with this object + * before the user can interact with an object in a different window. + * @ATSPI_STATE_MULTI_LINE: Indicates this (text) object can contain multiple + * lines of text. + * @ATSPI_STATE_MULTISELECTABLE: 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. + * @ATSPI_STATE_OPAQUE: Indicates this object paints every pixel within its + * rectangular region. It also indicates an alpha value of unity, if it + * supports alpha blending. + * @ATSPI_STATE_PRESSED: Indicates this object is currently pressed. + * @ATSPI_STATE_RESIZABLE: Indicates the size of this object's size is not + * fixed. + * @ATSPI_STATE_SELECTABLE: 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. + * @ATSPI_STATE_SELECTED: 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. + * @ATSPI_STATE_SENSITIVE: Indicates this object is sensitive, e.g. to user + * interaction. @ATSPI_STATE_SENSITIVE usually accompanies. + * @ATSPI_STATE_ENABLED for user-actionable controls, but may be found in the + * absence of @ATSPI_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 @ATSPI_STATE_SENSITIVE, + * for instance if a user makes an explicit selection using an object whose + * current state is ambiguous or undefined. See @ATSPI_STATE_ENABLED, + * @ATSPI_STATE_INDETERMINATE. + * @ATSPI_STATE_SHOWING: 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. + * @ATSPI_STATE_SINGLE_LINE: Indicates this (text) object can contain only a + * single line of text. + * @ATSPI_STATE_STALE: Indicates that the information returned for this object + * may no longer be synchronized with the application state. This can occur + * if the object has @ATSPI_STATE_TRANSIENT, and can also occur towards the + * end of the object peer's lifecycle. + * @ATSPI_STATE_TRANSIENT: Indicates this object is transient. + * @ATSPI_STATE_VERTICAL: 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. + * @ATSPI_STATE_VISIBLE: Indicates this object is visible, e.g. has been + * explicitly marked for exposure to the user. @ATSPI_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 + * @ATSPI_STATE_VISIBLE and @ATSPI_STATE_SHOWING. The absence of + * @ATSPI_STATE_VISIBLE and @ATSPI_STATE_SHOWING is + * semantically equivalent to saying that an object is 'hidden'. + * @ATSPI_STATE_MANAGES_DESCENDANTS: 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 + * @ATSPI_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. + * @ATSPI_STATE_INDETERMINATE: 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 + * @ATSPI_STATE_INDETERMINATE if the currently selected text contains a mixture + * of weight attributes. In many cases interacting with a + * @ATSPI_STATE_INDETERMINATE object will cause the context's corresponding + * boolean attribute to be homogenized, whereupon the object will lose + * @ATSPI_STATE_INDETERMINATE and a corresponding state-changed event will be + * fired. + * @ATSPI_STATE_REQUIRED: Indicates that user interaction with this object is + * 'required' from the user, for instance before completing the + * processing of a form. + * @ATSPI_STATE_TRUNCATED: Indicates that an object's onscreen content + * is truncated, e.g. a text value in a spreadsheet cell. + * @ATSPI_STATE_ANIMATED: 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. + * @ATSPI_STATE_INVALID_ENTRY: 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. + * @ATSPI_STATE_SUPPORTS_AUTOCOMPLETION: This state indicates that the object + * in question implements some form of typeahead 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 #AtspiSelection. + * In some cases the typeahead behavior may result in full or partial + * completion of the data in the input field, in which case + * these input events may trigger text-changed events from the source. + * @ATSPI_STATE_SELECTABLE_TEXT: This state indicates that the object in + * question supports text selection. It should only be exposed on objects + * which implement the #AtspiText interface, in order to distinguish this state + * from @ATSPI_STATE_SELECTABLE, which infers that the object in question is a + * selectable child of an object which implements #AtspiSelection. While + * similar, text selection and subelement selection are distinct operations. + * @ATSPI_STATE_IS_DEFAULT: 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. + * @ATSPI_STATE_VISITED: 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. + *@ATSPI_STATE_CHECKABLE: Indicates this object has the potential to + * be checked, such as a checkbox or toggle-able table cell. @Since: + * 2.12 + *@ATSPI_STATE_HAS_POPUP: Indicates that the object has a popup + * context menu or sub-level menu which may or may not be + * showing. This means that activation renders conditional content. + * Note that ordinary tooltips are not considered popups in this + * context. @Since: 2.12 + * @ATSPI_STATE_READ_ONLY: Indicates that an object which is ENABLED and + * SENSITIVE has a value which can be read, but not modified, by the + * user. @Since: 2.16 + * @ATSPI_STATE_LAST_DEFINED: This value of the enumeration should not be used + * as a parameter, it indicates the number of items in the #AtspiStateType + * enumeration. + * + * + * Enumeration used by various interfaces indicating every possible state + * an #AtspiAccesible object can assume. + * + **/ + typedef enum + { ATSPI_STATE_INVALID, ATSPI_STATE_ACTIVE, ATSPI_STATE_ARMED, @@ -639,96 +650,99 @@ typedef enum { ATSPI_STATE_HAS_POPUP, ATSPI_STATE_READ_ONLY, ATSPI_STATE_LAST_DEFINED, -} AtspiStateType; + } AtspiStateType; /** * ATSPI_STATETYPE_COUNT: * * One higher than the highest valid value of #AtspiStateType. **/ -#define ATSPI_STATETYPE_COUNT (41+1) +#define ATSPI_STATETYPE_COUNT (41 + 1) -/** - * AtspiKeyEventType: - * @ATSPI_KEY_PRESSED: Key press event - * @ATSPI_KEY_RELEASED: Key release event - * - * Deprecated. Should not be used. - * - **/ -typedef enum { + /** + * AtspiKeyEventType: + * @ATSPI_KEY_PRESSED: Key press event + * @ATSPI_KEY_RELEASED: Key release event + * + * Deprecated. Should not be used. + * + **/ + typedef enum + { ATSPI_KEY_PRESSED, ATSPI_KEY_RELEASED, -} AtspiKeyEventType; + } AtspiKeyEventType; /** * ATSPI_KEYEVENTTYPE_COUNT: * * One higher than the highest valid value of #AtspiKeyEventType. **/ -#define ATSPI_KEYEVENTTYPE_COUNT (1+1) +#define ATSPI_KEYEVENTTYPE_COUNT (1 + 1) -/** - * AtspiEventType: - * @ATSPI_KEY_PRESSED_EVENT: Indicates that a key on a keyboard device was - * pressed. - * @ATSPI_KEY_RELEASED_EVENT: Indicates that a key on a keyboard device was - * released. - * @ATSPI_BUTTON_PRESSED_EVENT: Indicates that a button on a non-keyboard - * human interface device (HID) was pressed. - * @ATSPI_BUTTON_RELEASED_EVENT: Indicates that a button on a non-keyboard - * human interface device (HID) was released. - * - * Enumeration used to specify the event types of interest to an - * #AtspiEventListener, or - * to identify the type of an event for which notification has been sent. - * - **/ -typedef enum { + /** + * AtspiEventType: + * @ATSPI_KEY_PRESSED_EVENT: Indicates that a key on a keyboard device was + * pressed. + * @ATSPI_KEY_RELEASED_EVENT: Indicates that a key on a keyboard device was + * released. + * @ATSPI_BUTTON_PRESSED_EVENT: Indicates that a button on a non-keyboard + * human interface device (HID) was pressed. + * @ATSPI_BUTTON_RELEASED_EVENT: Indicates that a button on a non-keyboard + * human interface device (HID) was released. + * + * Enumeration used to specify the event types of interest to an + * #AtspiEventListener, or + * to identify the type of an event for which notification has been sent. + * + **/ + typedef enum + { ATSPI_KEY_PRESSED_EVENT, ATSPI_KEY_RELEASED_EVENT, ATSPI_BUTTON_PRESSED_EVENT, ATSPI_BUTTON_RELEASED_EVENT, -} AtspiEventType; + } AtspiEventType; /** * ATSPI_EVENTTYPE_COUNT: * * One higher than the highest valid value of #AtspiEventType. */ -#define ATSPI_EVENTTYPE_COUNT (3+1) +#define ATSPI_EVENTTYPE_COUNT (3 + 1) -/** - * AtspiKeySynthType: - * @ATSPI_KEY_PRESS: Emulates the pressing of a hardware keyboard key. - * @ATSPI_KEY_RELEASE: Emulates the release of a hardware keyboard key. - * @ATSPI_KEY_PRESSRELEASE: Emulates the pressing and immediate releasing - * of a hardware keyboard key. - * @ATSPI_KEY_SYM: A symbolic key event is generated, without specifying a - * hardware key. Note: if the keysym is not present in the current keyboard - * map, the #AtspiDeviceEventController 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 keysyms 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). - * @ATSPI_KEY_STRING: A string is converted to its equivalent keyboard events - * and emitted. If the string consists of complex characters or composed - * characters which are not in the current keymap, string emission is - * subject to the out-of-keymap limitations described for - * @ATSPI_KEY_SYM. In practice this limitation primarily effects - * Chinese and Japanese locales. - * @ATSPI_KEY_LOCKMODIFIERS: Emulates locking a set of modifiers. - * @ATSPI_KEY_UNLOCKMODIFIERS: Emulates unlocking a set of modifiers. - * - * Enumeration used when synthesizing keyboard input via - * #atspi_generate_keyboard_event. - * - **/ -typedef enum { + /** + * AtspiKeySynthType: + * @ATSPI_KEY_PRESS: Emulates the pressing of a hardware keyboard key. + * @ATSPI_KEY_RELEASE: Emulates the release of a hardware keyboard key. + * @ATSPI_KEY_PRESSRELEASE: Emulates the pressing and immediate releasing + * of a hardware keyboard key. + * @ATSPI_KEY_SYM: A symbolic key event is generated, without specifying a + * hardware key. Note: if the keysym is not present in the current keyboard + * map, the #AtspiDeviceEventController 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 keysyms 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). + * @ATSPI_KEY_STRING: A string is converted to its equivalent keyboard events + * and emitted. If the string consists of complex characters or composed + * characters which are not in the current keymap, string emission is + * subject to the out-of-keymap limitations described for + * @ATSPI_KEY_SYM. In practice this limitation primarily effects + * Chinese and Japanese locales. + * @ATSPI_KEY_LOCKMODIFIERS: Emulates locking a set of modifiers. + * @ATSPI_KEY_UNLOCKMODIFIERS: Emulates unlocking a set of modifiers. + * + * Enumeration used when synthesizing keyboard input via + * #atspi_generate_keyboard_event. + * + **/ + typedef enum + { ATSPI_KEY_PRESS, ATSPI_KEY_RELEASE, ATSPI_KEY_PRESSRELEASE, @@ -736,36 +750,37 @@ typedef enum { ATSPI_KEY_STRING, ATSPI_KEY_LOCKMODIFIERS, ATSPI_KEY_UNLOCKMODIFIERS, -} AtspiKeySynthType; + } AtspiKeySynthType; /** * ATSPI_KEYSYNTHTYPE_COUNT: * * One higher than the highest valid value of #AtspiKeySynthType. **/ -#define ATSPI_KEYSYNTHTYPE_COUNT (4+1) +#define ATSPI_KEYSYNTHTYPE_COUNT (4 + 1) -/** - * AtspiModifierType: - * @ATSPI_MODIFIER_SHIFT: The left or right 'Shift' key. - * @ATSPI_MODIFIER_SHIFTLOCK: The ShiftLock or CapsLock key. - * @ATSPI_MODIFIER_CONTROL: 'Control'/'Ctrl'. - * @ATSPI_MODIFIER_ALT: The Alt key (as opposed to AltGr). - * @ATSPI_MODIFIER_META: 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 @ATSPI_MODIFIER_META2 means that the 'Mod2Mask' bit - * is set in the corresponding XEvent. - * @ATSPI_MODIFIER_META2: See @ATSPI_MODIFIER_META. - * @ATSPI_MODIFIER_META3: See @ATSPI_MODIFIER_META. - * @ATSPI_MODIFIER_NUMLOCK: A symbolic meta key name that is mapped by AT-SPI - * to the appropriate META value, for the convenience of the client. - * - * - * - **/ -typedef enum { + /** + * AtspiModifierType: + * @ATSPI_MODIFIER_SHIFT: The left or right 'Shift' key. + * @ATSPI_MODIFIER_SHIFTLOCK: The ShiftLock or CapsLock key. + * @ATSPI_MODIFIER_CONTROL: 'Control'/'Ctrl'. + * @ATSPI_MODIFIER_ALT: The Alt key (as opposed to AltGr). + * @ATSPI_MODIFIER_META: 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 @ATSPI_MODIFIER_META2 means that the 'Mod2Mask' bit + * is set in the corresponding XEvent. + * @ATSPI_MODIFIER_META2: See @ATSPI_MODIFIER_META. + * @ATSPI_MODIFIER_META3: See @ATSPI_MODIFIER_META. + * @ATSPI_MODIFIER_NUMLOCK: A symbolic meta key name that is mapped by AT-SPI + * to the appropriate META value, for the convenience of the client. + * + * + * + **/ + typedef enum + { ATSPI_MODIFIER_SHIFT, ATSPI_MODIFIER_SHIFTLOCK, ATSPI_MODIFIER_CONTROL, @@ -774,120 +789,121 @@ typedef enum { ATSPI_MODIFIER_META2, ATSPI_MODIFIER_META3, ATSPI_MODIFIER_NUMLOCK = 14, -} AtspiModifierType; + } AtspiModifierType; /** * ATSPI_MODIFIERTYPE_COUNT: * * One higher than the highest valid value of #AtspiModifierType. **/ -#define ATSPI_MODIFIERTYPE_COUNT (7+1) +#define ATSPI_MODIFIERTYPE_COUNT (7 + 1) -/** - * AtspiRelationType: - * @ATSPI_RELATION_NULL: Not a meaningful relationship; clients should not - * normally encounter this #AtspiRelationType value. - * @ATSPI_RELATION_LABEL_FOR: Object is a label for one or more other objects. - * @ATSPI_RELATION_LABELLED_BY: Object is labelled by one or more other - * objects. - * @ATSPI_RELATION_CONTROLLER_FOR: Object is an interactive object which - * modifies the state, onscreen location, or other attributes of one or more - * target objects. - * @ATSPI_RELATION_CONTROLLED_BY: 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 @ATSPI_RELATION_CONTROLLED_BY - * scrollbars. - * @ATSPI_RELATION_MEMBER_OF: Object has a grouping relationship (e.g. 'same - * group as') to one or more other objects. - * @ATSPI_RELATION_TOOLTIP_FOR: Object is a tooltip associated with another - * object. - * @ATSPI_RELATION_NODE_CHILD_OF: Object is a child of the target. - * @ATSPI_RELATION_NODE_PARENT_OF: Object is a parent of the target. - * @ATSPI_RELATION_EXTENDED: Used to indicate that a relationship exists, but - * its type is not specified in the enumeration. - * @ATSPI_RELATION_FLOWS_TO: 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. - * @ATSPI_RELATION_FLOWS_FROM: Reciprocal of @ATSPI_RELATION_FLOWS_TO. - * @ATSPI_RELATION_SUBWINDOW_OF: 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. - * @ATSPI_RELATION_EMBEDS: Similar to @ATSPI_RELATION_SUBWINDOW_OF, but - * specifically used for cross-process embedding. - * @ATSPI_RELATION_EMBEDDED_BY: Reciprocal of @ATSPI_RELATION_EMBEDS. Used to - * denote content rendered by embedded renderers that live in a separate process - * space from the embedding context. - * @ATSPI_RELATION_POPUP_FOR: Denotes that the object is a transient window or - * frame associated with another onscreen object. Similar to @ATSPI_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 an @ATSPI_ROLE_WINDOW - * object with the @ATSPI_RELATION_POPUP_FOR relation usually requires - * some presentation action on the part - * of assistive technology clients, even though the previous toplevel - * @ATSPI_ROLE_FRAME object may still be the active window. - * @ATSPI_RELATION_PARENT_WINDOW_OF: This is the reciprocal relation to - * @ATSPI_RELATION_POPUP_FOR. - * @ATSPI_RELATION_DESCRIPTION_FOR: Reciprocal of %ATSPI_RELATION_DESCRIBED_BY. - * Indicates that this object provides descriptive information about the target - * object(s). See also %ATSPI_RELATION_DETAILS_FOR and %ATSPI_RELATION_ERROR_FOR. - * @ATSPI_RELATION_DESCRIBED_BY: Reciprocal of %ATSPI_RELATION_DESCRIPTION_FOR. - * Indicates that one or more target objects provide descriptive information - * about this object. This relation type is most appropriate for information - * that is not essential as its presentation may be user-configurable and/or - * limited to an on-demand mechanism such as an assistive technology command. - * For brief, essential information such as can be found in a widget's on-screen - * label, use %ATSPI_RELATION_LABELLED_BY. For an on-screen error message, use - * %ATSPI_RELATION_ERROR_MESSAGE. For lengthy extended descriptive information - * contained in an on-screen object, consider using %ATSPI_RELATION_DETAILS as - * assistive technologies may provide a means for the user to navigate to - * objects containing detailed descriptions so that their content can be more - * closely reviewed. - * @ATSPI_RELATION_DETAILS: Reciprocal of %ATSPI_RELATION_DETAILS_FOR. Indicates - * that this object has a detailed or extended description, the contents of - * which can be found in the target object(s). This relation type is most - * appropriate for information that is sufficiently lengthy as to make - * navigation to the container of that information desirable. For less verbose - * information suitable for announcement only, see %ATSPI_RELATION_DESCRIBED_BY. - * If the detailed information describes an error condition, - * %ATSPI_RELATION_ERROR_FOR should be used instead. @Since: 2.26. - * @ATSPI_RELATION_DETAILS_FOR: Reciprocal of %ATSPI_RELATION_DETAILS. Indicates - * that this object provides a detailed or extended description about the target - * object(s). See also %ATSPI_RELATION_DESCRIPTION_FOR and - * %ATSPI_RELATION_ERROR_FOR. @Since: 2.26. - * @ATSPI_RELATION_ERROR_MESSAGE: Reciprocal of %ATSPI_RELATION_ERROR_FOR. - * Indicates that this object has one or more errors, the nature of which is - * described in the contents of the target object(s). Objects that have this - * relation type should also contain %ATSPI_STATE_INVALID_ENTRY in their - * #AtspiStateSet. @Since: 2.26. - * @ATSPI_RELATION_ERROR_FOR: Reciprocal of %ATSPI_RELATION_ERROR_MESSAGE. - * Indicates that this object contains an error message describing an invalid - * condition in the target object(s). @Since: 2.26. - * @ATSPI_RELATION_LAST_DEFINED: Do not use as a parameter value, used to - * determine the size of the enumeration. - * - * #AtspiRelationType 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 - * @ATSPI_RELATION_LABELLED_BY - * relationship may be used to identify labelling information that should - * accompany the accessible name property when presenting an object's content or - * identity to the end user. Similarly, - * @ATSPI_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. - * - * - * Enumeration used to specify - * the type of relation encapsulated in an #AtspiRelation object. - * - **/ -typedef enum { + /** + * AtspiRelationType: + * @ATSPI_RELATION_NULL: Not a meaningful relationship; clients should not + * normally encounter this #AtspiRelationType value. + * @ATSPI_RELATION_LABEL_FOR: Object is a label for one or more other objects. + * @ATSPI_RELATION_LABELLED_BY: Object is labelled by one or more other + * objects. + * @ATSPI_RELATION_CONTROLLER_FOR: Object is an interactive object which + * modifies the state, onscreen location, or other attributes of one or more + * target objects. + * @ATSPI_RELATION_CONTROLLED_BY: 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 @ATSPI_RELATION_CONTROLLED_BY + * scrollbars. + * @ATSPI_RELATION_MEMBER_OF: Object has a grouping relationship (e.g. 'same + * group as') to one or more other objects. + * @ATSPI_RELATION_TOOLTIP_FOR: Object is a tooltip associated with another + * object. + * @ATSPI_RELATION_NODE_CHILD_OF: Object is a child of the target. + * @ATSPI_RELATION_NODE_PARENT_OF: Object is a parent of the target. + * @ATSPI_RELATION_EXTENDED: Used to indicate that a relationship exists, but + * its type is not specified in the enumeration. + * @ATSPI_RELATION_FLOWS_TO: 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. + * @ATSPI_RELATION_FLOWS_FROM: Reciprocal of @ATSPI_RELATION_FLOWS_TO. + * @ATSPI_RELATION_SUBWINDOW_OF: 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. + * @ATSPI_RELATION_EMBEDS: Similar to @ATSPI_RELATION_SUBWINDOW_OF, but + * specifically used for cross-process embedding. + * @ATSPI_RELATION_EMBEDDED_BY: Reciprocal of @ATSPI_RELATION_EMBEDS. Used to + * denote content rendered by embedded renderers that live in a separate process + * space from the embedding context. + * @ATSPI_RELATION_POPUP_FOR: Denotes that the object is a transient window or + * frame associated with another onscreen object. Similar to @ATSPI_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 an @ATSPI_ROLE_WINDOW + * object with the @ATSPI_RELATION_POPUP_FOR relation usually requires + * some presentation action on the part + * of assistive technology clients, even though the previous toplevel + * @ATSPI_ROLE_FRAME object may still be the active window. + * @ATSPI_RELATION_PARENT_WINDOW_OF: This is the reciprocal relation to + * @ATSPI_RELATION_POPUP_FOR. + * @ATSPI_RELATION_DESCRIPTION_FOR: Reciprocal of %ATSPI_RELATION_DESCRIBED_BY. + * Indicates that this object provides descriptive information about the target + * object(s). See also %ATSPI_RELATION_DETAILS_FOR and %ATSPI_RELATION_ERROR_FOR. + * @ATSPI_RELATION_DESCRIBED_BY: Reciprocal of %ATSPI_RELATION_DESCRIPTION_FOR. + * Indicates that one or more target objects provide descriptive information + * about this object. This relation type is most appropriate for information + * that is not essential as its presentation may be user-configurable and/or + * limited to an on-demand mechanism such as an assistive technology command. + * For brief, essential information such as can be found in a widget's on-screen + * label, use %ATSPI_RELATION_LABELLED_BY. For an on-screen error message, use + * %ATSPI_RELATION_ERROR_MESSAGE. For lengthy extended descriptive information + * contained in an on-screen object, consider using %ATSPI_RELATION_DETAILS as + * assistive technologies may provide a means for the user to navigate to + * objects containing detailed descriptions so that their content can be more + * closely reviewed. + * @ATSPI_RELATION_DETAILS: Reciprocal of %ATSPI_RELATION_DETAILS_FOR. Indicates + * that this object has a detailed or extended description, the contents of + * which can be found in the target object(s). This relation type is most + * appropriate for information that is sufficiently lengthy as to make + * navigation to the container of that information desirable. For less verbose + * information suitable for announcement only, see %ATSPI_RELATION_DESCRIBED_BY. + * If the detailed information describes an error condition, + * %ATSPI_RELATION_ERROR_FOR should be used instead. @Since: 2.26. + * @ATSPI_RELATION_DETAILS_FOR: Reciprocal of %ATSPI_RELATION_DETAILS. Indicates + * that this object provides a detailed or extended description about the target + * object(s). See also %ATSPI_RELATION_DESCRIPTION_FOR and + * %ATSPI_RELATION_ERROR_FOR. @Since: 2.26. + * @ATSPI_RELATION_ERROR_MESSAGE: Reciprocal of %ATSPI_RELATION_ERROR_FOR. + * Indicates that this object has one or more errors, the nature of which is + * described in the contents of the target object(s). Objects that have this + * relation type should also contain %ATSPI_STATE_INVALID_ENTRY in their + * #AtspiStateSet. @Since: 2.26. + * @ATSPI_RELATION_ERROR_FOR: Reciprocal of %ATSPI_RELATION_ERROR_MESSAGE. + * Indicates that this object contains an error message describing an invalid + * condition in the target object(s). @Since: 2.26. + * @ATSPI_RELATION_LAST_DEFINED: Do not use as a parameter value, used to + * determine the size of the enumeration. + * + * #AtspiRelationType 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 + * @ATSPI_RELATION_LABELLED_BY + * relationship may be used to identify labelling information that should + * accompany the accessible name property when presenting an object's content or + * identity to the end user. Similarly, + * @ATSPI_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. + * + * + * Enumeration used to specify + * the type of relation encapsulated in an #AtspiRelation object. + * + **/ + typedef enum + { ATSPI_RELATION_NULL, ATSPI_RELATION_LABEL_FOR, ATSPI_RELATION_LABELLED_BY, @@ -912,360 +928,361 @@ typedef enum { ATSPI_RELATION_ERROR_MESSAGE, ATSPI_RELATION_ERROR_FOR, ATSPI_RELATION_LAST_DEFINED, -} AtspiRelationType; + } AtspiRelationType; /** * ATSPI_RELATIONTYPE_COUNT: * * One higher than the highest valid value of #AtspiRelationType. **/ -#define ATSPI_RELATIONTYPE_COUNT (23+1) +#define ATSPI_RELATIONTYPE_COUNT (23 + 1) -/** - * AtspiRole: - * @ATSPI_ROLE_INVALID: A role indicating an error condition, such as - * uninitialized Role data. - * @ATSPI_ROLE_ACCELERATOR_LABEL: Object is a label indicating the keyboard - * accelerators for the parent. - * @ATSPI_ROLE_ALERT: Object is used to alert the user about something. - * @ATSPI_ROLE_ANIMATION: Object contains a dynamic or moving image of some - * kind. - * @ATSPI_ROLE_ARROW: Object is a 2d directional indicator. - * @ATSPI_ROLE_CALENDAR: Object contains one or more dates, usually arranged - * into a 2d list. - * @ATSPI_ROLE_CANVAS: Object that can be drawn into and is used to trap - * events. - * @ATSPI_ROLE_CHECK_BOX: A choice that can be checked or unchecked and - * provides a separate indicator for the current state. - * @ATSPI_ROLE_CHECK_MENU_ITEM: A menu item that behaves like a check box. See - * @ATSPI_ROLE_CHECK_BOX. - * @ATSPI_ROLE_COLOR_CHOOSER: A specialized dialog that lets the user choose a - * color. - * @ATSPI_ROLE_COLUMN_HEADER: The header for a column of data. - * @ATSPI_ROLE_COMBO_BOX: A list of choices the user can select from. - * @ATSPI_ROLE_DATE_EDITOR: An object which allows entry of a date. - * @ATSPI_ROLE_DESKTOP_ICON: An inconifed internal frame within a DESKTOP_FRAME. - * @ATSPI_ROLE_DESKTOP_FRAME: A pane that supports internal frames and - * iconified versions of those internal frames. - * @ATSPI_ROLE_DIAL: An object that allows a value to be changed via rotating a - * visual element, or which displays a value via such a rotating element. - * @ATSPI_ROLE_DIALOG: A top level window with title bar and a border. - * @ATSPI_ROLE_DIRECTORY_PANE: A pane that allows the user to navigate through - * and select the contents of a directory. - * @ATSPI_ROLE_DRAWING_AREA: An object used for drawing custom user interface - * elements. - * @ATSPI_ROLE_FILE_CHOOSER: 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. - * @ATSPI_ROLE_FILLER: A object that fills up space in a user interface. - * @ATSPI_ROLE_FOCUS_TRAVERSABLE: Don't use, reserved for future use. - * @ATSPI_ROLE_FONT_CHOOSER: Allows selection of a display font. - * @ATSPI_ROLE_FRAME: A top level window with a title bar, border, menubar, - * etc. - * @ATSPI_ROLE_GLASS_PANE: A pane that is guaranteed to be painted on top of - * all panes beneath it. - * @ATSPI_ROLE_HTML_CONTAINER: A document container for HTML, whose children - * represent the document content. - * @ATSPI_ROLE_ICON: A small fixed size picture, typically used to decorate - * components. - * @ATSPI_ROLE_IMAGE: An image, typically static. - * @ATSPI_ROLE_INTERNAL_FRAME: A frame-like object that is clipped by a desktop - * pane. - * @ATSPI_ROLE_LABEL: An object used to present an icon or short string in an - * interface. - * @ATSPI_ROLE_LAYERED_PANE: A specialized pane that allows its children to be - * drawn in layers, providing a form of stacking order. - * @ATSPI_ROLE_LIST: An object that presents a list of objects to the user and - * allows the user to select one or more of them. - * @ATSPI_ROLE_LIST_ITEM: An object that represents an element of a list. - * @ATSPI_ROLE_MENU: An object usually found inside a menu bar that contains a - * list of actions the user can choose from. - * @ATSPI_ROLE_MENU_BAR: 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. - * @ATSPI_ROLE_MENU_ITEM: An object usually contained in a menu that presents - * an action the user can choose. - * @ATSPI_ROLE_OPTION_PANE: A specialized pane whose primary use is inside a - * dialog. - * @ATSPI_ROLE_PAGE_TAB: An object that is a child of a page tab list. - * @ATSPI_ROLE_PAGE_TAB_LIST: An object that presents a series of panels (or - * page tabs), one at a time,through some mechanism provided by the - * object. - * @ATSPI_ROLE_PANEL: A generic container that is often used to group objects. - * @ATSPI_ROLE_PASSWORD_TEXT: A text object uses for passwords, or other places - * where the text content is not shown visibly to the user. - * @ATSPI_ROLE_POPUP_MENU: 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. - * @ATSPI_ROLE_PROGRESS_BAR: An object used to indicate how much of a task has - * been completed. - * @ATSPI_ROLE_PUSH_BUTTON: An object the user can manipulate to tell the - * application to do something. - * @ATSPI_ROLE_RADIO_BUTTON: A specialized check box that will cause other - * radio buttons in the same group to become unchecked when this one is - * checked. - * @ATSPI_ROLE_RADIO_MENU_ITEM: Object is both a menu item and a "radio button" - * . See @ATSPI_ROLE_RADIO_BUTTON. - * @ATSPI_ROLE_ROOT_PANE: A specialized pane that has a glass pane and a - * layered pane as its children. - * @ATSPI_ROLE_ROW_HEADER: The header for a row of data. - * @ATSPI_ROLE_SCROLL_BAR: 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. - * @ATSPI_ROLE_SCROLL_PANE: An object that allows a user to incrementally view - * a large amount of information. @ATSPI_ROLE_SCROLL_PANE objects are usually - * accompanied by @ATSPI_ROLE_SCROLL_BAR controllers, on which the - * @ATSPI_RELATION_CONTROLLER_FOR and @ATSPI_RELATION_CONTROLLED_BY - * reciprocal relations are set. See #atspi_get_relation_set. - * @ATSPI_ROLE_SEPARATOR: An object usually contained in a menu to provide a - * visible and logical separation of the contents in a menu. - * @ATSPI_ROLE_SLIDER: An object that allows the user to select from a bounded - * range. Unlike @ATSPI_ROLE_SCROLL_BAR, @ATSPI_ROLE_SLIDER objects need not control - * 'viewport'-like objects. - * @ATSPI_ROLE_SPIN_BUTTON: An object which allows one of a set of choices to - * be selected, and which displays the current choice. - * @ATSPI_ROLE_SPLIT_PANE: A specialized panel that presents two other panels - * at the same time. - * @ATSPI_ROLE_STATUS_BAR: Object displays non-quantitative status information - * (c.f. @ATSPI_ROLE_PROGRESS_BAR) - * @ATSPI_ROLE_TABLE: An object used to repesent information in terms of rows - * and columns. - * @ATSPI_ROLE_TABLE_CELL: A 'cell' or discrete child within a Table. Note: - * Table cells need not have @ATSPI_ROLE_TABLE_CELL, other - * #AtspiRoleType values are valid as well. - * @ATSPI_ROLE_TABLE_COLUMN_HEADER: An object which labels a particular column - * in an #AtspiTable. - * @ATSPI_ROLE_TABLE_ROW_HEADER: An object which labels a particular row in a - * #AtspiTable. #AtspiTable rows and columns may also be labelled via the - * @ATSPI_RELATION_LABEL_FOR/@ATSPI_RELATION_LABELLED_BY relationships. - * See #atspi_get_relation_set. - * @ATSPI_ROLE_TEAROFF_MENU_ITEM: Object allows menu to be removed from menubar - * and shown in its own window. - * @ATSPI_ROLE_TERMINAL: An object that emulates a terminal. - * @ATSPI_ROLE_TEXT: An interactive widget that supports multiple lines of text - * and optionally accepts user input, but whose purpose is not to solicit user - * input. Thus @ATSPI_ROLE_TEXT is appropriate for the text view in a plain text - * editor but inappropriate for an input field in a dialog box or web form. For - * widgets whose purpose is to solicit input from the user, see @ATSPI_ROLE_ENTRY - * and @ATSPI_ROLE_PASSWORD_TEXT. For generic objects which display a brief amount - * of textual information, see @ATSPI_ROLE_STATIC. - * @ATSPI_ROLE_TOGGLE_BUTTON: A specialized push button that can be checked or - * unchecked, but does not procide a separate indicator for the current - * state. - * @ATSPI_ROLE_TOOL_BAR: A bar or palette usually composed of push buttons or - * toggle buttons. - * @ATSPI_ROLE_TOOL_TIP: An object that provides information about another - * object. - * @ATSPI_ROLE_TREE: An object used to repsent hierarchical information to the - * user. - * @ATSPI_ROLE_TREE_TABLE: An object that presents both tabular and - * hierarchical info to the user. - * @ATSPI_ROLE_UNKNOWN: The object contains some #AtspiAccessible information, - * but its role is not known. - * @ATSPI_ROLE_VIEWPORT: An object usually used in a scroll pane, or to - * otherwise clip a larger object or content renderer to a specific - * onscreen viewport. - * @ATSPI_ROLE_WINDOW: A top level window with no title or border. - * @ATSPI_ROLE_EXTENDED: means that the role for this item is known, but not - * included in the core enumeration. Deprecated since 2.24. - * @ATSPI_ROLE_HEADER: An object that serves as a document header. - * @ATSPI_ROLE_FOOTER: An object that serves as a document footer. - * @ATSPI_ROLE_PARAGRAPH: An object which is contains a single paragraph of - * text content. See also @ATSPI_ROLE_TEXT. - * @ATSPI_ROLE_RULER: An object which describes margins and tab stops, etc. - * for text objects which it controls (should have - * @ATSPI_RELATION_CONTROLLER_FOR relation to such). - * @ATSPI_ROLE_APPLICATION: An object corresponding to the toplevel accessible - * of an application, which may contain @ATSPI_ROLE_FRAME objects or other - * accessible objects. Children of objects with the #ATSPI_ROLE_DESKTOP_FRAME role are generally - * @ATSPI_ROLE_APPLICATION objects. - * @ATSPI_ROLE_AUTOCOMPLETE: 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. - * @ATSPI_ROLE_EDITBAR: The object is an editable text object in a toolbar. - * @ATSPI_ROLE_EMBEDDED: 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. - * @ATSPI_ROLE_ENTRY: The object is a component whose textual content may be - * entered or modified by the user, provided @ATSPI_STATE_EDITABLE is present. - * A readonly @ATSPI_ROLE_ENTRY object (i.e. where @ATSPI_STATE_EDITABLE is - * not present) implies a read-only 'text field' in a form, as opposed to a - * title, label, or caption. - * @ATSPI_ROLE_CHART: 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 @ATSPI_LABELLED_BY relation is - * particularly important in interpreting objects of this type, as is the - * accessible description property. See @ATSPI_ROLE_CAPTION. - * @ATSPI_ROLE_CAPTION: The object contains descriptive information, usually - * textual, about another user interface element such as a table, chart, or - * image. - * @ATSPI_ROLE_DOCUMENT_FRAME: The object is a visual frame or container which - * contains a view of document content. #AtspiDocument frames may occur within - * another #AtspiDocument instance, in which case the second document may be - * said to be embedded in the containing instance. HTML frames are often - * ATSPI_ROLE_DOCUMENT_FRAME: Either this object, or a singleton descendant, - * should implement the #AtspiDocument interface. - * @ATSPI_ROLE_HEADING: 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. - * @ATSPI_ROLE_PAGE: The object is a containing instance which encapsulates a - * page of information. @ATSPI_ROLE_PAGE is used in documents and content which - * support a paginated navigation model. - * @ATSPI_ROLE_SECTION: 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. - * @ATSPI_ROLE_REDUNDANT_OBJECT: 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. - * @ATSPI_ROLE_FORM: 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. @ATSPI_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, @ATSPI_ROLE_FORM containers' components are - * associated with the current document, rather than the current foreground - * application or viewer instance. - * @ATSPI_ROLE_LINK: 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 #AtspiHypertext/#AtspiHyperlink interfacesto indicate - * the range/location within a text object where an inline or embedded object - * lies. - * @ATSPI_ROLE_INPUT_METHOD_WINDOW: 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". - * @ATSPI_ROLE_TABLE_ROW: A row in a table. - * @ATSPI_ROLE_TREE_ITEM: An object that represents an element of a tree. - * @ATSPI_ROLE_DOCUMENT_SPREADSHEET: A document frame which contains a - * spreadsheet. - * @ATSPI_ROLE_DOCUMENT_PRESENTATION: A document frame which contains a - * presentation or slide content. - * @ATSPI_ROLE_DOCUMENT_TEXT: A document frame which contains textual content, - * such as found in a word processing - * application. - * @ATSPI_ROLE_DOCUMENT_WEB: A document frame which contains HTML or other - * markup suitable for display in a web browser. - * @ATSPI_ROLE_DOCUMENT_EMAIL: A document frame which contains email content - * to be displayed or composed either in plain text or - * HTML. - * @ATSPI_ROLE_COMMENT: 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. - * @ATSPI_ROLE_LIST_BOX: A non-collapsible list of choices the user can - * select from. - * @ATSPI_ROLE_GROUPING: A group of related widgets. This group typically has - * a label. - * @ATSPI_ROLE_IMAGE_MAP: 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. - * @ATSPI_ROLE_NOTIFICATION: A transitory object designed to present a - * message to the user, typically at the desktop level rather than inside a - * particular application. - * @ATSPI_ROLE_INFO_BAR: An object designed to present a message to the user - * within an existing window. - * @ATSPI_ROLE_LEVEL_BAR: A bar that serves as a level indicator to, for - * instance, show the strength of a password or the state of a battery. @Since: 2.8 - * @ATSPI_ROLE_TITLE_BAR: A bar that serves as the title of a window or a - * dialog. @Since: 2.12 - * @ATSPI_ROLE_BLOCK_QUOTE: An object which contains a text section - * that is quoted from another source. @Since: 2.12 - * @ATSPI_ROLE_AUDIO: An object which represents an audio - * element. @Since: 2.12 - * @ATSPI_ROLE_VIDEO: An object which represents a video - * element. @Since: 2.12 - * @ATSPI_ROLE_DEFINITION: A definition of a term or concept. @Since: 2.12 - * @ATSPI_ROLE_ARTICLE: A section of a page that consists of a - * composition that forms an independent part of a document, page, or - * site. Examples: A blog entry, a news story, a forum post. @Since: - * 2.12 - * @ATSPI_ROLE_LANDMARK: A region of a web page intended as a - * navigational landmark. This is designed to allow Assistive - * Technologies to provide quick navigation among key regions within a - * document. @Since: 2.12 - * @ATSPI_ROLE_LOG: A text widget or container holding log content, such - * as chat history and error logs. In this role there is a - * relationship between the arrival of new items in the log and the - * reading order. The log contains a meaningful sequence and new - * information is added only to the end of the log, not at arbitrary - * points. @Since: 2.12 - * @ATSPI_ROLE_MARQUEE: A container where non-essential information - * changes frequently. Common usages of marquee include stock tickers - * and ad banners. The primary difference between a marquee and a log - * is that logs usually have a meaningful order or sequence of - * important content changes. @Since: 2.12 - * @ATSPI_ROLE_MATH: A text widget or container that holds a mathematical - * expression. @Since: 2.12 - * @ATSPI_ROLE_RATING: A widget whose purpose is to display a rating, - * such as the number of stars associated with a song in a media - * player. Objects of this role should also implement - * AtspiValue. @Since: 2.12 - * @ATSPI_ROLE_TIMER: An object containing a numerical counter which - * indicates an amount of elapsed time from a start point, or the time - * remaining until an end point. @Since: 2.12 - * @ATSPI_ROLE_STATIC: A generic non-container object whose purpose is to display - * a brief amount of information to the user and whose role is known by the - * implementor but lacks semantic value for the user. Examples in which - * @ATSPI_ROLE_STATIC is appropriate include the message displayed in a message - * box and an image used as an alternative means to display text. - * @ATSPI_ROLE_STATIC should not be applied to widgets which are traditionally - * interactive, objects which display a significant amount of content, or any - * object which has an accessible relation pointing to another object. The - * displayed information, as a general rule, should be exposed through the - * accessible name of the object. For labels which describe another widget, see - * @ATSPI_ROLE_LABEL. For text views, see @ATSPI_ROLE_TEXT. For generic - * containers, see @ATSPI_ROLE_PANEL. For objects whose role is not known by the - * implementor, see @ATSPI_ROLE_UNKNOWN. @Since: 2.16. - * @ATSPI_ROLE_MATH_FRACTION: An object that represents a mathematical fraction. @Since: 2.16. - * @ATSPI_ROLE_MATH_ROOT: An object that represents a mathematical expression - * displayed with a radical. @Since: 2.16. - * @ATSPI_ROLE_SUBSCRIPT: An object that contains text that is displayed as a - * subscript. @Since: 2.16. - * @ATSPI_ROLE_SUPERSCRIPT: An object that contains text that is displayed as a - * superscript. @Since: 2.16. - * @ATSPI_ROLE_DESCRIPTION_LIST: An object that represents a list of term-value - * groups. A term-value group represents an individual description and consist - * of one or more names (@ATSPI_ROLE_DESCRIPTION_TERM) followed by one or more - * values (@ATSPI_ROLE_DESCRIPTION_VALUE). For each list, there should not be - * more than one group with the same term name. @Since: 2.26. - * @ATSPI_ROLE_DESCRIPTION_TERM: An object that represents a term or phrase - * with a corresponding definition. @Since: 2.26. - * @ATSPI_ROLE_DESCRIPTION_VALUE: An object that represents the description, - * definition, or value of a term. @Since: 2.26. - * @ATSPI_ROLE_FOOTNOTE: An object that contains the text of a footnote. @Since: 2.26. - * @ATSPI_ROLE_CONTENT_DELETION: Content previously deleted or proposed to be - * deleted, e.g. in revision history or a content view providing suggestions - * from reviewers. @Since: 2.34. - * @ATSPI_ROLE_CONTENT_INSERTION: Content previously inserted or proposed to be - * inserted, e.g. in revision history or a content view providing suggestions - * from reviewers. @Since: 2.34. - * @ATSPI_ROLE_MARK: A run of content that is marked or highlighted, such as for - * reference purposes, or to call it out as having a special purpose. If the - * marked content has an associated section in the document elaborating on the - * reason for the mark, then %ATSPI_RELATION_DETAILS should be used on the mark - * to point to that associated section. In addition, the reciprocal relation - * %ATSPI_RELATION_DETAILS_FOR should be used on the associated content section - * to point back to the mark. @Since: 2.36. - * @ATSPI_ROLE_SUGGESTION: A container for content that is called out as a proposed - * change from the current version of the document, such as by a reviewer of the - * content. An object with this role should include children with %ATSPI_ROLE_CONTENT_DELETION and/or - * %ATSPI_ROLE_CONTENT_INSERTION, in any order, to indicate what the - * actual change is. @Since: 2.36 - * @ATSPI_ROLE_PUSH_BUTTON_MENU: A specialized push button to open a menu. @Since 2.46 - * @ATSPI_ROLE_LAST_DEFINED: Not a valid role, used for finding end of - * enumeration. - * - * Enumeration used by interface #AtspiAccessible to specify the role - * of an #AtspiAccessible object. - * - */ -typedef enum { + /** + * AtspiRole: + * @ATSPI_ROLE_INVALID: A role indicating an error condition, such as + * uninitialized Role data. + * @ATSPI_ROLE_ACCELERATOR_LABEL: Object is a label indicating the keyboard + * accelerators for the parent. + * @ATSPI_ROLE_ALERT: Object is used to alert the user about something. + * @ATSPI_ROLE_ANIMATION: Object contains a dynamic or moving image of some + * kind. + * @ATSPI_ROLE_ARROW: Object is a 2d directional indicator. + * @ATSPI_ROLE_CALENDAR: Object contains one or more dates, usually arranged + * into a 2d list. + * @ATSPI_ROLE_CANVAS: Object that can be drawn into and is used to trap + * events. + * @ATSPI_ROLE_CHECK_BOX: A choice that can be checked or unchecked and + * provides a separate indicator for the current state. + * @ATSPI_ROLE_CHECK_MENU_ITEM: A menu item that behaves like a check box. See + * @ATSPI_ROLE_CHECK_BOX. + * @ATSPI_ROLE_COLOR_CHOOSER: A specialized dialog that lets the user choose a + * color. + * @ATSPI_ROLE_COLUMN_HEADER: The header for a column of data. + * @ATSPI_ROLE_COMBO_BOX: A list of choices the user can select from. + * @ATSPI_ROLE_DATE_EDITOR: An object which allows entry of a date. + * @ATSPI_ROLE_DESKTOP_ICON: An inconifed internal frame within a DESKTOP_FRAME. + * @ATSPI_ROLE_DESKTOP_FRAME: A pane that supports internal frames and + * iconified versions of those internal frames. + * @ATSPI_ROLE_DIAL: An object that allows a value to be changed via rotating a + * visual element, or which displays a value via such a rotating element. + * @ATSPI_ROLE_DIALOG: A top level window with title bar and a border. + * @ATSPI_ROLE_DIRECTORY_PANE: A pane that allows the user to navigate through + * and select the contents of a directory. + * @ATSPI_ROLE_DRAWING_AREA: An object used for drawing custom user interface + * elements. + * @ATSPI_ROLE_FILE_CHOOSER: 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. + * @ATSPI_ROLE_FILLER: A object that fills up space in a user interface. + * @ATSPI_ROLE_FOCUS_TRAVERSABLE: Don't use, reserved for future use. + * @ATSPI_ROLE_FONT_CHOOSER: Allows selection of a display font. + * @ATSPI_ROLE_FRAME: A top level window with a title bar, border, menubar, + * etc. + * @ATSPI_ROLE_GLASS_PANE: A pane that is guaranteed to be painted on top of + * all panes beneath it. + * @ATSPI_ROLE_HTML_CONTAINER: A document container for HTML, whose children + * represent the document content. + * @ATSPI_ROLE_ICON: A small fixed size picture, typically used to decorate + * components. + * @ATSPI_ROLE_IMAGE: An image, typically static. + * @ATSPI_ROLE_INTERNAL_FRAME: A frame-like object that is clipped by a desktop + * pane. + * @ATSPI_ROLE_LABEL: An object used to present an icon or short string in an + * interface. + * @ATSPI_ROLE_LAYERED_PANE: A specialized pane that allows its children to be + * drawn in layers, providing a form of stacking order. + * @ATSPI_ROLE_LIST: An object that presents a list of objects to the user and + * allows the user to select one or more of them. + * @ATSPI_ROLE_LIST_ITEM: An object that represents an element of a list. + * @ATSPI_ROLE_MENU: An object usually found inside a menu bar that contains a + * list of actions the user can choose from. + * @ATSPI_ROLE_MENU_BAR: 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. + * @ATSPI_ROLE_MENU_ITEM: An object usually contained in a menu that presents + * an action the user can choose. + * @ATSPI_ROLE_OPTION_PANE: A specialized pane whose primary use is inside a + * dialog. + * @ATSPI_ROLE_PAGE_TAB: An object that is a child of a page tab list. + * @ATSPI_ROLE_PAGE_TAB_LIST: An object that presents a series of panels (or + * page tabs), one at a time,through some mechanism provided by the + * object. + * @ATSPI_ROLE_PANEL: A generic container that is often used to group objects. + * @ATSPI_ROLE_PASSWORD_TEXT: A text object uses for passwords, or other places + * where the text content is not shown visibly to the user. + * @ATSPI_ROLE_POPUP_MENU: 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. + * @ATSPI_ROLE_PROGRESS_BAR: An object used to indicate how much of a task has + * been completed. + * @ATSPI_ROLE_PUSH_BUTTON: An object the user can manipulate to tell the + * application to do something. + * @ATSPI_ROLE_RADIO_BUTTON: A specialized check box that will cause other + * radio buttons in the same group to become unchecked when this one is + * checked. + * @ATSPI_ROLE_RADIO_MENU_ITEM: Object is both a menu item and a "radio button" + * . See @ATSPI_ROLE_RADIO_BUTTON. + * @ATSPI_ROLE_ROOT_PANE: A specialized pane that has a glass pane and a + * layered pane as its children. + * @ATSPI_ROLE_ROW_HEADER: The header for a row of data. + * @ATSPI_ROLE_SCROLL_BAR: 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. + * @ATSPI_ROLE_SCROLL_PANE: An object that allows a user to incrementally view + * a large amount of information. @ATSPI_ROLE_SCROLL_PANE objects are usually + * accompanied by @ATSPI_ROLE_SCROLL_BAR controllers, on which the + * @ATSPI_RELATION_CONTROLLER_FOR and @ATSPI_RELATION_CONTROLLED_BY + * reciprocal relations are set. See #atspi_get_relation_set. + * @ATSPI_ROLE_SEPARATOR: An object usually contained in a menu to provide a + * visible and logical separation of the contents in a menu. + * @ATSPI_ROLE_SLIDER: An object that allows the user to select from a bounded + * range. Unlike @ATSPI_ROLE_SCROLL_BAR, @ATSPI_ROLE_SLIDER objects need not control + * 'viewport'-like objects. + * @ATSPI_ROLE_SPIN_BUTTON: An object which allows one of a set of choices to + * be selected, and which displays the current choice. + * @ATSPI_ROLE_SPLIT_PANE: A specialized panel that presents two other panels + * at the same time. + * @ATSPI_ROLE_STATUS_BAR: Object displays non-quantitative status information + * (c.f. @ATSPI_ROLE_PROGRESS_BAR) + * @ATSPI_ROLE_TABLE: An object used to repesent information in terms of rows + * and columns. + * @ATSPI_ROLE_TABLE_CELL: A 'cell' or discrete child within a Table. Note: + * Table cells need not have @ATSPI_ROLE_TABLE_CELL, other + * #AtspiRoleType values are valid as well. + * @ATSPI_ROLE_TABLE_COLUMN_HEADER: An object which labels a particular column + * in an #AtspiTable. + * @ATSPI_ROLE_TABLE_ROW_HEADER: An object which labels a particular row in a + * #AtspiTable. #AtspiTable rows and columns may also be labelled via the + * @ATSPI_RELATION_LABEL_FOR/@ATSPI_RELATION_LABELLED_BY relationships. + * See #atspi_get_relation_set. + * @ATSPI_ROLE_TEAROFF_MENU_ITEM: Object allows menu to be removed from menubar + * and shown in its own window. + * @ATSPI_ROLE_TERMINAL: An object that emulates a terminal. + * @ATSPI_ROLE_TEXT: An interactive widget that supports multiple lines of text + * and optionally accepts user input, but whose purpose is not to solicit user + * input. Thus @ATSPI_ROLE_TEXT is appropriate for the text view in a plain text + * editor but inappropriate for an input field in a dialog box or web form. For + * widgets whose purpose is to solicit input from the user, see @ATSPI_ROLE_ENTRY + * and @ATSPI_ROLE_PASSWORD_TEXT. For generic objects which display a brief amount + * of textual information, see @ATSPI_ROLE_STATIC. + * @ATSPI_ROLE_TOGGLE_BUTTON: A specialized push button that can be checked or + * unchecked, but does not procide a separate indicator for the current + * state. + * @ATSPI_ROLE_TOOL_BAR: A bar or palette usually composed of push buttons or + * toggle buttons. + * @ATSPI_ROLE_TOOL_TIP: An object that provides information about another + * object. + * @ATSPI_ROLE_TREE: An object used to repsent hierarchical information to the + * user. + * @ATSPI_ROLE_TREE_TABLE: An object that presents both tabular and + * hierarchical info to the user. + * @ATSPI_ROLE_UNKNOWN: The object contains some #AtspiAccessible information, + * but its role is not known. + * @ATSPI_ROLE_VIEWPORT: An object usually used in a scroll pane, or to + * otherwise clip a larger object or content renderer to a specific + * onscreen viewport. + * @ATSPI_ROLE_WINDOW: A top level window with no title or border. + * @ATSPI_ROLE_EXTENDED: means that the role for this item is known, but not + * included in the core enumeration. Deprecated since 2.24. + * @ATSPI_ROLE_HEADER: An object that serves as a document header. + * @ATSPI_ROLE_FOOTER: An object that serves as a document footer. + * @ATSPI_ROLE_PARAGRAPH: An object which is contains a single paragraph of + * text content. See also @ATSPI_ROLE_TEXT. + * @ATSPI_ROLE_RULER: An object which describes margins and tab stops, etc. + * for text objects which it controls (should have + * @ATSPI_RELATION_CONTROLLER_FOR relation to such). + * @ATSPI_ROLE_APPLICATION: An object corresponding to the toplevel accessible + * of an application, which may contain @ATSPI_ROLE_FRAME objects or other + * accessible objects. Children of objects with the #ATSPI_ROLE_DESKTOP_FRAME role are generally + * @ATSPI_ROLE_APPLICATION objects. + * @ATSPI_ROLE_AUTOCOMPLETE: 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. + * @ATSPI_ROLE_EDITBAR: The object is an editable text object in a toolbar. + * @ATSPI_ROLE_EMBEDDED: 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. + * @ATSPI_ROLE_ENTRY: The object is a component whose textual content may be + * entered or modified by the user, provided @ATSPI_STATE_EDITABLE is present. + * A readonly @ATSPI_ROLE_ENTRY object (i.e. where @ATSPI_STATE_EDITABLE is + * not present) implies a read-only 'text field' in a form, as opposed to a + * title, label, or caption. + * @ATSPI_ROLE_CHART: 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 @ATSPI_LABELLED_BY relation is + * particularly important in interpreting objects of this type, as is the + * accessible description property. See @ATSPI_ROLE_CAPTION. + * @ATSPI_ROLE_CAPTION: The object contains descriptive information, usually + * textual, about another user interface element such as a table, chart, or + * image. + * @ATSPI_ROLE_DOCUMENT_FRAME: The object is a visual frame or container which + * contains a view of document content. #AtspiDocument frames may occur within + * another #AtspiDocument instance, in which case the second document may be + * said to be embedded in the containing instance. HTML frames are often + * ATSPI_ROLE_DOCUMENT_FRAME: Either this object, or a singleton descendant, + * should implement the #AtspiDocument interface. + * @ATSPI_ROLE_HEADING: 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. + * @ATSPI_ROLE_PAGE: The object is a containing instance which encapsulates a + * page of information. @ATSPI_ROLE_PAGE is used in documents and content which + * support a paginated navigation model. + * @ATSPI_ROLE_SECTION: 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. + * @ATSPI_ROLE_REDUNDANT_OBJECT: 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. + * @ATSPI_ROLE_FORM: 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. @ATSPI_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, @ATSPI_ROLE_FORM containers' components are + * associated with the current document, rather than the current foreground + * application or viewer instance. + * @ATSPI_ROLE_LINK: 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 #AtspiHypertext/#AtspiHyperlink interfacesto indicate + * the range/location within a text object where an inline or embedded object + * lies. + * @ATSPI_ROLE_INPUT_METHOD_WINDOW: 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". + * @ATSPI_ROLE_TABLE_ROW: A row in a table. + * @ATSPI_ROLE_TREE_ITEM: An object that represents an element of a tree. + * @ATSPI_ROLE_DOCUMENT_SPREADSHEET: A document frame which contains a + * spreadsheet. + * @ATSPI_ROLE_DOCUMENT_PRESENTATION: A document frame which contains a + * presentation or slide content. + * @ATSPI_ROLE_DOCUMENT_TEXT: A document frame which contains textual content, + * such as found in a word processing + * application. + * @ATSPI_ROLE_DOCUMENT_WEB: A document frame which contains HTML or other + * markup suitable for display in a web browser. + * @ATSPI_ROLE_DOCUMENT_EMAIL: A document frame which contains email content + * to be displayed or composed either in plain text or + * HTML. + * @ATSPI_ROLE_COMMENT: 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. + * @ATSPI_ROLE_LIST_BOX: A non-collapsible list of choices the user can + * select from. + * @ATSPI_ROLE_GROUPING: A group of related widgets. This group typically has + * a label. + * @ATSPI_ROLE_IMAGE_MAP: 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. + * @ATSPI_ROLE_NOTIFICATION: A transitory object designed to present a + * message to the user, typically at the desktop level rather than inside a + * particular application. + * @ATSPI_ROLE_INFO_BAR: An object designed to present a message to the user + * within an existing window. + * @ATSPI_ROLE_LEVEL_BAR: A bar that serves as a level indicator to, for + * instance, show the strength of a password or the state of a battery. @Since: 2.8 + * @ATSPI_ROLE_TITLE_BAR: A bar that serves as the title of a window or a + * dialog. @Since: 2.12 + * @ATSPI_ROLE_BLOCK_QUOTE: An object which contains a text section + * that is quoted from another source. @Since: 2.12 + * @ATSPI_ROLE_AUDIO: An object which represents an audio + * element. @Since: 2.12 + * @ATSPI_ROLE_VIDEO: An object which represents a video + * element. @Since: 2.12 + * @ATSPI_ROLE_DEFINITION: A definition of a term or concept. @Since: 2.12 + * @ATSPI_ROLE_ARTICLE: A section of a page that consists of a + * composition that forms an independent part of a document, page, or + * site. Examples: A blog entry, a news story, a forum post. @Since: + * 2.12 + * @ATSPI_ROLE_LANDMARK: A region of a web page intended as a + * navigational landmark. This is designed to allow Assistive + * Technologies to provide quick navigation among key regions within a + * document. @Since: 2.12 + * @ATSPI_ROLE_LOG: A text widget or container holding log content, such + * as chat history and error logs. In this role there is a + * relationship between the arrival of new items in the log and the + * reading order. The log contains a meaningful sequence and new + * information is added only to the end of the log, not at arbitrary + * points. @Since: 2.12 + * @ATSPI_ROLE_MARQUEE: A container where non-essential information + * changes frequently. Common usages of marquee include stock tickers + * and ad banners. The primary difference between a marquee and a log + * is that logs usually have a meaningful order or sequence of + * important content changes. @Since: 2.12 + * @ATSPI_ROLE_MATH: A text widget or container that holds a mathematical + * expression. @Since: 2.12 + * @ATSPI_ROLE_RATING: A widget whose purpose is to display a rating, + * such as the number of stars associated with a song in a media + * player. Objects of this role should also implement + * AtspiValue. @Since: 2.12 + * @ATSPI_ROLE_TIMER: An object containing a numerical counter which + * indicates an amount of elapsed time from a start point, or the time + * remaining until an end point. @Since: 2.12 + * @ATSPI_ROLE_STATIC: A generic non-container object whose purpose is to display + * a brief amount of information to the user and whose role is known by the + * implementor but lacks semantic value for the user. Examples in which + * @ATSPI_ROLE_STATIC is appropriate include the message displayed in a message + * box and an image used as an alternative means to display text. + * @ATSPI_ROLE_STATIC should not be applied to widgets which are traditionally + * interactive, objects which display a significant amount of content, or any + * object which has an accessible relation pointing to another object. The + * displayed information, as a general rule, should be exposed through the + * accessible name of the object. For labels which describe another widget, see + * @ATSPI_ROLE_LABEL. For text views, see @ATSPI_ROLE_TEXT. For generic + * containers, see @ATSPI_ROLE_PANEL. For objects whose role is not known by the + * implementor, see @ATSPI_ROLE_UNKNOWN. @Since: 2.16. + * @ATSPI_ROLE_MATH_FRACTION: An object that represents a mathematical fraction. @Since: 2.16. + * @ATSPI_ROLE_MATH_ROOT: An object that represents a mathematical expression + * displayed with a radical. @Since: 2.16. + * @ATSPI_ROLE_SUBSCRIPT: An object that contains text that is displayed as a + * subscript. @Since: 2.16. + * @ATSPI_ROLE_SUPERSCRIPT: An object that contains text that is displayed as a + * superscript. @Since: 2.16. + * @ATSPI_ROLE_DESCRIPTION_LIST: An object that represents a list of term-value + * groups. A term-value group represents an individual description and consist + * of one or more names (@ATSPI_ROLE_DESCRIPTION_TERM) followed by one or more + * values (@ATSPI_ROLE_DESCRIPTION_VALUE). For each list, there should not be + * more than one group with the same term name. @Since: 2.26. + * @ATSPI_ROLE_DESCRIPTION_TERM: An object that represents a term or phrase + * with a corresponding definition. @Since: 2.26. + * @ATSPI_ROLE_DESCRIPTION_VALUE: An object that represents the description, + * definition, or value of a term. @Since: 2.26. + * @ATSPI_ROLE_FOOTNOTE: An object that contains the text of a footnote. @Since: 2.26. + * @ATSPI_ROLE_CONTENT_DELETION: Content previously deleted or proposed to be + * deleted, e.g. in revision history or a content view providing suggestions + * from reviewers. @Since: 2.34. + * @ATSPI_ROLE_CONTENT_INSERTION: Content previously inserted or proposed to be + * inserted, e.g. in revision history or a content view providing suggestions + * from reviewers. @Since: 2.34. + * @ATSPI_ROLE_MARK: A run of content that is marked or highlighted, such as for + * reference purposes, or to call it out as having a special purpose. If the + * marked content has an associated section in the document elaborating on the + * reason for the mark, then %ATSPI_RELATION_DETAILS should be used on the mark + * to point to that associated section. In addition, the reciprocal relation + * %ATSPI_RELATION_DETAILS_FOR should be used on the associated content section + * to point back to the mark. @Since: 2.36. + * @ATSPI_ROLE_SUGGESTION: A container for content that is called out as a proposed + * change from the current version of the document, such as by a reviewer of the + * content. An object with this role should include children with %ATSPI_ROLE_CONTENT_DELETION and/or + * %ATSPI_ROLE_CONTENT_INSERTION, in any order, to indicate what the + * actual change is. @Since: 2.36 + * @ATSPI_ROLE_PUSH_BUTTON_MENU: A specialized push button to open a menu. @Since 2.46 + * @ATSPI_ROLE_LAST_DEFINED: Not a valid role, used for finding end of + * enumeration. + * + * Enumeration used by interface #AtspiAccessible to specify the role + * of an #AtspiAccessible object. + * + */ + typedef enum + { ATSPI_ROLE_INVALID, ATSPI_ROLE_ACCELERATOR_LABEL, ATSPI_ROLE_ALERT, @@ -1397,67 +1414,68 @@ typedef enum { ATSPI_ROLE_SUGGESTION, ATSPI_ROLE_PUSH_BUTTON_MENU, ATSPI_ROLE_LAST_DEFINED, -} AtspiRole; + } AtspiRole; /** * ATSPI_ROLE_COUNT: * * One higher than the highest valid value of #AtspiRole. */ -#define ATSPI_ROLE_COUNT (129+1) +#define ATSPI_ROLE_COUNT (129 + 1) -typedef enum -{ - ATSPI_CACHE_NONE = 0, - ATSPI_CACHE_PARENT = 1 << 0, - ATSPI_CACHE_CHILDREN = 1 << 1, - ATSPI_CACHE_NAME = 1 << 2, - ATSPI_CACHE_DESCRIPTION = 1 << 3, - ATSPI_CACHE_STATES = 1 << 4, - ATSPI_CACHE_ROLE = 1 << 5, - ATSPI_CACHE_INTERFACES = 1 << 6, - ATSPI_CACHE_ATTRIBUTES = 1 << 7, - ATSPI_CACHE_ALL = 0x3fffffff, - ATSPI_CACHE_DEFAULT = ATSPI_CACHE_PARENT | ATSPI_CACHE_CHILDREN | ATSPI_CACHE_NAME | ATSPI_CACHE_DESCRIPTION | ATSPI_CACHE_STATES | ATSPI_CACHE_ROLE | ATSPI_CACHE_INTERFACES, - ATSPI_CACHE_UNDEFINED = 0x40000000, -} AtspiCache; + typedef enum + { + ATSPI_CACHE_NONE = 0, + ATSPI_CACHE_PARENT = 1 << 0, + ATSPI_CACHE_CHILDREN = 1 << 1, + ATSPI_CACHE_NAME = 1 << 2, + ATSPI_CACHE_DESCRIPTION = 1 << 3, + ATSPI_CACHE_STATES = 1 << 4, + ATSPI_CACHE_ROLE = 1 << 5, + ATSPI_CACHE_INTERFACES = 1 << 6, + ATSPI_CACHE_ATTRIBUTES = 1 << 7, + ATSPI_CACHE_ALL = 0x3fffffff, + ATSPI_CACHE_DEFAULT = ATSPI_CACHE_PARENT | ATSPI_CACHE_CHILDREN | ATSPI_CACHE_NAME | ATSPI_CACHE_DESCRIPTION | ATSPI_CACHE_STATES | ATSPI_CACHE_ROLE | ATSPI_CACHE_INTERFACES, + ATSPI_CACHE_UNDEFINED = 0x40000000, + } AtspiCache; -/** - * AtspiScrollType: - * @ATSPI_SCROLL_TOP_LEFT: Scroll the object to the top left corner of the - * window. - * @ATSPI_SCROLL_BOTTOM_RIGHT: Scroll the object to the bottom right corner of - * the window. - * @ATSPI_SCROLL_TOP_EDGE: Scroll the object to the top edge of the window. - * @ATSPI_SCROLL_BOTTOM_EDGE: Scroll the object to the bottom edge of the - * window. - * @ATSPI_SCROLL_LEFT_EDGE: Scroll the object to the left edge of the - * window. - * @ATSPI_SCROLL_RIGHT_EDGE: Scroll the object to the right edge of the - * window. - * @ATSPI_SCROLL_ANYWHERE: Scroll the object to application-dependent position - * on the window. - * - * Enumeration used by interface #AtspiAccessible to specify where an - * #AtspiAccessible object should be placed on the screen when using scroll_to. - * - */ -typedef enum { - ATSPI_SCROLL_TOP_LEFT, - ATSPI_SCROLL_BOTTOM_RIGHT, - ATSPI_SCROLL_TOP_EDGE, - ATSPI_SCROLL_BOTTOM_EDGE, - ATSPI_SCROLL_LEFT_EDGE, - ATSPI_SCROLL_RIGHT_EDGE, - ATSPI_SCROLL_ANYWHERE -} AtspiScrollType; + /** + * AtspiScrollType: + * @ATSPI_SCROLL_TOP_LEFT: Scroll the object to the top left corner of the + * window. + * @ATSPI_SCROLL_BOTTOM_RIGHT: Scroll the object to the bottom right corner of + * the window. + * @ATSPI_SCROLL_TOP_EDGE: Scroll the object to the top edge of the window. + * @ATSPI_SCROLL_BOTTOM_EDGE: Scroll the object to the bottom edge of the + * window. + * @ATSPI_SCROLL_LEFT_EDGE: Scroll the object to the left edge of the + * window. + * @ATSPI_SCROLL_RIGHT_EDGE: Scroll the object to the right edge of the + * window. + * @ATSPI_SCROLL_ANYWHERE: Scroll the object to application-dependent position + * on the window. + * + * Enumeration used by interface #AtspiAccessible to specify where an + * #AtspiAccessible object should be placed on the screen when using scroll_to. + * + */ + typedef enum + { + ATSPI_SCROLL_TOP_LEFT, + ATSPI_SCROLL_BOTTOM_RIGHT, + ATSPI_SCROLL_TOP_EDGE, + ATSPI_SCROLL_BOTTOM_EDGE, + ATSPI_SCROLL_LEFT_EDGE, + ATSPI_SCROLL_RIGHT_EDGE, + ATSPI_SCROLL_ANYWHERE + } AtspiScrollType; /** * ATSPI_SCROLLTYPE_COUNT: * * One higher than the highest valid value of #AtspiScrollType. */ -#define ATSPI_SCROLLTYPE_COUNT (6+1) +#define ATSPI_SCROLLTYPE_COUNT (6 + 1) #define ATSPI_DBUS_NAME_REGISTRY "org.a11y.atspi.Registry" #define ATSPI_DBUS_PATH_REGISTRY "/org/a11y/atspi/registry" @@ -1497,4 +1515,4 @@ typedef enum { #ifdef __cplusplus } #endif -#endif /* _ATSPI_CONSTANTS_H_ */ +#endif /* _ATSPI_CONSTANTS_H_ */ diff --git a/atspi/atspi-device-legacy.c b/atspi/atspi-device-legacy.c index eec11378..d440483a 100644 --- a/atspi/atspi-device-legacy.c +++ b/atspi/atspi-device-legacy.c @@ -20,14 +20,14 @@ * Boston, MA 02110-1301, USA. */ -#include "atspi-private.h" #include "atspi-device-legacy.h" +#include "atspi-private.h" #ifdef HAVE_X11 +#include <X11/XKBlib.h> #include <X11/Xlib.h> #include <X11/Xutil.h> #include <X11/extensions/XInput2.h> -#include <X11/XKBlib.h> #endif typedef struct @@ -52,10 +52,7 @@ struct _AtspiDeviceLegacyPrivate GObjectClass *device_legacy_parent_class; -G_DEFINE_TYPE_WITH_CODE (AtspiDeviceLegacy, atspi_device_legacy, - ATSPI_TYPE_DEVICE, - G_ADD_PRIVATE (AtspiDeviceLegacy)) - +G_DEFINE_TYPE_WITH_CODE (AtspiDeviceLegacy, atspi_device_legacy, ATSPI_TYPE_DEVICE, G_ADD_PRIVATE (AtspiDeviceLegacy)) static guint find_virtual_mapping (AtspiDeviceLegacy *legacy_device, gint keycode) @@ -64,11 +61,11 @@ find_virtual_mapping (AtspiDeviceLegacy *legacy_device, gint keycode) GSList *l; for (l = priv->modifiers; l; l = l->next) - { - AtspiLegacyKeyModifier *entry = l->data; - if (entry->keycode == keycode) - return entry->modifier; - } + { + AtspiLegacyKeyModifier *entry = l->data; + if (entry->keycode == keycode) + return entry->modifier; + } return 0; } @@ -85,7 +82,6 @@ set_virtual_modifier (AtspiDeviceLegacy *legacy_device, gint keycode, gboolean e priv->virtual_mods_enabled &= ~modifier; } - static gboolean key_cb (AtspiDeviceEvent *event, void *user_data) { @@ -93,16 +89,16 @@ key_cb (AtspiDeviceEvent *event, void *user_data) AtspiDeviceLegacyPrivate *priv = atspi_device_legacy_get_instance_private (legacy_device); gboolean ret = priv->keyboard_grabbed; guint modifiers; - + set_virtual_modifier (legacy_device, event->hw_code, - event->type == (AtspiEventType)ATSPI_KEY_PRESS); + event->type == (AtspiEventType) ATSPI_KEY_PRESS); modifiers = event->modifiers | priv->virtual_mods_enabled; if (modifiers & (1 << ATSPI_MODIFIER_NUMLOCK)) modifiers &= ~priv->numlock_physical_mask; ret |= atspi_device_notify_key (ATSPI_DEVICE (legacy_device), - event->type == (AtspiEventType)ATSPI_KEY_PRESS, + event->type == (AtspiEventType) ATSPI_KEY_PRESS, event->hw_code, event->id, modifiers, event->event_string); @@ -137,11 +133,11 @@ check_virtual_modifier (AtspiDeviceLegacy *legacy_device, guint modifier) return TRUE; for (l = priv->modifiers; l; l = l->next) - { - AtspiLegacyKeyModifier *entry = l->data; - if (entry->modifier == modifier) - return TRUE; - } + { + AtspiLegacyKeyModifier *entry = l->data; + if (entry->modifier == modifier) + return TRUE; + } return FALSE; } @@ -152,11 +148,11 @@ get_unused_virtual_modifier (AtspiDeviceLegacy *legacy_device) guint ret = 0x1000; while (ret < 0x10000) - { - if (!check_virtual_modifier (legacy_device, ret)) - return ret; - ret <<= 1; - } + { + if (!check_virtual_modifier (legacy_device, ret)) + return ret; + ret <<= 1; + } return 0; } @@ -174,11 +170,11 @@ atspi_device_legacy_map_modifier (AtspiDevice *device, gint keycode) desc = XkbGetMap (priv->display, XkbModifierMapMask, XkbUseCoreKbd); if (keycode < desc->min_key_code || keycode >= desc->max_key_code) - { - XkbFreeKeyboard (desc, XkbModifierMapMask, TRUE); - g_warning ("Passed invalid keycode %d", keycode); - return 0; - } + { + XkbFreeKeyboard (desc, XkbModifierMapMask, TRUE); + g_warning ("Passed invalid keycode %d", keycode); + return 0; + } ret = desc->map->modmap[keycode]; XkbFreeKeyboard (desc, XkbModifierMapMask, TRUE); @@ -208,15 +204,15 @@ atspi_device_legacy_unmap_modifier (AtspiDevice *device, gint keycode) GSList *l; for (l = priv->modifiers; l; l = l->next) - { - AtspiLegacyKeyModifier *entry = l->data; - if (entry->keycode == keycode) { - priv->modifiers = g_slist_remove (priv->modifiers, entry); - g_free (entry); - return; + AtspiLegacyKeyModifier *entry = l->data; + if (entry->keycode == keycode) + { + priv->modifiers = g_slist_remove (priv->modifiers, entry); + g_free (entry); + return; + } } - } } static guint @@ -231,11 +227,11 @@ atspi_device_legacy_get_modifier (AtspiDevice *device, gint keycode) desc = XkbGetMap (priv->display, XkbModifierMapMask, XkbUseCoreKbd); if (keycode < desc->min_key_code || keycode >= desc->max_key_code) - { - XkbFreeKeyboard (desc, XkbModifierMapMask, TRUE); - g_warning ("Passed invalid keycode %d", keycode); - return 0; - } + { + XkbFreeKeyboard (desc, XkbModifierMapMask, TRUE); + g_warning ("Passed invalid keycode %d", keycode); + return 0; + } ret = desc->map->modmap[keycode]; XkbFreeKeyboard (desc, XkbModifierMapMask, TRUE); @@ -276,13 +272,12 @@ atspi_device_legacy_init (AtspiDeviceLegacy *device) atspi_register_keystroke_listener (priv->listener, NULL, i, 3, ATSPI_KEYLISTENER_SYNCHRONOUS | ATSPI_KEYLISTENER_CANCONSUME, NULL); #ifdef HAVE_X11 - priv->display=XOpenDisplay(""); + priv->display = XOpenDisplay (""); if (priv->display) - priv->window = DefaultRootWindow(priv->display); + priv->window = DefaultRootWindow (priv->display); priv->numlock_physical_mask = XkbKeysymToModifiers (priv->display, - XK_Num_Lock); + XK_Num_Lock); #endif - } static void @@ -295,7 +290,6 @@ atspi_device_legacy_finalize (GObject *object) device_legacy_parent_class->finalize (object); } - static void atspi_device_legacy_class_init (AtspiDeviceLegacyClass *klass) { diff --git a/atspi/atspi-device-legacy.h b/atspi/atspi-device-legacy.h index 50f777e2..4dadaf93 100644 --- a/atspi/atspi-device-legacy.h +++ b/atspi/atspi-device-legacy.h @@ -3,7 +3,7 @@ * (Gnome Accessibility Project; http://developer.gnome.org/projects/gap) * * Copyright 2020 SUSE LLC. - * + * * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -26,17 +26,17 @@ #include "glib-object.h" -#include "atspi-types.h" #include "atspi-device.h" +#include "atspi-types.h" G_BEGIN_DECLS -#define ATSPI_TYPE_DEVICE_LEGACY (atspi_device_legacy_get_type ()) -#define ATSPI_DEVICE_LEGACY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATSPI_TYPE_DEVICE_LEGACY, AtspiDeviceLegacy)) -#define ATSPI_DEVICE_LEGACY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ATSPI_TYPE_DEVICE_LEGACY, AtspiDeviceLegacyClass)) -#define ATSPI_IS_DEVICE_LEGACY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATSPI_TYPE_DEVICE_LEGACY)) -#define ATSPI_IS_DEVICE_LEGACY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ATSPI_TYPE_DEVICE_LEGACY)) -#define ATSPI_DEVICE_LEGACY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ATSPI_TYPE_DEVICE_LEGACY, AtspiDeviceLegacyClass)) +#define ATSPI_TYPE_DEVICE_LEGACY (atspi_device_legacy_get_type ()) +#define ATSPI_DEVICE_LEGACY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATSPI_TYPE_DEVICE_LEGACY, AtspiDeviceLegacy)) +#define ATSPI_DEVICE_LEGACY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ATSPI_TYPE_DEVICE_LEGACY, AtspiDeviceLegacyClass)) +#define ATSPI_IS_DEVICE_LEGACY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATSPI_TYPE_DEVICE_LEGACY)) +#define ATSPI_IS_DEVICE_LEGACY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ATSPI_TYPE_DEVICE_LEGACY)) +#define ATSPI_DEVICE_LEGACY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ATSPI_TYPE_DEVICE_LEGACY, AtspiDeviceLegacyClass)) typedef struct _AtspiDeviceLegacy AtspiDeviceLegacy; struct _AtspiDeviceLegacy @@ -56,4 +56,4 @@ AtspiDeviceLegacy *atspi_device_legacy_new (); G_END_DECLS -#endif /* _ATSPI_DEVICE_LEGACY_H_ */ +#endif /* _ATSPI_DEVICE_LEGACY_H_ */ diff --git a/atspi/atspi-device-listener-private.h b/atspi/atspi-device-listener-private.h index bd54232d..32694cef 100644 --- a/atspi/atspi-device-listener-private.h +++ b/atspi/atspi-device-listener-private.h @@ -4,7 +4,7 @@ * * Copyright 2002 Ximian, Inc. * 2002 Sun Microsystems Inc. - * + * * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -37,4 +37,4 @@ gchar *_atspi_device_listener_get_path (AtspiDeviceListener *listener); G_END_DECLS -#endif /* _ATSPI_DEVICE_LISTENER_H_ */ +#endif /* _ATSPI_DEVICE_LISTENER_H_ */ diff --git a/atspi/atspi-device-listener.c b/atspi/atspi-device-listener.c index 964d9160..d575b078 100644 --- a/atspi/atspi-device-listener.c +++ b/atspi/atspi-device-listener.c @@ -37,7 +37,7 @@ typedef struct { - AtspiDeviceListenerCB callback; + AtspiDeviceListenerCB callback; gpointer user_data; GDestroyNotify callback_destroyed; } DeviceEventHandler; @@ -68,7 +68,7 @@ device_remove_datum (AtspiDeviceEvent *event, void *user_data) AtspiDeviceListenerSimpleCB cb = user_data; return cb (event); } - + static void device_event_handler_free (DeviceEventHandler *eh) { @@ -88,17 +88,17 @@ static GList * event_list_remove_by_cb (GList *list, AtspiDeviceListenerCB callback) { GList *l, *next; - + for (l = list; l; l = next) { DeviceEventHandler *eh = l->data; next = l->next; if (eh->callback == callback) - { - list = g_list_delete_link (list, l); - device_event_handler_free (eh); - } + { + list = g_list_delete_link (list, l); + device_event_handler_free (eh); + } } return list; @@ -117,10 +117,11 @@ id_is_free (guint id) GList *l; for (l = device_listeners; l; l = g_list_next (l)) - { - AtspiDeviceListener *listener = l->data; - if (listener->id == id) return FALSE; - } + { + AtspiDeviceListener *listener = l->data; + if (listener->id == id) + return FALSE; + } return TRUE; } @@ -147,12 +148,12 @@ atspi_device_event_free (AtspiDeviceEvent *event) g_free (event); } -/* +/* * Device event handler */ static gboolean -atspi_device_event_dispatch (AtspiDeviceListener *listener, - const AtspiDeviceEvent *event) +atspi_device_event_dispatch (AtspiDeviceListener *listener, + const AtspiDeviceEvent *event) { GList *l; gboolean handled = FALSE; @@ -164,8 +165,8 @@ atspi_device_event_dispatch (AtspiDeviceListener *listener, if ((handled = eh->callback (atspi_device_event_copy (event), eh->user_data))) { - break; - } + break; + } } return handled; @@ -176,9 +177,10 @@ atspi_device_listener_init (AtspiDeviceListener *listener) { do - { - listener->id = listener_id++; - } while (!id_is_free (listener->id)); + { + listener->id = listener_id++; + } + while (!id_is_free (listener->id)); device_listeners = g_list_append (device_listeners, listener); } @@ -194,7 +196,7 @@ atspi_device_listener_finalize (GObject *object) { device_event_handler_free (l->data); } - + g_list_free (listener->callbacks); device_listener_parent_class->finalize (object); @@ -211,8 +213,7 @@ atspi_device_listener_class_init (AtspiDeviceListenerClass *klass) klass->device_event = atspi_device_event_dispatch; } -G_DEFINE_TYPE (AtspiDeviceListener, atspi_device_listener, - G_TYPE_OBJECT) +G_DEFINE_TYPE (AtspiDeviceListener, atspi_device_listener, G_TYPE_OBJECT) /** * atspi_device_listener_new: @@ -237,7 +238,7 @@ atspi_device_listener_new (AtspiDeviceListenerCB callback, if (callback) atspi_device_listener_add_callback (listener, callback, callback_destroyed, - user_data); + user_data); return listener; } @@ -257,7 +258,7 @@ atspi_device_listener_new (AtspiDeviceListenerCB callback, **/ AtspiDeviceListener * atspi_device_listener_new_simple (AtspiDeviceListenerSimpleCB callback, - GDestroyNotify callback_destroyed) + GDestroyNotify callback_destroyed) { return atspi_device_listener_new (device_remove_datum, callback, callback_destroyed); } @@ -269,16 +270,16 @@ atspi_device_listener_new_simple (AtspiDeviceListenerSimpleCB callback, * @callback_destroyed: A #GDestroyNotify called when the listener is freed * and data associated with the callback should be freed. It can be NULL. * @user_data: (closure): a pointer to data which will be passed to the - * callback when invoked. + * callback when invoked. * * Adds an in-process callback function to an existing #AtspiDeviceListener. * **/ void -atspi_device_listener_add_callback (AtspiDeviceListener *listener, - AtspiDeviceListenerCB callback, - GDestroyNotify callback_destroyed, - void *user_data) +atspi_device_listener_add_callback (AtspiDeviceListener *listener, + AtspiDeviceListenerCB callback, + GDestroyNotify callback_destroyed, + void *user_data) { g_return_if_fail (ATSPI_IS_DEVICE_LISTENER (listener)); DeviceEventHandler *new_handler; @@ -294,13 +295,13 @@ atspi_device_listener_add_callback (AtspiDeviceListener *listener, * @listener: the #AtspiDeviceListener instance to modify. * @callback: (scope call): an #AtspiDeviceListenerCB function pointer. * - * Removes an in-process callback function from an existing + * Removes an in-process callback function from an existing * #AtspiDeviceListener. * **/ void -atspi_device_listener_remove_callback (AtspiDeviceListener *listener, - AtspiDeviceListenerCB callback) +atspi_device_listener_remove_callback (AtspiDeviceListener *listener, + AtspiDeviceListenerCB callback) { g_return_if_fail (ATSPI_IS_DEVICE_LISTENER (listener)); @@ -354,7 +355,7 @@ _atspi_dbus_handle_DeviceEvent (DBusConnection *bus, DBusMessage *message) const char *path = dbus_message_get_path (message); int id; AtspiDeviceEvent event; - AtspiDeviceListener *listener; + AtspiDeviceListener *listener; DBusMessageIter iter; AtspiDeviceListenerClass *klass; dbus_bool_t retval = FALSE; @@ -362,47 +363,48 @@ _atspi_dbus_handle_DeviceEvent (DBusConnection *bus, DBusMessage *message) DBusMessage *reply; if (strcmp (dbus_message_get_signature (message), "(uiuuisb)") != 0) - { - g_warning ("AT-SPI: Unknown signature for an event"); - goto done; - } + { + g_warning ("AT-SPI: Unknown signature for an event"); + goto done; + } if (sscanf (path, "/org/a11y/atspi/listeners/%d", &id) != 1) - { - g_warning ("AT-SPI: Bad listener path: %s\n", path); - goto done; - } + { + g_warning ("AT-SPI: Bad listener path: %s\n", path); + goto done; + } for (l = device_listeners; l; l = g_list_next (l)) - { - listener = l->data; - if (listener->id == id) break; - } + { + listener = l->data; + if (listener->id == id) + break; + } if (!l) - { - goto done; - } + { + goto done; + } dbus_message_iter_init (message, &iter); read_device_event_from_iter (&iter, &event); klass = ATSPI_DEVICE_LISTENER_GET_CLASS (listener); if (klass->device_event) - { - retval = (*klass->device_event) (listener, &event); - if (retval != 0 && retval != 1) { - g_warning ("AT-SPI: device event handler returned %d; should be 0 or 1", retval); - retval = 0; + retval = (*klass->device_event) (listener, &event); + if (retval != 0 && retval != 1) + { + g_warning ("AT-SPI: device event handler returned %d; should be 0 or 1", retval); + retval = 0; + } } - } done: reply = dbus_message_new_method_return (message); if (reply) - { - dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &retval, DBUS_TYPE_INVALID); - dbus_connection_send (_atspi_bus(), reply, NULL); - dbus_message_unref (reply); - } + { + dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &retval, DBUS_TYPE_INVALID); + dbus_connection_send (_atspi_bus (), reply, NULL); + dbus_message_unref (reply); + } return DBUS_HANDLER_RESULT_HANDLED; } diff --git a/atspi/atspi-device-listener.h b/atspi/atspi-device-listener.h index 718a4153..f8d12c16 100644 --- a/atspi/atspi-device-listener.h +++ b/atspi/atspi-device-listener.h @@ -5,7 +5,7 @@ * Copyright 2002 Ximian, Inc. * 2002 Sun Microsystems Inc. * Copyright 2010, 2011 Novell, Inc. - * + * * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -45,8 +45,8 @@ GType atspi_device_event_get_type (void); * Returns: #TRUE if the client wishes to consume/preempt the event, preventing it from being * relayed to the currently focussed application, #FALSE if the event delivery should proceed as normal. **/ -typedef gboolean (*AtspiDeviceListenerCB) (AtspiDeviceEvent *stroke, - void *user_data); +typedef gboolean (*AtspiDeviceListenerCB) (AtspiDeviceEvent *stroke, + void *user_data); /** * AtspiDeviceListenerSimpleCB: @@ -58,14 +58,14 @@ typedef gboolean (*AtspiDeviceListenerCB) (AtspiDeviceEvent *stroke, * Returns: #TRUE if the client wishes to consume/preempt the event, preventing it from being * relayed to the currently focussed application, #FALSE if the event delivery should proceed as normal. **/ -typedef gboolean (*AtspiDeviceListenerSimpleCB) (const AtspiDeviceEvent *stroke); +typedef gboolean (*AtspiDeviceListenerSimpleCB) (const AtspiDeviceEvent *stroke); -#define ATSPI_TYPE_DEVICE_LISTENER (atspi_device_listener_get_type ()) -#define ATSPI_DEVICE_LISTENER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATSPI_TYPE_DEVICE_LISTENER, AtspiDeviceListener)) -#define ATSPI_DEVICE_LISTENER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ATSPI_TYPE_DEVICE_LISTENER, AtspiDeviceListenerClass)) -#define ATSPI_IS_DEVICE_LISTENER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATSPI_TYPE_DEVICE_LISTENER)) -#define ATSPI_IS_DEVICE_LISTENER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ATSPI_TYPE_DEVICE_LISTENER)) -#define ATSPI_DEVICE_LISTENER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ATSPI_TYPE_DEVICE_LISTENER, AtspiDeviceListenerClass)) +#define ATSPI_TYPE_DEVICE_LISTENER (atspi_device_listener_get_type ()) +#define ATSPI_DEVICE_LISTENER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATSPI_TYPE_DEVICE_LISTENER, AtspiDeviceListener)) +#define ATSPI_DEVICE_LISTENER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ATSPI_TYPE_DEVICE_LISTENER, AtspiDeviceListenerClass)) +#define ATSPI_IS_DEVICE_LISTENER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATSPI_TYPE_DEVICE_LISTENER)) +#define ATSPI_IS_DEVICE_LISTENER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ATSPI_TYPE_DEVICE_LISTENER)) +#define ATSPI_DEVICE_LISTENER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ATSPI_TYPE_DEVICE_LISTENER, AtspiDeviceListenerClass)) typedef struct _AtspiDeviceListener AtspiDeviceListener; struct _AtspiDeviceListener @@ -90,8 +90,8 @@ AtspiDeviceListener *atspi_device_listener_new_simple (AtspiDeviceListenerSimple void atspi_device_listener_add_callback (AtspiDeviceListener *listener, AtspiDeviceListenerCB callback, GDestroyNotify callback_destroyed, void *user_data); -void atspi_device_listener_remove_callback (AtspiDeviceListener *listener, AtspiDeviceListenerCB callback); +void atspi_device_listener_remove_callback (AtspiDeviceListener *listener, AtspiDeviceListenerCB callback); G_END_DECLS -#endif /* _ATSPI_DEVICE_LISTENER_H_ */ +#endif /* _ATSPI_DEVICE_LISTENER_H_ */ diff --git a/atspi/atspi-device-x11.c b/atspi/atspi-device-x11.c index eafdba62..fccaba8c 100644 --- a/atspi/atspi-device-x11.c +++ b/atspi/atspi-device-x11.c @@ -20,14 +20,13 @@ * Boston, MA 02110-1301, USA. */ -#include "atspi-private.h" #include "atspi-device-x11.h" +#include "atspi-private.h" +#include <X11/XKBlib.h> #include <X11/Xlib.h> #include <X11/Xutil.h> #include <X11/extensions/XInput2.h> -#include <X11/XKBlib.h> - #define ATSPI_VIRTUAL_MODIFIER_MASK 0x0000f000 @@ -52,9 +51,9 @@ GObjectClass *device_x11_parent_class; typedef struct _DisplaySource { GSource source; - + Display *display; - GPollFD event_poll_fd; + GPollFD event_poll_fd; } DisplaySource; typedef struct @@ -69,22 +68,22 @@ typedef struct gboolean enabled; } AtspiX11KeyGrab; -static gboolean +static gboolean event_prepare (GSource *source, gint *timeout) { - Display *display = ((DisplaySource *)source)->display; + Display *display = ((DisplaySource *) source)->display; gboolean retval; - + *timeout = -1; retval = XPending (display); - + return retval; } -static gboolean -event_check (GSource *source) +static gboolean +event_check (GSource *source) { - DisplaySource *display_source = (DisplaySource*)source; + DisplaySource *display_source = (DisplaySource *) source; gboolean retval; if (display_source->event_poll_fd.revents & G_IO_IN) @@ -101,16 +100,16 @@ xi2keyevent (XIDeviceEvent *xievent, XEvent *xkeyevent) memset (xkeyevent, 0, sizeof (*xkeyevent)); switch (xievent->evtype) - { - case XI_KeyPress: - xkeyevent->type = KeyPress; - break; - case XI_KeyRelease: - xkeyevent->type = KeyRelease; - break; - default: - break; - } + { + case XI_KeyPress: + xkeyevent->type = KeyPress; + break; + case XI_KeyRelease: + xkeyevent->type = KeyRelease; + break; + default: + break; + } xkeyevent->xkey.serial = xievent->serial; xkeyevent->xkey.send_event = xievent->send_event; xkeyevent->xkey.display = xievent->display; @@ -127,10 +126,7 @@ xi2keyevent (XIDeviceEvent *xievent, XEvent *xkeyevent) xkeyevent->xkey.same_screen = 1; } -G_DEFINE_TYPE_WITH_CODE (AtspiDeviceX11, atspi_device_x11, - ATSPI_TYPE_DEVICE, - G_ADD_PRIVATE (AtspiDeviceX11)) - +G_DEFINE_TYPE_WITH_CODE (AtspiDeviceX11, atspi_device_x11, ATSPI_TYPE_DEVICE, G_ADD_PRIVATE (AtspiDeviceX11)) static guint find_virtual_mapping (AtspiDeviceX11 *x11_device, gint keycode) @@ -139,11 +135,11 @@ find_virtual_mapping (AtspiDeviceX11 *x11_device, gint keycode) GSList *l; for (l = priv->modifiers; l; l = l->next) - { - AtspiX11KeyModifier *entry = l->data; - if (entry->keycode == keycode) - return entry->modifier; - } + { + AtspiX11KeyModifier *entry = l->data; + if (entry->keycode == keycode) + return entry->modifier; + } return 0; } @@ -168,11 +164,11 @@ grab_has_active_duplicate (AtspiDeviceX11 *x11_device, AtspiX11KeyGrab *grab) GSList *l; for (l = priv->key_grabs; l; l = l->next) - { - AtspiX11KeyGrab *other = l->data; - if (other != grab && other->enabled && other->kd->keycode == grab->kd->keycode && (other->kd->modifiers & ~ATSPI_VIRTUAL_MODIFIER_MASK) == (grab->kd->modifiers & ~ATSPI_VIRTUAL_MODIFIER_MASK)) - return TRUE; - } + { + AtspiX11KeyGrab *other = l->data; + if (other != grab && other->enabled && other->kd->keycode == grab->kd->keycode && (other->kd->modifiers & ~ATSPI_VIRTUAL_MODIFIER_MASK) == (grab->kd->modifiers & ~ATSPI_VIRTUAL_MODIFIER_MASK)) + return TRUE; + } return FALSE; } @@ -182,17 +178,17 @@ grab_key_aux (AtspiDeviceX11 *x11_device, int keycode, int modmask) AtspiDeviceX11Private *priv = atspi_device_x11_get_instance_private (x11_device); XIGrabModifiers xi_modifiers; XIEventMask eventmask; - unsigned char mask[XIMaskLen (XI_LASTEVENT)] = { 0 }; + unsigned char mask[XIMaskLen (XI_LASTEVENT)] = { 0 }; xi_modifiers.modifiers = modmask; xi_modifiers.status = 0; - eventmask.deviceid = XIAllDevices; - eventmask.mask_len = sizeof(mask); - eventmask.mask = mask; + eventmask.deviceid = XIAllDevices; + eventmask.mask_len = sizeof (mask); + eventmask.mask = mask; - XISetMask (mask, XI_KeyPress); - XISetMask (mask, XI_KeyRelease); + XISetMask (mask, XI_KeyPress); + XISetMask (mask, XI_KeyRelease); XIGrabKeycode (priv->display, XIAllMasterDevices, keycode, priv->window, XIGrabModeSync, XIGrabModeAsync, False, &eventmask, 1, &xi_modifiers); } @@ -206,11 +202,11 @@ grab_key (AtspiDeviceX11 *x11_device, int keycode, int modmask) if (!(modmask & LockMask)) grab_key_aux (x11_device, keycode, modmask | LockMask); if (!(modmask & priv->numlock_physical_mask)) - { - grab_key_aux (x11_device, keycode, modmask | priv->numlock_physical_mask); - if (!(modmask & LockMask)) - grab_key_aux (x11_device, keycode, modmask | LockMask | priv->numlock_physical_mask); - } + { + grab_key_aux (x11_device, keycode, modmask | priv->numlock_physical_mask); + if (!(modmask & LockMask)) + grab_key_aux (x11_device, keycode, modmask | LockMask | priv->numlock_physical_mask); + } } static void @@ -234,7 +230,7 @@ ungrab_key_aux (AtspiDeviceX11 *x11_device, int keycode, int modmask) xi_modifiers.modifiers = modmask; xi_modifiers.status = 0; - XIUngrabKeycode (priv->display, XIAllMasterDevices, keycode, priv->window, sizeof(xi_modifiers), &xi_modifiers); + XIUngrabKeycode (priv->display, XIAllMasterDevices, keycode, priv->window, sizeof (xi_modifiers), &xi_modifiers); } static void @@ -246,11 +242,11 @@ ungrab_key (AtspiDeviceX11 *x11_device, int keycode, int modmask) if (!(modmask & LockMask)) ungrab_key_aux (x11_device, keycode, modmask | LockMask); if (!(modmask & priv->numlock_physical_mask)) - { - ungrab_key_aux (x11_device, keycode, modmask | priv->numlock_physical_mask); - if (!(modmask & LockMask)) - ungrab_key_aux (x11_device, keycode, modmask | LockMask | priv->numlock_physical_mask); - } + { + ungrab_key_aux (x11_device, keycode, modmask | priv->numlock_physical_mask); + if (!(modmask & LockMask)) + ungrab_key_aux (x11_device, keycode, modmask | LockMask | priv->numlock_physical_mask); + } } static void @@ -278,14 +274,14 @@ refresh_key_grabs (AtspiDeviceX11 *x11_device) GSList *l; for (l = priv->key_grabs; l; l = l->next) - { - AtspiX11KeyGrab *grab = l->data; - gboolean new_enabled = grab_should_be_enabled (x11_device, grab); - if (new_enabled && !grab->enabled) - enable_key_grab (x11_device, grab); - else if (grab->enabled && !new_enabled) - disable_key_grab (x11_device, grab); - } + { + AtspiX11KeyGrab *grab = l->data; + gboolean new_enabled = grab_should_be_enabled (x11_device, grab); + if (new_enabled && !grab->enabled) + enable_key_grab (x11_device, grab); + else if (grab->enabled && !new_enabled) + disable_key_grab (x11_device, grab); + } } static void @@ -298,17 +294,17 @@ set_virtual_modifier (AtspiDeviceX11 *x11_device, gint keycode, gboolean enabled return; if (enabled) - { - if (priv->virtual_mods_enabled & modifier) - return; - priv->virtual_mods_enabled |= modifier; - } + { + if (priv->virtual_mods_enabled & modifier) + return; + priv->virtual_mods_enabled |= modifier; + } else - { - if (!(priv->virtual_mods_enabled & modifier)) - return; - priv->virtual_mods_enabled &= ~modifier; - } + { + if (!(priv->virtual_mods_enabled & modifier)) + return; + priv->virtual_mods_enabled &= ~modifier; + } refresh_key_grabs (x11_device); } @@ -324,68 +320,68 @@ do_event_dispatch (gpointer user_data) KeySym keysym; XComposeStatus status; guint modifiers; - - while (XPending (display)) - { - XNextEvent (display, &xevent); - XEvent keyevent; - switch (xevent.type) + while (XPending (display)) { - case KeyPress: - case KeyRelease: - XLookupString(&xevent.xkey, text, sizeof (text), &keysym, &status); - modifiers = xevent.xkey.state | priv->virtual_mods_enabled; - if (modifiers & priv->numlock_physical_mask) - { - modifiers |= (1 << ATSPI_MODIFIER_NUMLOCK); - modifiers &= ~priv->numlock_physical_mask; - } - atspi_device_notify_key (ATSPI_DEVICE (device), (xevent.type == KeyPress), xevent.xkey.keycode, keysym, modifiers, text); - break; - case GenericEvent: - if (xevent.xcookie.extension == priv->xi_opcode) - { - XGetEventData(priv->display, &xevent.xcookie); - XIRawEvent *xiRawEv = (XIRawEvent *) xevent.xcookie.data; - XIDeviceEvent *xiDevEv = (XIDeviceEvent *) xevent.xcookie.data; - switch (xevent.xcookie.evtype) + XNextEvent (display, &xevent); + XEvent keyevent; + + switch (xevent.type) { - case XI_KeyPress: - case XI_KeyRelease: - xi2keyevent (xiDevEv, &keyevent); - XLookupString((XKeyEvent *)&keyevent, text, sizeof (text), &keysym, &status); - if (text[0] < ' ') - text[0] = '\0'; - /* The deviceid can change. Would be nice to find a better way of - handling this */ - if (priv->device_id && priv->device_id_alt && xiDevEv->deviceid != priv->device_id && xiDevEv->deviceid != priv->device_id_alt) - priv->device_id = priv->device_id_alt = 0; - else if (priv->device_id && !priv->device_id_alt && xiDevEv->deviceid != priv->device_id) - priv->device_id_alt = xiDevEv->deviceid; - if (!priv->device_id) - priv->device_id = xiDevEv->deviceid; - set_virtual_modifier (device, xiRawEv->detail, xevent.xcookie.evtype == XI_KeyPress); - modifiers = keyevent.xkey.state | priv->virtual_mods_enabled; + case KeyPress: + case KeyRelease: + XLookupString (&xevent.xkey, text, sizeof (text), &keysym, &status); + modifiers = xevent.xkey.state | priv->virtual_mods_enabled; if (modifiers & priv->numlock_physical_mask) - modifiers |= (1 << ATSPI_MODIFIER_NUMLOCK); - if (xiDevEv->deviceid == priv->device_id) - atspi_device_notify_key (ATSPI_DEVICE (device), (xevent.xcookie.evtype == XI_KeyPress), xiRawEv->detail, keysym, modifiers, text); - /* otherwise it's probably a duplicate event from a key grab */ - XFreeEventData (priv->display, &xevent.xcookie); + { + modifiers |= (1 << ATSPI_MODIFIER_NUMLOCK); + modifiers &= ~priv->numlock_physical_mask; + } + atspi_device_notify_key (ATSPI_DEVICE (device), (xevent.type == KeyPress), xevent.xkey.keycode, keysym, modifiers, text); break; + case GenericEvent: + if (xevent.xcookie.extension == priv->xi_opcode) + { + XGetEventData (priv->display, &xevent.xcookie); + XIRawEvent *xiRawEv = (XIRawEvent *) xevent.xcookie.data; + XIDeviceEvent *xiDevEv = (XIDeviceEvent *) xevent.xcookie.data; + switch (xevent.xcookie.evtype) + { + case XI_KeyPress: + case XI_KeyRelease: + xi2keyevent (xiDevEv, &keyevent); + XLookupString ((XKeyEvent *) &keyevent, text, sizeof (text), &keysym, &status); + if (text[0] < ' ') + text[0] = '\0'; + /* The deviceid can change. Would be nice to find a better way of + handling this */ + if (priv->device_id && priv->device_id_alt && xiDevEv->deviceid != priv->device_id && xiDevEv->deviceid != priv->device_id_alt) + priv->device_id = priv->device_id_alt = 0; + else if (priv->device_id && !priv->device_id_alt && xiDevEv->deviceid != priv->device_id) + priv->device_id_alt = xiDevEv->deviceid; + if (!priv->device_id) + priv->device_id = xiDevEv->deviceid; + set_virtual_modifier (device, xiRawEv->detail, xevent.xcookie.evtype == XI_KeyPress); + modifiers = keyevent.xkey.state | priv->virtual_mods_enabled; + if (modifiers & priv->numlock_physical_mask) + modifiers |= (1 << ATSPI_MODIFIER_NUMLOCK); + if (xiDevEv->deviceid == priv->device_id) + atspi_device_notify_key (ATSPI_DEVICE (device), (xevent.xcookie.evtype == XI_KeyPress), xiRawEv->detail, keysym, modifiers, text); + /* otherwise it's probably a duplicate event from a key grab */ + XFreeEventData (priv->display, &xevent.xcookie); + break; + } + } + default: + if (XFilterEvent (&xevent, None)) + continue; } - } - default: - if (XFilterEvent (&xevent, None)) - continue; } - } return TRUE; } -static gboolean -event_dispatch (GSource *source, GSourceFunc callback, gpointer user_data) +static gboolean +event_dispatch (GSource *source, GSourceFunc callback, gpointer user_data) { if (callback) callback (user_data); @@ -405,13 +401,13 @@ display_source_new (Display *display) GSource *source = g_source_new (&event_funcs, sizeof (DisplaySource)); DisplaySource *display_source = (DisplaySource *) source; g_source_set_name (source, "[at-spi2-core] display_source_funcs"); - + display_source->display = display; - + return source; } -static void +static void create_event_source (AtspiDeviceX11 *device) { AtspiDeviceX11Private *priv = atspi_device_x11_get_instance_private (device); @@ -420,13 +416,13 @@ create_event_source (AtspiDeviceX11 *device) int connection_number = ConnectionNumber (priv->display); priv->source = display_source_new (priv->display); - display_source = (DisplaySource *)priv->source; + display_source = (DisplaySource *) priv->source; g_source_set_priority (priv->source, G_PRIORITY_DEFAULT); - + display_source->event_poll_fd.fd = connection_number; display_source->event_poll_fd.events = G_IO_IN; - + g_source_add_poll (priv->source, &display_source->event_poll_fd); g_source_set_can_recurse (priv->source, TRUE); g_source_set_callback (priv->source, do_event_dispatch, device, NULL); @@ -443,11 +439,11 @@ check_virtual_modifier (AtspiDeviceX11 *x11_device, guint modifier) return TRUE; for (l = priv->modifiers; l; l = l->next) - { - AtspiX11KeyModifier *entry = l->data; - if (entry->modifier == modifier) - return TRUE; - } + { + AtspiX11KeyModifier *entry = l->data; + if (entry->modifier == modifier) + return TRUE; + } return FALSE; } @@ -458,11 +454,11 @@ get_unused_virtual_modifier (AtspiDeviceX11 *x11_device) guint ret = 0x1000; while (ret < 0x10000) - { - if (!check_virtual_modifier (x11_device, ret)) - return ret; - ret <<= 1; - } + { + if (!check_virtual_modifier (x11_device, ret)) + return ret; + ret <<= 1; + } return 0; } @@ -479,11 +475,11 @@ atspi_device_x11_map_modifier (AtspiDevice *device, gint keycode) desc = XkbGetMap (priv->display, XkbModifierMapMask, XkbUseCoreKbd); if (keycode < desc->min_key_code || keycode >= desc->max_key_code) - { - XkbFreeKeyboard (desc, XkbModifierMapMask, TRUE); - g_warning ("Passed invalid keycode %d", keycode); - return 0; - } + { + XkbFreeKeyboard (desc, XkbModifierMapMask, TRUE); + g_warning ("Passed invalid keycode %d", keycode); + return 0; + } ret = desc->map->modmap[keycode]; XkbFreeKeyboard (desc, XkbModifierMapMask, TRUE); @@ -512,15 +508,15 @@ atspi_device_x11_unmap_modifier (AtspiDevice *device, gint keycode) GSList *l; for (l = priv->modifiers; l; l = l->next) - { - AtspiX11KeyModifier *entry = l->data; - if (entry->keycode == keycode) { - priv->modifiers = g_slist_remove (priv->modifiers, entry); - g_free (entry); - return; + AtspiX11KeyModifier *entry = l->data; + if (entry->keycode == keycode) + { + priv->modifiers = g_slist_remove (priv->modifiers, entry); + g_free (entry); + return; + } } - } } static guint @@ -534,11 +530,11 @@ atspi_device_x11_get_modifier (AtspiDevice *device, gint keycode) desc = XkbGetMap (priv->display, XkbModifierMapMask, XkbUseCoreKbd); if (keycode < desc->min_key_code || keycode >= desc->max_key_code) - { - XkbFreeKeyboard (desc, XkbModifierMapMask, TRUE); - g_warning ("Passed invalid keycode %d", keycode); - return 0; - } + { + XkbFreeKeyboard (desc, XkbModifierMapMask, TRUE); + g_warning ("Passed invalid keycode %d", keycode); + return 0; + } ret = desc->map->modmap[keycode]; XkbFreeKeyboard (desc, XkbModifierMapMask, TRUE); @@ -554,35 +550,35 @@ atspi_device_x11_init (AtspiDeviceX11 *device) AtspiDeviceX11Private *priv = atspi_device_x11_get_instance_private (device); int first_event, first_error; - priv->display=XOpenDisplay(""); + priv->display = XOpenDisplay (""); g_return_if_fail (priv->display != NULL); - priv->window = DefaultRootWindow(priv->display); + priv->window = DefaultRootWindow (priv->display); - if (XQueryExtension(priv->display, "XInputExtension", &priv->xi_opcode, &first_event, &first_error)) - { - int major = 2; - int minor = 1; - if (XIQueryVersion(priv->display, &major, &minor) != BadRequest) + if (XQueryExtension (priv->display, "XInputExtension", &priv->xi_opcode, &first_event, &first_error)) { - XIEventMask eventmask; - unsigned char mask[XIMaskLen (XI_LASTEVENT)] = { 0 }; - - eventmask.deviceid = XIAllDevices; - eventmask.mask_len = sizeof(mask); - eventmask.mask = mask; - - XISetMask (mask, XI_KeyPress); - XISetMask (mask, XI_KeyRelease); - XISetMask (mask, XI_ButtonPress); - XISetMask (mask, XI_ButtonRelease); - XISetMask (mask, XI_Motion); - XISelectEvents (priv->display, priv->window, &eventmask, 1); - create_event_source (device); + int major = 2; + int minor = 1; + if (XIQueryVersion (priv->display, &major, &minor) != BadRequest) + { + XIEventMask eventmask; + unsigned char mask[XIMaskLen (XI_LASTEVENT)] = { 0 }; + + eventmask.deviceid = XIAllDevices; + eventmask.mask_len = sizeof (mask); + eventmask.mask = mask; + + XISetMask (mask, XI_KeyPress); + XISetMask (mask, XI_KeyRelease); + XISetMask (mask, XI_ButtonPress); + XISetMask (mask, XI_ButtonRelease); + XISetMask (mask, XI_Motion); + XISelectEvents (priv->display, priv->window, &eventmask, 1); + create_event_source (device); + } } - } priv->numlock_physical_mask = XkbKeysymToModifiers (priv->display, - XK_Num_Lock); + XK_Num_Lock); } static void @@ -593,12 +589,12 @@ atspi_device_x11_finalize (GObject *object) GSList *l; for (l = priv->key_grabs; l; l = l->next) - { - AtspiX11KeyGrab *grab = l->data; - disable_key_grab (device, grab); - g_boxed_free (ATSPI_TYPE_KEY_DEFINITION, grab->kd); - g_free (grab); - } + { + AtspiX11KeyGrab *grab = l->data; + disable_key_grab (device, grab); + g_boxed_free (ATSPI_TYPE_KEY_DEFINITION, grab->kd); + g_free (grab); + } g_slist_free (priv->key_grabs); priv->key_grabs = NULL; @@ -606,16 +602,15 @@ atspi_device_x11_finalize (GObject *object) priv->modifiers = NULL; if (priv->source) - { - g_source_destroy ((GSource *) priv->source); - g_source_unref ((GSource *) priv->source); - priv->source = NULL; + { + g_source_destroy ((GSource *) priv->source); + g_source_unref ((GSource *) priv->source); + priv->source = NULL; } device_x11_parent_class->finalize (object); } - static void atspi_device_x11_add_key_grab (AtspiDevice *device, AtspiKeyDefinition *kd) { @@ -642,15 +637,15 @@ atspi_device_x11_remove_key_grab (AtspiDevice *device, guint id) kd = atspi_device_get_grab_by_id (device, id); for (l = priv->key_grabs; l; l = g_slist_next (l)) - { - AtspiX11KeyGrab *other = l->data; - if (other->kd->keycode == kd->keycode && other->kd->modifiers == kd->modifiers) { - disable_key_grab (x11_device, other); - priv->key_grabs = g_slist_remove (priv->key_grabs, other); - return; + AtspiX11KeyGrab *other = l->data; + if (other->kd->keycode == kd->keycode && other->kd->modifiers == kd->modifiers) + { + disable_key_grab (x11_device, other); + priv->key_grabs = g_slist_remove (priv->key_grabs, other); + return; + } } - } } static guint diff --git a/atspi/atspi-device-x11.h b/atspi/atspi-device-x11.h index 3a91edca..4affc5ab 100644 --- a/atspi/atspi-device-x11.h +++ b/atspi/atspi-device-x11.h @@ -3,7 +3,7 @@ * (Gnome Accessibility Project; http://developer.gnome.org/projects/gap) * * Copyright 2020 SUSE LLC. - * + * * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -26,17 +26,17 @@ #include "glib-object.h" -#include "atspi-types.h" #include "atspi-device.h" +#include "atspi-types.h" G_BEGIN_DECLS -#define ATSPI_TYPE_DEVICE_X11 (atspi_device_x11_get_type ()) -#define ATSPI_DEVICE_X11(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATSPI_TYPE_DEVICE_X11, AtspiDeviceX11)) -#define ATSPI_DEVICE_X11_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ATSPI_TYPE_DEVICE_X11, AtspiDeviceX11Class)) -#define ATSPI_IS_DEVICE_X11(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATSPI_TYPE_DEVICE_X11)) -#define ATSPI_IS_DEVICE_X11_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ATSPI_TYPE_DEVICE_X11)) -#define ATSPI_DEVICE_X11_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ATSPI_TYPE_DEVICE_X11, AtspiDeviceX11Class)) +#define ATSPI_TYPE_DEVICE_X11 (atspi_device_x11_get_type ()) +#define ATSPI_DEVICE_X11(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATSPI_TYPE_DEVICE_X11, AtspiDeviceX11)) +#define ATSPI_DEVICE_X11_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ATSPI_TYPE_DEVICE_X11, AtspiDeviceX11Class)) +#define ATSPI_IS_DEVICE_X11(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATSPI_TYPE_DEVICE_X11)) +#define ATSPI_IS_DEVICE_X11_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ATSPI_TYPE_DEVICE_X11)) +#define ATSPI_DEVICE_X11_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ATSPI_TYPE_DEVICE_X11, AtspiDeviceX11Class)) typedef struct _AtspiDeviceX11 AtspiDeviceX11; struct _AtspiDeviceX11 @@ -56,4 +56,4 @@ AtspiDeviceX11 *atspi_device_x11_new (); G_END_DECLS -#endif /* _ATSPI_DEVICE_X11_H_ */ +#endif /* _ATSPI_DEVICE_X11_H_ */ diff --git a/atspi/atspi-device.c b/atspi/atspi-device.c index e4a564c7..555c01ee 100644 --- a/atspi/atspi-device.c +++ b/atspi/atspi-device.c @@ -20,10 +20,10 @@ * Boston, MA 02110-1301, USA. */ -#include "atspi-private.h" #include "atspi-device.h" #include "atspi-device-legacy.h" #include "atspi-device-x11.h" +#include "atspi-private.h" typedef struct { @@ -51,9 +51,7 @@ atspi_device_init (AtspiDevice *device) { } -G_DEFINE_TYPE_WITH_CODE (AtspiDevice, atspi_device, - G_TYPE_OBJECT, - G_ADD_PRIVATE (AtspiDevice)) +G_DEFINE_TYPE_WITH_CODE (AtspiDevice, atspi_device, G_TYPE_OBJECT, G_ADD_PRIVATE (AtspiDevice)) static void atspi_device_finalize (GObject *object) @@ -128,21 +126,21 @@ atspi_device_notify_key (AtspiDevice *device, gboolean pressed, int keycode, int gboolean ret = FALSE; for (l = priv->key_watchers; l; l = l->next) - { - AtspiKeyGrab *grab = l->data; - grab->callback (device, pressed, keycode, keysym, state, text, grab->callback_data); - } + { + AtspiKeyGrab *grab = l->data; + grab->callback (device, pressed, keycode, keysym, state, text, grab->callback_data); + } for (l = priv->keygrabs; l; l = l->next) - { - AtspiKeyGrab *grab = l->data; - if (keycode == grab->keycode && key_matches_modifiers (state, grab->modifiers)) { - if (grab->callback) - grab->callback (device, pressed, keycode, keysym, state, text, grab->callback_data); - ret = TRUE; + AtspiKeyGrab *grab = l->data; + if (keycode == grab->keycode && key_matches_modifiers (state, grab->modifiers)) + { + if (grab->callback) + grab->callback (device, pressed, keycode, keysym, state, text, grab->callback_data); + ret = TRUE; + } } - } return ret; } @@ -154,18 +152,18 @@ is_id_used (AtspiDevice *device, guint id) GSList *l; for (l = priv->key_watchers; l; l = l->next) - { - AtspiKeyGrab *grab = l->data; - if (grab->id == id) - return TRUE; - } + { + AtspiKeyGrab *grab = l->data; + if (grab->id == id) + return TRUE; + } for (l = priv->keygrabs; l; l = l->next) - { - AtspiKeyGrab *grab = l->data; - if (grab->id == id) - return TRUE; - } + { + AtspiKeyGrab *grab = l->data; + if (grab->id == id) + return TRUE; + } return FALSE; } @@ -175,7 +173,8 @@ get_grab_id (AtspiDevice *device) { AtspiDevicePrivate *priv = atspi_device_get_instance_private (device); - while (is_id_used (device, priv->last_grab_id)) priv->last_grab_id++; + while (is_id_used (device, priv->last_grab_id)) + priv->last_grab_id++; return priv->last_grab_id++; } @@ -186,18 +185,18 @@ grab_has_duplicate (AtspiDevice *device, AtspiKeyGrab *grab) GSList *l; for (l = priv->keygrabs; l; l = l->next) - { - AtspiKeyGrab *other_grab = l->data; - if (other_grab->id != grab->id && other_grab->keycode == grab->keycode && other_grab->modifiers == grab->modifiers) - return TRUE; - } + { + AtspiKeyGrab *other_grab = l->data; + if (other_grab->id != grab->id && other_grab->keycode == grab->keycode && other_grab->modifiers == grab->modifiers) + return TRUE; + } return FALSE; } /** *atspi_device_add_key_grab: -* @device: the device. + * @device: the device. * @kd: a #AtspiKeyDefinition specifying the key code to grab. * @callback: (scope notified) (allow-none): the function to call when the * given key is pressed. @@ -241,24 +240,24 @@ atspi_device_remove_key_grab (AtspiDevice *device, guint id) GSList *l; for (l = priv->keygrabs; l; l = l->next) - { - AtspiKeyGrab *grab = l->data; - if (grab->id == id) { - if (!grab_has_duplicate (device, grab)) - ATSPI_DEVICE_GET_CLASS (device)->remove_key_grab (device, id); - priv->keygrabs = g_slist_remove (priv->keygrabs, grab); - if (grab->callback_destroyed) - (*grab->callback_destroyed) (grab->callback); - g_free (grab); - return; + AtspiKeyGrab *grab = l->data; + if (grab->id == id) + { + if (!grab_has_duplicate (device, grab)) + ATSPI_DEVICE_GET_CLASS (device)->remove_key_grab (device, id); + priv->keygrabs = g_slist_remove (priv->keygrabs, grab); + if (grab->callback_destroyed) + (*grab->callback_destroyed) (grab->callback); + g_free (grab); + return; + } } - } } /** *atspi_device_add_key_watcher: -* @device: the device. + * @device: the device. * @callback: (scope notified): the function to call when the given key is * pressed. * @user_data: (closure callback): Data to be passed to @callback. @@ -287,16 +286,16 @@ atspi_device_get_grab_by_id (AtspiDevice *device, guint id) GSList *l; for (l = priv->keygrabs; l; l = l->next) - { - AtspiKeyGrab *grab = l->data; - if (grab->id == id) { - AtspiKeyDefinition *kd = g_new0 (AtspiKeyDefinition, 1); - kd->keycode = grab->keycode;\ - kd->modifiers = grab->modifiers; - return kd; + AtspiKeyGrab *grab = l->data; + if (grab->id == id) + { + AtspiKeyDefinition *kd = g_new0 (AtspiKeyDefinition, 1); + kd->keycode = grab->keycode; + kd->modifiers = grab->modifiers; + return kd; + } } - } return NULL; } @@ -408,4 +407,3 @@ atspi_device_ungrab_keyboard (AtspiDevice *device) if (ATSPI_DEVICE_GET_CLASS (device)->ungrab_keyboard) ATSPI_DEVICE_GET_CLASS (device)->ungrab_keyboard (device); } - diff --git a/atspi/atspi-device.h b/atspi/atspi-device.h index a246842a..37ae067d 100644 --- a/atspi/atspi-device.h +++ b/atspi/atspi-device.h @@ -3,7 +3,7 @@ * (Gnome Accessibility Project; http://developer.gnome.org/projects/gap) * * Copyright 2020 SUSE LLC. - * + * * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -30,12 +30,12 @@ G_BEGIN_DECLS -#define ATSPI_TYPE_DEVICE (atspi_device_get_type ()) -#define ATSPI_DEVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATSPI_TYPE_DEVICE, AtspiDevice)) -#define ATSPI_DEVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ATSPI_TYPE_DEVICE, AtspiDeviceClass)) -#define ATSPI_IS_DEVICE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATSPI_TYPE_DEVICE)) -#define ATSPI_IS_DEVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ATSPI_TYPE_DEVICE)) -#define ATSPI_DEVICE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ATSPI_TYPE_DEVICE, AtspiDeviceClass)) +#define ATSPI_TYPE_DEVICE (atspi_device_get_type ()) +#define ATSPI_DEVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATSPI_TYPE_DEVICE, AtspiDevice)) +#define ATSPI_DEVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ATSPI_TYPE_DEVICE, AtspiDeviceClass)) +#define ATSPI_IS_DEVICE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATSPI_TYPE_DEVICE)) +#define ATSPI_IS_DEVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ATSPI_TYPE_DEVICE)) +#define ATSPI_DEVICE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ATSPI_TYPE_DEVICE, AtspiDeviceClass)) typedef struct _AtspiDevice AtspiDevice; struct _AtspiDevice @@ -100,4 +100,4 @@ void atspi_device_ungrab_keyboard (AtspiDevice *device); G_END_DECLS -#endif /* _ATSPI_DEVICE_H_ */ +#endif /* _ATSPI_DEVICE_H_ */ diff --git a/atspi/atspi-document.c b/atspi/atspi-document.c index a92c0e22..de2ad373 100644 --- a/atspi/atspi-document.c +++ b/atspi/atspi-document.c @@ -27,7 +27,7 @@ * atspi_document_get_locale: * @obj: a pointer to the #AtspiDocument object on which to operate. * - * Gets the locale associated with the document's content, + * Gets the locale associated with the document's content, * e.g. the locale for LOCALE_TYPE_MESSAGES. * * Returns: a string compliant with the POSIX standard for locale description. @@ -58,12 +58,12 @@ atspi_document_get_locale (AtspiDocument *obj, GError **error) **/ gchar * atspi_document_get_attribute_value (AtspiDocument *obj, - gchar *attribute, - GError **error) + gchar *attribute, + GError **error) { return atspi_document_get_document_attribute_value (obj, attribute, error); } - + /** * atspi_document_get_document_attribute_value: * @obj: a pointer to the #AtspiDocument object on which to operate. @@ -76,8 +76,8 @@ atspi_document_get_attribute_value (AtspiDocument *obj, **/ gchar * atspi_document_get_document_attribute_value (AtspiDocument *obj, - gchar *attribute, - GError **error) + gchar *attribute, + GError **error) { gchar *retval = NULL; @@ -90,15 +90,14 @@ atspi_document_get_document_attribute_value (AtspiDocument *obj, return retval; } - /** * atspi_document_get_attributes: (rename-to atspi_document_get_document_attributes) * @obj: a pointer to the #AtspiDocument object on which to operate. - * + * * Gets all constant attributes for the document as a whole. For attributes * that change within the document content, see @atspi_text_get_attribute_run instead. - * + * * Returns: (element-type gchar* gchar*) (transfer full): a #GHashTable * containing the constant attributes of the document, as name-value pairs. * @@ -113,10 +112,10 @@ atspi_document_get_attributes (AtspiDocument *obj, GError **error) /** * atspi_document_get_document_attributes: * @obj: a pointer to the #AtspiDocument object on which to operate. - * + * * Gets all constant attributes for the document as a whole. For attributes * that change within the document content, see @atspi_text_get_attribute_run instead. - * + * * Returns: (element-type gchar* gchar*) (transfer full): a #GHashTable * containing the constant attributes of the document, as name-value pairs. **/ @@ -125,7 +124,7 @@ atspi_document_get_document_attributes (AtspiDocument *obj, GError **error) { DBusMessage *message; - g_return_val_if_fail (obj != NULL, NULL); + g_return_val_if_fail (obj != NULL, NULL); message = _atspi_dbus_call_partial (obj, atspi_interface_document, "GetAttributes", error, ""); return _atspi_dbus_return_hash_from_message (message); @@ -183,16 +182,15 @@ atspi_document_get_type (void) { static GType type = 0; - if (!type) { - static const GTypeInfo tinfo = + if (!type) { - sizeof (AtspiDocument), - (GBaseInitFunc) atspi_document_base_init, - (GBaseFinalizeFunc) NULL, - }; - - type = g_type_register_static (G_TYPE_INTERFACE, "AtspiDocument", &tinfo, 0); - - } + static const GTypeInfo tinfo = { + sizeof (AtspiDocument), + (GBaseInitFunc) atspi_document_base_init, + (GBaseFinalizeFunc) NULL, + }; + + type = g_type_register_static (G_TYPE_INTERFACE, "AtspiDocument", &tinfo, 0); + } return type; } diff --git a/atspi/atspi-document.h b/atspi/atspi-document.h index 429b8c6d..5dd228c8 100644 --- a/atspi/atspi-document.h +++ b/atspi/atspi-document.h @@ -4,7 +4,7 @@ * * Copyright 2002 Ximian, Inc. * 2002 Sun Microsystems Inc. - * + * * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -33,10 +33,10 @@ G_BEGIN_DECLS -#define ATSPI_TYPE_DOCUMENT (atspi_document_get_type ()) -#define ATSPI_IS_DOCUMENT(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATSPI_TYPE_DOCUMENT) -#define ATSPI_DOCUMENT(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATSPI_TYPE_DOCUMENT, AtspiDocument) -#define ATSPI_DOCUMENT_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATSPI_TYPE_DOCUMENT, AtspiDocument)) +#define ATSPI_TYPE_DOCUMENT (atspi_document_get_type ()) +#define ATSPI_IS_DOCUMENT(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATSPI_TYPE_DOCUMENT) +#define ATSPI_DOCUMENT(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATSPI_TYPE_DOCUMENT, AtspiDocument) +#define ATSPI_DOCUMENT_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATSPI_TYPE_DOCUMENT, AtspiDocument)) GType atspi_document_get_type (); @@ -45,24 +45,23 @@ struct _AtspiDocument GTypeInterface parent; }; -gchar * atspi_document_get_locale (AtspiDocument *obj, GError **error); +gchar *atspi_document_get_locale (AtspiDocument *obj, GError **error); #ifndef ATSPI_DISABLE_DEPRECATED -gchar * atspi_document_get_attribute_value (AtspiDocument *obj, gchar *attribute, GError **error); +gchar *atspi_document_get_attribute_value (AtspiDocument *obj, gchar *attribute, GError **error); #endif -gchar * atspi_document_get_document_attribute_value (AtspiDocument *obj, gchar *attribute, GError **error); +gchar *atspi_document_get_document_attribute_value (AtspiDocument *obj, gchar *attribute, GError **error); #ifndef ATSPI_DISABLE_DEPRECATED -GHashTable * atspi_document_get_attributes (AtspiDocument *obj, GError **error); +GHashTable *atspi_document_get_attributes (AtspiDocument *obj, GError **error); #endif -GHashTable * atspi_document_get_document_attributes (AtspiDocument *obj, GError **error); +GHashTable *atspi_document_get_document_attributes (AtspiDocument *obj, GError **error); gint atspi_document_get_page_count (AtspiDocument *obj, GError **error); gint atspi_document_get_current_page_number (AtspiDocument *obj, GError **error); - G_END_DECLS -#endif /* _ATSPI_DOCUMENT_H_ */ +#endif /* _ATSPI_DOCUMENT_H_ */ diff --git a/atspi/atspi-editabletext.c b/atspi/atspi-editabletext.c index 75af1593..a9b8c39b 100644 --- a/atspi/atspi-editabletext.c +++ b/atspi/atspi-editabletext.c @@ -96,7 +96,7 @@ atspi_editable_text_set_text_contents (AtspiEditableText *obj, * atspi_editable_text_insert_text: * @obj: a pointer to the #AtspiEditableText object to modify. * @position: a #gint indicating the character offset at which to insert - * the new text. + * the new text. * @text: a string representing the text to insert, in UTF-8 encoding. * @length: the number of characters of text to insert, in bytes. If the * byte count of text is less than or equal to length, the entire contents @@ -136,7 +136,7 @@ atspi_editable_text_insert_text (AtspiEditableText *obj, * * Copies text from an #AtspiEditableText object into the system clipboard. * - * see: #atspi_editable_text_paste_text + * see: #atspi_editable_text_paste_text * * Returns: #TRUE if the operation was successful, otherwise #FALSE. **/ @@ -221,7 +221,7 @@ atspi_editable_text_delete_text (AtspiEditableText *obj, * atspi_editable_text_paste_text: * @obj: a pointer to the #AtspiEditableText object to modify. * @position: a #gint indicating the character offset at which to insert - * the new text. + * the new text. * * Inserts text from the system clipboard into an #AtspiEditableText object. * As with all character offsets, the specified @position may not be the @@ -255,16 +255,15 @@ atspi_editable_text_get_type (void) { static GType type = 0; - if (!type) { - static const GTypeInfo tinfo = + if (!type) { - sizeof (AtspiEditableText), - (GBaseInitFunc) atspi_editable_text_base_init, - (GBaseFinalizeFunc) NULL, - }; - - type = g_type_register_static (G_TYPE_INTERFACE, "AtspiEditableText", &tinfo, 0); - - } + static const GTypeInfo tinfo = { + sizeof (AtspiEditableText), + (GBaseInitFunc) atspi_editable_text_base_init, + (GBaseFinalizeFunc) NULL, + }; + + type = g_type_register_static (G_TYPE_INTERFACE, "AtspiEditableText", &tinfo, 0); + } return type; } diff --git a/atspi/atspi-editabletext.h b/atspi/atspi-editabletext.h index efa5630b..ae015a4b 100644 --- a/atspi/atspi-editabletext.h +++ b/atspi/atspi-editabletext.h @@ -4,7 +4,7 @@ * * Copyright 2002 Ximian, Inc. * 2002 Sun Microsystems Inc. - * + * * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -33,10 +33,10 @@ G_BEGIN_DECLS -#define ATSPI_TYPE_EDITABLE_TEXT (atspi_editable_text_get_type ()) -#define ATSPI_IS_EDITABLE_TEXT(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATSPI_TYPE_EDITABLE_TEXT) -#define ATSPI_EDITABLE_TEXT(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATSPI_TYPE_EDITABLE_TEXT, AtspiEditableText) -#define ATSPI_EDITABLE_TEXT_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATSPI_TYPE_EDITABLE_TEXT, AtspiEditableText)) +#define ATSPI_TYPE_EDITABLE_TEXT (atspi_editable_text_get_type ()) +#define ATSPI_IS_EDITABLE_TEXT(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATSPI_TYPE_EDITABLE_TEXT) +#define ATSPI_EDITABLE_TEXT(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATSPI_TYPE_EDITABLE_TEXT, AtspiEditableText) +#define ATSPI_EDITABLE_TEXT_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATSPI_TYPE_EDITABLE_TEXT, AtspiEditableText)) GType atspi_editable_text_get_type (); @@ -63,4 +63,4 @@ gboolean atspi_editable_text_paste_text (AtspiEditableText *obj, gint position, G_END_DECLS -#endif /* _ATSPI_EDITABLE_TEXT_H_ */ +#endif /* _ATSPI_EDITABLE_TEXT_H_ */ diff --git a/atspi/atspi-event-listener-private.h b/atspi/atspi-event-listener-private.h index 054aa498..c35f2d1c 100644 --- a/atspi/atspi-event-listener-private.h +++ b/atspi/atspi-event-listener-private.h @@ -5,7 +5,7 @@ * Copyright 2002 Ximian, Inc. * 2002 Sun Microsystems Inc. * Copyright 2010, 2011 Novell, Inc. - * + * * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -40,4 +40,4 @@ _atspi_reregister_event_listeners (); G_END_DECLS -#endif /* _ATSPI_EVENT_LISTENER_H_ */ +#endif /* _ATSPI_EVENT_LISTENER_H_ */ diff --git a/atspi/atspi-event-listener.c b/atspi/atspi-event-listener.c index 4c268c41..5cc7fee3 100644 --- a/atspi/atspi-event-listener.c +++ b/atspi/atspi-event-listener.c @@ -22,11 +22,11 @@ * Boston, MA 02110-1301, USA. */ -#include "atspi-private.h" #include "atspi-accessible-private.h" +#include "atspi-private.h" +#include <ctype.h> #include <string.h> #include <strings.h> -#include <ctype.h> /** * AtspiEventListener: @@ -86,21 +86,21 @@ callback_ref (void *callback, GDestroyNotify callback_destroyed) CallbackInfo *info; if (!callbacks) - { - callbacks = g_hash_table_new (g_direct_hash, g_direct_equal); - if (!callbacks) - return; - } + { + callbacks = g_hash_table_new (g_direct_hash, g_direct_equal); + if (!callbacks) + return; + } info = g_hash_table_lookup (callbacks, callback); if (!info) - { - info = g_new (CallbackInfo, 1); - info->callback = callback; - info->callback_destroyed = callback_destroyed; - info->ref_count = 1; - g_hash_table_insert (callbacks, callback, info); - } + { + info = g_new (CallbackInfo, 1); + info->callback = callback; + info->callback_destroyed = callback_destroyed; + info->ref_count = 1; + g_hash_table_insert (callbacks, callback, info); + } else info->ref_count++; } @@ -114,21 +114,21 @@ callback_unref (gpointer callback) return; info = g_hash_table_lookup (callbacks, callback); if (!info) - { - g_warning ("AT-SPI: Dereferencing invalid callback %p\n", callback); - return; - } + { + g_warning ("AT-SPI: Dereferencing invalid callback %p\n", callback); + return; + } info->ref_count--; if (info->ref_count == 0) - { + { #if 0 /* TODO: Figure out why this seg faults from Python */ if (info->callback_destroyed) (*info->callback_destroyed) (info->callback); #endif - g_free (info); - g_hash_table_remove (callbacks, callback); - } + g_free (info); + g_hash_table_remove (callbacks, callback); + } } /** @@ -145,8 +145,8 @@ callback_unref (gpointer callback) */ AtspiEventListener * atspi_event_listener_new (AtspiEventListenerCB callback, - gpointer user_data, - GDestroyNotify callback_destroyed) + gpointer user_data, + GDestroyNotify callback_destroyed) { AtspiEventListener *listener = g_object_new (ATSPI_TYPE_EVENT_LISTENER, NULL); listener->callback = callback; @@ -182,7 +182,6 @@ static GList *event_listeners = NULL; static GList *pending_removals = NULL; static int in_send = 0; - static gchar * convert_name_from_dbus (const char *name, gboolean path_hack) { @@ -193,25 +192,25 @@ convert_name_from_dbus (const char *name, gboolean path_hack) if (!name) return g_strdup (""); - ret = g_malloc (g_utf8_strlen (name, -1) * 2 + 1); + ret = g_malloc (g_utf8_strlen (name, -1) * 2 + 1); q = ret; while (*p) - { - if (isupper (*p)) - { - if (q > ret) - *q++ = '-'; - *q++ = tolower (*p++); - } - else if (path_hack && *p == '/') { - *q++ = ':'; - p++; + if (isupper (*p)) + { + if (q > ret) + *q++ = '-'; + *q++ = tolower (*p++); + } + else if (path_hack && *p == '/') + { + *q++ = ':'; + p++; + } + else + *q++ = *p++; } - else - *q++ = *p++; - } *q = '\0'; return ret; } @@ -231,88 +230,88 @@ cache_process_children_changed (AtspiEvent *event) return; if (!strncmp (event->type, "object:children-changed:add", 27)) - { - g_ptr_array_remove (event->source->children, child); /* just to be safe */ - if (event->detail1 < 0 || event->detail1 > event->source->children->len) { - event->source->cached_properties &= ~ATSPI_CACHE_CHILDREN; - return; + g_ptr_array_remove (event->source->children, child); /* just to be safe */ + if (event->detail1 < 0 || event->detail1 > event->source->children->len) + { + event->source->cached_properties &= ~ATSPI_CACHE_CHILDREN; + return; + } + /* Unfortunately, there's no g_ptr_array_insert or similar */ + g_ptr_array_add (event->source->children, NULL); + memmove (event->source->children->pdata + event->detail1 + 1, + event->source->children->pdata + event->detail1, + (event->source->children->len - event->detail1 - 1) * sizeof (gpointer)); + g_ptr_array_index (event->source->children, event->detail1) = g_object_ref (child); } - /* Unfortunately, there's no g_ptr_array_insert or similar */ - g_ptr_array_add (event->source->children, NULL); - memmove (event->source->children->pdata + event->detail1 + 1, - event->source->children->pdata + event->detail1, - (event->source->children->len - event->detail1 - 1) * sizeof (gpointer)); - g_ptr_array_index (event->source->children, event->detail1) = g_object_ref (child); - } else - { - g_ptr_array_remove (event->source->children, child); - if (child == child->parent.app->root) - g_object_run_dispose (G_OBJECT (child->parent.app)); - } + { + g_ptr_array_remove (event->source->children, child); + if (child == child->parent.app->root) + g_object_run_dispose (G_OBJECT (child->parent.app)); + } } static void cache_process_property_change (AtspiEvent *event) { if (!strcmp (event->type, "object:property-change:accessible-parent")) - { - if (event->source->accessible_parent) - g_object_unref (event->source->accessible_parent); - if (G_VALUE_HOLDS (&event->any_data, ATSPI_TYPE_ACCESSIBLE)) - { - event->source->accessible_parent = g_value_dup_object (&event->any_data); - _atspi_accessible_add_cache (event->source, ATSPI_CACHE_PARENT); - } - else { - event->source->accessible_parent = NULL; - event->source->cached_properties &= ~ATSPI_CACHE_PARENT; + if (event->source->accessible_parent) + g_object_unref (event->source->accessible_parent); + if (G_VALUE_HOLDS (&event->any_data, ATSPI_TYPE_ACCESSIBLE)) + { + event->source->accessible_parent = g_value_dup_object (&event->any_data); + _atspi_accessible_add_cache (event->source, ATSPI_CACHE_PARENT); + } + else + { + event->source->accessible_parent = NULL; + event->source->cached_properties &= ~ATSPI_CACHE_PARENT; + } } - } else if (!strcmp (event->type, "object:property-change:accessible-name")) - { - if (event->source->name) - g_free (event->source->name); - if (G_VALUE_HOLDS_STRING (&event->any_data)) { - event->source->name = g_value_dup_string (&event->any_data); - _atspi_accessible_add_cache (event->source, ATSPI_CACHE_NAME); - } - else - { - event->source->name = NULL; - event->source->cached_properties &= ~ATSPI_CACHE_NAME; + if (event->source->name) + g_free (event->source->name); + if (G_VALUE_HOLDS_STRING (&event->any_data)) + { + event->source->name = g_value_dup_string (&event->any_data); + _atspi_accessible_add_cache (event->source, ATSPI_CACHE_NAME); + } + else + { + event->source->name = NULL; + event->source->cached_properties &= ~ATSPI_CACHE_NAME; + } } - } else if (!strcmp (event->type, "object:property-change:accessible-description")) - { - if (event->source->description) - g_free (event->source->description); - if (G_VALUE_HOLDS_STRING (&event->any_data)) { - event->source->description = g_value_dup_string (&event->any_data); - _atspi_accessible_add_cache (event->source, ATSPI_CACHE_DESCRIPTION); - } - else - { - event->source->description = NULL; - event->source->cached_properties &= ~ATSPI_CACHE_DESCRIPTION; + if (event->source->description) + g_free (event->source->description); + if (G_VALUE_HOLDS_STRING (&event->any_data)) + { + event->source->description = g_value_dup_string (&event->any_data); + _atspi_accessible_add_cache (event->source, ATSPI_CACHE_DESCRIPTION); + } + else + { + event->source->description = NULL; + event->source->cached_properties &= ~ATSPI_CACHE_DESCRIPTION; + } } - } else if (!strcmp (event->type, "object:property-change:accessible-role")) - { - if (G_VALUE_HOLDS_INT (&event->any_data)) - { - event->source->role = g_value_get_int (&event->any_data); - _atspi_accessible_add_cache (event->source, ATSPI_CACHE_ROLE); - } - else { - event->source->cached_properties &= ~ATSPI_CACHE_ROLE; + if (G_VALUE_HOLDS_INT (&event->any_data)) + { + event->source->role = g_value_get_int (&event->any_data); + _atspi_accessible_add_cache (event->source, ATSPI_CACHE_ROLE); + } + else + { + event->source->cached_properties &= ~ATSPI_CACHE_ROLE; + } } - } } static void @@ -330,16 +329,20 @@ demarshal_rect (DBusMessageIter *iter, AtspiRect *rect) DBusMessageIter iter_struct; dbus_message_iter_recurse (iter, &iter_struct); - if (dbus_message_iter_get_arg_type (&iter_struct) != DBUS_TYPE_INT32) return FALSE; + if (dbus_message_iter_get_arg_type (&iter_struct) != DBUS_TYPE_INT32) + return FALSE; dbus_message_iter_get_basic (&iter_struct, &x); dbus_message_iter_next (&iter_struct); - if (dbus_message_iter_get_arg_type (&iter_struct) != DBUS_TYPE_INT32) return FALSE; + if (dbus_message_iter_get_arg_type (&iter_struct) != DBUS_TYPE_INT32) + return FALSE; dbus_message_iter_get_basic (&iter_struct, &y); dbus_message_iter_next (&iter_struct); - if (dbus_message_iter_get_arg_type (&iter_struct) != DBUS_TYPE_INT32) return FALSE; + if (dbus_message_iter_get_arg_type (&iter_struct) != DBUS_TYPE_INT32) + return FALSE; dbus_message_iter_get_basic (&iter_struct, &width); dbus_message_iter_next (&iter_struct); - if (dbus_message_iter_get_arg_type (&iter_struct) != DBUS_TYPE_INT32) return FALSE; + if (dbus_message_iter_get_arg_type (&iter_struct) != DBUS_TYPE_INT32) + return FALSE; dbus_message_iter_get_basic (&iter_struct, &height); rect->x = x; rect->y = y; @@ -355,52 +358,61 @@ convert_event_type_to_dbus (const char *eventType, char **categoryp, char **name char *category = NULL, *name = NULL, *detail = NULL; char *saveptr = NULL; - if (tmp == NULL) return FALSE; + if (tmp == NULL) + return FALSE; category = strtok_r (tmp, ":", &saveptr); - if (category) category = g_strdup (category); + if (category) + category = g_strdup (category); name = strtok_r (NULL, ":", &saveptr); if (name) - { - name = g_strdup (name); - detail = strtok_r (NULL, ":", &saveptr); - if (detail) detail = g_strdup (detail); - } - if (matchrule_array) - { - gchar *matchrule; - (*matchrule_array) = g_ptr_array_new (); - matchrule = g_strdup_printf ("type='signal',interface='org.a11y.atspi.Event.%s'", category); - if (app) - { - gchar *new_str = g_strconcat (matchrule, ",sender='", - app->parent.app->bus_name, "'", - NULL); - g_free (matchrule); - matchrule = new_str; - } - if (name && name [0]) { - gchar *new_str = g_strconcat (matchrule, ",member='", name, "'", NULL); - g_free (matchrule); - matchrule = new_str; + name = g_strdup (name); + detail = strtok_r (NULL, ":", &saveptr); + if (detail) + detail = g_strdup (detail); } - if (detail && detail [0]) + if (matchrule_array) { - gchar *new_str = g_strconcat (matchrule, ",arg0='", detail, "'", NULL); - g_ptr_array_add (*matchrule_array, new_str); - new_str = g_strconcat (matchrule, ",arg0path='", detail, "/'", NULL); - g_ptr_array_add (*matchrule_array, new_str); - g_free (matchrule); + gchar *matchrule; + (*matchrule_array) = g_ptr_array_new (); + matchrule = g_strdup_printf ("type='signal',interface='org.a11y.atspi.Event.%s'", category); + if (app) + { + gchar *new_str = g_strconcat (matchrule, ",sender='", + app->parent.app->bus_name, "'", + NULL); + g_free (matchrule); + matchrule = new_str; + } + if (name && name[0]) + { + gchar *new_str = g_strconcat (matchrule, ",member='", name, "'", NULL); + g_free (matchrule); + matchrule = new_str; + } + if (detail && detail[0]) + { + gchar *new_str = g_strconcat (matchrule, ",arg0='", detail, "'", NULL); + g_ptr_array_add (*matchrule_array, new_str); + new_str = g_strconcat (matchrule, ",arg0path='", detail, "/'", NULL); + g_ptr_array_add (*matchrule_array, new_str); + g_free (matchrule); + } + else + g_ptr_array_add (*matchrule_array, matchrule); } - else - g_ptr_array_add (*matchrule_array, matchrule); - } - if (categoryp) *categoryp = category; - else g_free (category); - if (namep) *namep = name; - else if (name) g_free (name); - if (detailp) *detailp = detail; - else if (detail) g_free (detail); + if (categoryp) + *categoryp = category; + else + g_free (category); + if (namep) + *namep = name; + else if (name) + g_free (name); + if (detailp) + *detailp = detail; + else if (detail) + g_free (detail); g_free (tmp); return TRUE; } @@ -408,15 +420,16 @@ convert_event_type_to_dbus (const char *eventType, char **categoryp, char **name static void listener_entry_free (EventListenerEntry *e) { - gpointer callback = (e->callback == remove_datum ? (gpointer)e->user_data : (gpointer)e->callback); + gpointer callback = (e->callback == remove_datum ? (gpointer) e->user_data : (gpointer) e->callback); g_free (e->event_type); g_free (e->category); g_free (e->name); - if (e->detail) g_free (e->detail); + if (e->detail) + g_free (e->detail); callback_unref (callback); - for (int i=0; i < e->properties->len; i++) - g_free (g_array_index (e->properties, char*, i)); + for (int i = 0; i < e->properties->len; i++) + g_free (g_array_index (e->properties, char *, i)); g_array_free (e->properties, TRUE); @@ -458,7 +471,7 @@ listener_entry_free (EventListenerEntry *e) * * (other object events) * - * object:state-changed + * object:state-changed * object:children-changed * object:visible-data-changed * object:selection-changed @@ -476,7 +489,7 @@ listener_entry_free (EventListenerEntry *e) * object:announcement * * (screen reader events) -* screen-reader:region-changed + * screen-reader:region-changed * * (window events) * @@ -510,7 +523,7 @@ listener_entry_free (EventListenerEntry *e) * mouse:b3p * mouse:b3r * - * NOTE: this character string may be UTF-8, but should not contain byte + * NOTE: this character string may be UTF-8, but should not contain byte * value 56 * (ascii ':'), except as a delimiter, since non-UTF-8 string * delimiting functions are used internally. @@ -525,11 +538,11 @@ listener_entry_free (EventListenerEntry *e) **/ gboolean atspi_event_listener_register (AtspiEventListener *listener, - const gchar *event_type, - GError **error) + const gchar *event_type, + GError **error) { /* TODO: Keep track of which events have been registered, so that we - * deregister all of them when the event listener is destroyed */ + * deregister all of them when the event listener is destroyed */ return atspi_event_listener_register_from_callback (listener->callback, listener->user_data, @@ -543,7 +556,7 @@ atspi_event_listener_register (AtspiEventListener *listener, * @event_type: a character string indicating the type of events for which * notification is requested. See #atspi_event_listener_register * for a description of the format and legal event types. -* @properties: (element-type gchar*) (transfer none) (allow-none): a list of + * @properties: (element-type gchar*) (transfer none) (allow-none): a list of * properties that should be sent along with the event. The * properties are valued for the duration of the event callback. * TODO: Document. @@ -554,12 +567,12 @@ atspi_event_listener_register (AtspiEventListener *listener, **/ gboolean atspi_event_listener_register_full (AtspiEventListener *listener, - const gchar *event_type, - GArray *properties, - GError **error) + const gchar *event_type, + GArray *properties, + GError **error) { /* TODO: Keep track of which events have been registered, so that we - * deregister all of them when the event listener is destroyed */ + * deregister all of them when the event listener is destroyed */ return atspi_event_listener_register_from_callback_full (listener->callback, listener->user_data, @@ -575,7 +588,7 @@ atspi_event_listener_register_full (AtspiEventListener *listener, * @event_type: a character string indicating the type of events for which * notification is requested. See #atspi_event_listener_register * for a description of the format and legal event types. -* @properties: (element-type gchar*) (transfer none) (allow-none): a list of + * @properties: (element-type gchar*) (transfer none) (allow-none): a list of * properties that should be sent along with the event. The * properties are valued for the duration of the event callback. * @app: (allow-none): the application whose events should be reported, or @@ -587,10 +600,10 @@ atspi_event_listener_register_full (AtspiEventListener *listener, **/ gboolean atspi_event_listener_register_with_app (AtspiEventListener *listener, - const gchar *event_type, - GArray *properties, - AtspiAccessible *app, - GError **error) + const gchar *event_type, + GArray *properties, + AtspiAccessible *app, + GError **error) { return atspi_event_listener_register_from_callback_with_app (listener->callback, listener->user_data, @@ -604,13 +617,13 @@ atspi_event_listener_register_with_app (AtspiEventListener *listener, static gboolean notify_event_registered (EventListenerEntry *e) { - const char *app_path = (e->app? e->app->parent.app->bus_name: ""); + const char *app_path = (e->app ? e->app->parent.app->bus_name : ""); dbind_method_call_reentrant (_atspi_bus (), atspi_bus_registry, - atspi_path_registry, - atspi_interface_registry, - "RegisterEvent", - NULL, "sass", e->event_type, + atspi_path_registry, + atspi_interface_registry, + "RegisterEvent", + NULL, "sass", e->event_type, e->properties, app_path); return TRUE; @@ -618,14 +631,14 @@ notify_event_registered (EventListenerEntry *e) /** * atspi_event_listener_register_from_callback: - * @callback: (scope notified): the #AtspiEventListenerCB to be registered + * @callback: (scope notified): the #AtspiEventListenerCB to be registered * against an event type. * @user_data: (closure): User data to be passed to the callback. * @callback_destroyed: A #GDestroyNotify called when the callback is destroyed. * @event_type: a character string indicating the type of events for which * notification is requested. See #atspi_event_listener_register * for a description of the format. - * + * * Registers an #AtspiEventListenerCB against an @event_type. * * Returns: #TRUE if successfull, otherwise #FALSE. @@ -633,10 +646,10 @@ notify_event_registered (EventListenerEntry *e) **/ gboolean atspi_event_listener_register_from_callback (AtspiEventListenerCB callback, - void *user_data, - GDestroyNotify callback_destroyed, - const gchar *event_type, - GError **error) + void *user_data, + GDestroyNotify callback_destroyed, + const gchar *event_type, + GError **error) { return atspi_event_listener_register_from_callback_with_app (callback, user_data, @@ -676,11 +689,11 @@ copy_event_properties (GArray *src) **/ gboolean atspi_event_listener_register_from_callback_full (AtspiEventListenerCB callback, - void *user_data, - GDestroyNotify callback_destroyed, - const gchar *event_type, - GArray *properties, - GError **error) + void *user_data, + GDestroyNotify callback_destroyed, + const gchar *event_type, + GArray *properties, + GError **error) { return atspi_event_listener_register_from_callback_with_app (callback, user_data, @@ -696,7 +709,7 @@ atspi_event_listener_register_from_callback_full (AtspiEventListenerCB callback, * @callback_destroyed: (destroy callback) * @event_type: * @properties: (element-type utf8) -* @app: (allow-none) + * @app: (allow-none) * @error: * * Returns: #TRUE if successful, otherwise #FALSE. @@ -704,12 +717,12 @@ atspi_event_listener_register_from_callback_full (AtspiEventListenerCB callback, **/ gboolean atspi_event_listener_register_from_callback_with_app (AtspiEventListenerCB callback, - void *user_data, - GDestroyNotify callback_destroyed, - const gchar *event_type, - GArray *properties, - AtspiAccessible *app, - GError **error) + void *user_data, + GDestroyNotify callback_destroyed, + const gchar *event_type, + GArray *properties, + AtspiAccessible *app, + GError **error) { EventListenerEntry *e; DBusError d_error; @@ -722,42 +735,42 @@ atspi_event_listener_register_from_callback_with_app (AtspiEventListenerCB callb } if (!event_type) - { - g_warning ("called atspi_event_listener_register_from_callback with a NULL event_type"); - return FALSE; - } + { + g_warning ("called atspi_event_listener_register_from_callback with a NULL event_type"); + return FALSE; + } e = g_new0 (EventListenerEntry, 1); e->event_type = g_strdup (event_type); e->callback = callback; e->user_data = user_data; e->callback_destroyed = callback_destroyed; - callback_ref (callback == remove_datum ? (gpointer)user_data : (gpointer)callback, + callback_ref (callback == remove_datum ? (gpointer) user_data : (gpointer) callback, callback_destroyed); if (!convert_event_type_to_dbus (event_type, &e->category, &e->name, &e->detail, app, &matchrule_array)) - { - g_free (e->event_type); - g_free (e); - return FALSE; - } + { + g_free (e->event_type); + g_free (e); + return FALSE; + } if (app) e->app = g_object_ref (app); e->properties = copy_event_properties (properties); event_listeners = g_list_prepend (event_listeners, e); for (i = 0; i < matchrule_array->len; i++) - { - char *matchrule = g_ptr_array_index (matchrule_array, i); - dbus_error_init (&d_error); - dbus_bus_add_match (_atspi_bus(), matchrule, &d_error); - if (dbus_error_is_set (&d_error)) - { - g_warning ("AT-SPI: Adding match: %s", d_error.message); - dbus_error_free (&d_error); - /* TODO: Set error */ - } + { + char *matchrule = g_ptr_array_index (matchrule_array, i); + dbus_error_init (&d_error); + dbus_bus_add_match (_atspi_bus (), matchrule, &d_error); + if (dbus_error_is_set (&d_error)) + { + g_warning ("AT-SPI: Adding match: %s", d_error.message); + dbus_error_free (&d_error); + /* TODO: Set error */ + } - g_free (matchrule); - } + g_free (matchrule); + } g_ptr_array_free (matchrule_array, TRUE); notify_event_registered (e); @@ -790,16 +803,16 @@ _atspi_reregister_event_listeners () * and toolkit events (e.g. "Gtk", "AWT"). * Examples: "focus:", "Gtk:GtkWidget:button_press_event". * - * Registers an #AtspiEventListenetSimpleCB. The method is similar to + * Registers an #AtspiEventListenetSimpleCB. The method is similar to * #atspi_event_listener_register, but @callback takes no user_data. * * Returns: #TRUE if successfull, otherwise #FALSE. **/ gboolean atspi_event_listener_register_no_data (AtspiEventListenerSimpleCB callback, - GDestroyNotify callback_destroyed, - const gchar *event_type, - GError **error) + GDestroyNotify callback_destroyed, + const gchar *event_type, + GError **error) { return atspi_event_listener_register_from_callback (remove_datum, callback, callback_destroyed, @@ -809,7 +822,7 @@ atspi_event_listener_register_no_data (AtspiEventListenerSimpleCB callback, static gboolean is_superset (const gchar *super, const gchar *sub) { - if (!super || !super [0]) + if (!super || !super[0]) return TRUE; return (strcmp (super, sub) == 0); } @@ -827,8 +840,8 @@ is_superset (const gchar *super, const gchar *sub) **/ gboolean atspi_event_listener_deregister (AtspiEventListener *listener, - const gchar *event_type, - GError **error) + const gchar *event_type, + GError **error) { return atspi_event_listener_deregister_from_callback (listener->callback, listener->user_data, @@ -850,9 +863,9 @@ atspi_event_listener_deregister (AtspiEventListener *listener, **/ gboolean atspi_event_listener_deregister_from_callback (AtspiEventListenerCB callback, - void *user_data, - const gchar *event_type, - GError **error) + void *user_data, + const gchar *event_type, + GError **error) { char *category, *name, *detail; GPtrArray *matchrule_array; @@ -860,57 +873,58 @@ atspi_event_listener_deregister_from_callback (AtspiEventListenerCB callback, GList *l; if (!convert_event_type_to_dbus (event_type, &category, &name, &detail, NULL, &matchrule_array)) - { - return FALSE; - } + { + return FALSE; + } if (!callback) { return FALSE; } for (l = event_listeners; l;) - { - EventListenerEntry *e = l->data; - if (e->callback == callback && - e->user_data == user_data && - is_superset (category, e->category) && - is_superset (name, e->name) && - is_superset (detail, e->detail)) { - DBusMessage *message, *reply; - l = g_list_next (l); - if (in_send) - { - pending_removals = g_list_remove (pending_removals, e); - pending_removals = g_list_append (pending_removals, e); - } + EventListenerEntry *e = l->data; + if (e->callback == callback && + e->user_data == user_data && + is_superset (category, e->category) && + is_superset (name, e->name) && + is_superset (detail, e->detail)) + { + DBusMessage *message, *reply; + l = g_list_next (l); + if (in_send) + { + pending_removals = g_list_remove (pending_removals, e); + pending_removals = g_list_append (pending_removals, e); + } + else + event_listeners = g_list_remove (event_listeners, e); + for (i = 0; i < matchrule_array->len; i++) + { + char *matchrule = g_ptr_array_index (matchrule_array, i); + dbus_bus_remove_match (_atspi_bus (), matchrule, NULL); + } + message = dbus_message_new_method_call (atspi_bus_registry, + atspi_path_registry, + atspi_interface_registry, + "DeregisterEvent"); + if (!message) + return FALSE; + dbus_message_append_args (message, DBUS_TYPE_STRING, &event_type, DBUS_TYPE_INVALID); + reply = _atspi_dbus_send_with_reply_and_block (message, error); + if (reply) + dbus_message_unref (reply); + + if (!in_send) + listener_entry_free (e); + } else - event_listeners = g_list_remove (event_listeners, e); - for (i = 0; i < matchrule_array->len; i++) - { - char *matchrule = g_ptr_array_index (matchrule_array, i); - dbus_bus_remove_match (_atspi_bus(), matchrule, NULL); - } - message = dbus_message_new_method_call (atspi_bus_registry, - atspi_path_registry, - atspi_interface_registry, - "DeregisterEvent"); - if (!message) - return FALSE; - dbus_message_append_args (message, DBUS_TYPE_STRING, &event_type, DBUS_TYPE_INVALID); - reply = _atspi_dbus_send_with_reply_and_block (message, error); - if (reply) - dbus_message_unref (reply); - - if (!in_send) - listener_entry_free (e); + l = g_list_next (l); } - else - l = g_list_next (l); - } g_free (category); g_free (name); - if (detail) g_free (detail); + if (detail) + g_free (detail); for (i = 0; i < matchrule_array->len; i++) g_free (g_ptr_array_index (matchrule_array, i)); g_ptr_array_free (matchrule_array, TRUE); @@ -931,8 +945,8 @@ atspi_event_listener_deregister_from_callback (AtspiEventListenerCB callback, **/ gboolean atspi_event_listener_deregister_no_data (AtspiEventListenerSimpleCB callback, - const gchar *event_type, - GError **error) + const gchar *event_type, + GError **error) { return atspi_event_listener_deregister_from_callback (remove_datum, callback, event_type, @@ -973,7 +987,7 @@ detail_matches_listener (const char *event_detail, const char *listener_detail) if (!event_detail) return (listener_detail ? FALSE : TRUE); - return !(listener_detail [strcspn (listener_detail, ":")] == '\0' + return !(listener_detail[strcspn (listener_detail, ":")] == '\0' ? strncmp (listener_detail, event_detail, strcspn (event_detail, ":")) : strcmp (listener_detail, event_detail)); @@ -996,51 +1010,52 @@ _atspi_send_event (AtspiEvent *e) /* Ensure that the value is set to avoid a Python exception */ /* TODO: Figure out how to do this without using a private field */ if (e->any_data.g_type == 0) - { - g_value_init (&e->any_data, G_TYPE_INT); - g_value_set_int (&e->any_data, 0); - } + { + g_value_init (&e->any_data, G_TYPE_INT); + g_value_set_int (&e->any_data, 0); + } if (!convert_event_type_to_dbus (e->type, &category, &name, &detail, NULL, NULL)) - { - g_warning ("AT-SPI: Couldn't parse event: %s\n", e->type); - return; - } + { + g_warning ("AT-SPI: Couldn't parse event: %s\n", e->type); + return; + } in_send++; for (l = event_listeners; l; l = g_list_next (l)) - { - EventListenerEntry *entry = l->data; - if (!strcmp (category, entry->category) && - (entry->name == NULL || !strcmp (name, entry->name)) && - detail_matches_listener (detail, entry->detail) && - (entry->app == NULL || !strcmp (entry->app->parent.app->bus_name, - e->source->parent.app->bus_name))) { - GList *l2; - for (l2 = called_listeners; l2; l2 = l2->next) - { - EventListenerEntry *e2 = l2->data; - if (entry->callback == e2->callback && entry->user_data == e2->user_data) - break; - } - if (!l2) - { - for (l2 = pending_removals; l2; l2 = l2->next) + EventListenerEntry *entry = l->data; + if (!strcmp (category, entry->category) && + (entry->name == NULL || !strcmp (name, entry->name)) && + detail_matches_listener (detail, entry->detail) && + (entry->app == NULL || !strcmp (entry->app->parent.app->bus_name, + e->source->parent.app->bus_name))) { - if (l2->data == entry) - break; + GList *l2; + for (l2 = called_listeners; l2; l2 = l2->next) + { + EventListenerEntry *e2 = l2->data; + if (entry->callback == e2->callback && entry->user_data == e2->user_data) + break; + } + if (!l2) + { + for (l2 = pending_removals; l2; l2 = l2->next) + { + if (l2->data == entry) + break; + } + } + if (!l2) + { + entry->callback (atspi_event_copy (e), entry->user_data); + called_listeners = g_list_prepend (called_listeners, entry); + } } - } - if (!l2) - { - entry->callback (atspi_event_copy (e), entry->user_data); - called_listeners = g_list_prepend (called_listeners, entry); - } } - } in_send--; - if (detail) g_free (detail); + if (detail) + g_free (detail); g_free (name); g_free (category); g_list_free (called_listeners); @@ -1068,30 +1083,30 @@ _atspi_dbus_handle_event (DBusConnection *bus, DBusMessage *message) if (strcmp (signature, "siiv(so)") != 0 && strcmp (signature, "siiva{sv}") != 0) - { - g_warning ("Got invalid signature %s for signal %s from interface %s\n", signature, member, category); - return DBUS_HANDLER_RESULT_HANDLED; - } + { + g_warning ("Got invalid signature %s for signal %s from interface %s\n", signature, member, category); + return DBUS_HANDLER_RESULT_HANDLED; + } memset (&e, 0, sizeof (e)); if (category) - { - category = g_utf8_strrchr (category, -1, '.'); - if (category == NULL) + { + category = g_utf8_strrchr (category, -1, '.'); + if (category == NULL) + { + // TODO: Error + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + } + category++; + } + else { // TODO: Error + // Note that the single caller of this function, process_deferred_message(), ignores the return value. + // We should probably free the message if we aren't going to process it after all. return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } - category++; - } - else - { - // TODO: Error - // Note that the single caller of this function, process_deferred_message(), ignores the return value. - // We should probably free the message if we aren't going to process it after all. - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; - } dbus_message_iter_get_basic (&iter, &detail); dbus_message_iter_next (&iter); dbus_message_iter_get_basic (&iter, &detail1); @@ -1105,108 +1120,108 @@ _atspi_dbus_handle_event (DBusConnection *bus, DBusMessage *message) name = convert_name_from_dbus (member, FALSE); detail = convert_name_from_dbus (detail, TRUE); - if (strcasecmp (category, name) != 0) - { - p = g_strconcat (converted_type, ":", name, NULL); - g_free (converted_type); - converted_type = p; - } - else if (detail [0] == '\0') - { - p = g_strconcat (converted_type, ":", NULL); - g_free (converted_type); - converted_type = p; - } + if (strcasecmp (category, name) != 0) + { + p = g_strconcat (converted_type, ":", name, NULL); + g_free (converted_type); + converted_type = p; + } + else if (detail[0] == '\0') + { + p = g_strconcat (converted_type, ":", NULL); + g_free (converted_type); + converted_type = p; + } if (detail[0] != '\0') - { - p = g_strconcat (converted_type, ":", detail, NULL); - g_free (converted_type); - converted_type = p; - } + { + p = g_strconcat (converted_type, ":", detail, NULL); + g_free (converted_type); + converted_type = p; + } e.type = converted_type; if (strcmp (category, "ScreenReader") != 0) - { - e.source = _atspi_ref_accessible (sender, dbus_message_get_path (message)); - if (e.source == NULL) { - g_warning ("Got no valid source accessible for signal %s from interface %s\n", member, category); - g_free (converted_type); - g_free (name); - g_free (detail); - return DBUS_HANDLER_RESULT_HANDLED; + e.source = _atspi_ref_accessible (sender, dbus_message_get_path (message)); + if (e.source == NULL) + { + g_warning ("Got no valid source accessible for signal %s from interface %s\n", member, category); + g_free (converted_type); + g_free (name); + g_free (detail); + return DBUS_HANDLER_RESULT_HANDLED; + } } - } dbus_message_iter_recurse (&iter, &iter_variant); switch (dbus_message_iter_get_arg_type (&iter_variant)) - { - case DBUS_TYPE_STRUCT: { - AtspiRect rect; - if (demarshal_rect (&iter_variant, &rect)) - { - g_value_init (&e.any_data, ATSPI_TYPE_RECT); - g_value_set_boxed (&e.any_data, &rect); - } - else + case DBUS_TYPE_STRUCT: { - AtspiAccessible *accessible; - accessible = _atspi_dbus_consume_accessible (&iter_variant); - if (!strcmp (category, "ScreenReader")) - { - g_object_unref (e.source); - e.source = accessible; - } + AtspiRect rect; + if (demarshal_rect (&iter_variant, &rect)) + { + g_value_init (&e.any_data, ATSPI_TYPE_RECT); + g_value_set_boxed (&e.any_data, &rect); + } else - { - g_value_init (&e.any_data, ATSPI_TYPE_ACCESSIBLE); - g_value_set_instance (&e.any_data, accessible); - if (accessible) - g_object_unref (accessible); /* value now owns it */ - } + { + AtspiAccessible *accessible; + accessible = _atspi_dbus_consume_accessible (&iter_variant); + if (!strcmp (category, "ScreenReader")) + { + g_object_unref (e.source); + e.source = accessible; + } + else + { + g_value_init (&e.any_data, ATSPI_TYPE_ACCESSIBLE); + g_value_set_instance (&e.any_data, accessible); + if (accessible) + g_object_unref (accessible); /* value now owns it */ + } + } + break; } - break; - } case DBUS_TYPE_STRING: - { - dbus_message_iter_get_basic (&iter_variant, &p); - g_value_init (&e.any_data, G_TYPE_STRING); - g_value_set_string (&e.any_data, p); + { + dbus_message_iter_get_basic (&iter_variant, &p); + g_value_init (&e.any_data, G_TYPE_STRING); + g_value_set_string (&e.any_data, p); + break; + } + default: break; } - default: - break; - } g_assert (e.source != NULL); dbus_message_iter_next (&iter); if (dbus_message_iter_get_arg_type (&iter) == DBUS_TYPE_ARRAY) - { - /* new form -- parse properties sent with event */ - cache = _atspi_dbus_update_cache_from_dict (e.source, &iter); - } + { + /* new form -- parse properties sent with event */ + cache = _atspi_dbus_update_cache_from_dict (e.source, &iter); + } e.sender = _atspi_ref_accessible (sender, ATSPI_DBUS_PATH_ROOT); if (!strncmp (e.type, "object:children-changed", 23)) - { - cache_process_children_changed (&e); - } + { + cache_process_children_changed (&e); + } else if (!strncmp (e.type, "object:property-change", 22)) - { - cache_process_property_change (&e); - } + { + cache_process_property_change (&e); + } else if (!strncmp (e.type, "object:state-changed", 20)) - { - cache_process_state_changed (&e); - } + { + cache_process_state_changed (&e); + } else if (!strncmp (e.type, "focus", 5)) - { - /* BGO#663992 - TODO: figure out the real problem */ - e.source->cached_properties &= ~(ATSPI_CACHE_STATES); - } + { + /* BGO#663992 - TODO: figure out the real problem */ + e.source->cached_properties &= ~(ATSPI_CACHE_STATES); + } _atspi_send_event (&e); diff --git a/atspi/atspi-event-listener.h b/atspi/atspi-event-listener.h index 687e1e78..b294525e 100644 --- a/atspi/atspi-event-listener.h +++ b/atspi/atspi-event-listener.h @@ -5,7 +5,7 @@ * Copyright 2002 Ximian, Inc. * 2002 Sun Microsystems Inc. * Copyright 2010, 2011 Novell, Inc. - * + * * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -40,26 +40,26 @@ GType atspi_event_get_type (void); * @user_data: User data which is passed to the callback each time a notification takes place. * * A function prototype for callbacks via which clients are notified of AT-SPI events. - * + * **/ -typedef void (*AtspiEventListenerCB) (AtspiEvent *event, - void *user_data); +typedef void (*AtspiEventListenerCB) (AtspiEvent *event, + void *user_data); /** * AtspiEventListenerSimpleCB: * @event: (transfer full): The event for which notification is sent. * * Like #AtspiEventlistenerCB, but with no user_data. - * + * **/ -typedef void (*AtspiEventListenerSimpleCB) (const AtspiEvent *event); +typedef void (*AtspiEventListenerSimpleCB) (const AtspiEvent *event); -#define ATSPI_TYPE_EVENT_LISTENER (atspi_event_listener_get_type ()) -#define ATSPI_EVENT_LISTENER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATSPI_TYPE_EVENT_LISTENER, AtspiEventListener)) -#define ATSPI_EVENT_LISTENER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ATSPI_TYPE_EVENT_LISTENER, AtspiEventListenerClass)) -#define ATSPI_IS_EVENT_LISTENER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATSPI_TYPE_EVENT_LISTENER)) -#define ATSPI_IS_EVENT_LISTENER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ATSPI_TYPE_EVENT_LISTENER)) -#define ATSPI_EVENT_LISTENER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ATSPI_TYPE_EVENT_LISTENER, AtspiEventListenerClass)) +#define ATSPI_TYPE_EVENT_LISTENER (atspi_event_listener_get_type ()) +#define ATSPI_EVENT_LISTENER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATSPI_TYPE_EVENT_LISTENER, AtspiEventListener)) +#define ATSPI_EVENT_LISTENER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ATSPI_TYPE_EVENT_LISTENER, AtspiEventListenerClass)) +#define ATSPI_IS_EVENT_LISTENER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATSPI_TYPE_EVENT_LISTENER)) +#define ATSPI_IS_EVENT_LISTENER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ATSPI_TYPE_EVENT_LISTENER)) +#define ATSPI_EVENT_LISTENER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ATSPI_TYPE_EVENT_LISTENER, AtspiEventListenerClass)) typedef struct _AtspiEventListener AtspiEventListener; struct _AtspiEventListener @@ -80,8 +80,8 @@ GType atspi_event_listener_get_type (void); AtspiEventListener * atspi_event_listener_new (AtspiEventListenerCB callback, - gpointer user_data, - GDestroyNotify callback_destroyed); + gpointer user_data, + GDestroyNotify callback_destroyed); AtspiEventListener * atspi_event_listener_new_simple (AtspiEventListenerSimpleCB callback, @@ -89,68 +89,68 @@ atspi_event_listener_new_simple (AtspiEventListenerSimpleCB callback, gboolean atspi_event_listener_register (AtspiEventListener *listener, - const gchar *event_type, - GError **error); + const gchar *event_type, + GError **error); gboolean atspi_event_listener_register_full (AtspiEventListener *listener, - const gchar *event_type, - GArray *properties, - GError **error); + const gchar *event_type, + GArray *properties, + GError **error); gboolean atspi_event_listener_register_with_app (AtspiEventListener *listener, - const gchar *event_type, + const gchar *event_type, GArray *properties, AtspiAccessible *app, - GError **error); + GError **error); gboolean atspi_event_listener_register_from_callback (AtspiEventListenerCB callback, - void *user_data, - GDestroyNotify callback_destroyed, - const gchar *event_type, - GError **error); + void *user_data, + GDestroyNotify callback_destroyed, + const gchar *event_type, + GError **error); gboolean atspi_event_listener_register_from_callback_full (AtspiEventListenerCB callback, - void *user_data, - GDestroyNotify callback_destroyed, - const gchar *event_type, + void *user_data, + GDestroyNotify callback_destroyed, + const gchar *event_type, GArray *properties, - GError **error); + GError **error); gboolean atspi_event_listener_register_from_callback_with_app (AtspiEventListenerCB callback, - void *user_data, - GDestroyNotify callback_destroyed, - const gchar *event_type, + void *user_data, + GDestroyNotify callback_destroyed, + const gchar *event_type, GArray *properties, AtspiAccessible *app, - GError **error); + GError **error); gboolean atspi_event_listener_register_no_data (AtspiEventListenerSimpleCB callback, - GDestroyNotify callback_destroyed, - const gchar *event_type, - GError **error); + GDestroyNotify callback_destroyed, + const gchar *event_type, + GError **error); gboolean atspi_event_listener_deregister (AtspiEventListener *listener, - const gchar *event_type, - GError **error); + const gchar *event_type, + GError **error); gboolean atspi_event_listener_deregister_from_callback (AtspiEventListenerCB callback, - void *user_data, - const gchar *event_type, - GError **error); + void *user_data, + const gchar *event_type, + GError **error); gboolean atspi_event_listener_deregister_no_data (AtspiEventListenerSimpleCB callback, - const gchar *event_type, - GError **error); + const gchar *event_type, + GError **error); G_END_DECLS -#endif /* _ATSPI_EVENT_LISTENER_H_ */ +#endif /* _ATSPI_EVENT_LISTENER_H_ */ diff --git a/atspi/atspi-gmain.c b/atspi/atspi-gmain.c index 588a60d1..941fee8c 100644 --- a/atspi/atspi-gmain.c +++ b/atspi/atspi-gmain.c @@ -5,7 +5,7 @@ * Copyright (C) 2005 Red Hat, Inc. * * Licensed under the Academic Free License version 2.1 - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -15,7 +15,7 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA @@ -24,9 +24,9 @@ * and unnecessary code removed. */ +#include "glib.h" #include <config.h> #include <dbus/dbus.h> -#include "glib.h" #include <string.h> #include <libintl.h> @@ -41,16 +41,16 @@ */ typedef struct { - GSource source; /* the parent GSource */ + GSource source; /* the parent GSource */ DBusConnection *connection; /* the connection to dispatch */ } DBusGMessageQueue; -static gboolean message_queue_prepare (GSource *source, - gint *timeout); -static gboolean message_queue_check (GSource *source); -static gboolean message_queue_dispatch (GSource *source, - GSourceFunc callback, - gpointer user_data); +static gboolean message_queue_prepare (GSource *source, + gint *timeout); +static gboolean message_queue_check (GSource *source); +static gboolean message_queue_dispatch (GSource *source, + GSourceFunc callback, + gpointer user_data); static const GSourceFuncs message_queue_funcs = { message_queue_prepare, @@ -61,13 +61,13 @@ static const GSourceFuncs message_queue_funcs = { static gboolean message_queue_prepare (GSource *source, - gint *timeout) + gint *timeout) { - DBusConnection *connection = ((DBusGMessageQueue *)source)->connection; - + DBusConnection *connection = ((DBusGMessageQueue *) source)->connection; + *timeout = -1; - return (dbus_connection_get_dispatch_status (connection) == DBUS_DISPATCH_DATA_REMAINS); + return (dbus_connection_get_dispatch_status (connection) == DBUS_DISPATCH_DATA_REMAINS); } static gboolean @@ -77,17 +77,17 @@ message_queue_check (GSource *source) } static gboolean -message_queue_dispatch (GSource *source, - GSourceFunc callback, - gpointer user_data) +message_queue_dispatch (GSource *source, + GSourceFunc callback, + gpointer user_data) { - DBusConnection *connection = ((DBusGMessageQueue *)source)->connection; + DBusConnection *connection = ((DBusGMessageQueue *) source)->connection; dbus_connection_ref (connection); /* Only dispatch once - we don't want to starve other GSource */ dbus_connection_dispatch (connection); - + dbus_connection_unref (connection); return TRUE; @@ -95,14 +95,13 @@ message_queue_dispatch (GSource *source, typedef struct { - GMainContext *context; /* the main context */ - GSList *ios; /* all IOHandler */ - GSList *timeouts; /* all TimeoutHandler */ - DBusConnection *connection; /* NULL if this is really for a server not a connection */ + GMainContext *context; /* the main context */ + GSList *ios; /* all IOHandler */ + GSList *timeouts; /* all TimeoutHandler */ + DBusConnection *connection; /* NULL if this is really for a server not a connection */ GSource *message_queue_source; /* DBusGMessageQueue */ } ConnectionSetup; - typedef struct { ConnectionSetup *cs; @@ -120,8 +119,8 @@ typedef struct dbus_int32_t _dbus_gmain_connection_slot = -1; static dbus_int32_t server_slot = -1; -static ConnectionSetup* -connection_setup_new (GMainContext *context, +static ConnectionSetup * +connection_setup_new (GMainContext *context, DBusConnection *connection) { ConnectionSetup *cs; @@ -129,9 +128,9 @@ connection_setup_new (GMainContext *context, cs = g_new0 (ConnectionSetup, 1); g_assert (context != NULL); - + cs->context = context; - g_main_context_ref (cs->context); + g_main_context_ref (cs->context); if (connection) { @@ -139,10 +138,10 @@ connection_setup_new (GMainContext *context, cs->message_queue_source = g_source_new ((GSourceFuncs *) &message_queue_funcs, sizeof (DBusGMessageQueue)); - ((DBusGMessageQueue*)cs->message_queue_source)->connection = connection; + ((DBusGMessageQueue *) cs->message_queue_source)->connection = connection; g_source_attach (cs->message_queue_source, cs->context); } - + return cs; } @@ -155,7 +154,7 @@ io_handler_source_finalized (gpointer data) if (handler->watch) dbus_watch_set_data (handler->watch, NULL, NULL); - + g_free (handler); } @@ -189,9 +188,9 @@ io_handler_watch_freed (void *data) } static gboolean -io_handler_dispatch (GIOChannel *source, - GIOCondition condition, - gpointer data) +io_handler_dispatch (GIOChannel *source, + GIOCondition condition, + gpointer data) { IOHandler *handler; guint dbus_condition = 0; @@ -200,10 +199,10 @@ io_handler_dispatch (GIOChannel *source, handler = data; connection = handler->cs->connection; - + if (connection) dbus_connection_ref (connection); - + if (condition & G_IO_IN) dbus_condition |= DBUS_WATCH_READABLE; if (condition & G_IO_OUT) @@ -222,7 +221,7 @@ io_handler_dispatch (GIOChannel *source, if (connection) dbus_connection_unref (connection); - + return TRUE; } @@ -231,16 +230,16 @@ io_handler_dispatch (GIOChannel *source, */ static void connection_setup_add_watch (ConnectionSetup *cs, - DBusWatch *watch) + DBusWatch *watch) { guint flags; GIOCondition condition; GIOChannel *channel; IOHandler *handler; - + if (!dbus_watch_get_enabled (watch)) return; - + flags = dbus_watch_get_flags (watch); condition = G_IO_ERR | G_IO_HUP; @@ -252,23 +251,23 @@ connection_setup_add_watch (ConnectionSetup *cs, handler = g_new0 (IOHandler, 1); handler->cs = cs; handler->watch = watch; - + channel = g_io_channel_unix_new (dbus_watch_get_unix_fd (watch)); - + handler->source = g_io_create_watch (channel, condition); g_source_set_callback (handler->source, (GSourceFunc) io_handler_dispatch, handler, io_handler_source_finalized); g_source_attach (handler->source, cs->context); cs->ios = g_slist_prepend (cs->ios, handler); - + dbus_watch_set_data (watch, handler, io_handler_watch_freed); g_io_channel_unref (channel); } static void connection_setup_remove_watch (ConnectionSetup *cs, - DBusWatch *watch) + DBusWatch *watch) { IOHandler *handler; @@ -276,7 +275,7 @@ connection_setup_remove_watch (ConnectionSetup *cs, if (handler == NULL || handler->cs != cs) return; - + io_handler_destroy_source (handler); } @@ -289,7 +288,7 @@ timeout_handler_source_finalized (gpointer data) if (handler->timeout) dbus_timeout_set_data (handler->timeout, NULL, NULL); - + g_free (handler); } @@ -323,26 +322,26 @@ timeout_handler_timeout_freed (void *data) } static gboolean -timeout_handler_dispatch (gpointer data) +timeout_handler_dispatch (gpointer data) { TimeoutHandler *handler; handler = data; dbus_timeout_handle (handler->timeout); - + return TRUE; } static void connection_setup_add_timeout (ConnectionSetup *cs, - DBusTimeout *timeout) + DBusTimeout *timeout) { TimeoutHandler *handler; - + if (!dbus_timeout_get_enabled (timeout)) return; - + handler = g_new0 (TimeoutHandler, 1); handler->cs = cs; handler->timeout = timeout; @@ -359,15 +358,15 @@ connection_setup_add_timeout (ConnectionSetup *cs, static void connection_setup_remove_timeout (ConnectionSetup *cs, - DBusTimeout *timeout) + DBusTimeout *timeout) { TimeoutHandler *handler; - + handler = dbus_timeout_get_data (timeout); if (handler == NULL) return; - + timeout_handler_destroy_source (handler); } @@ -390,27 +389,27 @@ connection_setup_free (ConnectionSetup *cs) g_source_destroy (source); g_source_unref (source); } - + g_main_context_unref (cs->context); g_free (cs); } static dbus_bool_t add_watch (DBusWatch *watch, - gpointer data) + gpointer data) { ConnectionSetup *cs; cs = data; connection_setup_add_watch (cs, watch); - + return TRUE; } static void remove_watch (DBusWatch *watch, - gpointer data) + gpointer data) { ConnectionSetup *cs; @@ -421,7 +420,7 @@ remove_watch (DBusWatch *watch, static void watch_toggled (DBusWatch *watch, - void *data) + void *data) { /* Because we just exit on OOM, enable/disable is * no different from add/remove @@ -434,12 +433,12 @@ watch_toggled (DBusWatch *watch, static dbus_bool_t add_timeout (DBusTimeout *timeout, - void *data) + void *data) { ConnectionSetup *cs; cs = data; - + if (!dbus_timeout_get_enabled (timeout)) return TRUE; @@ -450,7 +449,7 @@ add_timeout (DBusTimeout *timeout, static void remove_timeout (DBusTimeout *timeout, - void *data) + void *data) { ConnectionSetup *cs; @@ -461,7 +460,7 @@ remove_timeout (DBusTimeout *timeout, static void timeout_toggled (DBusTimeout *timeout, - void *data) + void *data) { /* Because we just exit on OOM, enable/disable is * no different from add/remove @@ -480,18 +479,17 @@ wakeup_main (void *data) g_main_context_wakeup (cs->context); } - /* Move to a new context */ -static ConnectionSetup* -connection_setup_new_from_old (GMainContext *context, +static ConnectionSetup * +connection_setup_new_from_old (GMainContext *context, ConnectionSetup *old) { ConnectionSetup *cs; g_assert (old->context != context); - + cs = connection_setup_new (context, old->connection); - + while (old->ios != NULL) { IOHandler *handler = old->ios->data; @@ -529,11 +527,11 @@ connection_setup_new_from_old (GMainContext *context, */ void atspi_dbus_connection_setup_with_g_main (DBusConnection *connection, - GMainContext *context) + GMainContext *context) { ConnectionSetup *old_setup; ConnectionSetup *cs; - + /* FIXME we never free the slot, so its refcount just keeps growing, * which is kind of broken. */ @@ -545,7 +543,7 @@ atspi_dbus_connection_setup_with_g_main (DBusConnection *connection, context = g_main_context_default (); cs = NULL; - + old_setup = dbus_connection_get_data (connection, _dbus_gmain_connection_slot); if (old_setup != NULL) { @@ -553,7 +551,7 @@ atspi_dbus_connection_setup_with_g_main (DBusConnection *connection, return; /* nothing to do */ cs = connection_setup_new_from_old (context, old_setup); - + /* Nuke the old setup */ dbus_connection_set_data (connection, _dbus_gmain_connection_slot, NULL, NULL); old_setup = NULL; @@ -563,9 +561,9 @@ atspi_dbus_connection_setup_with_g_main (DBusConnection *connection, cs = connection_setup_new (context, connection); if (!dbus_connection_set_data (connection, _dbus_gmain_connection_slot, cs, - (DBusFreeFunction)connection_setup_free)) + (DBusFreeFunction) connection_setup_free)) goto nomem; - + if (!dbus_connection_set_watch_functions (connection, add_watch, remove_watch, @@ -579,14 +577,14 @@ atspi_dbus_connection_setup_with_g_main (DBusConnection *connection, timeout_toggled, cs, NULL)) goto nomem; - + dbus_connection_set_wakeup_main_function (connection, - wakeup_main, - cs, NULL); - + wakeup_main, + cs, NULL); + return; - nomem: +nomem: g_error ("Not enough memory to set up DBusConnection for use with GLib"); } @@ -605,12 +603,12 @@ atspi_dbus_connection_setup_with_g_main (DBusConnection *connection, * connection. */ void -atspi_dbus_server_setup_with_g_main (DBusServer *server, - GMainContext *context) +atspi_dbus_server_setup_with_g_main (DBusServer *server, + GMainContext *context) { ConnectionSetup *old_setup; ConnectionSetup *cs; - + /* FIXME we never free the slot, so its refcount just keeps growing, * which is kind of broken. */ @@ -622,7 +620,7 @@ atspi_dbus_server_setup_with_g_main (DBusServer *server, context = g_main_context_default (); cs = NULL; - + old_setup = dbus_server_get_data (server, server_slot); if (old_setup != NULL) { @@ -630,7 +628,7 @@ atspi_dbus_server_setup_with_g_main (DBusServer *server, return; /* nothing to do */ cs = connection_setup_new_from_old (context, old_setup); - + /* Nuke the old setup */ if (!dbus_server_set_data (server, server_slot, NULL, NULL)) goto nomem; @@ -641,9 +639,9 @@ atspi_dbus_server_setup_with_g_main (DBusServer *server, cs = connection_setup_new (context, NULL); if (!dbus_server_set_data (server, server_slot, cs, - (DBusFreeFunction)connection_setup_free)) + (DBusFreeFunction) connection_setup_free)) goto nomem; - + if (!dbus_server_set_watch_functions (server, add_watch, remove_watch, @@ -657,9 +655,9 @@ atspi_dbus_server_setup_with_g_main (DBusServer *server, timeout_toggled, cs, NULL)) goto nomem; - + return; - nomem: +nomem: g_error ("Not enough memory to set up DBusServer for use with GLib"); } diff --git a/atspi/atspi-gmain.h b/atspi/atspi-gmain.h index 9efbe5e5..1fc3fb47 100644 --- a/atspi/atspi-gmain.h +++ b/atspi/atspi-gmain.h @@ -2,7 +2,7 @@ /* atspi-gmain.h atspi dbus gmain prototypes * * Licensed under the Academic Free License version 2.1 - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2.1 of the License, or @@ -12,7 +12,7 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA @@ -24,15 +24,18 @@ #ifndef _ATSPI_GMAIN_H #define _ATSPI_GMAIN_H +#include <dbus/dbus.h> +#include <glib.h> + G_BEGIN_DECLS void atspi_dbus_connection_setup_with_g_main (DBusConnection *connection, - GMainContext *context); + GMainContext *context); void -atspi_dbus_server_setup_with_g_main (DBusServer *server, - GMainContext *context); +atspi_dbus_server_setup_with_g_main (DBusServer *server, + GMainContext *context); G_END_DECLS diff --git a/atspi/atspi-hyperlink.c b/atspi/atspi-hyperlink.c index c815a31e..af091752 100644 --- a/atspi/atspi-hyperlink.c +++ b/atspi/atspi-hyperlink.c @@ -55,7 +55,7 @@ AtspiHyperlink * _atspi_hyperlink_new (AtspiApplication *app, const gchar *path) { AtspiHyperlink *hyperlink; - + hyperlink = g_object_new (ATSPI_TYPE_HYPERLINK, NULL); hyperlink->parent.app = g_object_ref (app); hyperlink->parent.path = g_strdup (path); @@ -124,7 +124,7 @@ atspi_hyperlink_get_uri (AtspiHyperlink *obj, int i, GError **error) * Returns: (transfer full): an #AtspiAccessible that represents the object * associated with the @ith anchor of the specified #AtspiHyperlink. **/ -AtspiAccessible* +AtspiAccessible * atspi_hyperlink_get_object (AtspiHyperlink *obj, gint i, GError **error) { dbus_int32_t d_i = i; @@ -207,7 +207,6 @@ atspi_hyperlink_get_end_index (AtspiHyperlink *obj, GError **error) return d_end_offset; } - /** * atspi_hyperlink_is_valid: * @obj: a pointer to the #AtspiHyperlink on which to operate. diff --git a/atspi/atspi-hyperlink.h b/atspi/atspi-hyperlink.h index 7caea90b..ebfb4e20 100644 --- a/atspi/atspi-hyperlink.h +++ b/atspi/atspi-hyperlink.h @@ -5,7 +5,7 @@ * Copyright 2002 Ximian, Inc. * 2002 Sun Microsystems Inc. * Copyright 2010, 2011 Novell, Inc. - * + * * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -30,17 +30,17 @@ #include "atspi-constants.h" -#include "atspi-text.h" /* for AtspiRange */ +#include "atspi-text.h" /* for AtspiRange */ #include "atspi-types.h" G_BEGIN_DECLS -#define ATSPI_TYPE_HYPERLINK (atspi_hyperlink_get_type ()) -#define ATSPI_HYPERLINK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATSPI_TYPE_HYPERLINK, AtspiHyperlink)) -#define ATSPI_HYPERLINK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ATSPI_TYPE_HYPERLINK, AtspiHyperlinkClass)) -#define ATSPI_IS_HYPERLINK(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATSPI_TYPE_HYPERLINK)) -#define ATSPI_IS_HYPERLINK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ATSPI_TYPE_HYPERLINK)) -#define ATSPI_HYPERLINK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ATSPI_TYPE_HYPERLINK, AtspiHyperlinkClass)) +#define ATSPI_TYPE_HYPERLINK (atspi_hyperlink_get_type ()) +#define ATSPI_HYPERLINK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATSPI_TYPE_HYPERLINK, AtspiHyperlink)) +#define ATSPI_HYPERLINK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ATSPI_TYPE_HYPERLINK, AtspiHyperlinkClass)) +#define ATSPI_IS_HYPERLINK(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATSPI_TYPE_HYPERLINK)) +#define ATSPI_IS_HYPERLINK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ATSPI_TYPE_HYPERLINK)) +#define ATSPI_HYPERLINK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ATSPI_TYPE_HYPERLINK, AtspiHyperlinkClass)) struct _AtspiHyperlink { @@ -53,18 +53,18 @@ struct _AtspiHyperlinkClass AtspiObjectClass parent_class; }; -GType atspi_hyperlink_get_type (void); +GType atspi_hyperlink_get_type (void); AtspiHyperlink * _atspi_hyperlink_new (AtspiApplication *app, const gchar *path); gint atspi_hyperlink_get_n_anchors (AtspiHyperlink *obj, GError **error); -gchar * atspi_hyperlink_get_uri (AtspiHyperlink *obj, int i, GError **error); +gchar *atspi_hyperlink_get_uri (AtspiHyperlink *obj, int i, GError **error); -AtspiAccessible* atspi_hyperlink_get_object (AtspiHyperlink *obj, gint i, GError **error); +AtspiAccessible *atspi_hyperlink_get_object (AtspiHyperlink *obj, gint i, GError **error); -AtspiRange * atspi_hyperlink_get_index_range (AtspiHyperlink *obj, GError **error); +AtspiRange *atspi_hyperlink_get_index_range (AtspiHyperlink *obj, GError **error); gint atspi_hyperlink_get_start_index (AtspiHyperlink *obj, GError **error); @@ -74,4 +74,4 @@ gboolean atspi_hyperlink_is_valid (AtspiHyperlink *obj, GError **error); G_END_DECLS -#endif /* _ATSPI_HYPERLINK_H_ */ +#endif /* _ATSPI_HYPERLINK_H_ */ diff --git a/atspi/atspi-hypertext.c b/atspi/atspi-hypertext.c index ffe20f21..c08c8bfe 100644 --- a/atspi/atspi-hypertext.c +++ b/atspi/atspi-hypertext.c @@ -77,7 +77,7 @@ atspi_hypertext_get_link (AtspiHypertext *obj, gint link_index, GError **error) { dbus_int32_t d_link_index = link_index; DBusMessage *reply; - + g_return_val_if_fail (obj != NULL, NULL); reply = _atspi_dbus_call_partial (obj, atspi_interface_hypertext, "GetLink", error, "i", d_link_index); @@ -99,7 +99,7 @@ atspi_hypertext_get_link (AtspiHypertext *obj, gint link_index, GError **error) **/ int atspi_hypertext_get_link_index (AtspiHypertext *obj, - gint character_offset, + gint character_offset, GError **error) { dbus_int32_t d_character_offset = character_offset; @@ -122,16 +122,15 @@ atspi_hypertext_get_type (void) { static GType type = 0; - if (!type) { - static const GTypeInfo tinfo = + if (!type) { - sizeof (AtspiHypertext), - (GBaseInitFunc) atspi_hypertext_base_init, - (GBaseFinalizeFunc) NULL, - }; - - type = g_type_register_static (G_TYPE_INTERFACE, "AtspiHypertext", &tinfo, 0); - - } + static const GTypeInfo tinfo = { + sizeof (AtspiHypertext), + (GBaseInitFunc) atspi_hypertext_base_init, + (GBaseFinalizeFunc) NULL, + }; + + type = g_type_register_static (G_TYPE_INTERFACE, "AtspiHypertext", &tinfo, 0); + } return type; } diff --git a/atspi/atspi-hypertext.h b/atspi/atspi-hypertext.h index 891fd3a9..83e7add4 100644 --- a/atspi/atspi-hypertext.h +++ b/atspi/atspi-hypertext.h @@ -5,7 +5,7 @@ * Copyright 2002 Ximian, Inc. * 2002 Sun Microsystems Inc. * Copyright 2010, 2011 Novell, Inc. - * + * * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -34,10 +34,10 @@ G_BEGIN_DECLS -#define ATSPI_TYPE_HYPERTEXT (atspi_hypertext_get_type ()) -#define ATSPI_IS_HYPERTEXT(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATSPI_TYPE_HYPERTEXT) -#define ATSPI_HYPERTEXT(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATSPI_TYPE_HYPERTEXT, AtspiHypertext) -#define ATSPI_HYPERTEXT_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATSPI_TYPE_HYPERTEXT, AtspiHypertext)) +#define ATSPI_TYPE_HYPERTEXT (atspi_hypertext_get_type ()) +#define ATSPI_IS_HYPERTEXT(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATSPI_TYPE_HYPERTEXT) +#define ATSPI_HYPERTEXT(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATSPI_TYPE_HYPERTEXT, AtspiHypertext) +#define ATSPI_HYPERTEXT_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATSPI_TYPE_HYPERTEXT, AtspiHypertext)) GType atspi_hypertext_get_type (); @@ -48,10 +48,10 @@ struct _AtspiHypertext gint atspi_hypertext_get_n_links (AtspiHypertext *obj, GError **error); -AtspiHyperlink * atspi_hypertext_get_link (AtspiHypertext *obj, gint link_index, GError **error); +AtspiHyperlink *atspi_hypertext_get_link (AtspiHypertext *obj, gint link_index, GError **error); -gint atspi_hypertext_get_link_index (AtspiHypertext *obj, gint character_offset, GError **error); +gint atspi_hypertext_get_link_index (AtspiHypertext *obj, gint character_offset, GError **error); G_END_DECLS -#endif /* _ATSPI_HYPERTEXT_H_ */ +#endif /* _ATSPI_HYPERTEXT_H_ */ diff --git a/atspi/atspi-image.c b/atspi/atspi-image.c index 4fd5ae71..40737ab6 100644 --- a/atspi/atspi-image.c +++ b/atspi/atspi-image.c @@ -84,8 +84,8 @@ atspi_image_get_image_size (AtspiImage *obj, GError **error) * STATE_VISIBLE and STATE_SHOWING. * * Returns: a pointer to an #AtspiPoint where x and y correspond to the - * minimum coordinates of the displayed image. - * + * minimum coordinates of the displayed image. + * **/ AtspiPoint * atspi_image_get_image_position (AtspiImage *obj, @@ -119,13 +119,13 @@ atspi_image_get_image_position (AtspiImage *obj, * The returned values are meaningful only if the Image has both * STATE_VISIBLE and STATE_SHOWING. * - * Returns: a pointer to an #AtspiRect corresponding to the image's bounding box. The minimum x and y coordinates, + * Returns: a pointer to an #AtspiRect corresponding to the image's bounding box. The minimum x and y coordinates, * width, and height are specified. **/ AtspiRect * atspi_image_get_image_extents (AtspiImage *obj, - AtspiCoordType ctype, - GError **error) + AtspiCoordType ctype, + GError **error) { dbus_uint32_t d_ctype = ctype; AtspiRect bbox; @@ -147,7 +147,7 @@ atspi_image_get_image_extents (AtspiImage *obj, * Returns: A POSIX LC_MESSAGES-style locale value for image description and text. **/ gchar * -atspi_image_get_image_locale (AtspiImage *obj, GError **error) +atspi_image_get_image_locale (AtspiImage *obj, GError **error) { gchar *retval = NULL; @@ -168,16 +168,15 @@ atspi_image_get_type (void) { static GType type = 0; - if (!type) { - static const GTypeInfo tinfo = + if (!type) { - sizeof (AtspiImage), - (GBaseInitFunc) atspi_image_base_init, - (GBaseFinalizeFunc) NULL, - }; - - type = g_type_register_static (G_TYPE_INTERFACE, "AtspiImage", &tinfo, 0); - - } + static const GTypeInfo tinfo = { + sizeof (AtspiImage), + (GBaseInitFunc) atspi_image_base_init, + (GBaseFinalizeFunc) NULL, + }; + + type = g_type_register_static (G_TYPE_INTERFACE, "AtspiImage", &tinfo, 0); + } return type; } diff --git a/atspi/atspi-image.h b/atspi/atspi-image.h index 57fe3a17..c101223a 100644 --- a/atspi/atspi-image.h +++ b/atspi/atspi-image.h @@ -5,7 +5,7 @@ * Copyright 2002 Ximian, Inc. * 2002 Sun Microsystems Inc. * Copyright 2010, 2011 Novell, Inc. - * + * * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -34,10 +34,10 @@ G_BEGIN_DECLS -#define ATSPI_TYPE_IMAGE (atspi_image_get_type ()) -#define ATSPI_IS_IMAGE(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATSPI_TYPE_IMAGE) -#define ATSPI_IMAGE(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATSPI_TYPE_IMAGE, AtspiImage) -#define ATSPI_IMAGE_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATSPI_TYPE_IMAGE, AtspiImage)) +#define ATSPI_TYPE_IMAGE (atspi_image_get_type ()) +#define ATSPI_IS_IMAGE(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATSPI_TYPE_IMAGE) +#define ATSPI_IMAGE(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATSPI_TYPE_IMAGE, AtspiImage) +#define ATSPI_IMAGE_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATSPI_TYPE_IMAGE, AtspiImage)) GType atspi_image_get_type (); @@ -46,16 +46,16 @@ struct _AtspiImage GTypeInterface parent; }; -gchar * atspi_image_get_image_description (AtspiImage *obj, GError **error); +gchar *atspi_image_get_image_description (AtspiImage *obj, GError **error); -AtspiPoint * atspi_image_get_image_size (AtspiImage *obj, GError **error); +AtspiPoint *atspi_image_get_image_size (AtspiImage *obj, GError **error); -AtspiPoint * atspi_image_get_image_position (AtspiImage *obj, AtspiCoordType ctype, GError **error); +AtspiPoint *atspi_image_get_image_position (AtspiImage *obj, AtspiCoordType ctype, GError **error); -AtspiRect * atspi_image_get_image_extents (AtspiImage *obj, AtspiCoordType ctype, GError **error); +AtspiRect *atspi_image_get_image_extents (AtspiImage *obj, AtspiCoordType ctype, GError **error); -gchar * atspi_image_get_image_locale (AtspiImage *obj, GError **error); +gchar *atspi_image_get_image_locale (AtspiImage *obj, GError **error); G_END_DECLS -#endif /* _ATSPI_IMAGE_H_ */ +#endif /* _ATSPI_IMAGE_H_ */ diff --git a/atspi/atspi-matchrule-private.h b/atspi/atspi-matchrule-private.h index a8b579a0..df12ba49 100644 --- a/atspi/atspi-matchrule-private.h +++ b/atspi/atspi-matchrule-private.h @@ -5,7 +5,7 @@ * Copyright 2002 Ximian, Inc. * 2002 Sun Microsystems Inc. * Copyright 2010, 2011 Novell, Inc. - * + * * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -38,4 +38,4 @@ _atspi_match_rule_marshal (AtspiMatchRule *rule, DBusMessageIter *iter); G_END_DECLS -#endif /* _ATSPI_MATCH_RULE_PRIVATE_H_ */ +#endif /* _ATSPI_MATCH_RULE_PRIVATE_H_ */ diff --git a/atspi/atspi-matchrule.c b/atspi/atspi-matchrule.c index a75150ee..b7508ca6 100644 --- a/atspi/atspi-matchrule.c +++ b/atspi/atspi-matchrule.c @@ -44,16 +44,16 @@ atspi_match_rule_dispose (GObject *object) AtspiMatchRule *rule = ATSPI_MATCH_RULE (object); if (rule->states) - { - g_object_unref (rule->states); - rule->states = NULL; - } + { + g_object_unref (rule->states); + rule->states = NULL; + } if (rule->attributes) - { - g_hash_table_unref (rule->attributes); - rule->attributes = NULL; - } + { + g_hash_table_unref (rule->attributes); + rule->attributes = NULL; + } G_OBJECT_CLASS (atspi_match_rule_parent_class)->dispose (object); } @@ -65,11 +65,11 @@ atspi_match_rule_finalize (GObject *object) gint i; if (rule->interfaces) - { - for (i = 0; i < rule->interfaces->len; i++) - g_free (g_array_index (rule->interfaces, gchar *, i)); - g_array_free (rule->interfaces, TRUE); - } + { + for (i = 0; i < rule->interfaces->len; i++) + g_free (g_array_index (rule->interfaces, gchar *, i)); + g_array_free (rule->interfaces, TRUE); + } if (rule->attributes) g_hash_table_unref (rule->attributes); @@ -114,7 +114,7 @@ atspi_match_rule_class_init (AtspiMatchRuleClass *klass) * inverting it would match all objects that are not of ROLE_HEADING, * focusable and clickable at the same time. * - * Creates a new #AtspiMatchRule with specified @states, @attributes, + * Creates a new #AtspiMatchRule with specified @states, @attributes, * @interfaces, and @roles. * * Returns: (transfer full): A new #AtspiMatchRule. @@ -138,44 +138,45 @@ atspi_match_rule_new (AtspiStateSet *states, rule->statematchtype = statematchtype; if (attributes) - { - GHashTableIter hash_table_iter; - gchar *key, *value; - rule->attributes = g_hash_table_new_full (g_str_hash, g_str_equal, - (GDestroyNotify) g_free, - (GDestroyNotify) g_free); - g_hash_table_iter_init (&hash_table_iter, attributes); - while (g_hash_table_iter_next (&hash_table_iter, (gpointer *)&key, - (gpointer *)&value)) - g_hash_table_insert (rule->attributes, g_strdup (key), g_strdup (value)); - } else + { + GHashTableIter hash_table_iter; + gchar *key, *value; + rule->attributes = g_hash_table_new_full (g_str_hash, g_str_equal, + (GDestroyNotify) g_free, + (GDestroyNotify) g_free); + g_hash_table_iter_init (&hash_table_iter, attributes); + while (g_hash_table_iter_next (&hash_table_iter, (gpointer *) &key, + (gpointer *) &value)) + g_hash_table_insert (rule->attributes, g_strdup (key), g_strdup (value)); + } + else rule->attributes = NULL; rule->attributematchtype = attributematchtype; if (interfaces) - { - rule->interfaces = g_array_new (TRUE, TRUE, sizeof (gchar *)); - for (i = 0; i < interfaces->len; i++) { - gchar *val = g_strdup (g_array_index (interfaces, gchar *, i)); - rule->interfaces = g_array_append_val (rule->interfaces, val); + rule->interfaces = g_array_new (TRUE, TRUE, sizeof (gchar *)); + for (i = 0; i < interfaces->len; i++) + { + gchar *val = g_strdup (g_array_index (interfaces, gchar *, i)); + rule->interfaces = g_array_append_val (rule->interfaces, val); + } } - } rule->interfacematchtype = interfacematchtype; if (roles) - { - for (i = 0; i < roles->len; i++) { - AtspiRole role = g_array_index (roles, AtspiRole, i); - if (role < 128) - rule->roles [role / 32] |= (1 << (role % 32)); - else - g_warning ("AT-SPI: unexpected role %d\n", role); + for (i = 0; i < roles->len; i++) + { + AtspiRole role = g_array_index (roles, AtspiRole, i); + if (role < 128) + rule->roles[role / 32] |= (1 << (role % 32)); + else + g_warning ("AT-SPI: unexpected role %d\n", role); + } } - } else - rule->roles [0] = rule->roles [1] = 0; + rule->roles[0] = rule->roles[1] = 0; rule->rolematchtype = rolematchtype; rule->invert = invert; @@ -190,7 +191,7 @@ append_entry (gpointer key, gpointer val, gpointer data) DBusMessageIter iter_entry; if (!dbus_message_iter_open_container (iter, DBUS_TYPE_DICT_ENTRY, NULL, - &iter_entry)) + &iter_entry)) return; dbus_message_iter_append_basic (&iter_entry, DBUS_TYPE_STRING, &key); dbus_message_iter_append_basic (&iter_entry, DBUS_TYPE_STRING, &val); @@ -201,7 +202,7 @@ gboolean _atspi_match_rule_marshal (AtspiMatchRule *rule, DBusMessageIter *iter) { DBusMessageIter iter_struct, iter_array, iter_dict; - dbus_int32_t states [2]; + dbus_int32_t states[2]; dbus_int32_t d_statematchtype = rule->statematchtype; dbus_int32_t d_attributematchtype = rule->attributematchtype; dbus_int32_t d_interfacematchtype = rule->interfacematchtype; @@ -216,17 +217,17 @@ _atspi_match_rule_marshal (AtspiMatchRule *rule, DBusMessageIter *iter) /* states */ if (rule->states) - { - states [0] = rule->states->states & 0xffffffff; - states [1] = rule->states->states >> 32; - } + { + states[0] = rule->states->states & 0xffffffff; + states[1] = rule->states->states >> 32; + } else - { - states [0] = states [1] = 0; - } + { + states[0] = states[1] = 0; + } dbus_message_iter_open_container (&iter_struct, DBUS_TYPE_ARRAY, "i", &iter_array); - dbus_message_iter_append_basic (&iter_array, DBUS_TYPE_INT32, &states [0]); - dbus_message_iter_append_basic (&iter_array, DBUS_TYPE_INT32, &states [1]); + dbus_message_iter_append_basic (&iter_array, DBUS_TYPE_INT32, &states[0]); + dbus_message_iter_append_basic (&iter_array, DBUS_TYPE_INT32, &states[1]); dbus_message_iter_close_container (&iter_struct, &iter_array); dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_INT32, &d_statematchtype); @@ -240,15 +241,15 @@ _atspi_match_rule_marshal (AtspiMatchRule *rule, DBusMessageIter *iter) dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_INT32, &d_attributematchtype); if (!dbus_message_iter_open_container (&iter_struct, DBUS_TYPE_ARRAY, "i", - &iter_array)) + &iter_array)) return FALSE; - d_role = rule->roles [0]; + d_role = rule->roles[0]; dbus_message_iter_append_basic (&iter_array, DBUS_TYPE_INT32, &d_role); - d_role = rule->roles [1]; + d_role = rule->roles[1]; dbus_message_iter_append_basic (&iter_array, DBUS_TYPE_INT32, &d_role); - d_role = rule->roles [2]; + d_role = rule->roles[2]; dbus_message_iter_append_basic (&iter_array, DBUS_TYPE_INT32, &d_role); - d_role = rule->roles [3]; + d_role = rule->roles[3]; dbus_message_iter_append_basic (&iter_array, DBUS_TYPE_INT32, &d_role); dbus_message_iter_close_container (&iter_struct, &iter_array); dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_INT32, @@ -256,16 +257,16 @@ _atspi_match_rule_marshal (AtspiMatchRule *rule, DBusMessageIter *iter) /* interfaces */ if (!dbus_message_iter_open_container (&iter_struct, DBUS_TYPE_ARRAY, "s", - &iter_array)) + &iter_array)) return FALSE; if (rule->interfaces) - { - for (i = 0; i < rule->interfaces->len; i++) { - char *val = g_array_index (rule->interfaces, gchar *, i); - dbus_message_iter_append_basic (&iter_array, DBUS_TYPE_STRING, &val); + for (i = 0; i < rule->interfaces->len; i++) + { + char *val = g_array_index (rule->interfaces, gchar *, i); + dbus_message_iter_append_basic (&iter_array, DBUS_TYPE_STRING, &val); + } } - } dbus_message_iter_close_container (&iter_struct, &iter_array); dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_INT32, &d_interfacematchtype); diff --git a/atspi/atspi-matchrule.h b/atspi/atspi-matchrule.h index ddcb0d6a..09ae1ecf 100644 --- a/atspi/atspi-matchrule.h +++ b/atspi/atspi-matchrule.h @@ -5,7 +5,7 @@ * Copyright 2002 Ximian, Inc. * 2002 Sun Microsystems Inc. * Copyright 2010, 2011 Novell, Inc. - * + * * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -28,18 +28,18 @@ #include "glib-object.h" -#include "atspi-stateset.h" #include "atspi-constants.h" +#include "atspi-stateset.h" #include "atspi-types.h" G_BEGIN_DECLS -#define ATSPI_TYPE_MATCH_RULE (atspi_match_rule_get_type ()) -#define ATSPI_MATCH_RULE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATSPI_TYPE_MATCH_RULE, AtspiMatchRule)) -#define ATSPI_MATCH_RULE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ATSPI_TYPE_MATCH_RULE, AtspiMatchRuleClass)) -#define ATSPI_IS_MATCH_RULE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATSPI_TYPE_MATCH_RULE)) -#define ATSPI_IS_MATCH_RULE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ATSPI_TYPE_MATCH_RULE)) -#define ATSPI_MATCH_RULE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ATSPI_TYPE_MATCH_RULE, AtspiMatchRuleClass)) +#define ATSPI_TYPE_MATCH_RULE (atspi_match_rule_get_type ()) +#define ATSPI_MATCH_RULE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATSPI_TYPE_MATCH_RULE, AtspiMatchRule)) +#define ATSPI_MATCH_RULE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ATSPI_TYPE_MATCH_RULE, AtspiMatchRuleClass)) +#define ATSPI_IS_MATCH_RULE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATSPI_TYPE_MATCH_RULE)) +#define ATSPI_IS_MATCH_RULE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ATSPI_TYPE_MATCH_RULE)) +#define ATSPI_MATCH_RULE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ATSPI_TYPE_MATCH_RULE, AtspiMatchRuleClass)) typedef struct _AtspiMatchRule AtspiMatchRule; struct _AtspiMatchRule @@ -51,7 +51,7 @@ struct _AtspiMatchRule AtspiCollectionMatchType attributematchtype; GArray *interfaces; AtspiCollectionMatchType interfacematchtype; - gint roles [4]; + gint roles[4]; AtspiCollectionMatchType rolematchtype; gboolean invert; }; @@ -77,4 +77,4 @@ atspi_match_rule_new (AtspiStateSet *states, G_END_DECLS -#endif /* _ATSPI_MATCH_RULE_H_ */ +#endif /* _ATSPI_MATCH_RULE_H_ */ diff --git a/atspi/atspi-misc-private.h b/atspi/atspi-misc-private.h index b3040d5d..e386a241 100644 --- a/atspi/atspi-misc-private.h +++ b/atspi/atspi-misc-private.h @@ -5,7 +5,7 @@ * Copyright 2002 Ximian, Inc. * 2002 Sun Microsystems Inc. * Copyright 2010, 2011 Novell, Inc. - * + * * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -73,9 +73,9 @@ extern const char *atspi_interface_value; /* function prototypes */ gint _atspi_get_iface_num (const char *iface); -DBusConnection * _atspi_bus (); +DBusConnection *_atspi_bus (); -AtspiAccessible * _atspi_ref_accessible (const char *app, const char *path); +AtspiAccessible *_atspi_ref_accessible (const char *app, const char *path); AtspiAccessible * _atspi_dbus_return_accessible_from_message (DBusMessage *message); @@ -97,7 +97,7 @@ DBusMessage *_atspi_dbus_call_partial_va (gpointer obj, const char *interface, c dbus_bool_t _atspi_dbus_get_property (gpointer obj, const char *interface, const char *name, GError **error, const char *type, void *data); -DBusMessage * _atspi_dbus_send_with_reply_and_block (DBusMessage *message, GError **error); +DBusMessage *_atspi_dbus_send_with_reply_and_block (DBusMessage *message, GError **error); GHashTable *_atspi_dbus_return_hash_from_message (DBusMessage *message); @@ -111,25 +111,24 @@ void _atspi_dbus_set_interfaces (AtspiAccessible *accessible, DBusMessageIter *i void _atspi_dbus_set_state (AtspiAccessible *accessible, DBusMessageIter *iter); -#define _ATSPI_DBUS_CHECK_SIG(message, type, error, ret) \ - if (!message) \ - return (ret); \ - if (dbus_message_get_type (message) == DBUS_MESSAGE_TYPE_ERROR) \ - { \ - const char *err; \ - dbus_message_get_args (message, NULL, DBUS_TYPE_STRING, &err, DBUS_TYPE_INVALID); \ - if (err) \ - g_set_error_literal (error, ATSPI_ERROR, ATSPI_ERROR_IPC, err); \ - dbus_message_unref (message); \ - return ret; \ - } \ - if (strcmp (dbus_message_get_signature (message), type) != 0) \ - { \ - g_warning ("AT-SPI: Expected message signature %s but got %s at %s line %d", type, dbus_message_get_signature (message), __FILE__, __LINE__); \ - dbus_message_unref (message); \ - return (ret); \ - } - +#define _ATSPI_DBUS_CHECK_SIG(message, type, error, ret) \ + if (!message) \ + return (ret); \ + if (dbus_message_get_type (message) == DBUS_MESSAGE_TYPE_ERROR) \ + { \ + const char *err; \ + dbus_message_get_args (message, NULL, DBUS_TYPE_STRING, &err, DBUS_TYPE_INVALID); \ + if (err) \ + g_set_error_literal (error, ATSPI_ERROR, ATSPI_ERROR_IPC, err); \ + dbus_message_unref (message); \ + return ret; \ + } \ + if (strcmp (dbus_message_get_signature (message), type) != 0) \ + { \ + g_warning ("AT-SPI: Expected message signature %s but got %s at %s line %d", type, dbus_message_get_signature (message), __FILE__, __LINE__); \ + dbus_message_unref (message); \ + return (ret); \ + } /** * ATSPI_ERROR: @@ -138,7 +137,7 @@ void _atspi_dbus_set_state (AtspiAccessible *accessible, DBusMessageIter *iter); * be from the #ATSPIAtspiError enumeration. See #GError for information on * error domains. */ -#define ATSPI_ERROR _atspi_error_quark() +#define ATSPI_ERROR _atspi_error_quark () GQuark _atspi_error_quark (void); /** @@ -162,7 +161,7 @@ GHashTable *_atspi_dbus_update_cache_from_dict (AtspiAccessible *accessible, DBu gboolean _atspi_prepare_screen_reader_interface (); -gchar * _atspi_strdup_and_adjust_for_dbus (const char *s); +gchar *_atspi_strdup_and_adjust_for_dbus (const char *s); G_END_DECLS -#endif /* _ATSPI_MISC_PRIVATE_H_ */ +#endif /* _ATSPI_MISC_PRIVATE_H_ */ diff --git a/atspi/atspi-misc.c b/atspi/atspi-misc.c index dc22a53b..388d65d1 100644 --- a/atspi/atspi-misc.c +++ b/atspi/atspi-misc.c @@ -33,9 +33,9 @@ #include "X11/Xlib.h" #endif #include "atspi-gmain.h" +#include <ctype.h> #include <stdio.h> #include <string.h> -#include <ctype.h> /** * AtspiMisc: @@ -79,8 +79,7 @@ const char *atspi_interface_text = ATSPI_DBUS_INTERFACE_TEXT; const char *atspi_interface_cache = ATSPI_DBUS_INTERFACE_CACHE; const char *atspi_interface_value = ATSPI_DBUS_INTERFACE_VALUE; -static const char *interfaces[] = -{ +static const char *interfaces[] = { ATSPI_DBUS_INTERFACE_ACCESSIBLE, ATSPI_DBUS_INTERFACE_ACTION, ATSPI_DBUS_INTERFACE_APPLICATION, @@ -107,16 +106,17 @@ _atspi_get_iface_num (const char *iface) int i; for (i = 0; interfaces[i]; i++) - { - if (!strcmp(iface, interfaces[i])) return i; - } + { + if (!strcmp (iface, interfaces[i])) + return i; + } return -1; } GHashTable * _atspi_get_live_refs (void) { - if (!live_refs) + if (!live_refs) { live_refs = g_hash_table_new (g_direct_hash, g_direct_equal); } @@ -158,12 +158,12 @@ cleanup () /* TODO: Do we need this code, or should we just dispose the desktop? */ for (i = desktop->children->len - 1; i >= 0; i--) - { - AtspiAccessible *child = g_ptr_array_index (desktop->children, i); - if (child->parent.app) - g_object_run_dispose (G_OBJECT (child->parent.app)); - g_object_run_dispose (G_OBJECT (child)); - } + { + AtspiAccessible *child = g_ptr_array_index (desktop->children, i); + if (child->parent.app) + g_object_run_dispose (G_OBJECT (child->parent.app)); + g_object_run_dispose (G_OBJECT (child)); + } g_object_run_dispose (G_OBJECT (desktop->parent.app)); g_object_unref (desktop); @@ -177,7 +177,7 @@ end: bus = NULL; } - cleanup_deferred_message (); + cleanup_deferred_message (); } static gboolean atspi_inited = FALSE; @@ -194,32 +194,33 @@ handle_get_bus_address (DBusPendingCall *pending, void *user_data) DBusPendingCall *new_pending; if (dbus_message_get_type (reply) == DBUS_MESSAGE_TYPE_METHOD_RETURN) - { - if (dbus_message_get_args (reply, NULL, DBUS_TYPE_STRING, &address, - DBUS_TYPE_INVALID) && address [0]) { - DBusError error; - DBusConnection *bus; + if (dbus_message_get_args (reply, NULL, DBUS_TYPE_STRING, &address, + DBUS_TYPE_INVALID) && + address[0]) + { + DBusError error; + DBusConnection *bus; - dbus_error_init (&error); - bus = dbus_connection_open_private (address, &error); - if (bus) - { - if (app->bus) - { - dbus_connection_unref (app->bus); - } - app->bus = bus; - atspi_dbus_connection_setup_with_g_main(bus, g_main_context_default()); - } - else - { - if (!strcmp (error.name, DBUS_ERROR_FILE_NOT_FOUND)) - g_warning ("AT-SPI: Unable to open bus connection: %s", error.message); - dbus_error_free (&error); - } + dbus_error_init (&error); + bus = dbus_connection_open_private (address, &error); + if (bus) + { + if (app->bus) + { + dbus_connection_unref (app->bus); + } + app->bus = bus; + atspi_dbus_connection_setup_with_g_main (bus, g_main_context_default ()); + } + else + { + if (!strcmp (error.name, DBUS_ERROR_FILE_NOT_FOUND)) + g_warning ("AT-SPI: Unable to open bus connection: %s", error.message); + dbus_error_free (&error); + } + } } - } dbus_message_unref (reply); dbus_pending_call_unref (pending); @@ -246,14 +247,17 @@ get_application (const char *bus_name) DBusPendingCall *pending = NULL; if (!app_hash) - { - app_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify)g_object_unref); - if (!app_hash) return NULL; - } + { + app_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify) g_object_unref); + if (!app_hash) + return NULL; + } app = g_hash_table_lookup (app_hash, bus_name); - if (app) return app; + if (app) + return app; bus_name_dup = g_strdup (bus_name); - if (!bus_name_dup) return NULL; + if (!bus_name_dup) + return NULL; // TODO: change below to something that will send state-change:defunct notification if necessary */ app = _atspi_application_new (bus_name); app->hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref); @@ -267,10 +271,10 @@ get_application (const char *bus_name) dbus_connection_send_with_reply (app->bus, message, &pending, 2000); dbus_message_unref (message); if (!pending) - { - g_hash_table_remove (app_hash, bus_name_dup); - return NULL; - } + { + g_hash_table_remove (app_hash, bus_name_dup); + return NULL; + } dbus_pending_call_set_notify (pending, handle_get_bus_address, app, NULL); return app; } @@ -287,21 +291,21 @@ ref_accessible (const char *app_name, const char *path) app = get_application (app_name); if (!strcmp (path, "/org/a11y/atspi/accessible/root")) - { - if (!app->root) { - app->root = _atspi_accessible_new (app, atspi_path_root); - app->root->accessible_parent = atspi_get_desktop (0); - g_ptr_array_add (app->root->accessible_parent->children, g_object_ref (app->root)); + if (!app->root) + { + app->root = _atspi_accessible_new (app, atspi_path_root); + app->root->accessible_parent = atspi_get_desktop (0); + g_ptr_array_add (app->root->accessible_parent->children, g_object_ref (app->root)); + } + return g_object_ref (app->root); } - return g_object_ref (app->root); - } a = g_hash_table_lookup (app->hash, path); if (a) - { - return g_object_ref (a); - } + { + return g_object_ref (a); + } a = _atspi_accessible_new (app, path); if (!a) return NULL; @@ -320,13 +324,13 @@ ref_hyperlink (const char *app_name, const char *path) hyperlink = g_hash_table_lookup (app->hash, path); if (hyperlink) - { - return g_object_ref (hyperlink); - } + { + return g_object_ref (hyperlink); + } hyperlink = _atspi_hyperlink_new (app, path); g_hash_table_insert (app->hash, g_strdup (hyperlink->parent.path), hyperlink); /* TODO: This should be a weak ref */ - g_object_ref (hyperlink); /* for the hash */ + g_object_ref (hyperlink); /* for the hash */ return hyperlink; } @@ -353,10 +357,10 @@ handle_remove_accessible (DBusConnection *bus, DBusMessage *message) AtspiAccessible *a; if (strcmp (signature, "(so)") != 0) - { - g_warning ("AT-SPI: Unknown signature %s for RemoveAccessible", signature); - return DBUS_HANDLER_RESULT_HANDLED; - } + { + g_warning ("AT-SPI: Unknown signature %s for RemoveAccessible", signature); + return DBUS_HANDLER_RESULT_HANDLED; + } dbus_message_iter_init (message, &iter); dbus_message_iter_recurse (&iter, &iter_struct); @@ -369,7 +373,7 @@ handle_remove_accessible (DBusConnection *bus, DBusMessage *message) return DBUS_HANDLER_RESULT_HANDLED; g_object_run_dispose (G_OBJECT (a)); g_hash_table_remove (app->hash, a->parent.path); - g_object_unref (a); /* unref our own ref */ + g_object_unref (a); /* unref our own ref */ return DBUS_HANDLER_RESULT_HANDLED; } @@ -384,27 +388,27 @@ handle_name_owner_changed (DBusConnection *bus, DBusMessage *message) DBUS_TYPE_STRING, &old, DBUS_TYPE_STRING, &new, DBUS_TYPE_INVALID)) - { - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; - } + { + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + } if (!strcmp (name, "org.a11y.atspi.Registry")) - { - if (registry_lost && !old[0]) { - _atspi_reregister_event_listeners (); - _atspi_reregister_device_listeners (); - registry_lost = FALSE; + if (registry_lost && !old[0]) + { + _atspi_reregister_event_listeners (); + _atspi_reregister_device_listeners (); + registry_lost = FALSE; + } + else if (!new[0]) + registry_lost = TRUE; } - else if (!new[0]) - registry_lost = TRUE; - } else if (app_hash) - { - AtspiApplication *app = g_hash_table_lookup (app_hash, old); - if (app && !strcmp (app->bus_name, old)) - g_object_run_dispose (G_OBJECT (app)); - } + { + AtspiApplication *app = g_hash_table_lookup (app_hash, old); + if (app && !strcmp (app->bus_name, old)) + g_object_run_dispose (G_OBJECT (app)); + } return DBUS_HANDLER_RESULT_HANDLED; } @@ -458,48 +462,48 @@ add_accessible_from_iter (DBusMessageIter *iter) accessible->accessible_parent = parent; if (dbus_message_iter_get_arg_type (&iter_struct) == 'i') - { - /* Get index in parent */ - dbus_message_iter_get_basic (&iter_struct, &index); - if (index >= 0 && accessible->accessible_parent) { - if (index >= accessible->accessible_parent->children->len) - { - /* There is no room for this object */ - g_ptr_array_set_size (accessible->accessible_parent->children, index + 1); - } - else - { - /* This place is already taken - let's free this place with dignity */ - if (g_ptr_array_index (accessible->accessible_parent->children, index)) - g_object_unref (g_ptr_array_index (accessible->accessible_parent->children, index)); - } - g_ptr_array_index (accessible->accessible_parent->children, index) = g_object_ref (accessible); - } + /* Get index in parent */ + dbus_message_iter_get_basic (&iter_struct, &index); + if (index >= 0 && accessible->accessible_parent) + { + if (index >= accessible->accessible_parent->children->len) + { + /* There is no room for this object */ + g_ptr_array_set_size (accessible->accessible_parent->children, index + 1); + } + else + { + /* This place is already taken - let's free this place with dignity */ + if (g_ptr_array_index (accessible->accessible_parent->children, index)) + g_object_unref (g_ptr_array_index (accessible->accessible_parent->children, index)); + } + g_ptr_array_index (accessible->accessible_parent->children, index) = g_object_ref (accessible); + } - /* get child count */ - dbus_message_iter_next (&iter_struct); - dbus_message_iter_get_basic (&iter_struct, &count); - if (count >= 0) - { - g_ptr_array_set_size (accessible->children, count); - children_cached = TRUE; + /* get child count */ + dbus_message_iter_next (&iter_struct); + dbus_message_iter_get_basic (&iter_struct, &count); + if (count >= 0) + { + g_ptr_array_set_size (accessible->children, count); + children_cached = TRUE; + } } - } else if (dbus_message_iter_get_arg_type (&iter_struct) == 'a') - { - /* It's the old API with a list of children */ - /* TODO: Perhaps remove this code eventually */ - dbus_message_iter_recurse (&iter_struct, &iter_array); - while (dbus_message_iter_get_arg_type (&iter_array) != DBUS_TYPE_INVALID) { - AtspiAccessible *child; - child = _atspi_dbus_consume_accessible (&iter_array); - g_ptr_array_remove (accessible->children, child); - g_ptr_array_add (accessible->children, child); + /* It's the old API with a list of children */ + /* TODO: Perhaps remove this code eventually */ + dbus_message_iter_recurse (&iter_struct, &iter_array); + while (dbus_message_iter_get_arg_type (&iter_array) != DBUS_TYPE_INVALID) + { + AtspiAccessible *child; + child = _atspi_dbus_consume_accessible (&iter_array); + g_ptr_array_remove (accessible->children, child); + g_ptr_array_add (accessible->children, child); + } + children_cached = TRUE; } - children_cached = TRUE; - } /* interfaces */ dbus_message_iter_next (&iter_struct); @@ -529,10 +533,10 @@ add_accessible_from_iter (DBusMessageIter *iter) dbus_message_iter_next (&iter_struct); _atspi_accessible_add_cache (accessible, ATSPI_CACHE_NAME | ATSPI_CACHE_ROLE | - ATSPI_CACHE_PARENT | ATSPI_CACHE_DESCRIPTION); + ATSPI_CACHE_PARENT | ATSPI_CACHE_DESCRIPTION); if (!atspi_state_set_contains (accessible->states, - ATSPI_STATE_MANAGES_DESCENDANTS) && - children_cached) + ATSPI_STATE_MANAGES_DESCENDANTS) && + children_cached) _atspi_accessible_add_cache (accessible, ATSPI_CACHE_CHILDREN); /* This is a bit of a hack since the cache holds a ref, so we don't need @@ -547,32 +551,31 @@ handle_get_items (DBusPendingCall *pending, void *user_data) DBusMessageIter iter, iter_array; if (dbus_message_get_type (reply) == DBUS_MESSAGE_TYPE_ERROR) - { - const char *sender = dbus_message_get_sender (reply); - const char *error = NULL; - const char *error_name = dbus_message_get_error_name (reply); - if (!strcmp (error_name, DBUS_ERROR_SERVICE_UNKNOWN) - || !strcmp (error_name, DBUS_ERROR_NO_REPLY)) - { - } - else { - dbus_message_get_args (reply, NULL, DBUS_TYPE_STRING, &error, - DBUS_TYPE_INVALID); - g_warning ("AT-SPI: Error in GetItems, sender=%s, error=%s", sender, error); + const char *sender = dbus_message_get_sender (reply); + const char *error = NULL; + const char *error_name = dbus_message_get_error_name (reply); + if (!strcmp (error_name, DBUS_ERROR_SERVICE_UNKNOWN) || !strcmp (error_name, DBUS_ERROR_NO_REPLY)) + { + } + else + { + dbus_message_get_args (reply, NULL, DBUS_TYPE_STRING, &error, + DBUS_TYPE_INVALID); + g_warning ("AT-SPI: Error in GetItems, sender=%s, error=%s", sender, error); + } + dbus_message_unref (reply); + dbus_pending_call_unref (pending); + return; } - dbus_message_unref (reply); - dbus_pending_call_unref (pending); - return; - } dbus_message_iter_init (reply, &iter); dbus_message_iter_recurse (&iter, &iter_array); while (dbus_message_iter_get_arg_type (&iter_array) != DBUS_TYPE_INVALID) - { - add_accessible_from_iter (&iter_array); - dbus_message_iter_next (&iter_array); - } + { + add_accessible_from_iter (&iter_array); + dbus_message_iter_next (&iter_array); + } dbus_message_unref (reply); dbus_pending_call_unref (pending); } @@ -587,46 +590,46 @@ ref_accessible_desktop (AtspiApplication *app) gchar *bus_name_dup; if (desktop) - { - g_object_ref (desktop); - return desktop; - } + { + g_object_ref (desktop); + return desktop; + } desktop = _atspi_accessible_new (app, atspi_path_root); if (!desktop) - { - return NULL; - } + { + return NULL; + } g_hash_table_insert (app->hash, g_strdup (desktop->parent.path), g_object_ref (desktop)); app->root = g_object_ref (desktop); desktop->name = g_strdup ("main"); message = dbus_message_new_method_call (atspi_bus_registry, - atspi_path_root, - atspi_interface_accessible, - "GetChildren"); + atspi_path_root, + atspi_interface_accessible, + "GetChildren"); if (!message) return NULL; error = NULL; reply = _atspi_dbus_send_with_reply_and_block (message, &error); if (!reply || strcmp (dbus_message_get_signature (reply), "a(so)") != 0) - { - if (error != NULL) { - g_warning ("Couldn't get application list: %s", error->message); - g_clear_error (&error); + if (error != NULL) + { + g_warning ("Couldn't get application list: %s", error->message); + g_clear_error (&error); + } + if (reply) + dbus_message_unref (reply); + return NULL; } - if (reply) - dbus_message_unref (reply); - return NULL; - } dbus_message_iter_init (reply, &iter); dbus_message_iter_recurse (&iter, &iter_array); while (dbus_message_iter_get_arg_type (&iter_array) != DBUS_TYPE_INVALID) - { - const char *app_name, *path; - get_reference_from_iter (&iter_array, &app_name, &path); - add_app_to_desktop (desktop, app_name); - } + { + const char *app_name, *path; + get_reference_from_iter (&iter_array, &app_name, &path); + add_app_to_desktop (desktop, app_name); + } /* Record the alternate name as an alias for org.a11y.atspi.Registry */ bus_name_dup = g_strdup (dbus_message_get_sender (reply)); @@ -644,12 +647,12 @@ _atspi_ref_accessible (const char *app, const char *path) AtspiApplication *a = get_application (app); if (!a) return NULL; - if ( APP_IS_REGISTRY(a)) - { - if (!a->root) - g_object_unref (ref_accessible_desktop (a)); /* sets a->root */ - return g_object_ref (a->root); - } + if (APP_IS_REGISTRY (a)) + { + if (!a->root) + g_object_unref (ref_accessible_desktop (a)); /* sets a->root */ + return g_object_ref (a->root); + } return ref_accessible (app, path); } @@ -665,14 +668,14 @@ _atspi_dbus_return_accessible_from_message (DBusMessage *message) signature = dbus_message_get_signature (message); if (!strcmp (signature, "(so)")) - { - dbus_message_iter_init (message, &iter); - retval = _atspi_dbus_consume_accessible (&iter); - } + { + dbus_message_iter_init (message, &iter); + retval = _atspi_dbus_consume_accessible (&iter); + } else - { - g_warning ("AT-SPI: Called _atspi_dbus_return_accessible_from_message with strange signature %s", signature); - } + { + g_warning ("AT-SPI: Called _atspi_dbus_return_accessible_from_message with strange signature %s", signature); + } dbus_message_unref (message); return retval; } @@ -693,20 +696,20 @@ _atspi_dbus_return_hyperlink_from_message (DBusMessage *message) DBusMessageIter iter; AtspiHyperlink *retval = NULL; const char *signature; - + if (!message) return NULL; signature = dbus_message_get_signature (message); if (!strcmp (signature, "(so)")) - { - dbus_message_iter_init (message, &iter); - retval = _atspi_dbus_return_hyperlink_from_iter (&iter); - } + { + dbus_message_iter_init (message, &iter); + retval = _atspi_dbus_return_hyperlink_from_iter (&iter); + } else - { - g_warning ("AT-SPI: Called _atspi_dbus_return_hyperlink_from_message with strange signature %s", signature); - } + { + g_warning ("AT-SPI: Called _atspi_dbus_return_hyperlink_from_message with strange signature %s", signature); + } dbus_message_unref (message); return retval; } @@ -731,10 +734,10 @@ handle_add_accessible (DBusConnection *bus, DBusMessage *message) if (strcmp (signature, cache_signal_type) != 0 && strcmp (signature, old_cache_signal_type) != 0) - { - g_warning ("AT-SPI: AddAccessible with unknown signature %s\n", signature); - return DBUS_HANDLER_RESULT_HANDLED; - } + { + g_warning ("AT-SPI: AddAccessible with unknown signature %s\n", signature); + return DBUS_HANDLER_RESULT_HANDLED; + } dbus_message_iter_init (message, &iter); add_accessible_from_iter (&iter); @@ -757,31 +760,31 @@ process_deferred_message (BusDataClosure *closure) if (type == DBUS_MESSAGE_TYPE_SIGNAL && !strncmp (interface, "org.a11y.atspi.Event.", 21)) - { - _atspi_dbus_handle_event (closure->bus, closure->message); - } + { + _atspi_dbus_handle_event (closure->bus, closure->message); + } if (dbus_message_is_method_call (closure->message, atspi_interface_device_event_listener, "NotifyEvent")) - { - _atspi_dbus_handle_DeviceEvent (closure->bus, closure->message); - } + { + _atspi_dbus_handle_DeviceEvent (closure->bus, closure->message); + } if (dbus_message_is_signal (closure->message, atspi_interface_cache, "AddAccessible")) - { - handle_add_accessible (closure->bus, closure->message); - } + { + handle_add_accessible (closure->bus, closure->message); + } if (dbus_message_is_signal (closure->message, atspi_interface_cache, "RemoveAccessible")) - { - handle_remove_accessible (closure->bus, closure->message); - } + { + handle_remove_accessible (closure->bus, closure->message); + } if (dbus_message_is_signal (closure->message, "org.freedesktop.DBus", "NameOwnerChanged")) - { - handle_name_owner_changed (closure->bus, closure->message); - } + { + handle_name_owner_changed (closure->bus, closure->message); + } } static GQueue *deferred_messages = NULL; static void -destroy_deferred_message_item(gpointer ptr) +destroy_deferred_message_item (gpointer ptr) { BusDataClosure *c = ptr; dbus_message_unref (c->message); @@ -790,13 +793,13 @@ destroy_deferred_message_item(gpointer ptr) } static void -cleanup_deferred_message(void) +cleanup_deferred_message (void) { if (deferred_messages) - { - g_queue_free_full (deferred_messages, destroy_deferred_message_item); - deferred_messages = NULL; - } + { + g_queue_free_full (deferred_messages, destroy_deferred_message_item); + deferred_messages = NULL; + } } static gboolean @@ -809,10 +812,10 @@ process_deferred_messages (void) return TRUE; in_process_deferred_messages = 1; while ((closure = g_queue_pop_head (deferred_messages))) - { - process_deferred_message (closure); - destroy_deferred_message_item (closure); - } + { + process_deferred_message (closure); + destroy_deferred_message_item (closure); + } in_process_deferred_messages = 0; return FALSE; } @@ -838,13 +841,13 @@ defer_message (DBusConnection *connection, DBusMessage *message) g_queue_push_tail (deferred_messages, closure); if (process_deferred_messages_source == NULL) - { - process_deferred_messages_source = g_idle_source_new (); - g_source_set_callback (process_deferred_messages_source, - process_deferred_messages_callback, NULL, NULL); - g_source_attach (process_deferred_messages_source, atspi_main_context); - g_source_unref (process_deferred_messages_source); - } + { + process_deferred_messages_source = g_idle_source_new (); + g_source_set_callback (process_deferred_messages_source, + process_deferred_messages_callback, NULL, NULL); + g_source_attach (process_deferred_messages_source, atspi_main_context); + g_source_unref (process_deferred_messages_source); + } return DBUS_HANDLER_RESULT_HANDLED; } @@ -860,26 +863,26 @@ atspi_dbus_filter (DBusConnection *bus, DBusMessage *message, void *data) if (type == DBUS_MESSAGE_TYPE_SIGNAL && !strncmp (interface, "org.a11y.atspi.Event.", 21)) - { - return defer_message (bus, message); - } + { + return defer_message (bus, message); + } if (dbus_message_is_method_call (message, atspi_interface_device_event_listener, "NotifyEvent")) - { - return defer_message (bus, message); - } + { + return defer_message (bus, message); + } if (dbus_message_is_signal (message, atspi_interface_cache, "AddAccessible")) - { - return defer_message (bus, message); - } + { + return defer_message (bus, message); + } if (dbus_message_is_signal (message, atspi_interface_cache, "RemoveAccessible")) - { - return defer_message (bus, message); - } + { + return defer_message (bus, message); + } if (dbus_message_is_signal (message, "org.freedesktop.DBus", "NameOwnerChanged")) - { - defer_message (bus, message); - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; - } + { + defer_message (bus, message); + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + } return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } @@ -888,7 +891,7 @@ atspi_dbus_filter (DBusConnection *bus, DBusMessage *message, void *data) * * Connects to the accessibility registry and initializes the SPI. * - * Returns: 0 on success, 1 if already initialized, or an integer error code. + * Returns: 0 on success, 1 if already initialized, or an integer error code. **/ int atspi_init (void) @@ -903,13 +906,13 @@ atspi_init (void) atspi_inited = TRUE; - _atspi_get_live_refs(); + _atspi_get_live_refs (); bus = atspi_get_a11y_bus (); if (!bus) return 2; dbus_bus_register (bus, NULL); - atspi_dbus_connection_setup_with_g_main(bus, g_main_context_default()); + atspi_dbus_connection_setup_with_g_main (bus, g_main_context_default ()); dbus_connection_add_filter (bus, atspi_dbus_filter, NULL, NULL); match = g_strdup_printf ("type='signal',interface='%s',member='AddAccessible'", atspi_interface_cache); dbus_bus_add_match (bus, match, NULL); @@ -985,7 +988,7 @@ atspi_event_quit (void) /** * atspi_exit: * - * Disconnects from #AtspiRegistry instances and releases + * Disconnects from #AtspiRegistry instances and releases * any floating resources. Call only once at exit. * * Returns: 0 if there were no leaks, otherwise other integer values. @@ -1031,27 +1034,27 @@ check_for_hang (DBusMessage *message, DBusError *error, DBusConnection *bus, con { if (!message && error->name && !strcmp (error->name, "org.freedesktop.DBus.Error.NoReply")) - { - GSList *l; - DBusMessage *message; - gchar *bus_name_dup; - DBusPendingCall *pending = NULL; - for (l = hung_processes; l; l = l->next) - if (!strcmp (l->data, bus_name)) + { + GSList *l; + DBusMessage *message; + gchar *bus_name_dup; + DBusPendingCall *pending = NULL; + for (l = hung_processes; l; l = l->next) + if (!strcmp (l->data, bus_name)) + return; + message = dbus_message_new_method_call (bus_name, "/", + "org.freedesktop.DBus.Peer", + "Ping"); + if (!message) return; - message = dbus_message_new_method_call (bus_name, "/", - "org.freedesktop.DBus.Peer", - "Ping"); - if (!message) - return; - dbus_connection_send_with_reply (bus, message, &pending, -1); - dbus_message_unref (message); - if (!pending) - return; - bus_name_dup = g_strdup (bus_name); - hung_processes = g_slist_append (hung_processes, bus_name_dup); - dbus_pending_call_set_notify (pending, remove_hung_process, bus_name_dup, NULL); - } + dbus_connection_send_with_reply (bus, message, &pending, -1); + dbus_message_unref (message); + if (!pending) + return; + bus_name_dup = g_strdup (bus_name); + hung_processes = g_slist_append (hung_processes, bus_name_dup); + dbus_pending_call_set_notify (pending, remove_hung_process, bus_name_dup, NULL); + } } static gboolean @@ -1069,18 +1072,18 @@ static gboolean check_app (AtspiApplication *app, GError **error) { if (!app || !app->bus) - { - g_set_error_literal (error, ATSPI_ERROR, ATSPI_ERROR_APPLICATION_GONE, - _("The application no longer exists")); - return FALSE; - } + { + g_set_error_literal (error, ATSPI_ERROR, ATSPI_ERROR_APPLICATION_GONE, + _ ("The application no longer exists")); + return FALSE; + } if (atspi_main_loop && connection_is_hung (app->bus_name)) - { + { g_set_error_literal (error, ATSPI_ERROR, ATSPI_ERROR_IPC, "The process appears to be hung."); - return FALSE; - } + return FALSE; + } return TRUE; } @@ -1092,11 +1095,11 @@ set_timeout (AtspiApplication *app) int diff; if (app && app_startup_time > 0) - { - gettimeofday (&tv, NULL); - diff = (tv.tv_sec - app->time_added.tv_sec) * 1000 + (tv.tv_usec - app->time_added.tv_usec) / 1000; - dbind_set_timeout (MAX(method_call_timeout, app_startup_time - diff)); - } + { + gettimeofday (&tv, NULL); + diff = (tv.tv_sec - app->time_added.tv_sec) * 1000 + (tv.tv_usec - app->time_added.tv_usec) / 1000; + dbind_set_timeout (MAX (method_call_timeout, app_startup_time - diff)); + } else dbind_set_timeout (method_call_timeout); } @@ -1122,10 +1125,10 @@ _atspi_dbus_call (gpointer obj, const char *interface, const char *method, GErro check_for_hang (NULL, &err, aobj->app->bus, aobj->app->bus_name); process_deferred_messages (); if (dbus_error_is_set (&err)) - { - g_set_error(error, ATSPI_ERROR, ATSPI_ERROR_IPC, "%s", err.message); - dbus_error_free (&err); - } + { + g_set_error (error, ATSPI_ERROR, ATSPI_ERROR_IPC, "%s", err.message); + dbus_error_free (&err); + } return retval; } @@ -1134,7 +1137,8 @@ _atspi_dbus_call_partial (gpointer obj, const char *interface, const char *method, GError **error, - const char *type, ...) + const char *type, + ...) { DBusMessage *ret; va_list args; @@ -1146,20 +1150,19 @@ _atspi_dbus_call_partial (gpointer obj, return ret; } - DBusMessage * _atspi_dbus_call_partial_va (gpointer obj, - const char *interface, - const char *method, - GError **error, - const char *type, - va_list args) + const char *interface, + const char *method, + GError **error, + const char *type, + va_list args) { AtspiObject *aobj = ATSPI_OBJECT (obj); DBusError err; - DBusMessage *msg = NULL, *reply = NULL; - DBusMessageIter iter; - const char *p; + DBusMessage *msg = NULL, *reply = NULL; + DBusMessageIter iter; + const char *p; dbus_error_init (&err); @@ -1182,20 +1185,20 @@ out: dbus_message_unref (msg); process_deferred_messages (); if (dbus_error_is_set (&err)) - { - /* TODO: Set gerror */ - dbus_error_free (&err); - } + { + /* TODO: Set gerror */ + dbus_error_free (&err); + } if (reply && dbus_message_get_type (reply) == DBUS_MESSAGE_TYPE_ERROR) - { - const char *err_str = NULL; - dbus_message_get_args (reply, NULL, DBUS_TYPE_STRING, &err_str, DBUS_TYPE_INVALID); - if (err_str) - g_set_error_literal (error, ATSPI_ERROR, ATSPI_ERROR_IPC, err_str); - dbus_message_unref (reply); - return NULL; - } + { + const char *err_str = NULL; + dbus_message_get_args (reply, NULL, DBUS_TYPE_STRING, &err_str, DBUS_TYPE_INVALID); + if (err_str) + g_set_error_literal (error, ATSPI_ERROR, ATSPI_ERROR_IPC, err_str); + dbus_message_unref (reply); + return NULL; + } return reply; } @@ -1208,7 +1211,7 @@ _atspi_dbus_get_property (gpointer obj, const char *interface, const char *name, DBusError err; dbus_bool_t retval = FALSE; AtspiObject *aobj = ATSPI_OBJECT (obj); - char expected_type = (type [0] == '(' ? 'r' : type [0]); + char expected_type = (type[0] == '(' ? 'r' : type[0]); if (!aobj) return FALSE; @@ -1221,10 +1224,10 @@ _atspi_dbus_get_property (gpointer obj, const char *interface, const char *name, "org.freedesktop.DBus.Properties", "Get"); if (!message) - { - // TODO: throw exception - return FALSE; - } + { + // TODO: throw exception + return FALSE; + } dbus_message_append_args (message, DBUS_TYPE_STRING, &interface, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID); dbus_error_init (&err); set_timeout (aobj->app); @@ -1233,47 +1236,47 @@ _atspi_dbus_get_property (gpointer obj, const char *interface, const char *name, dbus_message_unref (message); process_deferred_messages (); if (!reply) - { - /* TODO: throw exception */ - goto done; - } + { + /* TODO: throw exception */ + goto done; + } if (dbus_message_get_type (reply) == DBUS_MESSAGE_TYPE_ERROR) - { - const char *err_str = NULL; - dbus_message_get_args (reply, NULL, DBUS_TYPE_STRING, &err_str, DBUS_TYPE_INVALID); - if (err_str) - g_set_error_literal (error, ATSPI_ERROR, ATSPI_ERROR_IPC, err_str); - goto done; - } + { + const char *err_str = NULL; + dbus_message_get_args (reply, NULL, DBUS_TYPE_STRING, &err_str, DBUS_TYPE_INVALID); + if (err_str) + g_set_error_literal (error, ATSPI_ERROR, ATSPI_ERROR_IPC, err_str); + goto done; + } dbus_message_iter_init (reply, &iter); if (dbus_message_iter_get_arg_type (&iter) != 'v') - { - g_warning ("atspi_dbus_get_property: expected a variant when fetching %s from interface %s; got %s\n", name, interface, dbus_message_get_signature (reply)); - goto done; - } + { + g_warning ("atspi_dbus_get_property: expected a variant when fetching %s from interface %s; got %s\n", name, interface, dbus_message_get_signature (reply)); + goto done; + } dbus_message_iter_recurse (&iter, &iter_variant); if (dbus_message_iter_get_arg_type (&iter_variant) != expected_type) - { - g_warning ("atspi_dbus_get_property: Wrong type: expected %s, got %c\n", type, dbus_message_iter_get_arg_type (&iter_variant)); - goto done; - } + { + g_warning ("atspi_dbus_get_property: Wrong type: expected %s, got %c\n", type, dbus_message_iter_get_arg_type (&iter_variant)); + goto done; + } if (!strcmp (type, "(so)")) - { - *((AtspiAccessible **)data) = _atspi_dbus_consume_accessible (&iter_variant); - } - else - { - if (type [0] == 's') { - *(char**) data = NULL; + *((AtspiAccessible **) data) = _atspi_dbus_consume_accessible (&iter_variant); } + else + { + if (type[0] == 's') + { + *(char **) data = NULL; + } - dbus_message_iter_get_basic (&iter_variant, data); - if (type [0] == 's') - *(char **)data = g_strdup (*(char **)data); - } + dbus_message_iter_get_basic (&iter_variant, data); + if (type[0] == 's') + *(char **) data = g_strdup (*(char **) data); + } retval = TRUE; done: dbus_error_free (&err); @@ -1293,20 +1296,20 @@ _atspi_dbus_send_with_reply_and_block (DBusMessage *message, GError **error) app = get_application (dbus_message_get_destination (message)); if (app && !app->bus) - return NULL; /* will fail anyway; app has been disposed */ + return NULL; /* will fail anyway; app has been disposed */ - bus = (app ? app->bus : _atspi_bus()); + bus = (app ? app->bus : _atspi_bus ()); dbus_error_init (&err); set_timeout (app); reply = dbind_send_and_allow_reentry (bus, message, &err); process_deferred_messages (); dbus_message_unref (message); if (dbus_error_is_set (&err)) - { - if (error) - g_set_error_literal (error, ATSPI_ERROR, ATSPI_ERROR_IPC, err.message); - dbus_error_free (&err); - } + { + if (error) + g_set_error_literal (error, ATSPI_ERROR, ATSPI_ERROR_IPC, err.message); + dbus_error_free (&err); + } return reply; } @@ -1337,15 +1340,15 @@ _atspi_dbus_hash_from_iter (DBusMessageIter *iter) dbus_message_iter_recurse (iter, &iter_array); while (dbus_message_iter_get_arg_type (&iter_array) != DBUS_TYPE_INVALID) - { - const char *name, *value; - dbus_message_iter_recurse (&iter_array, &iter_dict); - dbus_message_iter_get_basic (&iter_dict, &name); - dbus_message_iter_next (&iter_dict); - dbus_message_iter_get_basic (&iter_dict, &value); - g_hash_table_insert (hash, g_strdup (name), g_strdup (value)); - dbus_message_iter_next (&iter_array); - } + { + const char *name, *value; + dbus_message_iter_recurse (&iter_array, &iter_dict); + dbus_message_iter_get_basic (&iter_dict, &name); + dbus_message_iter_next (&iter_dict); + dbus_message_iter_get_basic (&iter_dict, &value); + g_hash_table_insert (hash, g_strdup (name), g_strdup (value)); + dbus_message_iter_next (&iter_array); + } return hash; } @@ -1375,27 +1378,30 @@ _atspi_dbus_attribute_array_from_iter (DBusMessageIter *iter) dbus_message_iter_recurse (iter, &iter_array); while (dbus_message_iter_get_arg_type (&iter_array) != DBUS_TYPE_INVALID) - { - const char *name, *value; - gchar *str; - dbus_message_iter_recurse (&iter_array, &iter_dict); - dbus_message_iter_get_basic (&iter_dict, &name); - dbus_message_iter_next (&iter_dict); - dbus_message_iter_get_basic (&iter_dict, &value); - str = g_strdup_printf ("%s:%s", name, value); - array = g_array_append_val (array, str); - dbus_message_iter_next (&iter_array);; - } + { + const char *name, *value; + gchar *str; + dbus_message_iter_recurse (&iter_array, &iter_dict); + dbus_message_iter_get_basic (&iter_dict, &name); + dbus_message_iter_next (&iter_dict); + dbus_message_iter_get_basic (&iter_dict, &value); + str = g_strdup_printf ("%s:%s", name, value); + array = g_array_append_val (array, str); + dbus_message_iter_next (&iter_array); + ; + } return array; } -typedef enum { +typedef enum +{ DEMARSHAL_STATUS_SUCCESS, DEMARSHAL_STATUS_INVALID_SIGNATURE, DEMARSHAL_STATUS_INVALID_VALUE, } DemarshalStatus; -typedef struct { +typedef struct +{ /* array of (char *) */ GPtrArray *names; } InterfaceNames; @@ -1412,19 +1418,19 @@ interface_names_demarshal (DBusMessageIter *iter, InterfaceNames **out_interface GPtrArray *names = g_ptr_array_new_with_free_func (g_free); if (!matches) - { - return DEMARSHAL_STATUS_INVALID_SIGNATURE; - } + { + return DEMARSHAL_STATUS_INVALID_SIGNATURE; + } DBusMessageIter iter_array; dbus_message_iter_recurse (iter, &iter_array); while (dbus_message_iter_get_arg_type (&iter_array) != DBUS_TYPE_INVALID) - { - const char *iface; - dbus_message_iter_get_basic (&iter_array, &iface); - g_ptr_array_add (names, g_strdup (iface)); - dbus_message_iter_next (&iter_array); - } + { + const char *iface; + dbus_message_iter_get_basic (&iter_array, &iface); + g_ptr_array_add (names, g_strdup (iface)); + dbus_message_iter_next (&iter_array); + } InterfaceNames *ifaces = g_new0 (InterfaceNames, 1); ifaces->names = names; @@ -1473,10 +1479,10 @@ _atspi_dbus_set_interfaces (AtspiAccessible *accessible, DBusMessageIter *iter) accessible->interfaces = 0; if (interface_names_demarshal (iter, &ifaces) != DEMARSHAL_STATUS_SUCCESS) - { - g_warning ("Passed iterator with invalid signature"); - return; - } + { + g_warning ("Passed iterator with invalid signature"); + return; + } accessible->interfaces = interface_names_to_bitmask (ifaces); interface_names_free (ifaces); @@ -1494,20 +1500,20 @@ _atspi_dbus_set_state (AtspiAccessible *accessible, DBusMessageIter *iter) dbus_message_iter_recurse (iter, &iter_array); dbus_message_iter_get_fixed_array (&iter_array, &states, &count); if (count != 2) - { - g_warning ("AT-SPI: expected 2 values in states array; got %d\n", count); - if (!accessible->states) - accessible->states = _atspi_state_set_new_internal (accessible, 0); - } + { + g_warning ("AT-SPI: expected 2 values in states array; got %d\n", count); + if (!accessible->states) + accessible->states = _atspi_state_set_new_internal (accessible, 0); + } else - { - guint64 val = ((guint64)states [1]) << 32; - val += states [0]; - if (!accessible->states) - accessible->states = _atspi_state_set_new_internal (accessible, val); - else - accessible->states->states = val; - } + { + guint64 val = ((guint64) states[1]) << 32; + val += states[0]; + if (!accessible->states) + accessible->states = _atspi_state_set_new_internal (accessible, val); + else + accessible->states->states = val; + } _atspi_accessible_add_cache (accessible, ATSPI_CACHE_STATES); } @@ -1583,17 +1589,17 @@ get_accessibility_bus_address_x11 (void) g_warning ("Could not open X display"); return NULL; } - + AT_SPI_BUS = XInternAtom (bridge_display, "AT_SPI_BUS", False); XGetWindowProperty (bridge_display, - XDefaultRootWindow (bridge_display), - AT_SPI_BUS, 0L, - (long) BUFSIZ, False, - (Atom) 31, &actual_type, &actual_format, - &nitems, &leftover, &data_x11); + XDefaultRootWindow (bridge_display), + AT_SPI_BUS, 0L, + (long) BUFSIZ, False, + (Atom) 31, &actual_type, &actual_format, + &nitems, &leftover, &data_x11); XCloseDisplay (bridge_display); - data = g_strdup ((gchar *)data_x11); + data = g_strdup ((gchar *) data_x11); XFree (data_x11); return data; } @@ -1613,34 +1619,34 @@ get_accessibility_bus_address_dbus (void) return NULL; message = dbus_message_new_method_call ("org.a11y.Bus", - "/org/a11y/bus", - "org.a11y.Bus", - "GetAddress"); + "/org/a11y/bus", + "org.a11y.Bus", + "GetAddress"); dbus_error_init (&error); reply = dbus_connection_send_with_reply_and_block (session_bus, - message, - -1, - &error); + message, + -1, + &error); dbus_message_unref (message); if (!reply) - { - g_warning ("AT-SPI: Error retrieving accessibility bus address: %s: %s", - error.name, error.message); - dbus_error_free (&error); - goto out; - } - + { + g_warning ("AT-SPI: Error retrieving accessibility bus address: %s: %s", + error.name, error.message); + dbus_error_free (&error); + goto out; + } + { const char *tmp_address; if (!dbus_message_get_args (reply, - NULL, - DBUS_TYPE_STRING, - &tmp_address, - DBUS_TYPE_INVALID)) + NULL, + DBUS_TYPE_STRING, + &tmp_address, + DBUS_TYPE_INVALID)) { - dbus_message_unref (reply); + dbus_message_unref (reply); goto out; } address = g_strdup (tmp_address); @@ -1701,7 +1707,7 @@ atspi_get_a11y_bus (void) if (!a11y_bus) { - if (!g_getenv("SSH_CONNECTION")) + if (!g_getenv ("SSH_CONNECTION")) g_warning ("Couldn't connect to accessibility bus: %s", error.message); dbus_error_free (&error); return NULL; @@ -1709,16 +1715,16 @@ atspi_get_a11y_bus (void) else { if (!dbus_bus_register (a11y_bus, &error)) - { - g_warning ("Couldn't register with accessibility bus: %s", error.message); + { + g_warning ("Couldn't register with accessibility bus: %s", error.message); dbus_error_free (&error); dbus_connection_close (a11y_bus); dbus_connection_unref (a11y_bus); a11y_bus = NULL; - return NULL; - } + return NULL; + } } - + /* Simulate a weak ref on the bus */ dbus_connection_set_data (a11y_bus, a11y_dbus_slot, a11y_bus, a11y_bus_free); @@ -1770,27 +1776,27 @@ atspi_set_main_context (GMainContext *cnx) if (atspi_main_context == cnx) return; if (process_deferred_messages_source != NULL) - { - g_source_destroy (process_deferred_messages_source); - process_deferred_messages_source = g_idle_source_new (); - g_source_set_callback (process_deferred_messages_source, - process_deferred_messages_callback, NULL, NULL); - g_source_attach (process_deferred_messages_source, cnx); - g_source_unref (process_deferred_messages_source); - } + { + g_source_destroy (process_deferred_messages_source); + process_deferred_messages_source = g_idle_source_new (); + g_source_set_callback (process_deferred_messages_source, + process_deferred_messages_callback, NULL, NULL); + g_source_attach (process_deferred_messages_source, cnx); + g_source_unref (process_deferred_messages_source); + } atspi_main_context = cnx; atspi_dbus_connection_setup_with_g_main (atspi_get_a11y_bus (), cnx); if (desktop) - { - gint i; - for (i = desktop->children->len - 1; i >= 0; i--) { - AtspiAccessible *child = g_ptr_array_index (desktop->children, i); - if (child->parent.app && child->parent.app->bus) - atspi_dbus_connection_setup_with_g_main (child->parent.app->bus, cnx); + gint i; + for (i = desktop->children->len - 1; i >= 0; i--) + { + AtspiAccessible *child = g_ptr_array_index (desktop->children, i); + if (child->parent.app && child->parent.app->bus) + atspi_dbus_connection_setup_with_g_main (child->parent.app->bus, cnx); + } } - } } #ifdef DEBUG_REF_COUNTS @@ -1816,11 +1822,11 @@ _atspi_name_compat (gchar *name) gchar *p = name; while (*p) - { - if (*p == '-') - *p = ' '; - p++; - } + { + if (*p == '-') + *p = ' '; + p++; + } return name; } @@ -1866,89 +1872,91 @@ _atspi_dbus_update_cache_from_dict (AtspiAccessible *accessible, DBusMessageIter dbus_message_iter_recurse (iter, &iter_dict); while (dbus_message_iter_get_arg_type (&iter_dict) != DBUS_TYPE_INVALID) - { - const char *key; - GValue *val = NULL; - dbus_message_iter_recurse (&iter_dict, &iter_dict_entry); - dbus_message_iter_get_basic (&iter_dict_entry, &key); - dbus_message_iter_next (&iter_dict_entry); - dbus_message_iter_recurse (&iter_dict_entry, &iter_variant); - if (!strcmp (key, "interfaces")) - { - _atspi_dbus_set_interfaces (accessible, &iter_variant); - } - else if (!strcmp (key, "Attributes")) - { - char *iter_sig = dbus_message_iter_get_signature (&iter_variant); - val = g_new0 (GValue, 1);; - g_value_init (val, G_TYPE_HASH_TABLE); - if (strcmp (iter_sig, "a{ss}") != 0) - { - dbus_free (iter_sig); - break; - } - dbus_free (iter_sig); - g_value_take_boxed (val, _atspi_dbus_hash_from_iter (&iter_variant)); - } - else if (!strcmp (key, "Component.ScreenExtents")) { - dbus_int32_t d_int; - AtspiRect extents; - char *iter_sig = dbus_message_iter_get_signature (&iter_variant); - val = g_new0 (GValue, 1);; - g_value_init (val, ATSPI_TYPE_RECT); - if (strcmp (iter_sig, "(iiii)") != 0) - { - dbus_free (iter_sig); - break; - } - dbus_free (iter_sig); - dbus_message_iter_recurse (&iter_variant, &iter_struct); - dbus_message_iter_get_basic (&iter_struct, &d_int); - extents.x = d_int; - dbus_message_iter_next (&iter_struct); - dbus_message_iter_get_basic (&iter_struct, &d_int); - extents.y = d_int; - dbus_message_iter_next (&iter_struct); - dbus_message_iter_get_basic (&iter_struct, &d_int); - extents.width = d_int; - dbus_message_iter_next (&iter_struct); - dbus_message_iter_get_basic (&iter_struct, &d_int); - extents.height = d_int; - g_value_set_boxed (val, &extents); + const char *key; + GValue *val = NULL; + dbus_message_iter_recurse (&iter_dict, &iter_dict_entry); + dbus_message_iter_get_basic (&iter_dict_entry, &key); + dbus_message_iter_next (&iter_dict_entry); + dbus_message_iter_recurse (&iter_dict_entry, &iter_variant); + if (!strcmp (key, "interfaces")) + { + _atspi_dbus_set_interfaces (accessible, &iter_variant); + } + else if (!strcmp (key, "Attributes")) + { + char *iter_sig = dbus_message_iter_get_signature (&iter_variant); + val = g_new0 (GValue, 1); + ; + g_value_init (val, G_TYPE_HASH_TABLE); + if (strcmp (iter_sig, "a{ss}") != 0) + { + dbus_free (iter_sig); + break; + } + dbus_free (iter_sig); + g_value_take_boxed (val, _atspi_dbus_hash_from_iter (&iter_variant)); + } + else if (!strcmp (key, "Component.ScreenExtents")) + { + dbus_int32_t d_int; + AtspiRect extents; + char *iter_sig = dbus_message_iter_get_signature (&iter_variant); + val = g_new0 (GValue, 1); + ; + g_value_init (val, ATSPI_TYPE_RECT); + if (strcmp (iter_sig, "(iiii)") != 0) + { + dbus_free (iter_sig); + break; + } + dbus_free (iter_sig); + dbus_message_iter_recurse (&iter_variant, &iter_struct); + dbus_message_iter_get_basic (&iter_struct, &d_int); + extents.x = d_int; + dbus_message_iter_next (&iter_struct); + dbus_message_iter_get_basic (&iter_struct, &d_int); + extents.y = d_int; + dbus_message_iter_next (&iter_struct); + dbus_message_iter_get_basic (&iter_struct, &d_int); + extents.width = d_int; + dbus_message_iter_next (&iter_struct); + dbus_message_iter_get_basic (&iter_struct, &d_int); + extents.height = d_int; + g_value_set_boxed (val, &extents); + } + if (val) + g_hash_table_insert (cache, g_strdup (key), val); + dbus_message_iter_next (&iter_dict); } - if (val) - g_hash_table_insert (cache, g_strdup (key), val); - dbus_message_iter_next (&iter_dict); - } return cache; } static const char *sr_introspection = "<!DOCTYPE node PUBLIC \"-//freedesktop//DTD D-BUS Object Introspection 1.0//EN\"\n" -"\"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd\">\n" -"<node name=\"/org/a11y/atspi/screenreader\">\n" -" <interface name=\"org.a11y.Atspi.ScreenReader\">\n" -" <signal name=\"ReadingPosition\">\n" -" <arg type=\"i\"/>\n" -" <arg type=\"i\"/>\n" -" </signal>\n" -" </interface>\n" -"</node>"; + "\"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd\">\n" + "<node name=\"/org/a11y/atspi/screenreader\">\n" + " <interface name=\"org.a11y.Atspi.ScreenReader\">\n" + " <signal name=\"ReadingPosition\">\n" + " <arg type=\"i\"/>\n" + " <arg type=\"i\"/>\n" + " </signal>\n" + " </interface>\n" + "</node>"; static DBusHandlerResult screen_reader_filter (DBusConnection *bus, DBusMessage *message, void *user_data) { if (dbus_message_is_method_call (message, DBUS_INTERFACE_INTROSPECTABLE, - "Introspect")) - { - DBusMessage *reply = dbus_message_new_method_return (message); - dbus_message_append_args (reply, DBUS_TYPE_STRING, &sr_introspection, - DBUS_TYPE_INVALID); - dbus_connection_send (bus, reply, NULL); - dbus_message_unref (reply); - return DBUS_HANDLER_RESULT_HANDLED; - } + "Introspect")) + { + DBusMessage *reply = dbus_message_new_method_return (message); + dbus_message_append_args (reply, DBUS_TYPE_STRING, &sr_introspection, + DBUS_TYPE_INVALID); + dbus_connection_send (bus, reply, NULL); + dbus_message_unref (reply); + return DBUS_HANDLER_RESULT_HANDLED; + } return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } @@ -1962,10 +1970,10 @@ _atspi_prepare_screen_reader_interface () return (initialized > 0); if (dbus_bus_request_name (a11y_bus, "org.a11y.Atspi.ScreenReader", 0, NULL) < 0) - { - initialized = -1; - return FALSE; - } + { + initialized = -1; + return FALSE; + } initialized = 1; dbus_connection_add_filter (a11y_bus, screen_reader_filter, NULL, NULL); @@ -1983,21 +1991,21 @@ _atspi_strdup_and_adjust_for_dbus (const char *s) return NULL; for (p = d; *p; p++) - { - if (*p == '-') - { - memmove (p, p + 1, g_utf8_strlen (p, -1)); - *p = toupper (*p); - } - else if (*p == ':') { - parts++; - if (parts == 2) - break; - p [1] = toupper (p [1]); + if (*p == '-') + { + memmove (p, p + 1, g_utf8_strlen (p, -1)); + *p = toupper (*p); + } + else if (*p == ':') + { + parts++; + if (parts == 2) + break; + p[1] = toupper (p[1]); + } } - } - d [0] = toupper (d [0]); + d[0] = toupper (d[0]); return d; } diff --git a/atspi/atspi-misc.h b/atspi/atspi-misc.h index 04617282..d820d94e 100644 --- a/atspi/atspi-misc.h +++ b/atspi/atspi-misc.h @@ -5,7 +5,7 @@ * Copyright 2002 Ximian, Inc. * 2002 Sun Microsystems Inc. * Copyright 2010, 2011 Novell, Inc. - * + * * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -46,7 +46,7 @@ atspi_set_timeout (gint val, gint startup_time); void atspi_set_main_context (GMainContext *cnx); -gchar * atspi_role_get_name (AtspiRole role); +gchar *atspi_role_get_name (AtspiRole role); G_END_DECLS -#endif /* _ATSPI_MISC_H_ */ +#endif /* _ATSPI_MISC_H_ */ diff --git a/atspi/atspi-mutter-private.h b/atspi/atspi-mutter-private.h index 49140d02..f2d1c10b 100644 --- a/atspi/atspi-mutter-private.h +++ b/atspi/atspi-mutter-private.h @@ -3,7 +3,7 @@ * (Gnome Accessibility Project; http://developer.gnome.org/projects/gap) * * Copyright 2019 SUSE LLC. - * + * * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -33,4 +33,4 @@ gboolean _atspi_mutter_generate_mouse_event (glong x, glong y, const gchar *name void _atspi_mutter_set_reference_window (AtspiAccessible *accessible); G_END_DECLS -#endif /* _ATSPI_MUTTER_H_ */ +#endif /* _ATSPI_MUTTER_H_ */ diff --git a/atspi/atspi-mutter.c b/atspi/atspi-mutter.c index f6ceb84a..b40e2721 100644 --- a/atspi/atspi-mutter.c +++ b/atspi/atspi-mutter.c @@ -107,53 +107,53 @@ get_window_id (const char *name) if (!reply) return FALSE; if (strcmp (dbus_message_get_signature (reply), "a{ta{sv}}") != 0) - { - dbus_message_unref (reply); - return FALSE; - } + { + dbus_message_unref (reply); + return FALSE; + } dbus_message_iter_init (reply, &iter); dbus_message_iter_recurse (&iter, &iter_array); while (dbus_message_iter_get_arg_type (&iter_array) != DBUS_TYPE_INVALID) - { - dbus_message_iter_recurse (&iter_array, &iter_dict); - dbus_message_iter_get_basic (&iter_dict, &window_id); - dbus_message_iter_next (&iter_dict); - dbus_message_iter_recurse (&iter_dict, &iter_sub_array); - cur_name = NULL; - have_focus = FALSE; - while (dbus_message_iter_get_arg_type (&iter_sub_array) != DBUS_TYPE_INVALID) { - dbus_message_iter_recurse (&iter_sub_array, &iter_sub_dict); - dbus_message_iter_get_basic (&iter_sub_dict, &prop_name); - if (!strcmp (prop_name, "wm-class")) - { - DBusMessageIter iter_variant; - dbus_message_iter_next (&iter_sub_dict); - dbus_message_iter_recurse (&iter_sub_dict, &iter_variant); - dbus_message_iter_get_basic (&iter_variant, &cur_name); - } - if (!strcmp (prop_name, "has-focus")) - { - DBusMessageIter iter_variant; - dbus_message_iter_next (&iter_sub_dict); - dbus_message_iter_recurse (&iter_sub_dict, &iter_variant); - dbus_message_iter_get_basic (&iter_variant, &cur_focus); - have_focus = TRUE; - } - if (cur_name && have_focus) - { - if ((name && !strcmp (name, cur_name)) || cur_focus) + dbus_message_iter_recurse (&iter_array, &iter_dict); + dbus_message_iter_get_basic (&iter_dict, &window_id); + dbus_message_iter_next (&iter_dict); + dbus_message_iter_recurse (&iter_dict, &iter_sub_array); + cur_name = NULL; + have_focus = FALSE; + while (dbus_message_iter_get_arg_type (&iter_sub_array) != DBUS_TYPE_INVALID) { - dbus_message_unref (reply); - return window_id; + dbus_message_iter_recurse (&iter_sub_array, &iter_sub_dict); + dbus_message_iter_get_basic (&iter_sub_dict, &prop_name); + if (!strcmp (prop_name, "wm-class")) + { + DBusMessageIter iter_variant; + dbus_message_iter_next (&iter_sub_dict); + dbus_message_iter_recurse (&iter_sub_dict, &iter_variant); + dbus_message_iter_get_basic (&iter_variant, &cur_name); + } + if (!strcmp (prop_name, "has-focus")) + { + DBusMessageIter iter_variant; + dbus_message_iter_next (&iter_sub_dict); + dbus_message_iter_recurse (&iter_sub_dict, &iter_variant); + dbus_message_iter_get_basic (&iter_variant, &cur_focus); + have_focus = TRUE; + } + if (cur_name && have_focus) + { + if ((name && !strcmp (name, cur_name)) || cur_focus) + { + dbus_message_unref (reply); + return window_id; + } + break; + } + dbus_message_iter_next (&iter_sub_array); } - break; - } - dbus_message_iter_next (&iter_sub_array); + dbus_message_iter_next (&iter_array); } - dbus_message_iter_next (&iter_array); - } dbus_message_unref (reply); return 0; @@ -184,10 +184,10 @@ ensure_rd_session_id (GError **error) if (!reply) return FALSE; if (strcmp (dbus_message_get_signature (reply), "v") != 0) - { - dbus_message_unref (reply); - return FALSE; - } + { + dbus_message_unref (reply); + return FALSE; + } dbus_message_iter_init (reply, &iter); dbus_message_iter_recurse (&iter, &iter_variant); dbus_message_iter_get_basic (&iter_variant, &session_id); @@ -227,10 +227,10 @@ ensure_sc_session (GError **error) if (!reply) return FALSE; if (!dbus_message_get_args (reply, NULL, DBUS_TYPE_OBJECT_PATH, &sc_session_path, DBUS_TYPE_INVALID)) - { - dbus_message_unref (reply); - return FALSE; - } + { + dbus_message_unref (reply); + return FALSE; + } data.sc_session_path = g_strdup (sc_session_path); dbus_message_unref (reply); @@ -254,7 +254,7 @@ init_mutter (gboolean need_window, GError **error) return TRUE; window_id = (data.window_id_is_explicit) ? data.window_id - : get_window_id (NULL); + : get_window_id (NULL); if (!window_id) return FALSE; @@ -280,10 +280,10 @@ init_mutter (gboolean need_window, GError **error) if (!reply) return FALSE; if (!dbus_message_get_args (reply, NULL, DBUS_TYPE_OBJECT_PATH, &sc_stream_path, DBUS_TYPE_INVALID)) - { - dbus_message_unref (reply); - return FALSE; - } + { + dbus_message_unref (reply); + return FALSE; + } data.sc_stream_path = g_strdup (sc_stream_path); dbus_message_unref (reply); @@ -293,8 +293,9 @@ init_mutter (gboolean need_window, GError **error) gboolean _atspi_mutter_generate_keyboard_event (glong keyval, - const gchar *keystring, - AtspiKeySynthType synth_type, GError **error) + const gchar *keystring, + AtspiKeySynthType synth_type, + GError **error) { DBusError d_error; dbus_uint32_t d_keyval = keyval; @@ -304,31 +305,31 @@ _atspi_mutter_generate_keyboard_event (glong keyval, dbus_error_init (&d_error); switch (synth_type) - { - case ATSPI_KEY_PRESS: - dbind_method_call_reentrant (data.bus, MUTTER_REMOTE_DESKTOP_BUS_NAME, data.rd_session_path, MUTTER_REMOTE_DESKTOP_SESSION_INTERFACE, "NotifyKeyboardKeycode", &d_error, "ub", d_keyval, TRUE); - break; - case ATSPI_KEY_RELEASE: - dbind_method_call_reentrant (data.bus, MUTTER_REMOTE_DESKTOP_BUS_NAME, data.rd_session_path, MUTTER_REMOTE_DESKTOP_SESSION_INTERFACE, "NotifyKeyboardKeycode", &d_error, "ub", d_keyval, FALSE); - break; - case ATSPI_KEY_PRESSRELEASE: - dbind_method_call_reentrant (data.bus, MUTTER_REMOTE_DESKTOP_BUS_NAME, data.rd_session_path, MUTTER_REMOTE_DESKTOP_SESSION_INTERFACE, "NotifyKeyboardKeycode", &d_error, "ub", d_keyval, TRUE); - dbind_method_call_reentrant (data.bus, MUTTER_REMOTE_DESKTOP_BUS_NAME, data.rd_session_path, MUTTER_REMOTE_DESKTOP_SESSION_INTERFACE, "NotifyKeyboardKeycode", &d_error, "ub", d_keyval, FALSE); - break; - case ATSPI_KEY_SYM: - dbind_method_call_reentrant (data.bus, MUTTER_REMOTE_DESKTOP_BUS_NAME, data.rd_session_path, MUTTER_REMOTE_DESKTOP_SESSION_INTERFACE, "NotifyKeyboardKeysym", &d_error, "ub", d_keyval, TRUE); - dbind_method_call_reentrant (data.bus, MUTTER_REMOTE_DESKTOP_BUS_NAME, data.rd_session_path, MUTTER_REMOTE_DESKTOP_SESSION_INTERFACE, "NotifyKeyboardKeysym", &d_error, "ub", d_keyval, FALSE); - break; - default: - /* TODO: set error */ - g_warning ("%s: unsupported type", __func__); - return FALSE; - } + { + case ATSPI_KEY_PRESS: + dbind_method_call_reentrant (data.bus, MUTTER_REMOTE_DESKTOP_BUS_NAME, data.rd_session_path, MUTTER_REMOTE_DESKTOP_SESSION_INTERFACE, "NotifyKeyboardKeycode", &d_error, "ub", d_keyval, TRUE); + break; + case ATSPI_KEY_RELEASE: + dbind_method_call_reentrant (data.bus, MUTTER_REMOTE_DESKTOP_BUS_NAME, data.rd_session_path, MUTTER_REMOTE_DESKTOP_SESSION_INTERFACE, "NotifyKeyboardKeycode", &d_error, "ub", d_keyval, FALSE); + break; + case ATSPI_KEY_PRESSRELEASE: + dbind_method_call_reentrant (data.bus, MUTTER_REMOTE_DESKTOP_BUS_NAME, data.rd_session_path, MUTTER_REMOTE_DESKTOP_SESSION_INTERFACE, "NotifyKeyboardKeycode", &d_error, "ub", d_keyval, TRUE); + dbind_method_call_reentrant (data.bus, MUTTER_REMOTE_DESKTOP_BUS_NAME, data.rd_session_path, MUTTER_REMOTE_DESKTOP_SESSION_INTERFACE, "NotifyKeyboardKeycode", &d_error, "ub", d_keyval, FALSE); + break; + case ATSPI_KEY_SYM: + dbind_method_call_reentrant (data.bus, MUTTER_REMOTE_DESKTOP_BUS_NAME, data.rd_session_path, MUTTER_REMOTE_DESKTOP_SESSION_INTERFACE, "NotifyKeyboardKeysym", &d_error, "ub", d_keyval, TRUE); + dbind_method_call_reentrant (data.bus, MUTTER_REMOTE_DESKTOP_BUS_NAME, data.rd_session_path, MUTTER_REMOTE_DESKTOP_SESSION_INTERFACE, "NotifyKeyboardKeysym", &d_error, "ub", d_keyval, FALSE); + break; + default: + /* TODO: set error */ + g_warning ("%s: unsupported type", __func__); + return FALSE; + } if (dbus_error_is_set (&d_error)) { g_warning ("GenerateKeyboardEvent failed: %s", d_error.message); dbus_error_free (&d_error); - return FALSE; + return FALSE; } return TRUE; @@ -346,44 +347,44 @@ _atspi_mutter_generate_mouse_event (glong x, glong y, const gchar *name, GError dbus_error_init (&d_error); switch (name[0]) - { - case 'b': - button = name[1] - '1'; - if (button < 0 || button > 4) - return FALSE; - if (x != -1 && y != -1) - dbind_method_call_reentrant (data.bus, MUTTER_REMOTE_DESKTOP_BUS_NAME, data.rd_session_path, MUTTER_REMOTE_DESKTOP_SESSION_INTERFACE, "NotifyPointerMotionAbsolute", &d_error, "sdd", data.sc_stream_path, d_x, d_y); - switch (name[2]) { - case 'p': - dbind_method_call_reentrant (data.bus, MUTTER_REMOTE_DESKTOP_BUS_NAME, data.rd_session_path, MUTTER_REMOTE_DESKTOP_SESSION_INTERFACE, "NotifyPointerButton", &d_error, "ib", button, TRUE); - break; - case 'r': - dbind_method_call_reentrant (data.bus, MUTTER_REMOTE_DESKTOP_BUS_NAME, data.rd_session_path, MUTTER_REMOTE_DESKTOP_SESSION_INTERFACE, "NotifyPointerButton", &d_error, "ib", button, FALSE); + case 'b': + button = name[1] - '1'; + if (button < 0 || button > 4) + return FALSE; + if (x != -1 && y != -1) + dbind_method_call_reentrant (data.bus, MUTTER_REMOTE_DESKTOP_BUS_NAME, data.rd_session_path, MUTTER_REMOTE_DESKTOP_SESSION_INTERFACE, "NotifyPointerMotionAbsolute", &d_error, "sdd", data.sc_stream_path, d_x, d_y); + switch (name[2]) + { + case 'p': + dbind_method_call_reentrant (data.bus, MUTTER_REMOTE_DESKTOP_BUS_NAME, data.rd_session_path, MUTTER_REMOTE_DESKTOP_SESSION_INTERFACE, "NotifyPointerButton", &d_error, "ib", button, TRUE); + break; + case 'r': + dbind_method_call_reentrant (data.bus, MUTTER_REMOTE_DESKTOP_BUS_NAME, data.rd_session_path, MUTTER_REMOTE_DESKTOP_SESSION_INTERFACE, "NotifyPointerButton", &d_error, "ib", button, FALSE); + break; + case 'c': + dbind_method_call_reentrant (data.bus, MUTTER_REMOTE_DESKTOP_BUS_NAME, data.rd_session_path, MUTTER_REMOTE_DESKTOP_SESSION_INTERFACE, "NotifyPointerButton", &d_error, "ib", button, TRUE); + dbind_method_call_reentrant (data.bus, MUTTER_REMOTE_DESKTOP_BUS_NAME, data.rd_session_path, MUTTER_REMOTE_DESKTOP_SESSION_INTERFACE, "NotifyPointerButton", &d_error, "ib", button, FALSE); + break; + case 'd': + dbind_method_call_reentrant (data.bus, MUTTER_REMOTE_DESKTOP_BUS_NAME, data.rd_session_path, MUTTER_REMOTE_DESKTOP_SESSION_INTERFACE, "NotifyPointerButton", &d_error, "ib", button, TRUE); + dbind_method_call_reentrant (data.bus, MUTTER_REMOTE_DESKTOP_BUS_NAME, data.rd_session_path, MUTTER_REMOTE_DESKTOP_SESSION_INTERFACE, "NotifyPointerButton", &d_error, "ib", button, FALSE); + dbind_method_call_reentrant (data.bus, MUTTER_REMOTE_DESKTOP_BUS_NAME, data.rd_session_path, MUTTER_REMOTE_DESKTOP_SESSION_INTERFACE, "NotifyPointerButton", &d_error, "ib", button, TRUE); + dbind_method_call_reentrant (data.bus, MUTTER_REMOTE_DESKTOP_BUS_NAME, data.rd_session_path, MUTTER_REMOTE_DESKTOP_SESSION_INTERFACE, "NotifyPointerButton", &d_error, "ib", button, FALSE); + break; + default: + return FALSE; + } break; - case 'c': - dbind_method_call_reentrant (data.bus, MUTTER_REMOTE_DESKTOP_BUS_NAME, data.rd_session_path, MUTTER_REMOTE_DESKTOP_SESSION_INTERFACE, "NotifyPointerButton", &d_error, "ib", button, TRUE); - dbind_method_call_reentrant (data.bus, MUTTER_REMOTE_DESKTOP_BUS_NAME, data.rd_session_path, MUTTER_REMOTE_DESKTOP_SESSION_INTERFACE, "NotifyPointerButton", &d_error, "ib", button, FALSE); + case 'a': /* absolute motion */ + dbind_method_call_reentrant (data.bus, MUTTER_REMOTE_DESKTOP_BUS_NAME, data.rd_session_path, MUTTER_REMOTE_DESKTOP_SESSION_INTERFACE, "NotifyPointerMotionAbsolute", &d_error, "sdd", data.sc_stream_path, d_x, d_y); break; - case 'd': - dbind_method_call_reentrant (data.bus, MUTTER_REMOTE_DESKTOP_BUS_NAME, data.rd_session_path, MUTTER_REMOTE_DESKTOP_SESSION_INTERFACE, "NotifyPointerButton", &d_error, "ib", button, TRUE); - dbind_method_call_reentrant (data.bus, MUTTER_REMOTE_DESKTOP_BUS_NAME, data.rd_session_path, MUTTER_REMOTE_DESKTOP_SESSION_INTERFACE, "NotifyPointerButton", &d_error, "ib", button, FALSE); - dbind_method_call_reentrant (data.bus, MUTTER_REMOTE_DESKTOP_BUS_NAME, data.rd_session_path, MUTTER_REMOTE_DESKTOP_SESSION_INTERFACE, "NotifyPointerButton", &d_error, "ib", button, TRUE); - dbind_method_call_reentrant (data.bus, MUTTER_REMOTE_DESKTOP_BUS_NAME, data.rd_session_path, MUTTER_REMOTE_DESKTOP_SESSION_INTERFACE, "NotifyPointerButton", &d_error, "ib", button, FALSE); + case 'r': /* relative */ + dbind_method_call_reentrant (data.bus, MUTTER_REMOTE_DESKTOP_BUS_NAME, data.rd_session_path, MUTTER_REMOTE_DESKTOP_SESSION_INTERFACE, "NotifyPointerMotionRelative", &d_error, "dd", d_x, d_y); break; default: return FALSE; } - break; - case 'a': /* absolute motion */ - dbind_method_call_reentrant (data.bus, MUTTER_REMOTE_DESKTOP_BUS_NAME, data.rd_session_path, MUTTER_REMOTE_DESKTOP_SESSION_INTERFACE, "NotifyPointerMotionAbsolute", &d_error, "sdd", data.sc_stream_path, d_x, d_y); - break; - case 'r': /* relative */ - dbind_method_call_reentrant (data.bus, MUTTER_REMOTE_DESKTOP_BUS_NAME, data.rd_session_path, MUTTER_REMOTE_DESKTOP_SESSION_INTERFACE, "NotifyPointerMotionRelative", &d_error, "dd", d_x, d_y); - break; - default: - return FALSE; - } return TRUE; } @@ -391,17 +392,17 @@ void _atspi_mutter_set_reference_window (AtspiAccessible *accessible) { if (accessible) - { - AtspiRole role = atspi_accessible_get_role (accessible, NULL); - gchar *name; - g_return_if_fail (role != ATSPI_ROLE_APPLICATION); - name = atspi_accessible_get_name (accessible, NULL); - data.window_id = get_window_id (name); - data.window_id_is_explicit = TRUE; - } + { + AtspiRole role = atspi_accessible_get_role (accessible, NULL); + gchar *name; + g_return_if_fail (role != ATSPI_ROLE_APPLICATION); + name = atspi_accessible_get_name (accessible, NULL); + data.window_id = get_window_id (name); + data.window_id_is_explicit = TRUE; + } else - { - data.window_id_is_explicit = FALSE; - } + { + data.window_id_is_explicit = FALSE; + } } diff --git a/atspi/atspi-object.c b/atspi/atspi-object.c index a838ba0b..2e9a6d0e 100644 --- a/atspi/atspi-object.c +++ b/atspi/atspi-object.c @@ -36,10 +36,10 @@ atspi_object_dispose (GObject *object) AtspiObject *aobj = ATSPI_OBJECT (object); if (aobj->app) - { - g_object_unref (aobj->app); - aobj->app = NULL; - } + { + g_object_unref (aobj->app); + aobj->app = NULL; + } G_OBJECT_CLASS (atspi_object_parent_class)->dispose (object); } diff --git a/atspi/atspi-object.h b/atspi/atspi-object.h index 5acbde82..3bb0bc53 100644 --- a/atspi/atspi-object.h +++ b/atspi/atspi-object.h @@ -4,7 +4,7 @@ * * Copyright 2002 Ximian, Inc. * 2002 Sun Microsystems Inc. - * + * * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -32,12 +32,12 @@ G_BEGIN_DECLS -#define ATSPI_TYPE_OBJECT (atspi_object_get_type ()) -#define ATSPI_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATSPI_TYPE_OBJECT, AtspiObject)) -#define ATSPI_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ATSPI_TYPE_OBJECT, AtspiObjectClass)) -#define ATSPI_IS_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATSPI_TYPE_OBJECT)) -#define ATSPI_IS_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ATSPI_TYPE_OBJECT)) -#define ATSPI_OBJECT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ATSPI_TYPE_OBJECT, AtspiObjectClass)) +#define ATSPI_TYPE_OBJECT (atspi_object_get_type ()) +#define ATSPI_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATSPI_TYPE_OBJECT, AtspiObject)) +#define ATSPI_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ATSPI_TYPE_OBJECT, AtspiObjectClass)) +#define ATSPI_IS_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATSPI_TYPE_OBJECT)) +#define ATSPI_IS_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ATSPI_TYPE_OBJECT)) +#define ATSPI_OBJECT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ATSPI_TYPE_OBJECT, AtspiObjectClass)) typedef struct _AtspiObject AtspiObject; struct _AtspiObject @@ -53,8 +53,8 @@ struct _AtspiObjectClass GObjectClass parent_class; }; -GType atspi_object_get_type (void); +GType atspi_object_get_type (void); G_END_DECLS -#endif /* _ATSPI_OBJECT_H_ */ +#endif /* _ATSPI_OBJECT_H_ */ diff --git a/atspi/atspi-private.h b/atspi/atspi-private.h index 9ddc6006..a38142cd 100644 --- a/atspi/atspi-private.h +++ b/atspi/atspi-private.h @@ -4,7 +4,7 @@ * * Copyright 2002 Ximian, Inc. * 2002 Sun Microsystems Inc. - * + * * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -25,20 +25,20 @@ #ifndef _ATSPI_PRIVATE_H_ #define _ATSPI_PRIVATE_H_ -#include <config.h> #include "atspi-device-listener-private.h" #include "atspi-event-listener-private.h" #include "atspi-matchrule-private.h" #include "atspi-misc-private.h" #include "atspi-mutter-private.h" +#include <config.h> #include "glib/gi18n.h" -#include "atspi.h" #include "atspi-accessible-private.h" +#include "atspi.h" G_BEGIN_DECLS void _atspi_reregister_device_listeners (); G_END_DECLS -#endif /* _ATSPI_PRIVATE_H_ */ +#endif /* _ATSPI_PRIVATE_H_ */ diff --git a/atspi/atspi-registry.c b/atspi/atspi-registry.c index 1ec36599..19cb7e2e 100644 --- a/atspi/atspi-registry.c +++ b/atspi/atspi-registry.c @@ -41,9 +41,9 @@ typedef struct { AtspiDeviceListener *listener; - GArray *key_set; - AtspiKeyMaskType modmask; - AtspiKeyEventMask event_types; + GArray *key_set; + AtspiKeyMaskType modmask; + AtspiKeyEventMask event_types; gint sync_type; } DeviceListenerEntry; @@ -53,7 +53,7 @@ static GList *device_listeners; * atspi_get_desktop_count: * * Gets the number of virtual desktops. - * NOTE: multiple virtual desktops are not implemented yet; as a + * NOTE: multiple virtual desktops are not implemented yet; as a * consequence, this function always returns 1. * * Returns: a #gint indicating the number of active virtual desktops. @@ -76,10 +76,11 @@ atspi_get_desktop_count () * Returns: (transfer full): a pointer to the @i-th virtual desktop's * #AtspiAccessible representation. **/ -AtspiAccessible* +AtspiAccessible * atspi_get_desktop (gint i) { - if (i != 0) return NULL; + if (i != 0) + return NULL; return _atspi_ref_accessible (atspi_bus_registry, atspi_path_root); } @@ -116,19 +117,19 @@ notify_keystroke_listener (DeviceListenerEntry *e) gchar *path = _atspi_device_listener_get_path (e->listener); dbus_uint32_t d_modmask = e->modmask; dbus_uint32_t d_event_types = e->event_types; - AtspiEventListenerMode listener_mode; - gboolean retval = FALSE; + AtspiEventListenerMode listener_mode; + gboolean retval = FALSE; DBusError d_error; listener_mode.synchronous = - (dbus_bool_t) ((e->sync_type & ATSPI_KEYLISTENER_SYNCHRONOUS)!=0); + (dbus_bool_t) ((e->sync_type & ATSPI_KEYLISTENER_SYNCHRONOUS) != 0); listener_mode.preemptive = - (dbus_bool_t) ((e->sync_type & ATSPI_KEYLISTENER_CANCONSUME)!=0); + (dbus_bool_t) ((e->sync_type & ATSPI_KEYLISTENER_CANCONSUME) != 0); listener_mode.global = - (dbus_bool_t) ((e->sync_type & ATSPI_KEYLISTENER_ALL_WINDOWS)!=0); + (dbus_bool_t) ((e->sync_type & ATSPI_KEYLISTENER_ALL_WINDOWS) != 0); dbus_error_init (&d_error); - dbind_method_call_reentrant (_atspi_bus(), atspi_bus_registry, + dbind_method_call_reentrant (_atspi_bus (), atspi_bus_registry, atspi_path_dec, atspi_interface_dec, "RegisterKeystrokeListener", &d_error, "oa(iisi)uu(bbb)=>b", path, e->key_set, @@ -194,24 +195,24 @@ unregister_listener (gpointer data, GObject *object) * @sync_type: an #AtspiKeyListenerSyncType parameter indicating * the behavior of the notification/listener transaction. * @error: (allow-none): a pointer to a %NULL #GError pointer, or %NULL - * + * * Registers a listener for keystroke events, either pre-emptively for * all windows (%ATSPI_KEYLISTENER_ALL_WINDOWS), * non-preemptively (%ATSPI_KEYLISTENER_NOSYNC), or * pre-emptively at the toolkit level (%ATSPI_KEYLISTENER_CANCONSUME). * If ALL_WINDOWS or CANCONSUME are used, the event is consumed - * upon receipt if one of @listener's callbacks returns %TRUE + * upon receipt if one of @listener's callbacks returns %TRUE * (other sync_type values may be available in the future). * * Returns: %TRUE if successful, otherwise %FALSE. **/ gboolean -atspi_register_keystroke_listener (AtspiDeviceListener *listener, - GArray *key_set, - AtspiKeyMaskType modmask, - AtspiKeyEventMask event_types, - AtspiKeyListenerSyncType sync_type, - GError **error) +atspi_register_keystroke_listener (AtspiDeviceListener *listener, + GArray *key_set, + AtspiKeyMaskType modmask, + AtspiKeyEventMask event_types, + AtspiKeyListenerSyncType sync_type, + GError **error) { DeviceListenerEntry *e; @@ -230,18 +231,18 @@ atspi_register_keystroke_listener (AtspiDeviceListener *listener, e->key_set->len = key_set->len; for (i = 0; i < key_set->len; i++) { - AtspiKeyDefinition *kd = ((AtspiKeyDefinition *) key_set->data) + i; - AtspiKeyDefinition *d_kd = ((AtspiKeyDefinition *) e->key_set->data) + i; + AtspiKeyDefinition *kd = ((AtspiKeyDefinition *) key_set->data) + i; + AtspiKeyDefinition *d_kd = ((AtspiKeyDefinition *) e->key_set->data) + i; d_kd->keycode = kd->keycode; - d_kd->keysym = kd->keysym; - if (kd->keystring) - { - d_kd->keystring = kd->keystring; - } - else + d_kd->keysym = kd->keysym; + if (kd->keystring) + { + d_kd->keystring = kd->keystring; + } + else { - d_kd->keystring = ""; - } + d_kd->keystring = ""; + } } } else @@ -276,10 +277,10 @@ atspi_register_keystroke_listener (AtspiDeviceListener *listener, **/ gboolean atspi_deregister_keystroke_listener (AtspiDeviceListener *listener, - GArray *key_set, - AtspiKeyMaskType modmask, - AtspiKeyEventMask event_types, - GError **error) + GArray *key_set, + AtspiKeyMaskType modmask, + AtspiKeyEventMask event_types, + GError **error) { GArray *d_key_set; gchar *path; @@ -305,18 +306,18 @@ atspi_deregister_keystroke_listener (AtspiDeviceListener *listener, d_key_set->len = key_set->len; for (i = 0; i < key_set->len; ++i) { - AtspiKeyDefinition *kd = ((AtspiKeyDefinition *) key_set->data) + i; - AtspiKeyDefinition *d_kd = ((AtspiKeyDefinition *) d_key_set->data) + i; + AtspiKeyDefinition *kd = ((AtspiKeyDefinition *) key_set->data) + i; + AtspiKeyDefinition *d_kd = ((AtspiKeyDefinition *) d_key_set->data) + i; d_kd->keycode = kd->keycode; - d_kd->keysym = kd->keysym; - if (kd->keystring) - { - d_kd->keystring = kd->keystring; - } - else + d_kd->keysym = kd->keysym; + if (kd->keystring) { - d_kd->keystring = ""; - } + d_kd->keystring = kd->keystring; + } + else + { + d_kd->keystring = ""; + } } } else @@ -324,7 +325,7 @@ atspi_deregister_keystroke_listener (AtspiDeviceListener *listener, d_key_set = g_array_sized_new (FALSE, TRUE, sizeof (AtspiKeyDefinition), 0); } - dbind_method_call_reentrant (_atspi_bus(), atspi_bus_registry, + dbind_method_call_reentrant (_atspi_bus (), atspi_bus_registry, atspi_path_dec, atspi_interface_dec, "DeregisterKeystrokeListener", &d_error, "oa(iisi)uu", path, d_key_set, d_modmask, @@ -339,9 +340,9 @@ atspi_deregister_keystroke_listener (AtspiDeviceListener *listener, for (l = device_listeners; l;) { /* TODO: This code is all wrong / doesn't match what is in - * deviceeventcontroller.c. It would be nice to deprecate these methods - * in favor of methods that return an ID for the registration that can - * be passed to a deregister function, for instance. */ + * deviceeventcontroller.c. It would be nice to deprecate these methods + * in favor of methods that return an ID for the registration that can + * be passed to a deregister function, for instance. */ DeviceListenerEntry *e = l->data; if (e->modmask == modmask && e->event_types == event_types) { @@ -366,9 +367,10 @@ atspi_deregister_keystroke_listener (AtspiDeviceListener *listener, * Returns: Always returns %FALSE. **/ gboolean -atspi_register_device_event_listener (AtspiDeviceListener *listener, - AtspiDeviceEventMask event_types, - void *filter, GError **error) +atspi_register_device_event_listener (AtspiDeviceListener *listener, + AtspiDeviceEventMask event_types, + void *filter, + GError **error) { /* See https://gitlab.gnome.org/GNOME/at-spi2-core/-/issues/94 for why this code is removed */ return FALSE; @@ -388,7 +390,7 @@ atspi_register_device_event_listener (AtspiDeviceListener *listener, **/ gboolean atspi_deregister_device_event_listener (AtspiDeviceListener *listener, - void *filter, + void *filter, GError **error) { /* See https://gitlab.gnome.org/GNOME/at-spi2-core/-/issues/94 for why this code is removed */ @@ -426,23 +428,24 @@ using_mutter () **/ gboolean atspi_generate_keyboard_event (glong keyval, - const gchar *keystring, - AtspiKeySynthType synth_type, GError **error) + const gchar *keystring, + AtspiKeySynthType synth_type, + GError **error) { dbus_uint32_t d_synth_type = synth_type; dbus_int32_t d_keyval = keyval; DBusError d_error; if (using_mutter ()) - { - if (_atspi_mutter_generate_keyboard_event (keyval, keystring, synth_type, error)) - return TRUE; - } + { + if (_atspi_mutter_generate_keyboard_event (keyval, keystring, synth_type, error)) + return TRUE; + } dbus_error_init (&d_error); if (!keystring) keystring = ""; - dbind_method_call_reentrant (_atspi_bus(), atspi_bus_registry, atspi_path_dec, atspi_interface_dec, "GenerateKeyboardEvent", &d_error, "isu", d_keyval, keystring, d_synth_type); + dbind_method_call_reentrant (_atspi_bus (), atspi_bus_registry, atspi_path_dec, atspi_interface_dec, "GenerateKeyboardEvent", &d_error, "isu", d_keyval, keystring, d_synth_type); if (dbus_error_is_set (&d_error)) { g_warning ("GenerateKeyboardEvent failed: %s", d_error.message); @@ -478,13 +481,13 @@ atspi_generate_mouse_event (glong x, glong y, const gchar *name, GError **error) g_return_val_if_fail (name != NULL, FALSE); if (using_mutter ()) - { - if (_atspi_mutter_generate_mouse_event (x, y, name, error)) - return TRUE; - } + { + if (_atspi_mutter_generate_mouse_event (x, y, name, error)) + return TRUE; + } dbus_error_init (&d_error); - dbind_method_call_reentrant (_atspi_bus(), atspi_bus_registry, + dbind_method_call_reentrant (_atspi_bus (), atspi_bus_registry, atspi_path_dec, atspi_interface_dec, "GenerateMouseEvent", &d_error, "iis", d_x, d_y, name); diff --git a/atspi/atspi-registry.h b/atspi/atspi-registry.h index 43150c23..fea54c0c 100644 --- a/atspi/atspi-registry.h +++ b/atspi/atspi-registry.h @@ -4,7 +4,7 @@ * * Copyright 2002 Ximian, Inc. * 2002 Sun Microsystems Inc. - * + * * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -26,8 +26,8 @@ #define _ATSPI_REGISTRY_H_ #include "atspi-accessible.h" -#include "atspi-types.h" #include "atspi-device-listener.h" +#include "atspi-types.h" G_BEGIN_DECLS @@ -35,38 +35,41 @@ GType atspi_key_definition_get_type (); gint atspi_get_desktop_count (); -AtspiAccessible* atspi_get_desktop (gint i); +AtspiAccessible *atspi_get_desktop (gint i); GArray *atspi_get_desktop_list (); gboolean -atspi_register_keystroke_listener (AtspiDeviceListener *listener, - GArray *key_set, - AtspiKeyMaskType modmask, - AtspiKeyEventMask event_types, - AtspiKeyListenerSyncType sync_type, - GError **error); +atspi_register_keystroke_listener (AtspiDeviceListener *listener, + GArray *key_set, + AtspiKeyMaskType modmask, + AtspiKeyEventMask event_types, + AtspiKeyListenerSyncType sync_type, + GError **error); gboolean atspi_deregister_keystroke_listener (AtspiDeviceListener *listener, - GArray *key_set, - AtspiKeyMaskType modmask, - AtspiKeyEventMask event_types, - GError **error); + GArray *key_set, + AtspiKeyMaskType modmask, + AtspiKeyEventMask event_types, + GError **error); gboolean -atspi_register_device_event_listener (AtspiDeviceListener *listener, - AtspiDeviceEventMask event_types, - void *filter, GError **error); +atspi_register_device_event_listener (AtspiDeviceListener *listener, + AtspiDeviceEventMask event_types, + void *filter, + GError **error); gboolean atspi_deregister_device_event_listener (AtspiDeviceListener *listener, - void *filter, GError **error); + void *filter, + GError **error); gboolean atspi_generate_keyboard_event (glong keyval, - const gchar *keystring, - AtspiKeySynthType synth_type, GError **error); + const gchar *keystring, + AtspiKeySynthType synth_type, + GError **error); gboolean atspi_generate_mouse_event (glong x, glong y, const gchar *name, GError **error); @@ -75,4 +78,4 @@ void atspi_set_reference_window (AtspiAccessible *accessible); G_END_DECLS -#endif /* _ATSPI_REGISTRY_H_ */ +#endif /* _ATSPI_REGISTRY_H_ */ diff --git a/atspi/atspi-relation.c b/atspi/atspi-relation.c index 527826f6..a36e84c1 100644 --- a/atspi/atspi-relation.c +++ b/atspi/atspi-relation.c @@ -108,12 +108,12 @@ _atspi_relation_new_from_iter (DBusMessageIter *iter) relation->targets = g_array_new (TRUE, TRUE, sizeof (AtspiAccessible *)); dbus_message_iter_recurse (&iter_struct, &iter_array); while (dbus_message_iter_get_arg_type (&iter_array) != DBUS_TYPE_INVALID) - { - AtspiAccessible *accessible; - accessible = _atspi_dbus_consume_accessible (&iter_array); - relation->targets = g_array_append_val (relation->targets, accessible); - /* Iter was moved already, so no need to call dbus_message_iter_next */ - } + { + AtspiAccessible *accessible; + accessible = _atspi_dbus_consume_accessible (&iter_array); + relation->targets = g_array_append_val (relation->targets, accessible); + /* Iter was moved already, so no need to call dbus_message_iter_next */ + } return relation; } @@ -131,7 +131,7 @@ atspi_relation_finalize (GObject *object) gint i; for (i = 0; i < relation->targets->len; i++) - g_object_unref (g_array_index (relation->targets, AtspiAccessible *, i)); + g_object_unref (g_array_index (relation->targets, AtspiAccessible *, i)); g_array_free (relation->targets, TRUE); G_OBJECT_CLASS (atspi_relation_parent_class)->finalize (object); diff --git a/atspi/atspi-relation.h b/atspi/atspi-relation.h index 0c32d6a8..0a8da577 100644 --- a/atspi/atspi-relation.h +++ b/atspi/atspi-relation.h @@ -5,7 +5,7 @@ * Copyright 2002 Ximian, Inc. * 2002 Sun Microsystems Inc. * Copyright 2010, 2011 Novell, Inc. - * + * * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -32,10 +32,10 @@ G_BEGIN_DECLS -#define ATSPI_TYPE_RELATION (atspi_relation_get_type ()) -#define ATSPI_IS_RELATION(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATSPI_TYPE_RELATION) -#define ATSPI_RELATION(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATSPI_TYPE_RELATION, AtspiRelation) -#define ATSPI_RELATION_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATSPI_TYPE_RELATION, AtspiRelation)) +#define ATSPI_TYPE_RELATION (atspi_relation_get_type ()) +#define ATSPI_IS_RELATION(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATSPI_TYPE_RELATION) +#define ATSPI_RELATION(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATSPI_TYPE_RELATION, AtspiRelation) +#define ATSPI_RELATION_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATSPI_TYPE_RELATION, AtspiRelation)) GType atspi_relation_get_type (); @@ -57,11 +57,11 @@ AtspiRelationType atspi_relation_get_relation_type (AtspiRelation *obj); gint atspi_relation_get_n_targets (AtspiRelation *obj); -AtspiAccessible * atspi_relation_get_target (AtspiRelation *obj, gint i); +AtspiAccessible *atspi_relation_get_target (AtspiRelation *obj, gint i); /* private */ -AtspiRelation * _atspi_relation_new_from_iter (DBusMessageIter *iter); +AtspiRelation *_atspi_relation_new_from_iter (DBusMessageIter *iter); G_END_DECLS -#endif /* _ATSPI_RELATION_H_ */ +#endif /* _ATSPI_RELATION_H_ */ diff --git a/atspi/atspi-selection.c b/atspi/atspi-selection.c index ead851b5..0c747835 100644 --- a/atspi/atspi-selection.c +++ b/atspi/atspi-selection.c @@ -67,7 +67,7 @@ atspi_selection_get_n_selected_children (AtspiSelection *obj, GError **error) * children is specified. * * Gets the i-th selected #AtspiAccessible child of an #AtspiSelection. - * Note that @selected_child_index refers to the index in the list + * Note that @selected_child_index refers to the index in the list * of 'selected' * children and generally differs from that used in * #atspi_accessible_get_child_at_index or returned by @@ -81,13 +81,14 @@ atspi_selection_get_n_selected_children (AtspiSelection *obj, GError **error) **/ AtspiAccessible * atspi_selection_get_selected_child (AtspiSelection *obj, - gint selected_child_index, GError **error) + gint selected_child_index, + GError **error) { dbus_int32_t d_selected_child_index = selected_child_index; DBusMessage *reply; g_return_val_if_fail (obj != NULL, NULL); - + reply = _atspi_dbus_call_partial (obj, atspi_interface_selection, "GetSelectedChild", error, "i", d_selected_child_index); @@ -161,15 +162,15 @@ atspi_selection_deselect_selected_child (AtspiSelection *obj, * Deselects a specific child of an #AtspiSelection. * Note that @child_index is the index of the child * in the parent container. - * + * * See #atspi_selection_deselect_selected_child - * + * * Returns: #TRUE if the child was successfully deselected, #FALSE otherwise. **/ gboolean atspi_selection_deselect_child (AtspiSelection *obj, - gint child_index, - GError **error) + gint child_index, + GError **error) { dbus_int32_t d_child_index = child_index; dbus_bool_t retval = FALSE; @@ -222,7 +223,7 @@ gboolean atspi_selection_select_all (AtspiSelection *obj, GError **error) { dbus_bool_t retval = FALSE; - + g_return_val_if_fail (obj != NULL, FALSE); _atspi_dbus_call (obj, atspi_interface_selection, "SelectAll", error, "=>b", &retval); @@ -244,7 +245,7 @@ gboolean atspi_selection_clear_selection (AtspiSelection *obj, GError **error) { dbus_bool_t retval = FALSE; - + g_return_val_if_fail (obj != NULL, FALSE); _atspi_dbus_call (obj, atspi_interface_selection, "ClearSelection", error, "=>b", &retval); @@ -262,16 +263,15 @@ atspi_selection_get_type (void) { static GType type = 0; - if (!type) { - static const GTypeInfo tinfo = + if (!type) { - sizeof (AtspiSelection), - (GBaseInitFunc) atspi_selection_base_init, - (GBaseFinalizeFunc) NULL, - }; - - type = g_type_register_static (G_TYPE_INTERFACE, "AtspiSelection", &tinfo, 0); - - } + static const GTypeInfo tinfo = { + sizeof (AtspiSelection), + (GBaseInitFunc) atspi_selection_base_init, + (GBaseFinalizeFunc) NULL, + }; + + type = g_type_register_static (G_TYPE_INTERFACE, "AtspiSelection", &tinfo, 0); + } return type; } diff --git a/atspi/atspi-selection.h b/atspi/atspi-selection.h index dda225a7..651ca61c 100644 --- a/atspi/atspi-selection.h +++ b/atspi/atspi-selection.h @@ -5,7 +5,7 @@ * Copyright 2002 Ximian, Inc. * 2002 Sun Microsystems Inc. * Copyright 2010, 2011 Novell, Inc. - * + * * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -34,10 +34,10 @@ G_BEGIN_DECLS -#define ATSPI_TYPE_SELECTION (atspi_selection_get_type ()) -#define ATSPI_IS_SELECTION(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATSPI_TYPE_SELECTION) -#define ATSPI_SELECTION(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATSPI_TYPE_SELECTION, AtspiSelection) -#define ATSPI_SELECTION_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATSPI_TYPE_SELECTION, AtspiSelection)) +#define ATSPI_TYPE_SELECTION (atspi_selection_get_type ()) +#define ATSPI_IS_SELECTION(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATSPI_TYPE_SELECTION) +#define ATSPI_SELECTION(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATSPI_TYPE_SELECTION, AtspiSelection) +#define ATSPI_SELECTION_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATSPI_TYPE_SELECTION, AtspiSelection)) GType atspi_selection_get_type (); @@ -48,7 +48,7 @@ struct _AtspiSelection gint atspi_selection_get_n_selected_children (AtspiSelection *obj, GError **error); -AtspiAccessible * atspi_selection_get_selected_child (AtspiSelection *obj, gint selected_child_index, GError **error); +AtspiAccessible *atspi_selection_get_selected_child (AtspiSelection *obj, gint selected_child_index, GError **error); gboolean atspi_selection_select_child (AtspiSelection *obj, gint child_index, GError **error); @@ -58,7 +58,8 @@ gboolean atspi_selection_deselect_child (AtspiSelection *obj, gint child_index, gboolean atspi_selection_is_child_selected (AtspiSelection *obj, - gint child_index, GError **error); + gint child_index, + GError **error); gboolean atspi_selection_select_all (AtspiSelection *obj, GError **error); @@ -66,4 +67,4 @@ gboolean atspi_selection_clear_selection (AtspiSelection *obj, GError **error); G_END_DECLS -#endif /* _ATSPI_SELECTION_H_ */ +#endif /* _ATSPI_SELECTION_H_ */ diff --git a/atspi/atspi-stateset.c b/atspi/atspi-stateset.c index 2d5ca644..be71aae7 100644 --- a/atspi/atspi-stateset.c +++ b/atspi/atspi-stateset.c @@ -42,7 +42,7 @@ atspi_state_set_init (AtspiStateSet *set) } static void -atspi_state_set_class_init (AtspiStateSetClass* klass) +atspi_state_set_class_init (AtspiStateSetClass *klass) { } @@ -73,7 +73,7 @@ AtspiStateSet * _atspi_state_set_new_internal (AtspiAccessible *accessible, gint64 states) { AtspiStateSet *set; - + set = g_object_new (ATSPI_TYPE_STATE_SET, NULL); g_return_val_if_fail (set != NULL, NULL); @@ -106,14 +106,13 @@ atspi_state_set_set_by_name (AtspiStateSet *set, const gchar *name, gboolean ena value = g_enum_get_value_by_nick (G_ENUM_CLASS (type_class), name); if (!value) - { - g_warning ("AT-SPI: Attempt to set unknown state '%s'", name); - } + { + g_warning ("AT-SPI: Attempt to set unknown state '%s'", name); + } + else if (enabled) + set->states |= ((gint64) 1 << value->value); else - if (enabled) - set->states |= ((gint64)1 << value->value); - else - set->states &= ~((gint64)1 << value->value); + set->states &= ~((gint64) 1 << value->value); g_type_class_unref (type_class); } @@ -133,8 +132,8 @@ refresh_states (AtspiStateSet *set) states = (dbus_uint32_t *) state_array->data; - set->states = ((gint64)states [1]) << 32; - set->states |= (gint64) states [0]; + set->states = ((gint64) states[1]) << 32; + set->states |= (gint64) states[0]; g_array_free (state_array, TRUE); } @@ -151,7 +150,7 @@ void atspi_state_set_add (AtspiStateSet *set, AtspiStateType state) { g_return_if_fail (set != NULL); - set->states |= (((gint64)1) << state); + set->states |= (((gint64) 1) << state); } /** @@ -192,12 +191,12 @@ atspi_state_set_compare (AtspiStateSet *set, **/ gboolean atspi_state_set_contains (AtspiStateSet *set, - AtspiStateType state) + AtspiStateType state) { if (!set) return FALSE; refresh_states (set); - return (set->states & ((gint64)1 << state)) ? TRUE : FALSE; + return (set->states & ((gint64) 1 << state)) ? TRUE : FALSE; } /** @@ -217,7 +216,7 @@ atspi_state_set_contains (AtspiStateSet *set, **/ gboolean atspi_state_set_equals (AtspiStateSet *set, - AtspiStateSet *set2) + AtspiStateSet *set2) { if (set == set2) return TRUE; @@ -248,11 +247,11 @@ atspi_state_set_get_states (AtspiStateSet *set) if (!ret) return NULL; for (i = 0; i < 64; i++) - { - if (set->states & val) - ret = g_array_append_val (ret, i); - val <<= 1; - } + { + if (set->states & val) + ret = g_array_append_val (ret, i); + val <<= 1; + } return ret; } @@ -281,5 +280,5 @@ void atspi_state_set_remove (AtspiStateSet *set, AtspiStateType state) { g_return_if_fail (set != NULL); - set->states &= ~((gint64)1 << state); + set->states &= ~((gint64) 1 << state); } diff --git a/atspi/atspi-stateset.h b/atspi/atspi-stateset.h index e9e261ed..f00296ce 100644 --- a/atspi/atspi-stateset.h +++ b/atspi/atspi-stateset.h @@ -25,12 +25,12 @@ #ifndef _ATSPI_STATE_SET_H_ #define _ATSPI_STATE_SET_H_ -#define ATSPI_TYPE_STATE_SET (atspi_state_set_get_type ()) -#define ATSPI_STATE_SET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATSPI_TYPE_STATE_SET, AtspiStateSet)) -#define ATSPI_STATE_SET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ATSPI_TYPE_STATE_SET, AtspiStateSetClass)) -#define ATSPI_IS_STATE_SET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATSPI_TYPE_STATE_SET)) -#define ATSPI_IS_STATE_SET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ATSPI_TYPE_STATE_SET)) -#define ATSPI_STATE_SET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ATSPI_TYPE_STATE_SET, AtspiStateSetClass)) +#define ATSPI_TYPE_STATE_SET (atspi_state_set_get_type ()) +#define ATSPI_STATE_SET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATSPI_TYPE_STATE_SET, AtspiStateSet)) +#define ATSPI_STATE_SET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ATSPI_TYPE_STATE_SET, AtspiStateSetClass)) +#define ATSPI_IS_STATE_SET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATSPI_TYPE_STATE_SET)) +#define ATSPI_IS_STATE_SET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ATSPI_TYPE_STATE_SET)) +#define ATSPI_STATE_SET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ATSPI_TYPE_STATE_SET, AtspiStateSetClass)) G_BEGIN_DECLS @@ -50,26 +50,26 @@ struct _AtspiStateSetClass GType atspi_state_set_get_type (void); -AtspiStateSet * atspi_state_set_new (GArray *states); +AtspiStateSet *atspi_state_set_new (GArray *states); void atspi_state_set_set_by_name (AtspiStateSet *set, const gchar *name, gboolean enabled); void atspi_state_set_add (AtspiStateSet *set, AtspiStateType state); -AtspiStateSet * atspi_state_set_compare (AtspiStateSet *set, AtspiStateSet *set2); +AtspiStateSet *atspi_state_set_compare (AtspiStateSet *set, AtspiStateSet *set2); gboolean atspi_state_set_contains (AtspiStateSet *set, AtspiStateType state); gboolean atspi_state_set_equals (AtspiStateSet *set, AtspiStateSet *set2); -GArray * atspi_state_set_get_states (AtspiStateSet *set); +GArray *atspi_state_set_get_states (AtspiStateSet *set); gboolean atspi_state_set_is_empty (AtspiStateSet *set); void atspi_state_set_remove (AtspiStateSet *set, AtspiStateType state); -AtspiStateSet * _atspi_state_set_new_internal (struct _AtspiAccessible *accessible, gint64 states); +AtspiStateSet *_atspi_state_set_new_internal (struct _AtspiAccessible *accessible, gint64 states); G_END_DECLS -#endif /* _ATSPI_STATE_SET_H_ */ +#endif /* _ATSPI_STATE_SET_H_ */ diff --git a/atspi/atspi-table-cell.c b/atspi/atspi-table-cell.c index a33e0a89..4884f161 100644 --- a/atspi/atspi-table-cell.c +++ b/atspi/atspi-table-cell.c @@ -22,8 +22,8 @@ * Boston, MA 02110-1301, USA. */ -#include <stdlib.h> /* for malloc */ #include "atspi-private.h" +#include <stdlib.h> /* for malloc */ static GPtrArray * get_object_array_and_unref (DBusMessage *reply) @@ -35,20 +35,20 @@ get_object_array_and_unref (DBusMessage *reply) return NULL; if (strcmp (dbus_message_get_signature (reply), "a(so)") != 0) - { - dbus_message_unref (reply); - return NULL; - } + { + dbus_message_unref (reply); + return NULL; + } array = g_ptr_array_new (); dbus_message_iter_init (reply, &iter); dbus_message_iter_recurse (&iter, &iter_array); while (dbus_message_iter_get_arg_type (&iter_array) != DBUS_TYPE_INVALID) - { - AtspiAccessible *accessible = _atspi_dbus_consume_accessible (&iter_array); - g_ptr_array_add (array, accessible); - } + { + AtspiAccessible *accessible = _atspi_dbus_consume_accessible (&iter_array); + g_ptr_array_add (array, accessible); + } dbus_message_unref (reply); return array; } @@ -73,7 +73,7 @@ atspi_table_cell_get_column_span (AtspiTableCell *obj, GError **error) _atspi_dbus_get_property (obj, atspi_interface_table_cell, "ColumnSpan", error, "i", &retval); - + return retval; } @@ -85,7 +85,7 @@ atspi_table_cell_get_column_span (AtspiTableCell *obj, GError **error) * * Returns: (element-type AtspiAccessible) (transfer full): a GPtrArray of * AtspiAccessibles representing the column header cells. - */ + */ GPtrArray * atspi_table_cell_get_column_header_cells (AtspiTableCell *obj, GError **error) { @@ -94,7 +94,7 @@ atspi_table_cell_get_column_header_cells (AtspiTableCell *obj, GError **error) g_return_val_if_fail (obj != NULL, NULL); reply = _atspi_dbus_call_partial (obj, atspi_interface_table_cell, "GetColumnHeaderCells", error, ""); - + return get_object_array_and_unref (reply); } @@ -118,7 +118,7 @@ atspi_table_cell_get_row_span (AtspiTableCell *obj, GError **error) _atspi_dbus_get_property (obj, atspi_interface_table_cell, "RowSpan", error, "i", &retval); - + return retval; } @@ -139,7 +139,7 @@ atspi_table_cell_get_row_header_cells (AtspiTableCell *obj, GError **error) g_return_val_if_fail (obj != NULL, NULL); reply = _atspi_dbus_call_partial (obj, atspi_interface_table_cell, "GetRowHeaderCells", error, ""); - + return get_object_array_and_unref (reply); } @@ -169,7 +169,7 @@ atspi_table_cell_get_position (AtspiTableCell *obj, reply = _atspi_dbus_call_partial (obj, "org.freedesktop.DBus.Properties", "Get", error, "ss", atspi_interface_table_cell, "Position"); - + if (!reply) return -1; @@ -183,10 +183,10 @@ atspi_table_cell_get_position (AtspiTableCell *obj, iter_sig = dbus_message_iter_get_signature (&iter_variant); /* TODO: Also report error here */ if (strcmp (iter_sig, "(ii)") != 0) - { - dbus_free (iter_sig); - return FALSE; - } + { + dbus_free (iter_sig); + return FALSE; + } dbus_free (iter_sig); dbus_message_iter_recurse (&iter_variant, &iter_struct); @@ -215,13 +215,13 @@ atspi_table_cell_get_position (AtspiTableCell *obj, */ void atspi_table_cell_get_row_column_span (AtspiTableCell *obj, - gint *row, - gint *column, - gint *row_span, - gint *column_span, - GError **error) + gint *row, + gint *column, + gint *row_span, + gint *column_span, + GError **error) { - dbus_int32_t d_row = 0, d_column = 0, d_row_span = 0, d_column_span = 0; + dbus_int32_t d_row = 0, d_column = 0, d_row_span = 0, d_column_span = 0; if (row) *row = -1; @@ -265,7 +265,7 @@ atspi_table_cell_get_table (AtspiTableCell *obj, GError **error) _atspi_dbus_get_property (obj, atspi_interface_table_cell, "Table", error, "(so)", &retval); - + return retval; } @@ -279,16 +279,15 @@ atspi_table_cell_get_type (void) { static GType type = 0; - if (!type) { - static const GTypeInfo tinfo = + if (!type) { - sizeof (AtspiTableCell), - (GBaseInitFunc) atspi_table_cell_base_init, - (GBaseFinalizeFunc) NULL, - }; - - type = g_type_register_static (G_TYPE_INTERFACE, "AtspiTableCell", &tinfo, 0); - - } + static const GTypeInfo tinfo = { + sizeof (AtspiTableCell), + (GBaseInitFunc) atspi_table_cell_base_init, + (GBaseFinalizeFunc) NULL, + }; + + type = g_type_register_static (G_TYPE_INTERFACE, "AtspiTableCell", &tinfo, 0); + } return type; } diff --git a/atspi/atspi-table-cell.h b/atspi/atspi-table-cell.h index b16cd4b1..f12f3532 100644 --- a/atspi/atspi-table-cell.h +++ b/atspi/atspi-table-cell.h @@ -5,7 +5,7 @@ * Copyright 2002 Ximian, Inc. * 2002 Sun Microsystems Inc. * Copyright 2010, 2011 Novell, Inc. - * + * * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -34,10 +34,10 @@ G_BEGIN_DECLS -#define ATSPI_TYPE_TABLE_CELL (atspi_table_cell_get_type ()) -#define ATSPI_IS_TABLE_CELL(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATSPI_TYPE_TABLE_CELL) -#define ATSPI_TABLE_CELL(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATSPI_TYPE_TABLE_CELL, AtspiTableCell) -#define ATSPI_TABLE_CELL_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATSPI_TYPE_TABLE_CELL, AtspiTableCell)) +#define ATSPI_TYPE_TABLE_CELL (atspi_table_cell_get_type ()) +#define ATSPI_IS_TABLE_CELL(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATSPI_TYPE_TABLE_CELL) +#define ATSPI_TABLE_CELL(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATSPI_TYPE_TABLE_CELL, AtspiTableCell) +#define ATSPI_TABLE_CELL_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATSPI_TYPE_TABLE_CELL, AtspiTableCell)) GType atspi_table_cell_get_type (); @@ -59,19 +59,19 @@ GPtrArray *atspi_table_cell_get_row_header_cells (AtspiTableCell *obj, GError **error); gint atspi_table_cell_get_position (AtspiTableCell *obj, - gint *row, - gint *column, - GError **error); + gint *row, + gint *column, + GError **error); void atspi_table_cell_get_row_column_span (AtspiTableCell *obj, - gint *row, - gint *column, - gint *row_span, - gint *column_span, - GError **error); + gint *row, + gint *column, + gint *row_span, + gint *column_span, + GError **error); AtspiAccessible *atspi_table_cell_get_table (AtspiTableCell *obj, GError **error); G_END_DECLS -#endif /* _ATSPI_TABLE_CELL_H_ */ +#endif /* _ATSPI_TABLE_CELL_H_ */ diff --git a/atspi/atspi-table.c b/atspi/atspi-table.c index b2027e1e..6d9140b6 100644 --- a/atspi/atspi-table.c +++ b/atspi/atspi-table.c @@ -22,8 +22,8 @@ * Boston, MA 02110-1301, USA. */ -#include <stdlib.h> /* for malloc */ #include "atspi-private.h" +#include <stdlib.h> /* for malloc */ /** * AtspiTable: @@ -80,7 +80,7 @@ atspi_table_get_summary (AtspiTable *obj, GError **error) _atspi_dbus_get_property (obj, atspi_interface_table, "Summary", error, "(so)", &retval); - return retval; + return retval; } /** @@ -101,7 +101,7 @@ atspi_table_get_n_rows (AtspiTable *obj, GError **error) g_return_val_if_fail (obj != NULL, -1); _atspi_dbus_get_property (obj, atspi_interface_table, "NRows", error, "i", &retval); - + return retval; } @@ -123,7 +123,7 @@ atspi_table_get_n_columns (AtspiTable *obj, GError **error) g_return_val_if_fail (obj != NULL, -1); _atspi_dbus_get_property (obj, atspi_interface_table, "NColumns", error, "i", &retval); - + return retval; } @@ -134,7 +134,7 @@ atspi_table_get_n_columns (AtspiTable *obj, GError **error) * @column: the specified table column, zero-indexed. * * Gets the table cell at the specified row and column indices. - * To get the accessible object at a particular (x, y) screen + * To get the accessible object at a particular (x, y) screen * coordinate, use #atspi_component_get_accessible_at_point. * * Returns: (transfer full): an #AtspiAccessible object representing the @@ -142,9 +142,9 @@ atspi_table_get_n_columns (AtspiTable *obj, GError **error) **/ AtspiAccessible * atspi_table_get_accessible_at (AtspiTable *obj, - gint row, - gint column, - GError **error) + gint row, + gint column, + GError **error) { dbus_int32_t d_row = row, d_column = column; DBusMessage *reply; @@ -163,7 +163,7 @@ atspi_table_get_accessible_at (AtspiTable *obj, * @column: the specified table column, zero-indexed. * * Gets the 1-D child index corresponding to the specified 2-D row and - * column indices. To get the accessible object at a particular (x, y) screen + * column indices. To get the accessible object at a particular (x, y) screen * coordinate, use #atspi_component_get_accessible_at_point. * * @see #atspi_table_get_row_at_index, #atspi_table_get_column_at_index @@ -173,9 +173,9 @@ atspi_table_get_accessible_at (AtspiTable *obj, **/ gint atspi_table_get_index_at (AtspiTable *obj, - gint row, - gint column, - GError **error) + gint row, + gint column, + GError **error) { dbus_int32_t d_row = row, d_column = column; dbus_int32_t retval = -1; @@ -183,7 +183,7 @@ atspi_table_get_index_at (AtspiTable *obj, g_return_val_if_fail (obj != NULL, -1); _atspi_dbus_call (obj, atspi_interface_table, "GetIndexAt", error, "ii=>i", d_row, d_column, &retval); - + return retval; } @@ -192,7 +192,7 @@ atspi_table_get_index_at (AtspiTable *obj, * @obj: a pointer to the #AtspiTable implementor on which to operate. * @index: the specified child index, zero-indexed. * - * Gets the table row index occupied by the child at a particular 1-D + * Gets the table row index occupied by the child at a particular 1-D * child index. * * @see #atspi_table_get_index_at, #atspi_table_get_column_at_index @@ -202,8 +202,8 @@ atspi_table_get_index_at (AtspiTable *obj, **/ gint atspi_table_get_row_at_index (AtspiTable *obj, - gint index, - GError **error) + gint index, + GError **error) { dbus_int32_t d_index = index; dbus_int32_t retval = -1; @@ -211,7 +211,7 @@ atspi_table_get_row_at_index (AtspiTable *obj, g_return_val_if_fail (obj != NULL, -1); _atspi_dbus_call (obj, atspi_interface_table, "GetRowAtIndex", error, "i=>i", d_index, &retval); - + return retval; } @@ -230,8 +230,8 @@ atspi_table_get_row_at_index (AtspiTable *obj, **/ gint atspi_table_get_column_at_index (AtspiTable *obj, - gint index, - GError **error) + gint index, + GError **error) { dbus_int32_t d_index = index; dbus_int32_t retval = -1; @@ -239,7 +239,7 @@ atspi_table_get_column_at_index (AtspiTable *obj, g_return_val_if_fail (obj != NULL, -1); _atspi_dbus_call (obj, atspi_interface_table, "GetColumnAtIndex", error, "i=>i", d_index, &retval); - + return retval; } @@ -255,8 +255,8 @@ atspi_table_get_column_at_index (AtspiTable *obj, **/ gchar * atspi_table_get_row_description (AtspiTable *obj, - gint row, - GError **error) + gint row, + GError **error) { dbus_int32_t d_row = row; char *retval = NULL; @@ -264,7 +264,7 @@ atspi_table_get_row_description (AtspiTable *obj, g_return_val_if_fail (obj != NULL, NULL); _atspi_dbus_call (obj, atspi_interface_table, "GetRowDescription", error, "i=>s", d_row, &retval); - + return retval; } @@ -280,7 +280,8 @@ atspi_table_get_row_description (AtspiTable *obj, **/ gchar * atspi_table_get_column_description (AtspiTable *obj, - gint column, GError **error) + gint column, + GError **error) { dbus_int32_t d_column = column; char *retval = NULL; @@ -308,9 +309,9 @@ atspi_table_get_column_description (AtspiTable *obj, **/ gint atspi_table_get_row_extent_at (AtspiTable *obj, - gint row, - gint column, - GError **error) + gint row, + gint column, + GError **error) { dbus_int32_t d_row = row, d_column = column; dbus_int32_t retval = -1; @@ -318,7 +319,7 @@ atspi_table_get_row_extent_at (AtspiTable *obj, g_return_val_if_fail (obj != NULL, -1); _atspi_dbus_call (obj, atspi_interface_table, "GetRowExtentAt", error, "ii=>i", d_row, d_column, &retval); - + return retval; } @@ -338,9 +339,9 @@ atspi_table_get_row_extent_at (AtspiTable *obj, **/ gint atspi_table_get_column_extent_at (AtspiTable *obj, - gint row, - gint column, - GError **error) + gint row, + gint column, + GError **error) { dbus_int32_t d_row = row, d_column = column; dbus_int32_t retval = -1; @@ -348,7 +349,7 @@ atspi_table_get_column_extent_at (AtspiTable *obj, g_return_val_if_fail (obj != NULL, -1); _atspi_dbus_call (obj, atspi_interface_table, "GetColumnExtentAt", error, "ii=>i", d_row, d_column, &retval); - + return retval; } @@ -365,8 +366,8 @@ atspi_table_get_column_extent_at (AtspiTable *obj, **/ AtspiAccessible * atspi_table_get_row_header (AtspiTable *obj, - gint row, - GError **error) + gint row, + GError **error) { dbus_int32_t d_row = row; DBusMessage *reply; @@ -392,8 +393,8 @@ atspi_table_get_row_header (AtspiTable *obj, **/ AtspiAccessible * atspi_table_get_column_header (AtspiTable *obj, - gint column, - GError **error) + gint column, + GError **error) { dbus_int32_t d_column = column; DBusMessage *reply; @@ -409,7 +410,7 @@ atspi_table_get_column_header (AtspiTable *obj, * atspi_table_get_n_selected_rows: * @obj: a pointer to the #AtspiTable implementor on which to operate. * - * Query a table to find out how many rows are currently selected. + * Query a table to find out how many rows are currently selected. * Not all tables support row selection. * * Returns: a #gint indicating the number of rows currently selected. @@ -422,7 +423,7 @@ atspi_table_get_n_selected_rows (AtspiTable *obj, GError **error) g_return_val_if_fail (obj != NULL, -1); _atspi_dbus_get_property (obj, atspi_interface_table, "NSelectedRows", error, "i", &retval); - + return retval; } @@ -437,7 +438,7 @@ atspi_table_get_n_selected_rows (AtspiTable *obj, GError **error) **/ GArray * atspi_table_get_selected_rows (AtspiTable *obj, - GError **error) + GError **error) { GArray *rows = NULL; @@ -460,7 +461,7 @@ atspi_table_get_selected_rows (AtspiTable *obj, **/ GArray * atspi_table_get_selected_columns (AtspiTable *obj, - GError **error) + GError **error) { GArray *columns = NULL; @@ -475,7 +476,7 @@ atspi_table_get_selected_columns (AtspiTable *obj, * atspi_table_get_n_selected_columns: * @obj: a pointer to the #AtspiTable implementor on which to operate. * - * Queries a table to find out how many columns are currently selected. + * Queries a table to find out how many columns are currently selected. * Not all tables support column selection. * * Returns: a #gint indicating the number of columns currently selected. @@ -488,7 +489,7 @@ atspi_table_get_n_selected_columns (AtspiTable *obj, GError **error) g_return_val_if_fail (obj != NULL, -1); _atspi_dbus_get_property (obj, atspi_interface_table, "NSelectedColumns", error, "i", &retval); - + return retval; } @@ -497,15 +498,15 @@ atspi_table_get_n_selected_columns (AtspiTable *obj, GError **error) * @obj: a pointer to the #AtspiTable implementor on which to operate. * @row: the zero-indexed row number of the row being queried. * - * Determines whether a table row is selected. Not all tables support + * Determines whether a table row is selected. Not all tables support * row selection. * * Returns: #TRUE if the specified row is currently selected, #FALSE if not. **/ gboolean atspi_table_is_row_selected (AtspiTable *obj, - gint row, - GError **error) + gint row, + GError **error) { dbus_int32_t d_row = row; dbus_bool_t retval = FALSE; @@ -529,8 +530,8 @@ atspi_table_is_row_selected (AtspiTable *obj, **/ gboolean atspi_table_is_column_selected (AtspiTable *obj, - gint column, - GError **error) + gint column, + GError **error) { dbus_int32_t d_column = column; dbus_bool_t retval = FALSE; @@ -538,7 +539,7 @@ atspi_table_is_column_selected (AtspiTable *obj, g_return_val_if_fail (obj != NULL, FALSE); _atspi_dbus_call (obj, atspi_interface_table, "IsColumnSelected", error, "i=>b", d_column, &retval); - + return retval; } @@ -554,8 +555,8 @@ atspi_table_is_column_selected (AtspiTable *obj, **/ gboolean atspi_table_add_row_selection (AtspiTable *obj, - gint row, - GError **error) + gint row, + GError **error) { dbus_int32_t d_row = row; dbus_bool_t retval = FALSE; @@ -563,7 +564,7 @@ atspi_table_add_row_selection (AtspiTable *obj, g_return_val_if_fail (obj != NULL, FALSE); _atspi_dbus_call (obj, atspi_interface_table, "AddRowSelection", error, "i=>b", d_row, &retval); - + return retval; } @@ -579,8 +580,8 @@ atspi_table_add_row_selection (AtspiTable *obj, **/ gboolean atspi_table_add_column_selection (AtspiTable *obj, - gint column, - GError **error) + gint column, + GError **error) { dbus_int32_t d_column = column; dbus_bool_t retval = FALSE; @@ -588,7 +589,7 @@ atspi_table_add_column_selection (AtspiTable *obj, g_return_val_if_fail (obj != NULL, FALSE); _atspi_dbus_call (obj, atspi_interface_table, "AddColumnSelection", error, "i=>b", d_column, &retval); - + return retval; } @@ -605,8 +606,8 @@ atspi_table_add_column_selection (AtspiTable *obj, **/ gboolean atspi_table_remove_row_selection (AtspiTable *obj, - gint row, - GError **error) + gint row, + GError **error) { dbus_int32_t d_row = row; dbus_bool_t retval = FALSE; @@ -614,7 +615,7 @@ atspi_table_remove_row_selection (AtspiTable *obj, g_return_val_if_fail (obj != NULL, FALSE); _atspi_dbus_call (obj, atspi_interface_table, "RemoveRowSelection", error, "i=>b", d_row, &retval); - + return retval; } @@ -632,8 +633,8 @@ atspi_table_remove_row_selection (AtspiTable *obj, **/ gboolean atspi_table_remove_column_selection (AtspiTable *obj, - gint column, - GError **error) + gint column, + GError **error) { dbus_int32_t d_column = column; dbus_bool_t retval = FALSE; @@ -641,20 +642,20 @@ atspi_table_remove_column_selection (AtspiTable *obj, g_return_val_if_fail (obj != NULL, FALSE); _atspi_dbus_call (obj, atspi_interface_table, "RemoveColumnSelection", error, "i=>b", d_column, &retval); - + return retval; } /** * atspi_table_get_row_column_extents_at_index: * @obj: a pointer to the #AtspiTable implementor on which to operate. - * @index: the index of the #AtspiTable child whose row/column + * @index: the index of the #AtspiTable child whose row/column * extents are requested. * @row: (out): back-filled with the first table row associated with * the cell with child index. - * @col: (out): back-filled with the first table column associated + * @col: (out): back-filled with the first table column associated * with the cell with child index. - * @row_extents: (out): back-filled with the number of table rows + * @row_extents: (out): back-filled with the number of table rows * across which child i extends. * @col_extents: (out): back-filled with the number of table columns * across which child i extends. @@ -662,9 +663,9 @@ atspi_table_remove_column_selection (AtspiTable *obj, * if the child at index i corresponds to a selected table cell, * #FALSE otherwise. * - * Given a child index, determines the row and column indices and + * Given a child index, determines the row and column indices and * extents, and whether the cell is currently selected. If - * the child at index is not a cell (for instance, if it is + * the child at index is not a cell (for instance, if it is * a summary, caption, etc.), #FALSE is returned. * The returned values are meaningful only if the Table has both * STATE_VISIBLE and STATE_SHOWING. @@ -672,32 +673,36 @@ atspi_table_remove_column_selection (AtspiTable *obj, * Example: * If the #AtspiTable child at index '6' extends across columns 5 and 6 of * row 2 of an #AtspiTable instance, and is currently selected, then - * + * * retval = atspi_table_get_row_column_extents_at_index (table, 6, - * row, col, + * row, col, * row_extents, * col_extents, * is_selected); - * + * * will return #TRUE, and after the call * row, col, row_extents, col_extents, - * and is_selected will contain 2, 5, 1, 2, and + * and is_selected will contain 2, 5, 1, 2, and * #TRUE, respectively. * * Returns: #TRUE if the index is associated with a valid table - * cell, #FALSE if the index does not correspond to a cell. If - * #FALSE is returned, the values of the out parameters are + * cell, #FALSE if the index does not correspond to a cell. If + * #FALSE is returned, the values of the out parameters are * undefined. **/ gboolean atspi_table_get_row_column_extents_at_index (AtspiTable *obj, - gint index, gint *row, gint *col, - gint *row_extents, gint *col_extents, - gboolean *is_selected, GError **error) + gint index, + gint *row, + gint *col, + gint *row_extents, + gint *col_extents, + gboolean *is_selected, + GError **error) { dbus_int32_t d_index = index; dbus_bool_t retval = FALSE; - dbus_int32_t d_row = 0, d_col = 0, d_row_extents = 0, d_col_extents = 0; + dbus_int32_t d_row = 0, d_col = 0, d_row_extents = 0, d_col_extents = 0; dbus_bool_t d_is_selected = FALSE; g_return_val_if_fail (obj != NULL, FALSE); @@ -708,14 +713,15 @@ atspi_table_get_row_column_extents_at_index (AtspiTable *obj, *row = d_row; *col = d_col; - *row_extents = d_row_extents;; + *row_extents = d_row_extents; + ; *col_extents = d_col_extents; - *is_selected = d_is_selected;; - + *is_selected = d_is_selected; + ; + return retval; } - /** * atspi_table_is_selected: * @obj: a pointer to the #AtspiTable implementor on which to operate. @@ -728,9 +734,9 @@ atspi_table_get_row_column_extents_at_index (AtspiTable *obj, **/ gboolean atspi_table_is_selected (AtspiTable *obj, - gint row, - gint column, - GError **error) + gint row, + gint column, + GError **error) { dbus_int32_t d_row = row, d_column = column; dbus_bool_t retval = FALSE; @@ -738,7 +744,7 @@ atspi_table_is_selected (AtspiTable *obj, g_return_val_if_fail (obj != NULL, FALSE); _atspi_dbus_call (obj, atspi_interface_table, "IsSelected", error, "ii=>b", d_row, d_column, &retval); - + return retval; } @@ -752,16 +758,15 @@ atspi_table_get_type (void) { static GType type = 0; - if (!type) { - static const GTypeInfo tinfo = + if (!type) { - sizeof (AtspiTable), - (GBaseInitFunc) atspi_table_base_init, - (GBaseFinalizeFunc) NULL, - }; - - type = g_type_register_static (G_TYPE_INTERFACE, "AtspiTable", &tinfo, 0); - - } + static const GTypeInfo tinfo = { + sizeof (AtspiTable), + (GBaseInitFunc) atspi_table_base_init, + (GBaseFinalizeFunc) NULL, + }; + + type = g_type_register_static (G_TYPE_INTERFACE, "AtspiTable", &tinfo, 0); + } return type; } diff --git a/atspi/atspi-table.h b/atspi/atspi-table.h index 942f2f6f..bbe5e83b 100644 --- a/atspi/atspi-table.h +++ b/atspi/atspi-table.h @@ -5,7 +5,7 @@ * Copyright 2002 Ximian, Inc. * 2002 Sun Microsystems Inc. * Copyright 2010, 2011 Novell, Inc. - * + * * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -34,10 +34,10 @@ G_BEGIN_DECLS -#define ATSPI_TYPE_TABLE (atspi_table_get_type ()) -#define ATSPI_IS_TABLE(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATSPI_TYPE_TABLE) -#define ATSPI_TABLE(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATSPI_TYPE_TABLE, AtspiTable) -#define ATSPI_TABLE_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATSPI_TYPE_TABLE, AtspiTable)) +#define ATSPI_TYPE_TABLE (atspi_table_get_type ()) +#define ATSPI_IS_TABLE(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATSPI_TYPE_TABLE) +#define ATSPI_TABLE(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATSPI_TYPE_TABLE, AtspiTable) +#define ATSPI_TABLE_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATSPI_TYPE_TABLE, AtspiTable)) GType atspi_table_get_type (); @@ -46,15 +46,15 @@ struct _AtspiTable GTypeInterface parent; }; -AtspiAccessible * atspi_table_get_caption (AtspiTable *obj, GError **error); +AtspiAccessible *atspi_table_get_caption (AtspiTable *obj, GError **error); -AtspiAccessible * atspi_table_get_summary (AtspiTable *obj, GError **error); +AtspiAccessible *atspi_table_get_summary (AtspiTable *obj, GError **error); gint atspi_table_get_n_rows (AtspiTable *obj, GError **error); gint atspi_table_get_n_columns (AtspiTable *obj, GError **error); -AtspiAccessible * atspi_table_get_accessible_at (AtspiTable *obj, gint row, gint column, GError **error); +AtspiAccessible *atspi_table_get_accessible_at (AtspiTable *obj, gint row, gint column, GError **error); gint atspi_table_get_index_at (AtspiTable *obj, gint row, gint column, GError **error); @@ -62,9 +62,9 @@ gint atspi_table_get_row_at_index (AtspiTable *obj, gint index, GError **error); gint atspi_table_get_column_at_index (AtspiTable *obj, gint index, GError **error); -gchar * atspi_table_get_row_description (AtspiTable *obj, gint row, GError **error); +gchar *atspi_table_get_row_description (AtspiTable *obj, gint row, GError **error); -gchar * atspi_table_get_column_description (AtspiTable *obj, gint column, GError **error); +gchar *atspi_table_get_column_description (AtspiTable *obj, gint column, GError **error); gint atspi_table_get_row_extent_at (AtspiTable *obj, gint row, gint column, GError **error); @@ -72,15 +72,15 @@ atspi_table_get_row_extent_at (AtspiTable *obj, gint row, gint column, GError ** gint atspi_table_get_column_extent_at (AtspiTable *obj, gint row, gint column, GError **error); -AtspiAccessible * atspi_table_get_row_header (AtspiTable *obj, gint row, GError **error); +AtspiAccessible *atspi_table_get_row_header (AtspiTable *obj, gint row, GError **error); -AtspiAccessible * atspi_table_get_column_header (AtspiTable *obj, gint column, GError **error); +AtspiAccessible *atspi_table_get_column_header (AtspiTable *obj, gint column, GError **error); gint atspi_table_get_n_selected_rows (AtspiTable *obj, GError **error); GArray *atspi_table_get_selected_rows (AtspiTable *obj, GError **error); -GArray * atspi_table_get_selected_columns (AtspiTable *obj, GError **error); +GArray *atspi_table_get_selected_columns (AtspiTable *obj, GError **error); gint atspi_table_get_n_selected_columns (AtspiTable *obj, GError **error); @@ -102,4 +102,4 @@ gboolean atspi_table_is_selected (AtspiTable *obj, gint row, gint column, GError G_END_DECLS -#endif /* _ATSPI_TABLE_H_ */ +#endif /* _ATSPI_TABLE_H_ */ diff --git a/atspi/atspi-text.c b/atspi/atspi-text.c index f85d3f3e..8ef77490 100644 --- a/atspi/atspi-text.c +++ b/atspi/atspi-text.c @@ -76,8 +76,7 @@ atspi_text_range_free (AtspiTextRange *range) g_free (range); } -G_DEFINE_BOXED_TYPE (AtspiTextRange, atspi_text_range, atspi_text_range_copy, - atspi_text_range_free) +G_DEFINE_BOXED_TYPE (AtspiTextRange, atspi_text_range, atspi_text_range_copy, atspi_text_range_free) /** * atspi_text_get_character_count: @@ -115,9 +114,9 @@ atspi_text_get_character_count (AtspiText *obj, GError **error) **/ gchar * atspi_text_get_text (AtspiText *obj, - gint start_offset, - gint end_offset, - GError **error) + gint start_offset, + gint end_offset, + GError **error) { gchar *retval = NULL; dbus_int32_t d_start_offset = start_offset, d_end_offset = end_offset; @@ -174,10 +173,10 @@ atspi_text_get_caret_offset (AtspiText *obj, GError **error) **/ GHashTable * atspi_text_get_attributes (AtspiText *obj, - gint offset, - gint *start_offset, - gint *end_offset, - GError **error) + gint offset, + gint *start_offset, + gint *end_offset, + GError **error) { return atspi_text_get_text_attributes (obj, offset, start_offset, end_offset, error); } @@ -202,10 +201,10 @@ atspi_text_get_attributes (AtspiText *obj, **/ GHashTable * atspi_text_get_text_attributes (AtspiText *obj, - gint offset, - gint *start_offset, - gint *end_offset, - GError **error) + gint offset, + gint *start_offset, + gint *end_offset, + GError **error) { dbus_int32_t d_offset = offset; dbus_int32_t d_start_offset, d_end_offset; @@ -214,7 +213,7 @@ atspi_text_get_text_attributes (AtspiText *obj, GHashTable *ret = NULL; if (obj == NULL) - return NULL; + return NULL; reply = _atspi_dbus_call_partial (obj, atspi_interface_text, "GetAttributes", error, "i", d_offset); _ATSPI_DBUS_CHECK_SIG (reply, "a{ss}ii", error, ret) @@ -242,7 +241,7 @@ atspi_text_get_text_attributes (AtspiText *obj, * search is based. * @include_defaults: a #bool that, when set as #FALSE, indicates the call * should only return those attributes which are explicitly set on the current - * attribute run, omitting any attributes which are inherited from the + * attribute run, omitting any attributes which are inherited from the * default values. * @start_offset: (out): a #gint pointer indicating the start of the desired text * range. @@ -257,11 +256,11 @@ atspi_text_get_text_attributes (AtspiText *obj, **/ GHashTable * atspi_text_get_attribute_run (AtspiText *obj, - gint offset, - gboolean include_defaults, - gint *start_offset, - gint *end_offset, - GError **error) + gint offset, + gboolean include_defaults, + gint *start_offset, + gint *end_offset, + GError **error) { dbus_int32_t d_offset = offset; dbus_int32_t d_start_offset, d_end_offset; @@ -270,7 +269,7 @@ atspi_text_get_attribute_run (AtspiText *obj, GHashTable *ret = NULL; if (obj == NULL) - return NULL; + return NULL; reply = _atspi_dbus_call_partial (obj, atspi_interface_text, "GetAttributeRun", error, "ib", d_offset, @@ -338,7 +337,7 @@ atspi_text_get_text_attribute_value (AtspiText *obj, g_return_val_if_fail (obj != NULL, NULL); - _atspi_dbus_call (obj, atspi_interface_text, "GetAttributeValue", error, "is=>s", d_i, (const gchar *)attribute_value, &retval); + _atspi_dbus_call (obj, atspi_interface_text, "GetAttributeValue", error, "is=>s", d_i, (const gchar *) attribute_value, &retval); if (!retval) retval = g_strdup (""); @@ -351,7 +350,7 @@ atspi_text_get_text_attribute_value (AtspiText *obj, * @obj: a pointer to the #AtspiText object to query. * * Gets the default attributes applied to an #AtspiText - * object. The text attributes correspond to CSS attributes + * object. The text attributes correspond to CSS attributes * where possible. The combination of this attribute set and * the attributes reported by #atspi_text_get_attributes * describes the entire set of text attributes over a range. @@ -365,13 +364,12 @@ atspi_text_get_default_attributes (AtspiText *obj, GError **error) { DBusMessage *reply; - g_return_val_if_fail (obj != NULL, NULL); + g_return_val_if_fail (obj != NULL, NULL); reply = _atspi_dbus_call_partial (obj, atspi_interface_text, "GetDefaultAttributes", error, ""); return _atspi_dbus_return_hash_from_message (reply); } - /** * atspi_text_set_caret_offset: * @obj: a pointer to the #AtspiText object on which to operate. @@ -383,8 +381,8 @@ atspi_text_get_default_attributes (AtspiText *obj, GError **error) **/ gboolean atspi_text_set_caret_offset (AtspiText *obj, - gint new_offset, - GError **error) + gint new_offset, + GError **error) { dbus_int32_t d_new_offset = new_offset; dbus_bool_t retval = FALSE; @@ -413,9 +411,9 @@ atspi_text_set_caret_offset (AtspiText *obj, **/ AtspiTextRange * atspi_text_get_text_before_offset (AtspiText *obj, - gint offset, - AtspiTextBoundaryType type, - GError **error) + gint offset, + AtspiTextBoundaryType type, + GError **error) { dbus_int32_t d_offset = offset; dbus_uint32_t d_type = type; @@ -527,9 +525,9 @@ atspi_text_get_string_at_offset (AtspiText *obj, **/ AtspiTextRange * atspi_text_get_text_at_offset (AtspiText *obj, - gint offset, - AtspiTextBoundaryType type, - GError **error) + gint offset, + AtspiTextBoundaryType type, + GError **error) { dbus_int32_t d_offset = offset; dbus_uint32_t d_type = type; @@ -570,9 +568,9 @@ atspi_text_get_text_at_offset (AtspiText *obj, **/ AtspiTextRange * atspi_text_get_text_after_offset (AtspiText *obj, - gint offset, - AtspiTextBoundaryType type, - GError **error) + gint offset, + AtspiTextBoundaryType type, + GError **error) { dbus_int32_t d_offset = offset; dbus_uint32_t d_type = type; @@ -610,8 +608,8 @@ atspi_text_get_text_after_offset (AtspiText *obj, **/ guint atspi_text_get_character_at_offset (AtspiText *obj, - gint offset, - GError **error) + gint offset, + GError **error) { dbus_int32_t d_offset = offset; dbus_int32_t retval = -1; @@ -641,9 +639,9 @@ atspi_text_get_character_at_offset (AtspiText *obj, **/ AtspiRect * atspi_text_get_character_extents (AtspiText *obj, - gint offset, - AtspiCoordType type, - GError **error) + gint offset, + AtspiCoordType type, + GError **error) { dbus_int32_t d_offset = offset; dbus_uint32_t d_type = type; @@ -680,10 +678,10 @@ atspi_text_get_character_extents (AtspiText *obj, **/ gint atspi_text_get_offset_at_point (AtspiText *obj, - gint x, - gint y, - AtspiCoordType type, - GError **error) + gint x, + gint y, + AtspiCoordType type, + GError **error) { dbus_int32_t d_x = x, d_y = y; dbus_uint32_t d_type = type; @@ -716,10 +714,10 @@ atspi_text_get_offset_at_point (AtspiText *obj, **/ AtspiRect * atspi_text_get_range_extents (AtspiText *obj, - gint start_offset, - gint end_offset, - AtspiCoordType type, - GError **error) + gint start_offset, + gint end_offset, + AtspiCoordType type, + GError **error) { dbus_int32_t d_start_offset = start_offset, d_end_offset = end_offset; dbus_uint32_t d_type = type; @@ -762,14 +760,14 @@ atspi_text_get_range_extents (AtspiText *obj, **/ GArray * atspi_text_get_bounded_ranges (AtspiText *obj, - gint x, - gint y, - gint width, - gint height, - AtspiCoordType type, - AtspiTextClipType clipTypeX, - AtspiTextClipType clipTypeY, - GError **error) + gint x, + gint y, + gint width, + gint height, + AtspiCoordType type, + AtspiTextClipType clipTypeX, + AtspiTextClipType clipTypeY, + GError **error) { dbus_int32_t d_x = x, d_y = y, d_width = width, d_height = height; dbus_uint32_t d_type = type; @@ -816,8 +814,8 @@ atspi_text_get_n_selections (AtspiText *obj, GError **error) **/ AtspiRange * atspi_text_get_selection (AtspiText *obj, - gint selection_num, - GError **error) + gint selection_num, + GError **error) { dbus_int32_t d_selection_num = selection_num; dbus_int32_t d_start_offset, d_end_offset; @@ -847,8 +845,9 @@ atspi_text_get_selection (AtspiText *obj, **/ gboolean atspi_text_add_selection (AtspiText *obj, - gint start_offset, gint end_offset, - GError **error) + gint start_offset, + gint end_offset, + GError **error) { dbus_int32_t d_start_offset = start_offset, d_end_offset = end_offset; dbus_bool_t retval = FALSE; @@ -869,8 +868,8 @@ atspi_text_add_selection (AtspiText *obj, **/ gboolean atspi_text_remove_selection (AtspiText *obj, - gint selection_num, - GError **error) + gint selection_num, + GError **error) { dbus_int32_t d_selection_num = selection_num; dbus_bool_t retval = FALSE; @@ -896,10 +895,10 @@ atspi_text_remove_selection (AtspiText *obj, **/ gboolean atspi_text_set_selection (AtspiText *obj, - gint selection_num, - gint start_offset, - gint end_offset, - GError **error) + gint selection_num, + gint start_offset, + gint end_offset, + GError **error) { dbus_int32_t d_selection_num = selection_num, d_start_offset = start_offset, d_end_offset = end_offset; dbus_bool_t retval = FALSE; @@ -926,10 +925,10 @@ atspi_text_set_selection (AtspiText *obj, **/ gboolean atspi_text_scroll_substring_to (AtspiText *obj, - gint start_offset, - gint end_offset, - AtspiScrollType type, - GError **error) + gint start_offset, + gint end_offset, + AtspiScrollType type, + GError **error) { dbus_bool_t retval = FALSE; @@ -959,12 +958,12 @@ atspi_text_scroll_substring_to (AtspiText *obj, **/ gboolean atspi_text_scroll_substring_to_point (AtspiText *obj, - gint start_offset, - gint end_offset, - AtspiCoordType coords, - gint x, - gint y, - GError **error) + gint start_offset, + gint end_offset, + AtspiCoordType coords, + gint x, + gint y, + GError **error) { dbus_bool_t retval = FALSE; @@ -987,16 +986,15 @@ atspi_text_get_type (void) { static GType type = 0; - if (!type) { - static const GTypeInfo tinfo = + if (!type) { - sizeof (AtspiText), - (GBaseInitFunc) atspi_text_base_init, - (GBaseFinalizeFunc) NULL, - }; - - type = g_type_register_static (G_TYPE_INTERFACE, "AtspiText", &tinfo, 0); - - } + static const GTypeInfo tinfo = { + sizeof (AtspiText), + (GBaseInitFunc) atspi_text_base_init, + (GBaseFinalizeFunc) NULL, + }; + + type = g_type_register_static (G_TYPE_INTERFACE, "AtspiText", &tinfo, 0); + } return type; } diff --git a/atspi/atspi-text.h b/atspi/atspi-text.h index 994d12b2..61375b18 100644 --- a/atspi/atspi-text.h +++ b/atspi/atspi-text.h @@ -5,7 +5,7 @@ * Copyright 2002 Ximian, Inc. * 2002 Sun Microsystems Inc. * Copyright 2010, 2011 Novell, Inc. - * + * * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -43,10 +43,10 @@ struct _AtspiRange /** * ATSPI_TYPE_RANGE: - * + * * The #GType for a boxed type holding a range within a text bock. */ -#define ATSPI_TYPE_RANGE atspi_range_get_type () +#define ATSPI_TYPE_RANGE atspi_range_get_type () GType atspi_range_get_type (); @@ -63,15 +63,15 @@ struct _AtspiTextRange /** * ATSPI_TYPE_TEXT_RANGE: - * + * * The #GType for a boxed type holding a range within a text bock. */ -#define ATSPI_TYPE_TEXT_RANGE atspi_text_range_get_type () +#define ATSPI_TYPE_TEXT_RANGE atspi_text_range_get_type () -#define ATSPI_TYPE_TEXT (atspi_text_get_type ()) -#define ATSPI_IS_TEXT(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATSPI_TYPE_TEXT) -#define ATSPI_TEXT(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATSPI_TYPE_TEXT, AtspiText) -#define ATSPI_TEXT_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATSPI_TYPE_TEXT, AtspiText)) +#define ATSPI_TYPE_TEXT (atspi_text_get_type ()) +#define ATSPI_IS_TEXT(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATSPI_TYPE_TEXT) +#define ATSPI_TEXT(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATSPI_TYPE_TEXT, AtspiText) +#define ATSPI_TEXT_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATSPI_TYPE_TEXT, AtspiText)) GType atspi_text_get_type (); @@ -80,12 +80,11 @@ struct _AtspiText GTypeInterface parent; }; - GType atspi_text_range_get_type (); gint atspi_text_get_character_count (AtspiText *obj, GError **error); -gchar * atspi_text_get_text (AtspiText *obj, gint start_offset, gint end_offset, GError **error); +gchar *atspi_text_get_text (AtspiText *obj, gint start_offset, gint end_offset, GError **error); gint atspi_text_get_caret_offset (AtspiText *obj, GError **error); @@ -98,38 +97,38 @@ GHashTable *atspi_text_get_text_attributes (AtspiText *obj, gint offset, gint *s GHashTable *atspi_text_get_attribute_run (AtspiText *obj, gint offset, gboolean include_defaults, gint *start_offset, gint *end_offset, GError **error); #ifndef ATSPI_DISABLE_DEPRECATED -gchar * atspi_text_get_attribute_value (AtspiText *obj, gint offset, gchar *attribute_name, GError **error); +gchar *atspi_text_get_attribute_value (AtspiText *obj, gint offset, gchar *attribute_name, GError **error); #endif -gchar * atspi_text_get_text_attribute_value (AtspiText *obj, gint offset, gchar *attribute_name, GError **error); +gchar *atspi_text_get_text_attribute_value (AtspiText *obj, gint offset, gchar *attribute_name, GError **error); -GHashTable * atspi_text_get_default_attributes (AtspiText *obj, GError **error); +GHashTable *atspi_text_get_default_attributes (AtspiText *obj, GError **error); gboolean atspi_text_set_caret_offset (AtspiText *obj, gint new_offset, GError **error); #ifndef ATSPI_DISABLE_DEPRECATED -AtspiTextRange * atspi_text_get_text_before_offset (AtspiText *obj, gint offset, AtspiTextBoundaryType type, GError **error); +AtspiTextRange *atspi_text_get_text_before_offset (AtspiText *obj, gint offset, AtspiTextBoundaryType type, GError **error); -AtspiTextRange * atspi_text_get_text_at_offset (AtspiText *obj, gint offset, AtspiTextBoundaryType type, GError **error); +AtspiTextRange *atspi_text_get_text_at_offset (AtspiText *obj, gint offset, AtspiTextBoundaryType type, GError **error); -AtspiTextRange * atspi_text_get_text_after_offset (AtspiText *obj, gint offset, AtspiTextBoundaryType type, GError **error); +AtspiTextRange *atspi_text_get_text_after_offset (AtspiText *obj, gint offset, AtspiTextBoundaryType type, GError **error); #endif -AtspiTextRange * atspi_text_get_string_at_offset (AtspiText *obj, gint offset, AtspiTextGranularity granularity, GError **error); +AtspiTextRange *atspi_text_get_string_at_offset (AtspiText *obj, gint offset, AtspiTextGranularity granularity, GError **error); guint atspi_text_get_character_at_offset (AtspiText *obj, gint offset, GError **error); -AtspiRect * atspi_text_get_character_extents (AtspiText *obj, gint offset, AtspiCoordType type, GError **error); +AtspiRect *atspi_text_get_character_extents (AtspiText *obj, gint offset, AtspiCoordType type, GError **error); gint atspi_text_get_offset_at_point (AtspiText *obj, gint x, gint y, AtspiCoordType type, GError **error); -AtspiRect * atspi_text_get_range_extents (AtspiText *obj, gint start_offset, gint end_offset, AtspiCoordType type, GError **error); +AtspiRect *atspi_text_get_range_extents (AtspiText *obj, gint start_offset, gint end_offset, AtspiCoordType type, GError **error); -GArray * atspi_text_get_bounded_ranges (AtspiText *obj, gint x, gint y, gint width, gint height, AtspiCoordType type, AtspiTextClipType clipTypeX, AtspiTextClipType clipTypeY, GError **error); +GArray *atspi_text_get_bounded_ranges (AtspiText *obj, gint x, gint y, gint width, gint height, AtspiCoordType type, AtspiTextClipType clipTypeX, AtspiTextClipType clipTypeY, GError **error); gint atspi_text_get_n_selections (AtspiText *obj, GError **error); -AtspiRange * atspi_text_get_selection (AtspiText *obj, gint selection_num, GError **error); +AtspiRange *atspi_text_get_selection (AtspiText *obj, gint selection_num, GError **error); gboolean atspi_text_add_selection (AtspiText *obj, gint start_offset, gint end_offset, GError **error); @@ -142,4 +141,4 @@ gboolean atspi_text_scroll_substring_to (AtspiText *obj, gint start_offset, gint gboolean atspi_text_scroll_substring_to_point (AtspiText *obj, gint start_offset, gint end_offset, AtspiCoordType coords, gint x, gint y, GError **error); G_END_DECLS -#endif /* _ATSPI_TEXT_H_ */ +#endif /* _ATSPI_TEXT_H_ */ diff --git a/atspi/atspi-types.h b/atspi/atspi-types.h index 8eca6dd5..b6c28b49 100644 --- a/atspi/atspi-types.h +++ b/atspi/atspi-types.h @@ -4,7 +4,7 @@ * * Copyright 2002 Ximian, Inc. * 2002 Sun Microsystems Inc. - * + * * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -66,7 +66,7 @@ struct _AtspiDeviceEvent gushort hw_code; gushort modifiers; guint timestamp; - gchar * event_string; + gchar *event_string; gboolean is_text; }; @@ -89,35 +89,35 @@ struct _AtspiKeyDefinition /** * ATSPI_TYPE_KEY_DEFINITION: - * + * * The #GType for a boxed type holding a #AtspiKeyDefinition. */ -#define ATSPI_TYPE_KEY_DEFINITION (atspi_key_definition_get_type ()) +#define ATSPI_TYPE_KEY_DEFINITION (atspi_key_definition_get_type ()) typedef struct _AtspiEvent AtspiEvent; struct _AtspiEvent { - gchar *type; - AtspiAccessible *source; - gint detail1; - gint detail2; + gchar *type; + AtspiAccessible *source; + gint detail1; + gint detail2; GValue any_data; AtspiAccessible *sender; }; /** * ATSPI_TYPE_DEVICE_EVENT: - * + * * The #GType for a boxed type holding a #AtspiDeviceEvent. */ -#define ATSPI_TYPE_DEVICE_EVENT (atspi_device_event_get_type ()) +#define ATSPI_TYPE_DEVICE_EVENT (atspi_device_event_get_type ()) /** * ATSPI_TYPE_EVENT: - * + * * The #GType for a boxed type holding a #AtspiEvent. */ -#define ATSPI_TYPE_EVENT (atspi_event_get_type ()) +#define ATSPI_TYPE_EVENT (atspi_event_get_type ()) typedef void AtspiKeystrokeListener; @@ -134,22 +134,22 @@ typedef struct _AtspiKeySet { guint *keysyms; gushort *keycodes; - gchar **keystrings; - gshort len; + gchar **keystrings; + gshort len; } AtspiKeySet; /** * AtspiKeyListenerSyncType: * * @ATSPI_KEYLISTENER_NOSYNC: Events may be delivered asynchronously, - * which means in some cases they may already have been delivered to the - * application before the AT client receives the notification. - * @ATSPI_KEYLISTENER_SYNCHRONOUS: Events are delivered synchronously, before the - * currently focussed application sees them. + * which means in some cases they may already have been delivered to the + * application before the AT client receives the notification. + * @ATSPI_KEYLISTENER_SYNCHRONOUS: Events are delivered synchronously, before the + * currently focussed application sees them. * @ATSPI_KEYLISTENER_CANCONSUME: Events may be consumed by the AT client. Presumes and * requires #ATSPI_KEYLISTENER_SYNCHRONOUS, incompatible with #ATSPI_KEYLISTENER_NOSYNC. * @ATSPI_KEYLISTENER_ALL_WINDOWS: Events are received not from the application toolkit layer, but - * from the device driver or windowing system subsystem; such notifications are 'global' in the + * from the device driver or windowing system subsystem; such notifications are 'global' in the * sense that they are not broken or defeated by applications that participate poorly * in the accessibility APIs, or not at all; however because of the intrusive nature of * such snooping, it can have side-effects on certain older platforms. If unconditional @@ -161,13 +161,14 @@ typedef struct _AtspiKeySet * together, observing the compatibility limitations specified in the description of * each value. For instance, #ATSPI_KEYLISTENER_ALL_WINDOWS | #ATSPI_KEYLISTENER_CANCONSUME is * a commonly used combination which gives the AT complete control over the delivery of matching - * events. However, such filters should be used sparingly as they may have a negative impact on + * events. However, such filters should be used sparingly as they may have a negative impact on * system performance. **/ -typedef enum { +typedef enum +{ ATSPI_KEYLISTENER_NOSYNC = 0, ATSPI_KEYLISTENER_SYNCHRONOUS = 1 << 0, ATSPI_KEYLISTENER_CANCONSUME = 1 << 1, ATSPI_KEYLISTENER_ALL_WINDOWS = 1 << 2 } AtspiKeyListenerSyncType; -#endif /* _ATSPI_TYPES_H_ */ +#endif /* _ATSPI_TYPES_H_ */ diff --git a/atspi/atspi-value.c b/atspi/atspi-value.c index 54300319..ac2d3da3 100644 --- a/atspi/atspi-value.c +++ b/atspi/atspi-value.c @@ -38,7 +38,7 @@ /** * atspi_value_get_minimum_value: - * @obj: a pointer to the #AtspiValue implementor on which to operate. + * @obj: a pointer to the #AtspiValue implementor on which to operate. * * Gets the minimum allowed value for an #AtspiValue. * @@ -52,13 +52,13 @@ atspi_value_get_minimum_value (AtspiValue *obj, GError **error) g_return_val_if_fail (obj != NULL, 0.0); _atspi_dbus_get_property (obj, atspi_interface_value, "MinimumValue", error, "d", &retval); - + return retval; } /** * atspi_value_get_current_value: - * @obj: a pointer to the #AtspiValue implementor on which to operate. + * @obj: a pointer to the #AtspiValue implementor on which to operate. * * Gets the current value for an #AtspiValue. * @@ -78,7 +78,7 @@ atspi_value_get_current_value (AtspiValue *obj, GError **error) /** * atspi_value_get_maximum_value: - * @obj: a pointer to the #AtspiValue implementor on which to operate. + * @obj: a pointer to the #AtspiValue implementor on which to operate. * * Gets the maximum allowed value for an #AtspiValue. * @@ -87,7 +87,7 @@ atspi_value_get_current_value (AtspiValue *obj, GError **error) gdouble atspi_value_get_maximum_value (AtspiValue *obj, GError **error) { - double retval; + double retval; g_return_val_if_fail (obj != NULL, 0.0); @@ -118,25 +118,25 @@ atspi_value_set_current_value (AtspiValue *obj, gdouble new_value, GError **erro g_return_val_if_fail (accessible != NULL, FALSE); if (!accessible->parent.app || !accessible->parent.app->bus_name) -{ - g_set_error_literal (error, ATSPI_ERROR, ATSPI_ERROR_APPLICATION_GONE, - _("The application no longer exists")); - return FALSE; - } - - message = dbus_message_new_method_call (accessible->parent.app->bus_name, - accessible->parent.path, - DBUS_INTERFACE_PROPERTIES, "Set"); - if (!message) + { + g_set_error_literal (error, ATSPI_ERROR, ATSPI_ERROR_APPLICATION_GONE, + _ ("The application no longer exists")); return FALSE; - dbus_message_append_args (message, DBUS_TYPE_STRING, &atspi_interface_value, - DBUS_TYPE_STRING, &str_curval, - DBUS_TYPE_INVALID); + } + + message = dbus_message_new_method_call (accessible->parent.app->bus_name, + accessible->parent.path, + DBUS_INTERFACE_PROPERTIES, "Set"); + if (!message) + return FALSE; + dbus_message_append_args (message, DBUS_TYPE_STRING, &atspi_interface_value, + DBUS_TYPE_STRING, &str_curval, + DBUS_TYPE_INVALID); dbus_message_iter_init_append (message, &iter); dbus_message_iter_open_container (&iter, DBUS_TYPE_VARIANT, "d", &iter_variant); dbus_message_iter_append_basic (&iter_variant, DBUS_TYPE_DOUBLE, &d_new_value); dbus_message_iter_close_container (&iter, &iter_variant); - reply = _atspi_dbus_send_with_reply_and_block (message, error); + reply = _atspi_dbus_send_with_reply_and_block (message, error); dbus_message_unref (reply); return TRUE; @@ -144,7 +144,7 @@ atspi_value_set_current_value (AtspiValue *obj, gdouble new_value, GError **erro /** * atspi_value_get_minimum_increment: - * @obj: a pointer to the #AtspiValue implementor on which to operate. + * @obj: a pointer to the #AtspiValue implementor on which to operate. * * Gets the minimum increment by which an #AtspiValue can be adjusted. * @@ -160,13 +160,13 @@ atspi_value_get_minimum_increment (AtspiValue *obj, GError **error) g_return_val_if_fail (obj != NULL, 0.0); _atspi_dbus_get_property (obj, atspi_interface_value, "MinimumIncrement", error, "d", &retval); - + return retval; } /** * atspi_value_get_text: - * @obj: a pointer to the #AtspiValue implementor on which to operate. + * @obj: a pointer to the #AtspiValue implementor on which to operate. * * Gets the human readable text alternative associated with the value. * @text is a newly created string, that must be freed by the @@ -182,7 +182,7 @@ atspi_value_get_text (AtspiValue *obj, GError **error) g_return_val_if_fail (obj != NULL, NULL); _atspi_dbus_get_property (obj, atspi_interface_value, "Text", error, "s", &retval); - + return retval; } @@ -196,17 +196,15 @@ atspi_value_get_type (void) { static GType type = 0; - if (!type) { - static const GTypeInfo tinfo = + if (!type) { - sizeof (AtspiValue), - (GBaseInitFunc) atspi_value_base_init, - (GBaseFinalizeFunc) NULL, - }; - - type = g_type_register_static (G_TYPE_INTERFACE, "AtspiValue", &tinfo, 0); - - } + static const GTypeInfo tinfo = { + sizeof (AtspiValue), + (GBaseInitFunc) atspi_value_base_init, + (GBaseFinalizeFunc) NULL, + }; + + type = g_type_register_static (G_TYPE_INTERFACE, "AtspiValue", &tinfo, 0); + } return type; } - diff --git a/atspi/atspi-value.h b/atspi/atspi-value.h index 478ea951..ba04ff0f 100644 --- a/atspi/atspi-value.h +++ b/atspi/atspi-value.h @@ -5,7 +5,7 @@ * Copyright 2002 Ximian, Inc. * 2002 Sun Microsystems Inc. * Copyright 2010, 2011 Novell, Inc. - * + * * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -34,10 +34,10 @@ G_BEGIN_DECLS -#define ATSPI_TYPE_VALUE (atspi_value_get_type ()) -#define ATSPI_IS_VALUE(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATSPI_TYPE_VALUE) -#define ATSPI_VALUE(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATSPI_TYPE_VALUE, AtspiValue) -#define ATSPI_VALUE_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATSPI_TYPE_VALUE, AtspiValue)) +#define ATSPI_TYPE_VALUE (atspi_value_get_type ()) +#define ATSPI_IS_VALUE(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATSPI_TYPE_VALUE) +#define ATSPI_VALUE(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATSPI_TYPE_VALUE, AtspiValue) +#define ATSPI_VALUE_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATSPI_TYPE_VALUE, AtspiValue)) GType atspi_value_get_type (); @@ -59,4 +59,4 @@ gdouble atspi_value_get_minimum_increment (AtspiValue *obj, GError **error); gchar *atspi_value_get_text (AtspiValue *obj, GError **error); G_END_DECLS -#endif /* _ATSPI_VALUE_H_ */ +#endif /* _ATSPI_VALUE_H_ */ diff --git a/atspi/atspi.h b/atspi/atspi.h index 89ff20f0..f036d86d 100644 --- a/atspi/atspi.h +++ b/atspi/atspi.h @@ -26,12 +26,11 @@ #include "glib.h" -#include "atspi-constants.h" -#include "atspi-types.h" #include "atspi-accessible.h" #include "atspi-action.h" #include "atspi-collection.h" #include "atspi-component.h" +#include "atspi-constants.h" #include "atspi-device-listener.h" #include "atspi-document.h" #include "atspi-editabletext.h" @@ -45,9 +44,10 @@ #include "atspi-relation.h" #include "atspi-selection.h" #include "atspi-stateset.h" -#include "atspi-table.h" #include "atspi-table-cell.h" +#include "atspi-table.h" #include "atspi-text.h" +#include "atspi-types.h" #include "atspi-value.h" #include "atspi-gmain.h" diff --git a/bus/at-spi-bus-launcher.c b/bus/at-spi-bus-launcher.c index 0633c303..53ae3ff1 100644 --- a/bus/at-spi-bus-launcher.c +++ b/bus/at-spi-bus-launcher.c @@ -1,6 +1,6 @@ /* -*- mode: c; c-basic-offset: 2; indent-tabs-mode: nil; -*- - * - * at-spi-bus-launcher: Manage the a11y bus as a child process + * + * at-spi-bus-launcher: Manage the a11y bus as a child process * * Copyright 2011-2018 Red Hat, Inc. * @@ -22,36 +22,38 @@ #include "config.h" -#include <unistd.h> -#include <string.h> #include <signal.h> +#include <string.h> +#include <unistd.h> #ifdef __linux__ #include <sys/prctl.h> #include <sys/socket.h> #include <sys/un.h> #endif -#include <sys/wait.h> #include <errno.h> #include <stdio.h> +#include <sys/wait.h> #include <gio/gio.h> #ifdef HAVE_X11 -#include <X11/Xlib.h> #include <X11/Xatom.h> +#include <X11/Xlib.h> #endif #ifdef DBUS_BROKER #include <systemd/sd-login.h> #endif #include <sys/stat.h> -typedef enum { +typedef enum +{ A11Y_BUS_STATE_IDLE = 0, A11Y_BUS_STATE_READING_ADDRESS, A11Y_BUS_STATE_RUNNING, A11Y_BUS_STATE_ERROR } A11yBusState; -typedef struct { +typedef struct +{ GMainLoop *loop; gboolean launch_immediately; gboolean a11y_enabled; @@ -80,17 +82,17 @@ typedef struct { static A11yBusLauncher *_global_app = NULL; static const gchar introspection_xml[] = - "<node>" - " <interface name='org.a11y.Bus'>" - " <method name='GetAddress'>" - " <arg type='s' name='address' direction='out'/>" - " </method>" - " </interface>" - " <interface name='org.a11y.Status'>" - " <property name='IsEnabled' type='b' access='readwrite'/>" - " <property name='ScreenReaderEnabled' type='b' access='readwrite'/>" - " </interface>" - "</node>"; + "<node>" + " <interface name='org.a11y.Bus'>" + " <method name='GetAddress'>" + " <arg type='s' name='address' direction='out'/>" + " </method>" + " </interface>" + " <interface name='org.a11y.Status'>" + " <property name='IsEnabled' type='b' access='readwrite'/>" + " <property name='ScreenReaderEnabled' type='b' access='readwrite'/>" + " </interface>" + "</node>"; static GDBusNodeInfo *introspection_data = NULL; static void @@ -108,10 +110,10 @@ respond_to_end_session (GDBusProxy *proxy) static void g_signal_cb (GDBusProxy *proxy, - gchar *sender_name, - gchar *signal_name, - GVariant *parameters, - gpointer user_data) + gchar *sender_name, + gchar *signal_name, + GVariant *parameters, + gpointer user_data) { A11yBusLauncher *app = user_data; @@ -124,9 +126,9 @@ g_signal_cb (GDBusProxy *proxy, } static void -client_proxy_ready_cb (GObject *source_object, +client_proxy_ready_cb (GObject *source_object, GAsyncResult *res, - gpointer user_data) + gpointer user_data) { A11yBusLauncher *app = user_data; GError *error = NULL; @@ -230,14 +232,13 @@ register_client (A11yBusLauncher *app) "RegisterClient", parameters, G_DBUS_CALL_FLAGS_NONE, G_MAXINT, NULL, client_registered, app); - } static void name_appeared_handler (GDBusConnection *connection, - const gchar *name, - const gchar *name_owner, - gpointer user_data) + const gchar *name, + const gchar *name_owner, + gpointer user_data) { A11yBusLauncher *app = user_data; @@ -250,10 +251,10 @@ name_appeared_handler (GDBusConnection *connection, * Read all data from a file descriptor to a C string buffer. */ static gboolean -unix_read_all_fd_to_string (int fd, - char *buf, - ssize_t max_bytes, - char **error_msg) +unix_read_all_fd_to_string (int fd, + char *buf, + ssize_t max_bytes, + char **error_msg) { g_assert (max_bytes > 1); *error_msg = NULL; @@ -293,12 +294,12 @@ unix_read_all_fd_to_string (int fd, } static void -on_bus_exited (GPid pid, - gint status, +on_bus_exited (GPid pid, + gint status, gpointer data) { A11yBusLauncher *app = data; - + app->a11y_bus_pid = -1; app->state = A11Y_BUS_STATE_ERROR; if (app->a11y_launch_error_message == NULL) @@ -347,7 +348,7 @@ ensure_a11y_bus_daemon (A11yBusLauncher *app, char *config_path) g_clear_pointer (&app->a11y_launch_error_message, g_free); if (!g_spawn_async_with_pipes_and_fds (NULL, - (const gchar * const *) argv, + (const gchar *const *) argv, NULL, G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_LEAVE_DESCRIPTORS_OPEN, NULL, /* child_setup */ @@ -412,7 +413,7 @@ error: static gboolean ensure_a11y_bus_daemon (A11yBusLauncher *app, char *config_path) { - return FALSE; + return FALSE; } #endif @@ -426,11 +427,11 @@ setup_bus_child_broker (gpointer data) dup2 (app->listenfd, 3); close (app->listenfd); - g_setenv("LISTEN_FDS", "1", TRUE); + g_setenv ("LISTEN_FDS", "1", TRUE); - pid_str = g_strdup_printf("%u", getpid()); - g_setenv("LISTEN_PID", pid_str, TRUE); - g_free(pid_str); + pid_str = g_strdup_printf ("%u", getpid ()); + g_setenv ("LISTEN_PID", pid_str, TRUE); + g_free (pid_str); } static gboolean @@ -439,7 +440,7 @@ ensure_a11y_bus_broker (A11yBusLauncher *app, char *config_path) char *argv[] = { DBUS_BROKER, config_path, "--scope", "user", NULL }; char *unit; struct sockaddr_un addr = { .sun_family = AF_UNIX, "" }; - socklen_t addr_len = sizeof(addr); + socklen_t addr_len = sizeof (addr); GPid pid; GError *error = NULL; @@ -466,15 +467,15 @@ ensure_a11y_bus_broker (A11yBusLauncher *app, char *config_path) if ((app->listenfd = socket (PF_UNIX, SOCK_STREAM | SOCK_NONBLOCK, 0)) < 0) g_error ("Failed to create listening socket: %s", strerror (errno)); - if (bind (app->listenfd, (struct sockaddr *)&addr, addr_len) < 0) + if (bind (app->listenfd, (struct sockaddr *) &addr, addr_len) < 0) g_error ("Failed to bind listening socket: %s", strerror (errno)); if (!app->socket_name && - getsockname (app->listenfd, (struct sockaddr *)&addr, &addr_len) < 0) - g_error ("Failed to get socket name for listening socket: %s", strerror(errno)); + getsockname (app->listenfd, (struct sockaddr *) &addr, &addr_len) < 0) + g_error ("Failed to get socket name for listening socket: %s", strerror (errno)); if (listen (app->listenfd, 1024) < 0) - g_error ("Failed to listen on socket: %s", strerror(errno)); + g_error ("Failed to listen on socket: %s", strerror (errno)); g_clear_pointer (&app->a11y_launch_error_message, g_free); @@ -502,9 +503,9 @@ ensure_a11y_bus_broker (A11yBusLauncher *app, char *config_path) app->state = A11Y_BUS_STATE_RUNNING; if (app->socket_name) - app->a11y_bus_address = g_strconcat("unix:path=", addr.sun_path, NULL); + app->a11y_bus_address = g_strconcat ("unix:path=", addr.sun_path, NULL); else - app->a11y_bus_address = g_strconcat("unix:abstract=", addr.sun_path + 1, NULL); + app->a11y_bus_address = g_strconcat ("unix:abstract=", addr.sun_path + 1, NULL); g_debug ("a11y bus address: %s", app->a11y_bus_address); return TRUE; @@ -519,7 +520,7 @@ error: static gboolean ensure_a11y_bus_broker (A11yBusLauncher *app, char *config_path) { - return FALSE; + return FALSE; } #endif @@ -533,55 +534,55 @@ ensure_a11y_bus (A11yBusLauncher *app) if (app->a11y_bus_pid != 0) return FALSE; - if (g_file_test (SYSCONFDIR"/at-spi2/accessibility.conf", G_FILE_TEST_EXISTS)) - config_path = "--config-file="SYSCONFDIR"/at-spi2/accessibility.conf"; + if (g_file_test (SYSCONFDIR "/at-spi2/accessibility.conf", G_FILE_TEST_EXISTS)) + config_path = "--config-file=" SYSCONFDIR "/at-spi2/accessibility.conf"; else - config_path = "--config-file="DATADIR"/defaults/at-spi2/accessibility.conf"; - - xdg_runtime_dir = g_get_user_runtime_dir (); - if (xdg_runtime_dir) - { - const gchar *display = g_getenv ("DISPLAY"); - gchar *at_spi_dir = g_strconcat (xdg_runtime_dir, "/at-spi", NULL); - gchar *p; - mkdir (xdg_runtime_dir, 0700); - if (!g_path_is_absolute (at_spi_dir)) + config_path = "--config-file=" DATADIR "/defaults/at-spi2/accessibility.conf"; + + xdg_runtime_dir = g_get_user_runtime_dir (); + if (xdg_runtime_dir) + { + const gchar *display = g_getenv ("DISPLAY"); + gchar *at_spi_dir = g_strconcat (xdg_runtime_dir, "/at-spi", NULL); + gchar *p; + mkdir (xdg_runtime_dir, 0700); + if (!g_path_is_absolute (at_spi_dir)) { gchar *new_dir = g_canonicalize_filename (at_spi_dir, NULL); g_free (at_spi_dir); at_spi_dir = new_dir; } - if (mkdir (at_spi_dir, 0700) == 0 || errno == EEXIST) - { - app->socket_name = g_strconcat (at_spi_dir, "/bus", display, NULL); - g_free (at_spi_dir); - p = strchr (app->socket_name, ':'); - if (p) - *p = '_'; - if (strlen (app->socket_name) >= 100) - { - g_free (app->socket_name); - app->socket_name = NULL; - } - } - else + if (mkdir (at_spi_dir, 0700) == 0 || errno == EEXIST) + { + app->socket_name = g_strconcat (at_spi_dir, "/bus", display, NULL); g_free (at_spi_dir); - } + p = strchr (app->socket_name, ':'); + if (p) + *p = '_'; + if (strlen (app->socket_name) >= 100) + { + g_free (app->socket_name); + app->socket_name = NULL; + } + } + else + g_free (at_spi_dir); + } #ifdef WANT_DBUS_BROKER - success = ensure_a11y_bus_broker (app, config_path); - if (!success) - { - if (!ensure_a11y_bus_daemon (app, config_path)) - return FALSE; - } + success = ensure_a11y_bus_broker (app, config_path); + if (!success) + { + if (!ensure_a11y_bus_daemon (app, config_path)) + return FALSE; + } #else - success = ensure_a11y_bus_daemon (app, config_path); - if (!success) - { - if (!ensure_a11y_bus_broker (app, config_path)) - return FALSE; - } + success = ensure_a11y_bus_daemon (app, config_path); + if (!success) + { + if (!ensure_a11y_bus_broker (app, config_path)) + return FALSE; + } #endif #ifdef HAVE_X11 @@ -607,14 +608,14 @@ ensure_a11y_bus (A11yBusLauncher *app) } static void -handle_method_call (GDBusConnection *connection, - const gchar *sender, - const gchar *object_path, - const gchar *interface_name, - const gchar *method_name, - GVariant *parameters, +handle_method_call (GDBusConnection *connection, + const gchar *sender, + const gchar *object_path, + const gchar *interface_name, + const gchar *method_name, + GVariant *parameters, GDBusMethodInvocation *invocation, - gpointer user_data) + gpointer user_data) { A11yBusLauncher *app = user_data; @@ -632,13 +633,13 @@ handle_method_call (GDBusConnection *connection, } static GVariant * -handle_get_property (GDBusConnection *connection, - const gchar *sender, - const gchar *object_path, - const gchar *interface_name, - const gchar *property_name, - GError **error, - gpointer user_data) +handle_get_property (GDBusConnection *connection, + const gchar *sender, + const gchar *object_path, + const gchar *interface_name, + const gchar *property_name, + GError **error, + gpointer user_data) { A11yBusLauncher *app = user_data; @@ -651,8 +652,7 @@ handle_get_property (GDBusConnection *connection, } static void -handle_a11y_enabled_change (A11yBusLauncher *app, gboolean enabled, - gboolean notify_gsettings) +handle_a11y_enabled_change (A11yBusLauncher *app, gboolean enabled, gboolean notify_gsettings) { GVariantBuilder builder; GVariantBuilder invalidated_builder; @@ -687,8 +687,7 @@ handle_a11y_enabled_change (A11yBusLauncher *app, gboolean enabled, } static void -handle_screen_reader_enabled_change (A11yBusLauncher *app, gboolean enabled, - gboolean notify_gsettings) +handle_screen_reader_enabled_change (A11yBusLauncher *app, gboolean enabled, gboolean notify_gsettings) { GVariantBuilder builder; GVariantBuilder invalidated_builder; @@ -728,23 +727,23 @@ handle_screen_reader_enabled_change (A11yBusLauncher *app, gboolean enabled, } static gboolean -handle_set_property (GDBusConnection *connection, - const gchar *sender, - const gchar *object_path, - const gchar *interface_name, - const gchar *property_name, - GVariant *value, - GError **error, - gpointer user_data) +handle_set_property (GDBusConnection *connection, + const gchar *sender, + const gchar *object_path, + const gchar *interface_name, + const gchar *property_name, + GVariant *value, + GError **error, + gpointer user_data) { A11yBusLauncher *app = user_data; const gchar *type = g_variant_get_type_string (value); gboolean enabled; - + if (g_strcmp0 (type, "b") != 0) { g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS, - "org.a11y.Status.%s expects a boolean but got %s", property_name, type); + "org.a11y.Status.%s expects a boolean but got %s", property_name, type); return FALSE; } @@ -763,20 +762,18 @@ handle_set_property (GDBusConnection *connection, else { g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS, - "Unknown property '%s'", property_name); + "Unknown property '%s'", property_name); return FALSE; } } -static const GDBusInterfaceVTable bus_vtable = -{ +static const GDBusInterfaceVTable bus_vtable = { handle_method_call, NULL, /* handle_get_property, */ NULL /* handle_set_property */ }; -static const GDBusInterfaceVTable status_vtable = -{ +static const GDBusInterfaceVTable status_vtable = { NULL, /* handle_method_call */ handle_get_property, handle_set_property @@ -784,13 +781,13 @@ static const GDBusInterfaceVTable status_vtable = static void on_bus_acquired (GDBusConnection *connection, - const gchar *name, - gpointer user_data) + const gchar *name, + gpointer user_data) { A11yBusLauncher *app = user_data; GError *error; guint registration_id; - + if (connection == NULL) { g_main_loop_quit (app->loop); @@ -823,21 +820,19 @@ on_bus_acquired (GDBusConnection *connection, static void on_name_lost (GDBusConnection *connection, - const gchar *name, - gpointer user_data) + const gchar *name, + gpointer user_data) { A11yBusLauncher *app = user_data; - if (app->session_bus == NULL - && connection == NULL - && app->a11y_launch_error_message == NULL) + if (app->session_bus == NULL && connection == NULL && app->a11y_launch_error_message == NULL) app->a11y_launch_error_message = g_strdup ("Failed to connect to session bus"); g_main_loop_quit (app->loop); } static void on_name_acquired (GDBusConnection *connection, - const gchar *name, - gpointer user_data) + const gchar *name, + gpointer user_data) { A11yBusLauncher *app = user_data; @@ -867,12 +862,12 @@ sigterm_handler (int signum) } static gboolean -on_sigterm_pipe (GIOChannel *channel, +on_sigterm_pipe (GIOChannel *channel, GIOCondition condition, - gpointer data) + gpointer data) { A11yBusLauncher *app = data; - + g_main_loop_quit (app->loop); return FALSE; @@ -897,7 +892,7 @@ init_sigterm_handling (A11yBusLauncher *app) static GSettings * get_schema (const gchar *name) { -#if GLIB_CHECK_VERSION (2, 32, 0) +#if GLIB_CHECK_VERSION(2, 32, 0) GSettingsSchemaSource *source = g_settings_schema_source_get_default (); if (!source) { @@ -911,15 +906,15 @@ get_schema (const gchar *name) return g_settings_new_full (schema, NULL, NULL); #else - const char * const *schemas = NULL; + const char *const *schemas = NULL; gint i; schemas = g_settings_list_schemas (); for (i = 0; schemas[i]; i++) - { - if (!strcmp (schemas[i], name)) - return g_settings_new (schemas[i]); - } + { + if (!strcmp (schemas[i], name)) + return g_settings_new (schemas[i]); + } return NULL; #endif @@ -937,7 +932,7 @@ gsettings_key_changed (GSettings *gsettings, const gchar *key, void *user_data) } int -main (int argc, +main (int argc, char **argv) { gboolean a11y_set = FALSE; @@ -956,8 +951,8 @@ main (int argc, else if (sscanf (argv[i], "--screen-reader=%d", &_global_app->screen_reader_enabled) == 1) screen_reader_set = TRUE; - else - g_error ("usage: %s [--launch-immediately] [--a11y=0|1] [--screen-reader=0|1]", argv[0]); + else + g_error ("usage: %s [--launch-immediately] [--a11y=0|1] [--screen-reader=0|1]", argv[0]); } _global_app->interface_schema = get_schema ("org.gnome.desktop.interface"); @@ -966,15 +961,15 @@ main (int argc, if (!a11y_set) { _global_app->a11y_enabled = _global_app->interface_schema - ? g_settings_get_boolean (_global_app->interface_schema, "toolkit-accessibility") - : _global_app->launch_immediately; + ? g_settings_get_boolean (_global_app->interface_schema, "toolkit-accessibility") + : _global_app->launch_immediately; } if (!screen_reader_set) { _global_app->screen_reader_enabled = _global_app->a11y_schema - ? g_settings_get_boolean (_global_app->a11y_schema, "screen-reader-enabled") - : FALSE; + ? g_settings_get_boolean (_global_app->a11y_schema, "screen-reader-enabled") + : FALSE; } if (_global_app->interface_schema) @@ -993,14 +988,14 @@ main (int argc, g_assert (introspection_data != NULL); _global_app->name_owner_id = - g_bus_own_name (G_BUS_TYPE_SESSION, - "org.a11y.Bus", - G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT, - on_bus_acquired, - on_name_acquired, - on_name_lost, - _global_app, - NULL); + g_bus_own_name (G_BUS_TYPE_SESSION, + "org.a11y.Bus", + G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT, + on_bus_acquired, + on_name_acquired, + on_name_lost, + _global_app, + NULL); g_main_loop_run (_global_app->loop); @@ -1011,10 +1006,10 @@ main (int argc, _global_app->a11y_bus_pid = -1; } - /* Clear the X property if our bus is gone; in the case where e.g. - * GDM is launching a login on an X server it was using before, - * we don't want early login processes to pick up the stale address. - */ + /* Clear the X property if our bus is gone; in the case where e.g. + * GDM is launching a login on an X server it was using before, + * we don't want early login processes to pick up the stale address. + */ #ifdef HAVE_X11 if (_global_app->x11_prop_set) { diff --git a/dbind/dbind-any.c b/dbind/dbind-any.c index 512c1b34..bcbe3911 100644 --- a/dbind/dbind-any.c +++ b/dbind/dbind-any.c @@ -18,8 +18,8 @@ */ /* type driven marshalling */ -#include <stdio.h> #include <glib.h> +#include <stdio.h> #include "config.h" #include "dbind-any.h" @@ -34,32 +34,32 @@ * ~(boundary - 1) */ #define ALIGN_VALUE(this, boundary) \ - (( ((gulong)(this)) + (((gulong)(boundary)) -1)) & (~(((gulong)(boundary))-1))) + ((((gulong) (this)) + (((gulong) (boundary)) - 1)) & (~(((gulong) (boundary)) - 1))) #define ALIGN_ADDRESS(this, boundary) \ - ((gpointer)ALIGN_VALUE(this, boundary)) + ((gpointer) ALIGN_VALUE (this, boundary)) #define PTR_PLUS(ptr, offset) \ - ((gpointer) (((guchar *)(ptr)) + (offset))) - -#define DBIND_POD_CASES \ - DBUS_TYPE_BYTE: \ - case DBUS_TYPE_INT16: \ - case DBUS_TYPE_UINT16: \ - case DBUS_TYPE_INT32: \ - case DBUS_TYPE_UINT32: \ - case DBUS_TYPE_BOOLEAN: \ - case DBUS_TYPE_INT64: \ - case DBUS_TYPE_UINT64: \ - case DBUS_TYPE_DOUBLE + ((gpointer) (((guchar *) (ptr)) + (offset))) + +#define DBIND_POD_CASES \ + DBUS_TYPE_BYTE: \ + case DBUS_TYPE_INT16: \ + case DBUS_TYPE_UINT16: \ + case DBUS_TYPE_INT32: \ + case DBUS_TYPE_UINT32: \ + case DBUS_TYPE_BOOLEAN: \ + case DBUS_TYPE_INT64: \ + case DBUS_TYPE_UINT64: \ + case DBUS_TYPE_DOUBLE /*---------------------------------------------------------------------------*/ static void warn_braces () { - fprintf (stderr, "Error: dbus flags structures & dicts with braces rather than " - " an explicit type member of 'struct'\n"); + fprintf (stderr, "Error: dbus flags structures & dicts with braces rather than " + " an explicit type member of 'struct'\n"); } /*---------------------------------------------------------------------------*/ @@ -67,68 +67,71 @@ warn_braces () static unsigned int dbind_find_c_alignment_r (const char **type) { - unsigned int retval = 1; + unsigned int retval = 1; - char t = **type; - (*type)++; + char t = **type; + (*type)++; #ifdef DEBUG - fprintf (stderr, "\tfind align for %c (0x%x)\n", t, t); + fprintf (stderr, "\tfind align for %c (0x%x)\n", t, t); #endif - switch (t) { + switch (t) + { case DBUS_TYPE_BYTE: - return ALIGNOF_CHAR; + return ALIGNOF_CHAR; case DBUS_TYPE_BOOLEAN: - return ALIGNOF_DBUS_BOOL_T; + return ALIGNOF_DBUS_BOOL_T; case DBUS_TYPE_INT16: case DBUS_TYPE_UINT16: - return ALIGNOF_DBUS_INT16_T; + return ALIGNOF_DBUS_INT16_T; case DBUS_TYPE_INT32: case DBUS_TYPE_UINT32: - return ALIGNOF_DBUS_INT32_T; + return ALIGNOF_DBUS_INT32_T; case DBUS_TYPE_INT64: case DBUS_TYPE_UINT64: - return ALIGNOF_DBUS_INT64_T; + return ALIGNOF_DBUS_INT64_T; case DBUS_TYPE_DOUBLE: - return ALIGNOF_DOUBLE; + return ALIGNOF_DOUBLE; /* ptr types */ case DBUS_TYPE_STRING: case DBUS_TYPE_OBJECT_PATH: case DBUS_TYPE_SIGNATURE: case DBUS_TYPE_ARRAY: - return ALIGNOF_DBIND_POINTER; + return ALIGNOF_DBIND_POINTER; case DBUS_STRUCT_BEGIN_CHAR: /* TODO: I think this would break with a nested struct */ #if ALIGNOF_DBIND_STRUCT > 1 - retval = MAX (retval, ALIGNOF_DBIND_STRUCT); + retval = MAX (retval, ALIGNOF_DBIND_STRUCT); #endif - while (**type != DBUS_STRUCT_END_CHAR) { - int elem_align = dbind_find_c_alignment_r (type); - retval = MAX (retval, elem_align); + while (**type != DBUS_STRUCT_END_CHAR) + { + int elem_align = dbind_find_c_alignment_r (type); + retval = MAX (retval, elem_align); } - (*type)++; - return retval; + (*type)++; + return retval; case DBUS_DICT_ENTRY_BEGIN_CHAR: #if ALIGNOF_DBIND_STRUCT > 1 - retval = MAX (retval, ALIGNOF_DBIND_STRUCT); + retval = MAX (retval, ALIGNOF_DBIND_STRUCT); #endif - while (**type != DBUS_DICT_ENTRY_END_CHAR) { - int elem_align = dbind_find_c_alignment_r (type); - retval = MAX (retval, elem_align); + while (**type != DBUS_DICT_ENTRY_END_CHAR) + { + int elem_align = dbind_find_c_alignment_r (type); + retval = MAX (retval, elem_align); } - (*type)++; - return retval; + (*type)++; + return retval; case DBUS_TYPE_STRUCT: case DBUS_TYPE_DICT_ENTRY: - warn_braces (); - return ALIGNOF_DBIND_POINTER; + warn_braces (); + return ALIGNOF_DBIND_POINTER; case '\0': - g_assert_not_reached(); - break; + g_assert_not_reached (); + break; default: - return 1; - } + return 1; + } } /*---------------------------------------------------------------------------*/ @@ -143,82 +146,91 @@ dbind_gather_alloc_info_r (const char **type) { switch (**type) { - case DBUS_STRUCT_BEGIN_CHAR: - while (**type != DBUS_STRUCT_END_CHAR && **type != '\0') (*type)++; - if (**type != '\0') (*type)++; - break; - case DBUS_DICT_ENTRY_BEGIN_CHAR: - while (**type != DBUS_DICT_ENTRY_END_CHAR && **type != '\0') (*type)++; - if (**type != '\0') (*type)++; - break; - case '\0': - break; - default: - (*type)++; - break; + case DBUS_STRUCT_BEGIN_CHAR: + while (**type != DBUS_STRUCT_END_CHAR && **type != '\0') + (*type)++; + if (**type != '\0') + (*type)++; + break; + case DBUS_DICT_ENTRY_BEGIN_CHAR: + while (**type != DBUS_DICT_ENTRY_END_CHAR && **type != '\0') + (*type)++; + if (**type != '\0') + (*type)++; + break; + case '\0': + break; + default: + (*type)++; + break; } } - switch (t) { + switch (t) + { case DBUS_TYPE_BYTE: - return sizeof (char); + return sizeof (char); case DBUS_TYPE_BOOLEAN: - return sizeof (dbus_bool_t); + return sizeof (dbus_bool_t); case DBUS_TYPE_INT16: case DBUS_TYPE_UINT16: - return sizeof (dbus_int16_t); + return sizeof (dbus_int16_t); case DBUS_TYPE_INT32: case DBUS_TYPE_UINT32: - return sizeof (dbus_int32_t); + return sizeof (dbus_int32_t); case DBUS_TYPE_INT64: case DBUS_TYPE_UINT64: - return sizeof (dbus_int64_t); + return sizeof (dbus_int64_t); case DBUS_TYPE_DOUBLE: - return sizeof (double); + return sizeof (double); /* ptr types */ case DBUS_TYPE_STRING: case DBUS_TYPE_OBJECT_PATH: case DBUS_TYPE_SIGNATURE: case DBUS_TYPE_ARRAY: - return sizeof (void *); - case DBUS_STRUCT_BEGIN_CHAR: { - int sum = 0, stralign; + return sizeof (void *); + case DBUS_STRUCT_BEGIN_CHAR: + { + int sum = 0, stralign; stralign = dbind_find_c_alignment (*type - 1); - while (**type != DBUS_STRUCT_END_CHAR) { - sum = ALIGN_VALUE (sum, dbind_find_c_alignment (*type)); - sum += dbind_gather_alloc_info_r (type); - } - sum = ALIGN_VALUE (sum, stralign); + while (**type != DBUS_STRUCT_END_CHAR) + { + sum = ALIGN_VALUE (sum, dbind_find_c_alignment (*type)); + sum += dbind_gather_alloc_info_r (type); + } + sum = ALIGN_VALUE (sum, stralign); g_assert (**type == DBUS_STRUCT_END_CHAR); (*type)++; - return sum; - } - case DBUS_DICT_ENTRY_BEGIN_CHAR: { - int sum = 0, stralign; + return sum; + } + case DBUS_DICT_ENTRY_BEGIN_CHAR: + { + int sum = 0, stralign; stralign = dbind_find_c_alignment (*type - 1); - while (**type != DBUS_DICT_ENTRY_END_CHAR) { - sum = ALIGN_VALUE (sum, dbind_find_c_alignment (*type)); - sum += dbind_gather_alloc_info_r (type); - } - sum = ALIGN_VALUE (sum, stralign); + while (**type != DBUS_DICT_ENTRY_END_CHAR) + { + sum = ALIGN_VALUE (sum, dbind_find_c_alignment (*type)); + sum += dbind_gather_alloc_info_r (type); + } + sum = ALIGN_VALUE (sum, stralign); g_assert (**type == DBUS_DICT_ENTRY_END_CHAR); (*type)++; - return sum; - } + return sum; + } case DBUS_TYPE_STRUCT: case DBUS_TYPE_DICT_ENTRY: - warn_braces (); + warn_braces (); default: - return 0; - } + return 0; + } } static size_t @@ -233,27 +245,29 @@ static void dbind_any_free_r (const char **type, void **data) { #ifdef DEBUG - fprintf (stderr, "any free '%c' to %p\n", **type, *data); + fprintf (stderr, "any free '%c' to %p\n", **type, *data); #endif - switch (**type) { + switch (**type) + { case DBIND_POD_CASES: - *data = ((guchar *)*data) + dbind_gather_alloc_info (*type); - (*type)++; - break; + *data = ((guchar *) *data) + dbind_gather_alloc_info (*type); + (*type)++; + break; case DBUS_TYPE_STRING: case DBUS_TYPE_OBJECT_PATH: case DBUS_TYPE_SIGNATURE: #ifdef DEBUG - fprintf (stderr, "string free %p\n", **(void ***)data); + fprintf (stderr, "string free %p\n", **(void ***) data); #endif - g_free (**(void ***)data); - *data = ((guchar *)*data) + dbind_gather_alloc_info (*type); - (*type)++; - break; - case DBUS_TYPE_ARRAY: { + g_free (**(void ***) data); + *data = ((guchar *) *data) + dbind_gather_alloc_info (*type); + (*type)++; + break; + case DBUS_TYPE_ARRAY: + { int i; - GArray *vals = **(void ***)data; + GArray *vals = **(void ***) data; size_t elem_size, elem_align; const char *saved_child_type; @@ -261,69 +275,74 @@ dbind_any_free_r (const char **type, void **data) saved_child_type = *type; elem_size = dbind_gather_alloc_info (*type); - elem_align = dbind_find_c_alignment_r (type); + elem_align = dbind_find_c_alignment_r (type); - for (i = 0; i < vals->len; i++) { + for (i = 0; i < vals->len; i++) + { void *ptr = vals->data + elem_size * i; *type = saved_child_type; /* rewind type info */ ptr = ALIGN_ADDRESS (ptr, elem_align); dbind_any_free_r (type, &ptr); - } + } g_array_free (vals, TRUE); break; - } - case DBUS_STRUCT_BEGIN_CHAR: { - gconstpointer data0 = *data; - int offset = 0, stralign; + } + case DBUS_STRUCT_BEGIN_CHAR: + { + gconstpointer data0 = *data; + int offset = 0, stralign; stralign = dbind_find_c_alignment (*type); (*type)++; - offset = 0 ; - while (**type != DBUS_STRUCT_END_CHAR) { + offset = 0; + while (**type != DBUS_STRUCT_END_CHAR) + { const char *subt = *type; - offset = ALIGN_VALUE (offset, dbind_find_c_alignment (*type)); - *data = PTR_PLUS (data0, offset); + offset = ALIGN_VALUE (offset, dbind_find_c_alignment (*type)); + *data = PTR_PLUS (data0, offset); dbind_any_free_r (type, data); offset += dbind_gather_alloc_info (subt); - } + } - offset = ALIGN_VALUE (offset, stralign); - *data = PTR_PLUS (data0, offset); + offset = ALIGN_VALUE (offset, stralign); + *data = PTR_PLUS (data0, offset); g_assert (**type == DBUS_STRUCT_END_CHAR); (*type)++; break; - } - case DBUS_DICT_ENTRY_BEGIN_CHAR: { - gconstpointer data0 = *data; - int offset = 0, stralign; + } + case DBUS_DICT_ENTRY_BEGIN_CHAR: + { + gconstpointer data0 = *data; + int offset = 0, stralign; stralign = dbind_find_c_alignment (*type); (*type)++; - offset = 0 ; - while (**type != DBUS_DICT_ENTRY_END_CHAR) { + offset = 0; + while (**type != DBUS_DICT_ENTRY_END_CHAR) + { const char *subt = *type; - offset = ALIGN_VALUE (offset, dbind_find_c_alignment (*type)); - *data = PTR_PLUS (data0, offset); + offset = ALIGN_VALUE (offset, dbind_find_c_alignment (*type)); + *data = PTR_PLUS (data0, offset); dbind_any_free_r (type, data); offset += dbind_gather_alloc_info (subt); - } + } - offset = ALIGN_VALUE (offset, stralign); - *data = PTR_PLUS (data0, offset); + offset = ALIGN_VALUE (offset, stralign); + *data = PTR_PLUS (data0, offset); g_assert (**type == DBUS_DICT_ENTRY_END_CHAR); (*type)++; break; - } + } case DBUS_TYPE_STRUCT: case DBUS_TYPE_DICT_ENTRY: - warn_braces (); - break; + warn_braces (); + break; } } @@ -331,28 +350,30 @@ dbind_any_free_r (const char **type, void **data) void dbind_any_marshal (DBusMessageIter *iter, - const char **type, - void **data) + const char **type, + void **data) { - size_t len; + size_t len; #ifdef DEBUG - fprintf (stderr, "any marshal '%c' to %p\n", **type, *data); + fprintf (stderr, "any marshal '%c' to %p\n", **type, *data); #endif - switch (**type) { + switch (**type) + { case DBIND_POD_CASES: case DBUS_TYPE_STRING: case DBUS_TYPE_OBJECT_PATH: case DBUS_TYPE_SIGNATURE: - len = dbind_gather_alloc_info (*type); - dbus_message_iter_append_basic (iter, **type, *data); - *data = ((guchar *)*data) + len; - (*type)++; - break; - case DBUS_TYPE_ARRAY: { + len = dbind_gather_alloc_info (*type); + dbus_message_iter_append_basic (iter, **type, *data); + *data = ((guchar *) *data) + len; + (*type)++; + break; + case DBUS_TYPE_ARRAY: + { int i; - GArray *vals = **(void ***)data; + GArray *vals = **(void ***) data; size_t elem_size, elem_align; DBusMessageIter sub; const char *saved_child_type; @@ -362,27 +383,29 @@ dbind_any_marshal (DBusMessageIter *iter, saved_child_type = *type; elem_size = dbind_gather_alloc_info (*type); - elem_align = dbind_find_c_alignment_r (type); + elem_align = dbind_find_c_alignment_r (type); /* wow this part of the API sucks too ... */ child_type_string = g_strndup (saved_child_type, *type - saved_child_type); /* fprintf (stderr, "array child type '%s'\n", child_type_string); */ dbus_message_iter_open_container (iter, DBUS_TYPE_ARRAY, child_type_string, &sub); - for (i = 0; i < vals->len; i++) { + for (i = 0; i < vals->len; i++) + { void *ptr = vals->data + elem_size * i; *type = saved_child_type; /* rewind type info */ ptr = ALIGN_ADDRESS (ptr, elem_align); dbind_any_marshal (&sub, type, &ptr); - } + } dbus_message_iter_close_container (iter, &sub); g_free (child_type_string); break; - } - case DBUS_STRUCT_BEGIN_CHAR: { - gconstpointer data0 = *data; - int offset = 0, stralign; + } + case DBUS_STRUCT_BEGIN_CHAR: + { + gconstpointer data0 = *data; + int offset = 0, stralign; DBusMessageIter sub; stralign = dbind_find_c_alignment (*type); @@ -391,17 +414,18 @@ dbind_any_marshal (DBusMessageIter *iter, dbus_message_iter_open_container (iter, DBUS_TYPE_STRUCT, NULL, &sub); - offset = 0 ; - while (**type != DBUS_STRUCT_END_CHAR) { + offset = 0; + while (**type != DBUS_STRUCT_END_CHAR) + { const char *subt = *type; - offset = ALIGN_VALUE (offset, dbind_find_c_alignment (*type)); - *data = PTR_PLUS (data0, offset); + offset = ALIGN_VALUE (offset, dbind_find_c_alignment (*type)); + *data = PTR_PLUS (data0, offset); dbind_any_marshal (&sub, type, data); offset += dbind_gather_alloc_info (subt); - } + } - offset = ALIGN_VALUE (offset, stralign); - *data = PTR_PLUS (data0, offset); + offset = ALIGN_VALUE (offset, stralign); + *data = PTR_PLUS (data0, offset); dbus_message_iter_close_container (iter, &sub); @@ -409,10 +433,11 @@ dbind_any_marshal (DBusMessageIter *iter, (*type)++; break; - } - case DBUS_DICT_ENTRY_BEGIN_CHAR: { - gconstpointer data0 = *data; - int offset = 0, stralign; + } + case DBUS_DICT_ENTRY_BEGIN_CHAR: + { + gconstpointer data0 = *data; + int offset = 0, stralign; DBusMessageIter sub; stralign = dbind_find_c_alignment (*type); @@ -421,17 +446,18 @@ dbind_any_marshal (DBusMessageIter *iter, dbus_message_iter_open_container (iter, DBUS_TYPE_DICT_ENTRY, NULL, &sub); - offset = 0 ; - while (**type != DBUS_DICT_ENTRY_END_CHAR) { + offset = 0; + while (**type != DBUS_DICT_ENTRY_END_CHAR) + { const char *subt = *type; - offset = ALIGN_VALUE (offset, dbind_find_c_alignment (*type)); - *data = PTR_PLUS (data0, offset); + offset = ALIGN_VALUE (offset, dbind_find_c_alignment (*type)); + *data = PTR_PLUS (data0, offset); dbind_any_marshal (&sub, type, data); offset += dbind_gather_alloc_info (subt); - } + } - offset = ALIGN_VALUE (offset, stralign); - *data = PTR_PLUS (data0, offset); + offset = ALIGN_VALUE (offset, stralign); + *data = PTR_PLUS (data0, offset); dbus_message_iter_close_container (iter, &sub); @@ -439,11 +465,11 @@ dbind_any_marshal (DBusMessageIter *iter, (*type)++; break; - } + } case DBUS_TYPE_STRUCT: case DBUS_TYPE_DICT_ENTRY: - warn_braces (); - break; + warn_braces (); + break; } } @@ -451,113 +477,117 @@ dbind_any_marshal (DBusMessageIter *iter, void dbind_any_marshal_va (DBusMessageIter *iter, - const char **arg_types, - va_list args) + const char **arg_types, + va_list args) { - const char *p = *arg_types; + const char *p = *arg_types; - /* Guard against null arg types - Fix for - http://bugs.freedesktop.org/show_bug.cgi?id=23027 - */ - if (p == NULL) - p = ""; + /* Guard against null arg types + Fix for - http://bugs.freedesktop.org/show_bug.cgi?id=23027 + */ + if (p == NULL) + p = ""; - { - /* special case base-types since we need to walk the stack worse-luck */ - for (;*p != '\0' && *p != '=';) { - int intarg; - void *ptrarg; - double doublearg; - dbus_int64_t int64arg; - void *arg = NULL; - - switch (*p) { - case DBUS_TYPE_BYTE: - case DBUS_TYPE_BOOLEAN: - case DBUS_TYPE_INT16: - case DBUS_TYPE_UINT16: - case DBUS_TYPE_INT32: - case DBUS_TYPE_UINT32: - intarg = va_arg (args, int); - arg = &intarg; - break; - case DBUS_TYPE_INT64: - case DBUS_TYPE_UINT64: - int64arg = va_arg (args, dbus_int64_t); - arg = &int64arg; - break; - case DBUS_TYPE_DOUBLE: - doublearg = va_arg (args, double); - arg = &doublearg; - break; - /* ptr types */ - case DBUS_TYPE_STRING: - case DBUS_TYPE_OBJECT_PATH: - case DBUS_TYPE_SIGNATURE: - case DBUS_TYPE_ARRAY: - case DBUS_TYPE_DICT_ENTRY: - ptrarg = va_arg (args, void *); - arg = &ptrarg; - break; - case DBUS_STRUCT_BEGIN_CHAR: - ptrarg = va_arg (args, void *); - arg = ptrarg; - break; - case DBUS_DICT_ENTRY_BEGIN_CHAR: - ptrarg = va_arg (args, void *); - arg = ptrarg; - break; - - case DBUS_TYPE_VARIANT: - fprintf (stderr, "No variant support yet - very toolkit specific\n"); - ptrarg = va_arg (args, void *); - arg = &ptrarg; - break; - default: - fprintf (stderr, "Unknown / invalid arg type %c\n", *p); - break; - } - if (arg != NULL) - dbind_any_marshal (iter, &p, &arg); - } - if (*arg_types) - *arg_types = p; - } + { + /* special case base-types since we need to walk the stack worse-luck */ + for (; *p != '\0' && *p != '=';) + { + int intarg; + void *ptrarg; + double doublearg; + dbus_int64_t int64arg; + void *arg = NULL; + + switch (*p) + { + case DBUS_TYPE_BYTE: + case DBUS_TYPE_BOOLEAN: + case DBUS_TYPE_INT16: + case DBUS_TYPE_UINT16: + case DBUS_TYPE_INT32: + case DBUS_TYPE_UINT32: + intarg = va_arg (args, int); + arg = &intarg; + break; + case DBUS_TYPE_INT64: + case DBUS_TYPE_UINT64: + int64arg = va_arg (args, dbus_int64_t); + arg = &int64arg; + break; + case DBUS_TYPE_DOUBLE: + doublearg = va_arg (args, double); + arg = &doublearg; + break; + /* ptr types */ + case DBUS_TYPE_STRING: + case DBUS_TYPE_OBJECT_PATH: + case DBUS_TYPE_SIGNATURE: + case DBUS_TYPE_ARRAY: + case DBUS_TYPE_DICT_ENTRY: + ptrarg = va_arg (args, void *); + arg = &ptrarg; + break; + case DBUS_STRUCT_BEGIN_CHAR: + ptrarg = va_arg (args, void *); + arg = ptrarg; + break; + case DBUS_DICT_ENTRY_BEGIN_CHAR: + ptrarg = va_arg (args, void *); + arg = ptrarg; + break; + + case DBUS_TYPE_VARIANT: + fprintf (stderr, "No variant support yet - very toolkit specific\n"); + ptrarg = va_arg (args, void *); + arg = &ptrarg; + break; + default: + fprintf (stderr, "Unknown / invalid arg type %c\n", *p); + break; + } + if (arg != NULL) + dbind_any_marshal (iter, &p, &arg); + } + if (*arg_types) + *arg_types = p; + } } /*---------------------------------------------------------------------------*/ void dbind_any_demarshal (DBusMessageIter *iter, - const char **type, - void **data) + const char **type, + void **data) { - size_t len; + size_t len; #ifdef DEBUG - fprintf (stderr, "any demarshal '%c' to %p\n", **type, *data); + fprintf (stderr, "any demarshal '%c' to %p\n", **type, *data); #endif - switch (**type) { + switch (**type) + { case DBIND_POD_CASES: - len = dbind_gather_alloc_info (*type); - dbus_message_iter_get_basic (iter, *data); - *data = ((guchar *)*data) + len; - (*type)++; - break; + len = dbind_gather_alloc_info (*type); + dbus_message_iter_get_basic (iter, *data); + *data = ((guchar *) *data) + len; + (*type)++; + break; case DBUS_TYPE_STRING: case DBUS_TYPE_OBJECT_PATH: case DBUS_TYPE_SIGNATURE: - len = dbind_gather_alloc_info (*type); - dbus_message_iter_get_basic (iter, *data); + len = dbind_gather_alloc_info (*type); + dbus_message_iter_get_basic (iter, *data); #ifdef DEBUG - fprintf (stderr, "dup string '%s' (%p)\n", **(void ***)data, **(void ***)data); + fprintf (stderr, "dup string '%s' (%p)\n", **(void ***) data, **(void ***) data); #endif - **(void ***)data = g_strdup (**(void ***)data); - *data = ((guchar *)*data) + len; - (*type)++; - break; - case DBUS_TYPE_ARRAY: { + **(void ***) data = g_strdup (**(void ***) data); + *data = ((guchar *) *data) + len; + (*type)++; + break; + case DBUS_TYPE_ARRAY: + { GArray *vals; DBusMessageIter child; size_t elem_size, elem_align; @@ -570,12 +600,13 @@ dbind_any_demarshal (DBusMessageIter *iter, elem_size = dbind_gather_alloc_info (*type); elem_align = dbind_find_c_alignment_r (type); vals = g_array_new (FALSE, FALSE, elem_size); - (**(void ***)data) = vals; - *data = ((guchar *)*data) + sizeof (void *); + (**(void ***) data) = vals; + *data = ((guchar *) *data) + sizeof (void *); i = 0; dbus_message_iter_recurse (iter, &child); - while (dbus_message_iter_get_arg_type (&child) != DBUS_TYPE_INVALID) { + while (dbus_message_iter_get_arg_type (&child) != DBUS_TYPE_INVALID) + { void *ptr; const char *subt = stored_child_type; g_array_set_size (vals, i + 1); @@ -583,12 +614,13 @@ dbind_any_demarshal (DBusMessageIter *iter, ptr = ALIGN_ADDRESS (ptr, elem_align); dbind_any_demarshal (&child, &subt, &ptr); i++; - }; + }; break; - } - case DBUS_STRUCT_BEGIN_CHAR: { - gconstpointer data0 = *data; - int offset = 0, stralign; + } + case DBUS_STRUCT_BEGIN_CHAR: + { + gconstpointer data0 = *data; + int offset = 0, stralign; DBusMessageIter child; stralign = dbind_find_c_alignment (*type); @@ -597,25 +629,27 @@ dbind_any_demarshal (DBusMessageIter *iter, dbus_message_iter_recurse (iter, &child); - while (**type != DBUS_STRUCT_END_CHAR) { + while (**type != DBUS_STRUCT_END_CHAR) + { const char *subt = *type; - offset = ALIGN_VALUE (offset, dbind_find_c_alignment (*type)); - *data = PTR_PLUS (data0, offset); + offset = ALIGN_VALUE (offset, dbind_find_c_alignment (*type)); + *data = PTR_PLUS (data0, offset); dbind_any_demarshal (&child, type, data); offset += dbind_gather_alloc_info (subt); - } + } - offset = ALIGN_VALUE (offset, stralign); - *data = PTR_PLUS (data0, offset); + offset = ALIGN_VALUE (offset, stralign); + *data = PTR_PLUS (data0, offset); g_assert (**type == DBUS_STRUCT_END_CHAR); (*type)++; break; - } - case DBUS_DICT_ENTRY_BEGIN_CHAR: { - gconstpointer data0 = *data; - int offset = 0, stralign; + } + case DBUS_DICT_ENTRY_BEGIN_CHAR: + { + gconstpointer data0 = *data; + int offset = 0, stralign; DBusMessageIter child; stralign = dbind_find_c_alignment (*type); @@ -624,32 +658,33 @@ dbind_any_demarshal (DBusMessageIter *iter, dbus_message_iter_recurse (iter, &child); - while (**type != DBUS_DICT_ENTRY_END_CHAR) { + while (**type != DBUS_DICT_ENTRY_END_CHAR) + { const char *subt = *type; - offset = ALIGN_VALUE (offset, dbind_find_c_alignment (*type)); - *data = PTR_PLUS (data0, offset); + offset = ALIGN_VALUE (offset, dbind_find_c_alignment (*type)); + *data = PTR_PLUS (data0, offset); dbind_any_demarshal (&child, type, data); offset += dbind_gather_alloc_info (subt); - } + } - offset = ALIGN_VALUE (offset, stralign); - *data = PTR_PLUS (data0, offset); + offset = ALIGN_VALUE (offset, stralign); + *data = PTR_PLUS (data0, offset); g_assert (**type == DBUS_DICT_ENTRY_END_CHAR); (*type)++; break; - case DBUS_TYPE_VARIANT: + case DBUS_TYPE_VARIANT: /* skip; unimplemented for now */ (*type)++; break; - } + } case DBUS_TYPE_STRUCT: case DBUS_TYPE_DICT_ENTRY: - warn_braces (); - break; + warn_braces (); + break; } - dbus_message_iter_next (iter); + dbus_message_iter_next (iter); } static const char * @@ -659,13 +694,13 @@ pass_complex_arg (const char *p, char begin, char end) p++; while (*p && level > 0) - { - if (*p == begin) - level++; - else if (*p == end) - level--; - p++; - } + { + if (*p == begin) + level++; + else if (*p == end) + level--; + p++; + } if (*p == end) p++; return p; @@ -675,77 +710,80 @@ static const char * pass_arg (const char *p) { switch (*p) - { - case '(': - return pass_complex_arg (p, '(', ')'); - case '{': - return pass_complex_arg (p, '{', '}'); - case 'a': - return pass_arg (p+1); - default: - return p + 1; - } + { + case '(': + return pass_complex_arg (p, '(', ')'); + case '{': + return pass_complex_arg (p, '{', '}'); + case 'a': + return pass_arg (p + 1); + default: + return p + 1; + } } /*---------------------------------------------------------------------------*/ void dbind_any_demarshal_va (DBusMessageIter *iter, - const char **arg_types, - va_list args) + const char **arg_types, + va_list args) { - const char *p = *arg_types; + const char *p = *arg_types; - /* Just consume the in args without doing anything to them */ - for (;*p != '\0' && *p != '=';) { - switch (*p) { + /* Just consume the in args without doing anything to them */ + for (; *p != '\0' && *p != '=';) + { + switch (*p) + { case DBUS_TYPE_BYTE: case DBUS_TYPE_BOOLEAN: case DBUS_TYPE_INT16: case DBUS_TYPE_UINT16: case DBUS_TYPE_INT32: case DBUS_TYPE_UINT32: - va_arg (args, int); - break; + va_arg (args, int); + break; case DBUS_TYPE_INT64: case DBUS_TYPE_UINT64: - va_arg (args, dbus_int64_t); - break; + va_arg (args, dbus_int64_t); + break; case DBUS_TYPE_DOUBLE: - va_arg (args, double); - break; + va_arg (args, double); + break; /* ptr types */ case DBUS_TYPE_STRING: case DBUS_TYPE_OBJECT_PATH: case DBUS_TYPE_SIGNATURE: case DBUS_TYPE_ARRAY: case DBUS_TYPE_DICT_ENTRY: - va_arg (args, void *); - break; + va_arg (args, void *); + break; case DBUS_STRUCT_BEGIN_CHAR: - va_arg (args, void *); - break; + va_arg (args, void *); + break; case DBUS_DICT_ENTRY_BEGIN_CHAR: - va_arg (args, void *); - break; + va_arg (args, void *); + break; case DBUS_TYPE_VARIANT: - fprintf (stderr, "No variant support yet - very toolkit specific\n"); - va_arg (args, void *); - break; + fprintf (stderr, "No variant support yet - very toolkit specific\n"); + va_arg (args, void *); + break; default: - fprintf (stderr, "Unknown / invalid arg type %c\n", *p); - break; + fprintf (stderr, "Unknown / invalid arg type %c\n", *p); + break; } p = pass_arg (p); } - if (p [0] == '=' && p[1] == '>') - p += 2; + if (p[0] == '=' && p[1] == '>') + p += 2; - for (;*p != '\0';) { - void *arg = va_arg (args, void *); - dbind_any_demarshal (iter, &p, &arg); + for (; *p != '\0';) + { + void *arg = va_arg (args, void *); + dbind_any_demarshal (iter, &p, &arg); } } @@ -756,14 +794,14 @@ void dbind_any_free (const char *type, void *ptr) { - dbind_any_free_r (&type, &ptr); + dbind_any_free_r (&type, &ptr); } /* should this be the default normalization ? */ void dbind_any_free_ptr (const char *type, void *ptr) { - dbind_any_free (type, &ptr); + dbind_any_free (type, &ptr); } /*---------------------------------------------------------------------------*/ @@ -771,7 +809,7 @@ dbind_any_free_ptr (const char *type, void *ptr) unsigned int dbind_find_c_alignment (const char *type) { - return dbind_find_c_alignment_r (&type); + return dbind_find_c_alignment_r (&type); } /*END------------------------------------------------------------------------*/ diff --git a/dbind/dbind-any.h b/dbind/dbind-any.h index 859c8953..f13539bd 100644 --- a/dbind/dbind-any.h +++ b/dbind/dbind-any.h @@ -25,26 +25,26 @@ unsigned int dbind_find_c_alignment (const char *type); -void dbind_any_marshal (DBusMessageIter *iter, - const char **type, - void **val); +void dbind_any_marshal (DBusMessageIter *iter, + const char **type, + void **val); -void dbind_any_marshal_va (DBusMessageIter *iter, - const char **arg_types, - va_list args); +void dbind_any_marshal_va (DBusMessageIter *iter, + const char **arg_types, + va_list args); -void dbind_any_demarshal (DBusMessageIter *iter, - const char **type, - void **val); +void dbind_any_demarshal (DBusMessageIter *iter, + const char **type, + void **val); -void dbind_any_demarshal_va (DBusMessageIter *iter, - const char **arg_types, - va_list args); +void dbind_any_demarshal_va (DBusMessageIter *iter, + const char **arg_types, + va_list args); -void dbind_any_free (const char *type, - void *ptr_to_ptr); +void dbind_any_free (const char *type, + void *ptr_to_ptr); -void dbind_any_free_ptr (const char *type, - void *ptr); +void dbind_any_free_ptr (const char *type, + void *ptr); #endif /* _DBIND_ANY_H_ */ diff --git a/dbind/dbind.c b/dbind/dbind.c index e154f857..8c6c65d7 100644 --- a/dbind/dbind.c +++ b/dbind/dbind.c @@ -17,15 +17,15 @@ * Boston, MA 02110-1301, USA. */ -#include <stdio.h> +#include <glib.h> #include <stdarg.h> -#include <sys/time.h> +#include <stdio.h> #include <string.h> -#include <glib.h> +#include <sys/time.h> +#include "atspi/atspi-gmain.h" #include "config.h" #include "dbind/dbind.h" -#include "atspi/atspi-gmain.h" static int dbind_timeout = -1; @@ -36,15 +36,15 @@ static int dbind_timeout = -1; /*---------------------------------------------------------------------------*/ -typedef struct _SpiReentrantCallClosure +typedef struct _SpiReentrantCallClosure { DBusMessage *reply; } SpiReentrantCallClosure; static void -set_reply (DBusPendingCall * pending, void *user_data) +set_reply (DBusPendingCall *pending, void *user_data) { - SpiReentrantCallClosure* closure = (SpiReentrantCallClosure *) user_data; + SpiReentrantCallClosure *closure = (SpiReentrantCallClosure *) user_data; closure->reply = dbus_pending_call_steal_reply (pending); dbus_pending_call_unref (pending); @@ -60,7 +60,7 @@ time_elapsed (struct timeval *origin) } DBusMessage * -dbind_send_and_allow_reentry (DBusConnection * bus, DBusMessage * message, DBusError *error) +dbind_send_and_allow_reentry (DBusConnection *bus, DBusMessage *message, DBusError *error) { DBusPendingCall *pending; SpiReentrantCallClosure *closure; @@ -76,18 +76,18 @@ dbind_send_and_allow_reentry (DBusConnection * bus, DBusMessage * message, DBusE ret = dbus_connection_send_with_reply_and_block (bus, message, dbind_timeout, error); if (g_main_depth () == 0 && !in_dispatch) - { - in_dispatch = TRUE; - while (dbus_connection_dispatch (bus) == DBUS_DISPATCH_DATA_REMAINS); - in_dispatch = FALSE; - } + { + in_dispatch = TRUE; + while (dbus_connection_dispatch (bus) == DBUS_DISPATCH_DATA_REMAINS) + ; + in_dispatch = FALSE; + } return ret; } closure = g_new0 (SpiReentrantCallClosure, 1); closure->reply = NULL; - if (!dbus_connection_send_with_reply (bus, message, &pending, dbind_timeout) - || !pending) + if (!dbus_connection_send_with_reply (bus, message, &pending, dbind_timeout) || !pending) { g_free (closure); return NULL; @@ -101,14 +101,14 @@ dbind_send_and_allow_reentry (DBusConnection * bus, DBusMessage * message, DBusE { if (!dbus_connection_read_write_dispatch (bus, dbind_timeout)) { - //dbus_pending_call_set_notify (pending, NULL, NULL, NULL); + // dbus_pending_call_set_notify (pending, NULL, NULL, NULL); dbus_pending_call_cancel (pending); dbus_pending_call_unref (pending); return NULL; } if (time_elapsed (&tv) > dbind_timeout) { - //dbus_pending_call_set_notify (pending, NULL, NULL, NULL); + // dbus_pending_call_set_notify (pending, NULL, NULL, NULL); dbus_pending_call_cancel (pending); dbus_pending_call_unref (pending); dbus_set_error_const (error, "org.freedesktop.DBus.Error.NoReply", @@ -116,7 +116,7 @@ dbind_send_and_allow_reentry (DBusConnection * bus, DBusMessage * message, DBusE return NULL; } } - + ret = closure->reply; dbus_pending_call_unref (pending); return ret; @@ -124,79 +124,80 @@ dbind_send_and_allow_reentry (DBusConnection * bus, DBusMessage * message, DBusE dbus_bool_t dbind_method_call_reentrant_va (DBusConnection *cnx, - const char *bus_name, - const char *path, - const char *interface, - const char *method, - DBusError *opt_error, - const char *arg_types, - va_list args) + const char *bus_name, + const char *path, + const char *interface, + const char *method, + DBusError *opt_error, + const char *arg_types, + va_list args) { - dbus_bool_t success = FALSE; - DBusMessage *msg = NULL, *reply = NULL; - DBusMessageIter iter; - DBusError *err, real_err; - const char *p; + dbus_bool_t success = FALSE; + DBusMessage *msg = NULL, *reply = NULL; + DBusMessageIter iter; + DBusError *err, real_err; + const char *p; va_list args_demarshal; dbus_error_init (&real_err); va_copy (args_demarshal, args); - if (opt_error) - err = opt_error; - else { - err = &real_err; + if (opt_error) + err = opt_error; + else + { + err = &real_err; } - msg = dbus_message_new_method_call (bus_name, path, interface, method); - if (!msg) - goto out; + msg = dbus_message_new_method_call (bus_name, path, interface, method); + if (!msg) + goto out; - p = arg_types; - dbus_message_iter_init_append (msg, &iter); - dbind_any_marshal_va (&iter, &p, args); + p = arg_types; + dbus_message_iter_init_append (msg, &iter); + dbind_any_marshal_va (&iter, &p, args); - reply = dbind_send_and_allow_reentry (cnx, msg, err); - if (!reply) - goto out; + reply = dbind_send_and_allow_reentry (cnx, msg, err); + if (!reply) + goto out; - if (dbus_message_get_type (reply) == DBUS_MESSAGE_TYPE_ERROR) + if (dbus_message_get_type (reply) == DBUS_MESSAGE_TYPE_ERROR) { goto out; } - /* demarshal */ - if (p[0] == '=' && p[1] == '>') + /* demarshal */ + if (p[0] == '=' && p[1] == '>') { - DBusMessageIter iter; - dbus_message_iter_init (reply, &iter); - if (strcmp (p + 2, dbus_message_get_signature (reply)) != 0) - { - g_warning ("dbind: Call to \"%s\" returned signature %s; expected %s", - method, dbus_message_get_signature (reply), p + 2); - if (opt_error) - dbus_set_error (opt_error, DBUS_ERROR_INVALID_ARGS, - "Call to \"%s\" returned signature %s; expected %s", - method, dbus_message_get_signature (reply), - p + 2); - goto out; - } - p = arg_types; - dbind_any_demarshal_va (&iter, &p, args_demarshal); + DBusMessageIter iter; + dbus_message_iter_init (reply, &iter); + if (strcmp (p + 2, dbus_message_get_signature (reply)) != 0) + { + g_warning ("dbind: Call to \"%s\" returned signature %s; expected %s", + method, dbus_message_get_signature (reply), p + 2); + if (opt_error) + dbus_set_error (opt_error, DBUS_ERROR_INVALID_ARGS, + "Call to \"%s\" returned signature %s; expected %s", + method, dbus_message_get_signature (reply), + p + 2); + goto out; + } + p = arg_types; + dbind_any_demarshal_va (&iter, &p, args_demarshal); } - success = TRUE; + success = TRUE; out: - if (msg) - dbus_message_unref (msg); + if (msg) + dbus_message_unref (msg); - if (reply) - dbus_message_unref (reply); + if (reply) + dbus_message_unref (reply); - if (dbus_error_is_set (&real_err)) - dbus_error_free (&real_err); + if (dbus_error_is_set (&real_err)) + dbus_error_free (&real_err); - va_end (args_demarshal); - return success; + va_end (args_demarshal); + return success; } /** @@ -218,29 +219,29 @@ out: **/ dbus_bool_t dbind_method_call_reentrant (DBusConnection *cnx, - const char *bus_name, - const char *path, - const char *interface, - const char *method, - DBusError *opt_error, - const char *arg_types, + const char *bus_name, + const char *path, + const char *interface, + const char *method, + DBusError *opt_error, + const char *arg_types, ...) { - dbus_bool_t success = FALSE; - va_list args; - - va_start (args, arg_types); - success = dbind_method_call_reentrant_va (cnx, - bus_name, - path, - interface, - method, - opt_error, - arg_types, - args); - va_end (args); - - return success; + dbus_bool_t success = FALSE; + va_list args; + + va_start (args, arg_types); + success = dbind_method_call_reentrant_va (cnx, + bus_name, + path, + interface, + method, + opt_error, + arg_types, + args); + va_end (args); + + return success; } /*---------------------------------------------------------------------------*/ @@ -248,36 +249,36 @@ dbind_method_call_reentrant (DBusConnection *cnx, /* TODO: opt_error is unused; should be removed */ dbus_bool_t dbind_emit_signal_va (DBusConnection *cnx, - const char *path, - const char *interface, - const char *signal, - DBusError *opt_error, - const char *arg_types, - va_list args) + const char *path, + const char *interface, + const char *signal, + DBusError *opt_error, + const char *arg_types, + va_list args) { - dbus_bool_t success = FALSE; - DBusMessage *msg = NULL; - DBusMessageIter iter; - const char *p; + dbus_bool_t success = FALSE; + DBusMessage *msg = NULL; + DBusMessageIter iter; + const char *p; - msg = dbus_message_new_signal (path, interface, signal); - if (!msg) - goto out; + msg = dbus_message_new_signal (path, interface, signal); + if (!msg) + goto out; - p = arg_types; - dbus_message_iter_init_append (msg, &iter); - dbind_any_marshal_va (&iter, &p, args); + p = arg_types; + dbus_message_iter_init_append (msg, &iter); + dbind_any_marshal_va (&iter, &p, args); - if (!dbus_connection_send (cnx, msg, NULL)) - goto out; + if (!dbus_connection_send (cnx, msg, NULL)) + goto out; - success = TRUE; + success = TRUE; out: - if (msg) - dbus_message_unref (msg); + if (msg) + dbus_message_unref (msg); - return success; + return success; } /** @@ -295,21 +296,21 @@ out: **/ dbus_bool_t dbind_emit_signal (DBusConnection *cnx, - const char *path, - const char *interface, - const char *signal, - DBusError *opt_error, - const char *arg_types, + const char *path, + const char *interface, + const char *signal, + DBusError *opt_error, + const char *arg_types, ...) { - dbus_bool_t success = FALSE; - va_list args; + dbus_bool_t success = FALSE; + va_list args; - va_start (args, arg_types); - success = dbind_emit_signal_va (cnx, path, interface, signal, opt_error, arg_types, args); - va_end (args); + va_start (args, arg_types); + success = dbind_emit_signal_va (cnx, path, interface, signal, opt_error, arg_types, args); + va_end (args); - return success; + return success; } void dbind_set_timeout (int timeout) @@ -317,5 +318,4 @@ dbind_set_timeout (int timeout) dbind_timeout = timeout; } - /*END------------------------------------------------------------------------*/ diff --git a/dbind/dbind.h b/dbind/dbind.h index 0c10c7dd..e27dcfe8 100644 --- a/dbind/dbind.h +++ b/dbind/dbind.h @@ -21,48 +21,48 @@ #define _DBIND_H_ #define DBUS_API_SUBJECT_TO_CHANGE -#include <dbus/dbus.h> #include <dbind/dbind-any.h> +#include <dbus/dbus.h> DBusMessage * dbind_send_and_allow_reentry (DBusConnection *bus, DBusMessage *message, DBusError *error); dbus_bool_t dbind_method_call_reentrant_va (DBusConnection *cnx, - const char *bus_name, - const char *path, - const char *interface, - const char *method, - DBusError *opt_error, - const char *arg_types, - va_list args); + const char *bus_name, + const char *path, + const char *interface, + const char *method, + DBusError *opt_error, + const char *arg_types, + va_list args); dbus_bool_t dbind_method_call_reentrant (DBusConnection *cnx, - const char *bus_name, - const char *path, - const char *interface, - const char *method, - DBusError *opt_error, - const char *arg_types, + const char *bus_name, + const char *path, + const char *interface, + const char *method, + DBusError *opt_error, + const char *arg_types, ...); dbus_bool_t dbind_emit_signal_va (DBusConnection *cnx, - const char *path, - const char *interface, - const char *signal, - DBusError *opt_error, - const char *arg_types, - va_list args); + const char *path, + const char *interface, + const char *signal, + DBusError *opt_error, + const char *arg_types, + va_list args); dbus_bool_t dbind_emit_signal (DBusConnection *cnx, - const char *path, - const char *interface, - const char *signal, - DBusError *opt_error, - const char *arg_types, + const char *path, + const char *interface, + const char *signal, + DBusError *opt_error, + const char *arg_types, ...); void dbind_set_timeout (int timeout); diff --git a/dbind/dbtest.c b/dbind/dbtest.c index 22ea2165..a6f15263 100644 --- a/dbind/dbtest.c +++ b/dbind/dbtest.c @@ -17,30 +17,32 @@ * Boston, MA 02110-1301, USA. */ -#include <stdio.h> +#include <dbind/dbind.h> #include <glib.h> +#include <stdio.h> #include <string.h> -#include <dbind/dbind.h> -void marshal (DBusMessage *msg, const char *type, void *ptr) +void +marshal (DBusMessage *msg, const char *type, void *ptr) { - DBusMessageIter iter; + DBusMessageIter iter; - dbus_message_iter_init_append (msg, &iter); - dbind_any_marshal (&iter, &type, &ptr); + dbus_message_iter_init_append (msg, &iter); + dbind_any_marshal (&iter, &type, &ptr); } -void demarshal (DBusMessage *msg, const char *type, void *ptr) +void +demarshal (DBusMessage *msg, const char *type, void *ptr) { - DBusMessageIter iter; - - if (!dbus_message_iter_init (msg, &iter)) - { - fprintf (stderr, "no data in msg\n"); - g_assert_not_reached (); - } - else - dbind_any_demarshal (&iter, &type, &ptr); + DBusMessageIter iter; + + if (!dbus_message_iter_init (msg, &iter)) + { + fprintf (stderr, "no data in msg\n"); + g_assert_not_reached (); + } + else + dbind_any_demarshal (&iter, &type, &ptr); } #if 0 @@ -69,309 +71,320 @@ void dump_msg (DBusMessage *msg) } #endif -void test_simple () +void +test_simple () { - dbus_int32_t v1, v2; - DBusMessage *msg; + dbus_int32_t v1, v2; + DBusMessage *msg; - msg = dbus_message_new (DBUS_MESSAGE_TYPE_METHOD_CALL); - v1 = 42; - marshal (msg, "i", &v1); - demarshal (msg, "i", &v2); - g_assert (v2 == 42); - g_assert (v1 == v2); + msg = dbus_message_new (DBUS_MESSAGE_TYPE_METHOD_CALL); + v1 = 42; + marshal (msg, "i", &v1); + demarshal (msg, "i", &v2); + g_assert (v2 == 42); + g_assert (v1 == v2); - dbind_any_free ("i", &v2); /* nop */ - dbus_message_unref (msg); + dbind_any_free ("i", &v2); /* nop */ + dbus_message_unref (msg); - printf ("simple ok\n"); + printf ("simple ok\n"); } -void test_array () +void +test_array () { - GArray *a1, *a2; - DBusMessage *msg; - - /* pod types */ - a1 = g_array_new (FALSE, FALSE, sizeof (dbus_int32_t)); - g_array_set_size (a1, 4); - g_array_index (a1, dbus_int32_t, 0) = 42; - g_array_index (a1, dbus_int32_t, 1) = 17; - g_array_index (a1, dbus_int32_t, 2) = 26; - g_array_index (a1, dbus_int32_t, 3) = 38; - - msg = dbus_message_new (DBUS_MESSAGE_TYPE_METHOD_CALL); - marshal (msg, "ai", &a1); - demarshal (msg, "ai", &a2); - - g_assert (a2 != NULL); - g_assert (a2->len == 4); - g_assert (g_array_index (a2, dbus_int32_t, 0) == 42); - g_assert (g_array_index (a2, dbus_int32_t, 1) == 17); - g_assert (g_array_index (a2, dbus_int32_t, 2) == 26); - g_assert (g_array_index (a2, dbus_int32_t, 3) == 38); - g_array_free (a1, TRUE); - - dbind_any_free ("ai", &a2); - dbus_message_unref (msg); - - printf ("array ok\n"); + GArray *a1, *a2; + DBusMessage *msg; + + /* pod types */ + a1 = g_array_new (FALSE, FALSE, sizeof (dbus_int32_t)); + g_array_set_size (a1, 4); + g_array_index (a1, dbus_int32_t, 0) = 42; + g_array_index (a1, dbus_int32_t, 1) = 17; + g_array_index (a1, dbus_int32_t, 2) = 26; + g_array_index (a1, dbus_int32_t, 3) = 38; + + msg = dbus_message_new (DBUS_MESSAGE_TYPE_METHOD_CALL); + marshal (msg, "ai", &a1); + demarshal (msg, "ai", &a2); + + g_assert (a2 != NULL); + g_assert (a2->len == 4); + g_assert (g_array_index (a2, dbus_int32_t, 0) == 42); + g_assert (g_array_index (a2, dbus_int32_t, 1) == 17); + g_assert (g_array_index (a2, dbus_int32_t, 2) == 26); + g_assert (g_array_index (a2, dbus_int32_t, 3) == 38); + g_array_free (a1, TRUE); + + dbind_any_free ("ai", &a2); + dbus_message_unref (msg); + + printf ("array ok\n"); } -/* this taught me that the struct type is a mis-nomer, +/* this taught me that the struct type is a mis-nomer, it is generated by brackets */ -void test_struct_native () +void +test_struct_native () { - DBusMessage *msg; - DBusMessageIter iter, arr, str; + DBusMessage *msg; + DBusMessageIter iter, arr, str; - /* manually create ar(ss) */ - msg = dbus_message_new (DBUS_MESSAGE_TYPE_METHOD_CALL); + /* manually create ar(ss) */ + msg = dbus_message_new (DBUS_MESSAGE_TYPE_METHOD_CALL); - dbus_message_iter_init_append (msg, &iter); + dbus_message_iter_init_append (msg, &iter); - dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, "(ss)", &arr); - { - char *foo; - dbus_message_iter_open_container (&arr, DBUS_TYPE_STRUCT, NULL, &str); - - foo = "foo"; - dbus_message_iter_append_basic (&str, DBUS_TYPE_STRING, &foo); - foo = "baa"; - dbus_message_iter_append_basic (&str, DBUS_TYPE_STRING, &foo); - - dbus_message_iter_close_container (&arr, &str); - } - dbus_message_iter_close_container (&iter, &arr); + dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, "(ss)", &arr); + { + char *foo; + dbus_message_iter_open_container (&arr, DBUS_TYPE_STRUCT, NULL, &str); - printf ("native struct marshalling ok\n"); - - dbus_message_unref (msg); -} + foo = "foo"; + dbus_message_iter_append_basic (&str, DBUS_TYPE_STRING, &foo); + foo = "baa"; + dbus_message_iter_append_basic (&str, DBUS_TYPE_STRING, &foo); + + dbus_message_iter_close_container (&arr, &str); + } + dbus_message_iter_close_container (&iter, &arr); + printf ("native struct marshalling ok\n"); + + dbus_message_unref (msg); +} -void test_struct_simple () +void +test_struct_simple () { - typedef struct { - char *foo; - char *baa; - char *baz; - } FooBaa; - GArray *a1 = NULL, *a2 = NULL; - DBusMessage *msg; - - a1 = g_array_new (FALSE, FALSE, sizeof (FooBaa)); - g_array_set_size (a1, 2); - g_array_index (a1, FooBaa, 0).foo = "foo"; - g_array_index (a1, FooBaa, 0).baa = "baa"; - g_array_index (a1, FooBaa, 0).baz = "baz"; - g_array_index (a1, FooBaa, 1).foo = "Foo"; - g_array_index (a1, FooBaa, 1).baa = "baA"; - g_array_index (a1, FooBaa, 1).baz = "BaZ"; - - msg = dbus_message_new (DBUS_MESSAGE_TYPE_METHOD_CALL); - marshal (msg, "a(sss)", &a1); - demarshal (msg, "a(sss)", &a2); - - g_assert (a2 != NULL); - g_assert (a2 != a1); - g_assert (a2->len == 2); - g_assert (!strcmp (g_array_index (a2, FooBaa, 0).foo, "foo")); - g_assert (!strcmp (g_array_index (a2, FooBaa, 0).baa, "baa")); - g_assert (!strcmp (g_array_index (a2, FooBaa, 0).baz, "baz")); - g_assert (!strcmp (g_array_index (a2, FooBaa, 1).foo, "Foo")); - g_assert (!strcmp (g_array_index (a2, FooBaa, 1).baa, "baA")); - g_assert (!strcmp (g_array_index (a2, FooBaa, 1).baz, "BaZ")); - - printf ("simple struct ok\n"); - - dbind_any_free ("a(sss)", &a2); - dbus_message_unref (msg); + typedef struct + { + char *foo; + char *baa; + char *baz; + } FooBaa; + GArray *a1 = NULL, *a2 = NULL; + DBusMessage *msg; + + a1 = g_array_new (FALSE, FALSE, sizeof (FooBaa)); + g_array_set_size (a1, 2); + g_array_index (a1, FooBaa, 0).foo = "foo"; + g_array_index (a1, FooBaa, 0).baa = "baa"; + g_array_index (a1, FooBaa, 0).baz = "baz"; + g_array_index (a1, FooBaa, 1).foo = "Foo"; + g_array_index (a1, FooBaa, 1).baa = "baA"; + g_array_index (a1, FooBaa, 1).baz = "BaZ"; + + msg = dbus_message_new (DBUS_MESSAGE_TYPE_METHOD_CALL); + marshal (msg, "a(sss)", &a1); + demarshal (msg, "a(sss)", &a2); + + g_assert (a2 != NULL); + g_assert (a2 != a1); + g_assert (a2->len == 2); + g_assert (!strcmp (g_array_index (a2, FooBaa, 0).foo, "foo")); + g_assert (!strcmp (g_array_index (a2, FooBaa, 0).baa, "baa")); + g_assert (!strcmp (g_array_index (a2, FooBaa, 0).baz, "baz")); + g_assert (!strcmp (g_array_index (a2, FooBaa, 1).foo, "Foo")); + g_assert (!strcmp (g_array_index (a2, FooBaa, 1).baa, "baA")); + g_assert (!strcmp (g_array_index (a2, FooBaa, 1).baz, "BaZ")); + + printf ("simple struct ok\n"); + + dbind_any_free ("a(sss)", &a2); + dbus_message_unref (msg); } -void test_struct_complex () +void +test_struct_complex () { - typedef struct { - dbus_int32_t x, y; - } Point; - typedef struct { - unsigned char pad1; - double val; - Point tl, br; - char pad2; - char *name; - } Complex; -#define TYPEOF_POINT \ - DBUS_STRUCT_BEGIN_CHAR_AS_STRING \ - DBUS_TYPE_INT32_AS_STRING \ - DBUS_TYPE_INT32_AS_STRING \ - DBUS_STRUCT_END_CHAR_AS_STRING -#define TYPEOF_COMPLEX \ - DBUS_STRUCT_BEGIN_CHAR_AS_STRING \ - DBUS_TYPE_BYTE_AS_STRING \ - DBUS_TYPE_DOUBLE_AS_STRING \ - TYPEOF_POINT \ - TYPEOF_POINT \ - DBUS_TYPE_BYTE_AS_STRING \ - DBUS_TYPE_STRING_AS_STRING \ - DBUS_STRUCT_END_CHAR_AS_STRING - - - DBusMessage *msg; - Complex c1, c2; - - memset (&c1, 0, sizeof (c1)); - memset (&c2, 0, sizeof (c2)); - - c1.pad1 = 2; - c1.val = 0.1327569; - c1.tl.x = 1; - c1.tl.y = 17; - c1.br.x = 2587; - c1.br.y = -1; - c1.pad2 = 1; - c1.name = "stroustrup"; - - msg = dbus_message_new (DBUS_MESSAGE_TYPE_METHOD_CALL); - marshal (msg, TYPEOF_COMPLEX, &c1); - demarshal (msg, TYPEOF_COMPLEX, &c2); - - g_assert (c2.pad1 == 2); - g_assert (c2.val == c1.val); - g_assert (c2.val != 0); - g_assert (c2.tl.x == 1); - g_assert (c2.tl.y == 17); - g_assert (c2.br.x == 2587); - g_assert (c2.br.y == -1); - g_assert (c2.pad2 == 1); - g_assert (!strcmp (c1.name, "stroustrup")); - - printf ("complex struct ok\n"); - - dbind_any_free (TYPEOF_COMPLEX, &c2); - dbus_message_unref (msg); + typedef struct + { + dbus_int32_t x, y; + } Point; + typedef struct + { + unsigned char pad1; + double val; + Point tl, br; + char pad2; + char *name; + } Complex; +#define TYPEOF_POINT \ + DBUS_STRUCT_BEGIN_CHAR_AS_STRING \ + DBUS_TYPE_INT32_AS_STRING \ + DBUS_TYPE_INT32_AS_STRING \ + DBUS_STRUCT_END_CHAR_AS_STRING +#define TYPEOF_COMPLEX \ + DBUS_STRUCT_BEGIN_CHAR_AS_STRING \ + DBUS_TYPE_BYTE_AS_STRING \ + DBUS_TYPE_DOUBLE_AS_STRING \ + TYPEOF_POINT \ + TYPEOF_POINT \ + DBUS_TYPE_BYTE_AS_STRING \ + DBUS_TYPE_STRING_AS_STRING \ + DBUS_STRUCT_END_CHAR_AS_STRING + + DBusMessage *msg; + Complex c1, c2; + + memset (&c1, 0, sizeof (c1)); + memset (&c2, 0, sizeof (c2)); + + c1.pad1 = 2; + c1.val = 0.1327569; + c1.tl.x = 1; + c1.tl.y = 17; + c1.br.x = 2587; + c1.br.y = -1; + c1.pad2 = 1; + c1.name = "stroustrup"; + + msg = dbus_message_new (DBUS_MESSAGE_TYPE_METHOD_CALL); + marshal (msg, TYPEOF_COMPLEX, &c1); + demarshal (msg, TYPEOF_COMPLEX, &c2); + + g_assert (c2.pad1 == 2); + g_assert (c2.val == c1.val); + g_assert (c2.val != 0); + g_assert (c2.tl.x == 1); + g_assert (c2.tl.y == 17); + g_assert (c2.br.x == 2587); + g_assert (c2.br.y == -1); + g_assert (c2.pad2 == 1); + g_assert (!strcmp (c1.name, "stroustrup")); + + printf ("complex struct ok\n"); + + dbind_any_free (TYPEOF_COMPLEX, &c2); + dbus_message_unref (msg); } -void test_struct_with_array () +void +test_struct_with_array () { - typedef struct { - GArray *vals; - unsigned char pad1; - } ArrayStruct; -#define TYPEOF_ARRAYSTRUCT \ - DBUS_TYPE_ARRAY_AS_STRING \ - DBUS_STRUCT_BEGIN_CHAR_AS_STRING \ - DBUS_TYPE_ARRAY_AS_STRING \ - DBUS_TYPE_UINT32_AS_STRING \ - DBUS_TYPE_BYTE_AS_STRING \ - DBUS_STRUCT_END_CHAR_AS_STRING - - - DBusMessage *msg; - GArray *a1, *a2; - ArrayStruct *p, *q; - - - a1 = g_array_new (FALSE, FALSE, sizeof (ArrayStruct)); - g_array_set_size (a1, 2); - p = &g_array_index (a1, ArrayStruct, 0); - p[0].vals = g_array_new (FALSE, FALSE, sizeof (dbus_uint32_t)); - g_array_set_size (p[0].vals, 2); - g_array_index (p[0].vals, dbus_uint32_t, 0) = 1; - g_array_index (p[0].vals, dbus_uint32_t, 1) = 1000; - p[0].pad1 = 2; - p[1].vals = g_array_new (FALSE, FALSE, sizeof (dbus_uint32_t)); - g_array_set_size (p[1].vals, 2); - g_array_index (p[1].vals, dbus_uint32_t, 0) = 1000000; - g_array_index (p[1].vals, dbus_uint32_t, 1) = 1000000000; - p[1].pad1 = 8; - - msg = dbus_message_new (DBUS_MESSAGE_TYPE_METHOD_CALL); - marshal (msg, TYPEOF_ARRAYSTRUCT, &a1); - demarshal (msg, TYPEOF_ARRAYSTRUCT, &a2); - - q = &g_array_index (a2, ArrayStruct, 0); - g_assert (q[0].pad1 == 2); - g_assert (g_array_index (q[1].vals, dbus_uint32_t, 1) == 1000000000); - - printf ("struct with array ok\n"); - - dbind_any_free (TYPEOF_ARRAYSTRUCT, &a2); - dbus_message_unref (msg); - g_array_free (p[0].vals, TRUE); - g_array_free (p[1].vals, TRUE); + typedef struct + { + GArray *vals; + unsigned char pad1; + } ArrayStruct; +#define TYPEOF_ARRAYSTRUCT \ + DBUS_TYPE_ARRAY_AS_STRING \ + DBUS_STRUCT_BEGIN_CHAR_AS_STRING \ + DBUS_TYPE_ARRAY_AS_STRING \ + DBUS_TYPE_UINT32_AS_STRING \ + DBUS_TYPE_BYTE_AS_STRING \ + DBUS_STRUCT_END_CHAR_AS_STRING + + DBusMessage *msg; + GArray *a1, *a2; + ArrayStruct *p, *q; + + a1 = g_array_new (FALSE, FALSE, sizeof (ArrayStruct)); + g_array_set_size (a1, 2); + p = &g_array_index (a1, ArrayStruct, 0); + p[0].vals = g_array_new (FALSE, FALSE, sizeof (dbus_uint32_t)); + g_array_set_size (p[0].vals, 2); + g_array_index (p[0].vals, dbus_uint32_t, 0) = 1; + g_array_index (p[0].vals, dbus_uint32_t, 1) = 1000; + p[0].pad1 = 2; + p[1].vals = g_array_new (FALSE, FALSE, sizeof (dbus_uint32_t)); + g_array_set_size (p[1].vals, 2); + g_array_index (p[1].vals, dbus_uint32_t, 0) = 1000000; + g_array_index (p[1].vals, dbus_uint32_t, 1) = 1000000000; + p[1].pad1 = 8; + + msg = dbus_message_new (DBUS_MESSAGE_TYPE_METHOD_CALL); + marshal (msg, TYPEOF_ARRAYSTRUCT, &a1); + demarshal (msg, TYPEOF_ARRAYSTRUCT, &a2); + + q = &g_array_index (a2, ArrayStruct, 0); + g_assert (q[0].pad1 == 2); + g_assert (g_array_index (q[1].vals, dbus_uint32_t, 1) == 1000000000); + + printf ("struct with array ok\n"); + + dbind_any_free (TYPEOF_ARRAYSTRUCT, &a2); + dbus_message_unref (msg); + g_array_free (p[0].vals, TRUE); + g_array_free (p[1].vals, TRUE); } -void test_twovals () +void +test_twovals () { - typedef struct { - dbus_int32_t v1; - dbus_int32_t v2; - } TwoVal; -#define TYPEOF_TWOVAL \ - DBUS_TYPE_INT32_AS_STRING \ - DBUS_TYPE_INT32_AS_STRING \ - - DBusMessage *msg; - DBusMessageIter iter; - TwoVal i, o; - const char *type_twoval = TYPEOF_TWOVAL; - const char *type; - void *ptr; - - msg = dbus_message_new (DBUS_MESSAGE_TYPE_METHOD_CALL); - i.v1 = 42; + typedef struct + { + dbus_int32_t v1; + dbus_int32_t v2; + } TwoVal; +#define TYPEOF_TWOVAL \ + DBUS_TYPE_INT32_AS_STRING \ + DBUS_TYPE_INT32_AS_STRING + + DBusMessage *msg; + DBusMessageIter iter; + TwoVal i, o; + const char *type_twoval = TYPEOF_TWOVAL; + const char *type; + void *ptr; + + msg = dbus_message_new (DBUS_MESSAGE_TYPE_METHOD_CALL); + i.v1 = 42; i.v2 = 1764; - dbus_message_iter_init_append (msg, &iter); - type = type_twoval; - ptr = &i; - dbind_any_marshal (&iter, &type, &ptr); - dbind_any_marshal (&iter, &type, &ptr); - dbus_message_iter_init (msg, &iter); - type = type_twoval; - ptr = &o; - dbind_any_demarshal (&iter, &type, &ptr); - dbind_any_demarshal (&iter, &type, &ptr); - g_assert (o.v1 == 42); - g_assert (o.v2 == 1764); - g_assert (i.v1 == o.v1); - g_assert (i.v2 == o.v2); - - dbind_any_free ("ii", &o); /* nop */ - dbus_message_unref (msg); - - printf ("two-val ok\n"); + dbus_message_iter_init_append (msg, &iter); + type = type_twoval; + ptr = &i; + dbind_any_marshal (&iter, &type, &ptr); + dbind_any_marshal (&iter, &type, &ptr); + dbus_message_iter_init (msg, &iter); + type = type_twoval; + ptr = &o; + dbind_any_demarshal (&iter, &type, &ptr); + dbind_any_demarshal (&iter, &type, &ptr); + g_assert (o.v1 == 42); + g_assert (o.v2 == 1764); + g_assert (i.v1 == o.v1); + g_assert (i.v2 == o.v2); + + dbind_any_free ("ii", &o); /* nop */ + dbus_message_unref (msg); + + printf ("two-val ok\n"); } -void test_marshalling () +void +test_marshalling () { - test_simple (); - test_array (); - test_struct_native (); - test_struct_simple (); - test_struct_complex (); - test_struct_with_array (); - test_twovals (); - - printf ("Marshalling ok\n"); + test_simple (); + test_array (); + test_struct_native (); + test_struct_simple (); + test_struct_complex (); + test_struct_with_array (); + test_twovals (); + + printf ("Marshalling ok\n"); } -void test_helpers () +void +test_helpers () { - dbind_find_c_alignment ("(sss)"); - dbind_find_c_alignment ("a(sss)"); - dbind_find_c_alignment ("(s(s)yd(d)s)"); - dbind_find_c_alignment ("a{ss}"); - printf ("helpers passed\n"); + dbind_find_c_alignment ("(sss)"); + dbind_find_c_alignment ("a(sss)"); + dbind_find_c_alignment ("(s(s)yd(d)s)"); + dbind_find_c_alignment ("a{ss}"); + printf ("helpers passed\n"); } -int main (int argc, char **argv) +int +main (int argc, char **argv) { - DBusConnection *bus = dbus_bus_get (DBUS_BUS_SESSION, NULL); - g_assert (bus != NULL); + DBusConnection *bus = dbus_bus_get (DBUS_BUS_SESSION, NULL); + g_assert (bus != NULL); - test_helpers (); - test_marshalling (); + test_helpers (); + test_marshalling (); - return 0; + return 0; } diff --git a/droute/droute-pairhash.c b/droute/droute-pairhash.c index 404b4365..8c5e4588 100644 --- a/droute/droute-pairhash.c +++ b/droute/droute-pairhash.c @@ -28,7 +28,7 @@ static guint str_hash (guint32 h, const char *p) { for (p += 1; *p != '\0'; p++) - h = (h << 5) - h + *p; + h = (h << 5) - h + *p; return h; } @@ -38,50 +38,50 @@ str_hash (guint32 h, const char *p) StrPair * str_pair_new (const gchar *one, const gchar *two) { - StrPair *pair; + StrPair *pair; - pair = g_new (StrPair, 1); - pair->one = one; - pair->two = two; - return pair; + pair = g_new (StrPair, 1); + pair->one = one; + pair->two = two; + return pair; } guint str_pair_hash (gconstpointer key) { - StrPair *pair = (StrPair *) key; - guint hash = 0; + StrPair *pair = (StrPair *) key; + guint hash = 0; - /*g_return_val_if_fail (pair != NULL, 0); - g_return_val_if_fail (pair->one != NULL, 0); - g_return_val_if_fail (pair->two != NULL, 0); - */ + /*g_return_val_if_fail (pair != NULL, 0); + g_return_val_if_fail (pair->one != NULL, 0); + g_return_val_if_fail (pair->two != NULL, 0); + */ - if (*(pair->two) != '\0') - { - hash = *(pair->two); - hash = str_hash (hash, pair->two); - hash = str_hash (hash, pair->one); - } + if (*(pair->two) != '\0') + { + hash = *(pair->two); + hash = str_hash (hash, pair->two); + hash = str_hash (hash, pair->one); + } - return hash; + return hash; } gboolean str_pair_equal (gconstpointer a, gconstpointer b) { - StrPair *ap = (StrPair *) a; - StrPair *bp = (StrPair *) b; + StrPair *ap = (StrPair *) a; + StrPair *bp = (StrPair *) b; - if (g_str_equal (ap->one, bp->one) && - g_str_equal (ap->two, bp->two)) - { - return TRUE; - } - else - { - return FALSE; - } + if (g_str_equal (ap->one, bp->one) && + g_str_equal (ap->two, bp->two)) + { + return TRUE; + } + else + { + return FALSE; + } } /*END------------------------------------------------------------------------*/ diff --git a/droute/droute-pairhash.h b/droute/droute-pairhash.h index 1cc0c1c5..54aec93e 100644 --- a/droute/droute-pairhash.h +++ b/droute/droute-pairhash.h @@ -27,15 +27,15 @@ typedef struct _StrPair StrPair; struct _StrPair { - const gchar *one; - const gchar *two; + const gchar *one; + const gchar *two; }; -StrPair *str_pair_new (const gchar *one, - const gchar *two); +StrPair *str_pair_new (const gchar *one, + const gchar *two); -guint str_pair_hash (gconstpointer key); -gboolean str_pair_equal (gconstpointer a, - gconstpointer b); +guint str_pair_hash (gconstpointer key); +gboolean str_pair_equal (gconstpointer a, + gconstpointer b); #endif /* _DROUTE_PAIRHASH_H */ diff --git a/droute/droute-test.c b/droute/droute-test.c index 2065dbf3..73d7bbb5 100644 --- a/droute/droute-test.c +++ b/droute/droute-test.c @@ -1,14 +1,14 @@ +#include <droute/droute.h> +#include <glib.h> #include <stdio.h> #include <stdlib.h> -#include <glib.h> #include <string.h> -#include <droute/droute.h> #include "atspi/atspi.h" -#define TEST_OBJECT_PATH "/test/object" -#define TEST_INTERFACE_ONE "test.interface.One" -#define TEST_INTERFACE_TWO "test.interface.Two" +#define TEST_OBJECT_PATH "/test/object" +#define TEST_INTERFACE_ONE "test.interface.One" +#define TEST_INTERFACE_TWO "test.interface.Two" #define OBJECT_ONE "ObjectOne"; #define OBJECT_TWO "ObjectTwo"; @@ -21,290 +21,290 @@ #define NONE_REPLY_STRING "NoneMethod" -const gchar *test_interface_One = \ -"<interface name=\"test.interface.One\">" -" <method name=\"null\"/>" -" <method name=\"getInt\">" -" <arg direction=\"out\" type=\"o\"/>" -" </method>" -" <method name=\"setInt\">" -" <arg direction=\"in\" type=\"o\"/>" -" </method>" -" <method name=\"getString\">" -" <arg direction=\"out\" type=\"s\"/>" -" </method>" -" <method name=\"setString\">" -" <arg direction=\"in\" type=\"s\"/>" -" </method>" -"</interface>"; - -const gchar *test_interface_Two = \ -"<interface name=\"test.interface.One\">" -" <method name=\"null\"/>" -" <method name=\"getInt\">" -" <arg direction=\"out\" type=\"o\"/>" -" </method>" -" <method name=\"setInt\">" -" <arg direction=\"in\" type=\"o\"/>" -" </method>" -" <method name=\"getString\">" -" <arg direction=\"out\" type=\"s\"/>" -" </method>" -" <method name=\"setString\">" -" <arg direction=\"in\" type=\"s\"/>" -" </method>" -"</interface>"; +const gchar *test_interface_One = + "<interface name=\"test.interface.One\">" + " <method name=\"null\"/>" + " <method name=\"getInt\">" + " <arg direction=\"out\" type=\"o\"/>" + " </method>" + " <method name=\"setInt\">" + " <arg direction=\"in\" type=\"o\"/>" + " </method>" + " <method name=\"getString\">" + " <arg direction=\"out\" type=\"s\"/>" + " </method>" + " <method name=\"setString\">" + " <arg direction=\"in\" type=\"s\"/>" + " </method>" + "</interface>"; + +const gchar *test_interface_Two = + "<interface name=\"test.interface.One\">" + " <method name=\"null\"/>" + " <method name=\"getInt\">" + " <arg direction=\"out\" type=\"o\"/>" + " </method>" + " <method name=\"setInt\">" + " <arg direction=\"in\" type=\"o\"/>" + " </method>" + " <method name=\"getString\">" + " <arg direction=\"out\" type=\"s\"/>" + " </method>" + " <method name=\"setString\">" + " <arg direction=\"in\" type=\"s\"/>" + " </method>" + "</interface>"; typedef struct _AnObject { - gchar *astring; - guint *anint; + gchar *astring; + guint *anint; } AnObject; static DBusConnection *bus; -static GMainLoop *main_loop; -static gboolean success = TRUE; +static GMainLoop *main_loop; +static gboolean success = TRUE; static DBusMessage * impl_null (DBusConnection *bus, DBusMessage *message, void *user_data) { - DBusMessage *reply; + DBusMessage *reply; - reply = dbus_message_new_method_return (message); - return reply; + reply = dbus_message_new_method_return (message); + return reply; } static DBusMessage * impl_getInt (DBusConnection *bus, DBusMessage *message, void *user_data) { - AnObject *object = (AnObject *) user_data; - DBusMessage *reply; - DBusError error; + AnObject *object = (AnObject *) user_data; + DBusMessage *reply; + DBusError error; - dbus_error_init (&error); + dbus_error_init (&error); - reply = dbus_message_new_method_return (message); - dbus_message_append_args (reply, DBUS_TYPE_INT32, &(object->anint), DBUS_TYPE_INVALID); - return reply; + reply = dbus_message_new_method_return (message); + dbus_message_append_args (reply, DBUS_TYPE_INT32, &(object->anint), DBUS_TYPE_INVALID); + return reply; } static DBusMessage * impl_setInt (DBusConnection *bus, DBusMessage *message, void *user_data) { - AnObject *object = (AnObject *) user_data; - DBusMessage *reply; - DBusError error; + AnObject *object = (AnObject *) user_data; + DBusMessage *reply; + DBusError error; - dbus_error_init (&error); + dbus_error_init (&error); - dbus_message_get_args (message, &error, DBUS_TYPE_INT32, &(object->anint), DBUS_TYPE_INVALID); + dbus_message_get_args (message, &error, DBUS_TYPE_INT32, &(object->anint), DBUS_TYPE_INVALID); - reply = dbus_message_new_method_return (message); - return reply; + reply = dbus_message_new_method_return (message); + return reply; } static DBusMessage * impl_getString (DBusConnection *bus, DBusMessage *message, void *user_data) { - AnObject *object = (AnObject *) user_data; - DBusMessage *reply; - DBusError error; + AnObject *object = (AnObject *) user_data; + DBusMessage *reply; + DBusError error; - dbus_error_init (&error); + dbus_error_init (&error); - reply = dbus_message_new_method_return (message); - dbus_message_append_args (reply, DBUS_TYPE_STRING, &(object->astring), DBUS_TYPE_INVALID); - return reply; + reply = dbus_message_new_method_return (message); + dbus_message_append_args (reply, DBUS_TYPE_STRING, &(object->astring), DBUS_TYPE_INVALID); + return reply; } static DBusMessage * impl_setString (DBusConnection *bus, DBusMessage *message, void *user_data) { - AnObject *object = (AnObject *) user_data; - DBusMessage *reply; - DBusError error; + AnObject *object = (AnObject *) user_data; + DBusMessage *reply; + DBusError error; - dbus_error_init (&error); + dbus_error_init (&error); - g_free (object->astring); - dbus_message_get_args (message, &error, DBUS_TYPE_STRING, &(object->astring), DBUS_TYPE_INVALID); + g_free (object->astring); + dbus_message_get_args (message, &error, DBUS_TYPE_STRING, &(object->astring), DBUS_TYPE_INVALID); - reply = dbus_message_new_method_return (message); - return reply; + reply = dbus_message_new_method_return (message); + return reply; } static DBusMessage * impl_getInterfaceOne (DBusConnection *bus, DBusMessage *message, void *user_data) { - DBusMessage *reply; - DBusError error; - gchar *itf = TEST_INTERFACE_ONE; + DBusMessage *reply; + DBusError error; + gchar *itf = TEST_INTERFACE_ONE; - dbus_error_init (&error); + dbus_error_init (&error); - reply = dbus_message_new_method_return (message); - dbus_message_append_args (reply, DBUS_TYPE_STRING, &itf, DBUS_TYPE_INVALID); - return reply; + reply = dbus_message_new_method_return (message); + dbus_message_append_args (reply, DBUS_TYPE_STRING, &itf, DBUS_TYPE_INVALID); + return reply; } static DBusMessage * impl_getInterfaceTwo (DBusConnection *bus, DBusMessage *message, void *user_data) { - DBusMessage *reply; - DBusError error; - gchar *itf = TEST_INTERFACE_TWO; + DBusMessage *reply; + DBusError error; + gchar *itf = TEST_INTERFACE_TWO; - dbus_error_init (&error); + dbus_error_init (&error); - reply = dbus_message_new_method_return (message); - dbus_message_append_args (reply, DBUS_TYPE_STRING, &itf, DBUS_TYPE_INVALID); - return reply; + reply = dbus_message_new_method_return (message); + dbus_message_append_args (reply, DBUS_TYPE_STRING, &itf, DBUS_TYPE_INVALID); + return reply; } static DRouteMethod test_methods_one[] = { - {impl_null, "null"}, - {impl_getInt, "getInt"}, - {impl_setInt, "setInt"}, - {impl_getString, "getString"}, - {impl_setString, "setString"}, - {impl_getInterfaceOne, "getInterfaceOne"}, - {NULL, NULL} + { impl_null, "null" }, + { impl_getInt, "getInt" }, + { impl_setInt, "setInt" }, + { impl_getString, "getString" }, + { impl_setString, "setString" }, + { impl_getInterfaceOne, "getInterfaceOne" }, + { NULL, NULL } }; static DRouteMethod test_methods_two[] = { - {impl_null, "null"}, - {impl_getInt, "getInt"}, - {impl_setInt, "setInt"}, - {impl_getString, "getString"}, - {impl_setString, "setString"}, - {impl_getInterfaceTwo, "getInterfaceTwo"}, - {NULL, NULL} + { impl_null, "null" }, + { impl_getInt, "getInt" }, + { impl_setInt, "setInt" }, + { impl_getString, "getString" }, + { impl_setString, "setString" }, + { impl_getInterfaceTwo, "getInterfaceTwo" }, + { NULL, NULL } }; static DRouteProperty test_properties[] = { - {NULL, NULL, NULL} + { NULL, NULL, NULL } }; static void set_reply (DBusPendingCall *pending, void *user_data) { - void **replyptr = (void **)user_data; + void **replyptr = (void **) user_data; - *replyptr = dbus_pending_call_steal_reply (pending); + *replyptr = dbus_pending_call_steal_reply (pending); } static DBusMessage * send_and_allow_reentry (DBusConnection *bus, DBusMessage *message, DBusError *error) { - DBusPendingCall *pending; - DBusMessage *reply = NULL; + DBusPendingCall *pending; + DBusMessage *reply = NULL; - if (!dbus_connection_send_with_reply (bus, message, &pending, -1)) + if (!dbus_connection_send_with_reply (bus, message, &pending, -1)) { - return NULL; + return NULL; } - dbus_pending_call_set_notify (pending, set_reply, (void *)&reply, NULL); - while (!reply) + dbus_pending_call_set_notify (pending, set_reply, (void *) &reply, NULL); + while (!reply) { if (!dbus_connection_read_write_dispatch (bus, -1)) return NULL; } - return reply; + return reply; } gboolean do_tests_func (gpointer data) { - DBusError error; - const gchar *bus_name; + DBusError error; + const gchar *bus_name; DBusMessage *message, *reply; - gchar *expected_string; - gchar *result_string; + gchar *expected_string; + gchar *result_string; - dbus_error_init (&error); - bus_name = dbus_bus_get_unique_name (bus); + dbus_error_init (&error); + bus_name = dbus_bus_get_unique_name (bus); - /* --------------------------------------------------------*/ + /* --------------------------------------------------------*/ - message = dbus_message_new_method_call (bus_name, - TEST_OBJECT_PATH, - TEST_INTERFACE_ONE, - "null"); - reply = send_and_allow_reentry (bus, message, NULL); - dbus_message_unref (message); - if (reply) - dbus_message_unref (reply); + message = dbus_message_new_method_call (bus_name, + TEST_OBJECT_PATH, + TEST_INTERFACE_ONE, + "null"); + reply = send_and_allow_reentry (bus, message, NULL); + dbus_message_unref (message); + if (reply) + dbus_message_unref (reply); - /* --------------------------------------------------------*/ + /* --------------------------------------------------------*/ - expected_string = TEST_INTERFACE_ONE; - result_string = NULL; - message = dbus_message_new_method_call (bus_name, - TEST_OBJECT_PATH, - TEST_INTERFACE_ONE, - "getInterfaceOne"); - reply = send_and_allow_reentry (bus, message, NULL); + expected_string = TEST_INTERFACE_ONE; + result_string = NULL; + message = dbus_message_new_method_call (bus_name, + TEST_OBJECT_PATH, + TEST_INTERFACE_ONE, + "getInterfaceOne"); + reply = send_and_allow_reentry (bus, message, NULL); dbus_message_unref (message); - dbus_message_get_args (reply, NULL, DBUS_TYPE_STRING, &result_string, - DBUS_TYPE_INVALID); - dbus_message_unref (reply); - if (g_strcmp0(expected_string, result_string)) + dbus_message_get_args (reply, NULL, DBUS_TYPE_STRING, &result_string, + DBUS_TYPE_INVALID); + dbus_message_unref (reply); + if (g_strcmp0 (expected_string, result_string)) { - g_print ("Failed: reply to getInterfaceOne was %s; expected %s\n", - result_string, expected_string); - exit (1); + g_print ("Failed: reply to getInterfaceOne was %s; expected %s\n", + result_string, expected_string); + exit (1); } - /* --------------------------------------------------------*/ + /* --------------------------------------------------------*/ - g_main_loop_quit (main_loop); - return FALSE; + g_main_loop_quit (main_loop); + return FALSE; } - -int main (int argc, char **argv) +int +main (int argc, char **argv) { - DRouteContext *cnx; - DRoutePath *path; - AnObject *object; - DBusError error; + DRouteContext *cnx; + DRoutePath *path; + AnObject *object; + DBusError error; - /* Setup some server object */ + /* Setup some server object */ - object = g_new0(AnObject, 1); - object->astring = g_strdup (STRING_ONE); - object->anint = INT_ONE; + object = g_new0 (AnObject, 1); + object->astring = g_strdup (STRING_ONE); + object->anint = INT_ONE; - dbus_error_init (&error); - main_loop = g_main_loop_new(NULL, FALSE); - bus = dbus_bus_get (DBUS_BUS_SESSION, &error); - atspi_dbus_connection_setup_with_g_main(bus, g_main_context_default()); + dbus_error_init (&error); + main_loop = g_main_loop_new (NULL, FALSE); + bus = dbus_bus_get (DBUS_BUS_SESSION, &error); + atspi_dbus_connection_setup_with_g_main (bus, g_main_context_default ()); - cnx = droute_new (); - path = droute_add_one (cnx, TEST_OBJECT_PATH, object); + cnx = droute_new (); + path = droute_add_one (cnx, TEST_OBJECT_PATH, object); - droute_path_add_interface (path, - TEST_INTERFACE_ONE, - test_interface_One, - test_methods_one, - test_properties); + droute_path_add_interface (path, + TEST_INTERFACE_ONE, + test_interface_One, + test_methods_one, + test_properties); - droute_path_add_interface (path, - TEST_INTERFACE_TWO, - test_interface_Two, - test_methods_two, - test_properties); + droute_path_add_interface (path, + TEST_INTERFACE_TWO, + test_interface_Two, + test_methods_two, + test_properties); - droute_path_register (path, bus); + droute_path_register (path, bus); - g_idle_add (do_tests_func, NULL); - g_main_loop_run(main_loop); + g_idle_add (do_tests_func, NULL); + g_main_loop_run (main_loop); - droute_free (cnx); + droute_free (cnx); - if (success) - return 0; - else - return 1; + if (success) + return 0; + else + return 1; } diff --git a/droute/droute-variant.c b/droute/droute-variant.c index b877bb74..b6ebb721 100644 --- a/droute/droute-variant.c +++ b/droute/droute-variant.c @@ -20,9 +20,9 @@ * Boston, MA 02110-1301, USA. */ +#include "glib.h" #include <stdlib.h> #include <string.h> -#include "glib.h" #include "droute-variant.h" @@ -31,69 +31,65 @@ dbus_bool_t droute_return_v_int32 (DBusMessageIter *iter, dbus_int32_t val) { - DBusMessageIter sub; - - if (!dbus_message_iter_open_container - (iter, DBUS_TYPE_VARIANT, DBUS_TYPE_INT32_AS_STRING, &sub)) - { - return FALSE; - } - dbus_message_iter_append_basic (&sub, DBUS_TYPE_INT32, &val); - dbus_message_iter_close_container (iter, &sub); - return TRUE; + DBusMessageIter sub; + + if (!dbus_message_iter_open_container (iter, DBUS_TYPE_VARIANT, DBUS_TYPE_INT32_AS_STRING, &sub)) + { + return FALSE; + } + dbus_message_iter_append_basic (&sub, DBUS_TYPE_INT32, &val); + dbus_message_iter_close_container (iter, &sub); + return TRUE; } dbus_bool_t droute_return_v_double (DBusMessageIter *iter, double val) { - DBusMessageIter sub; - - if (!dbus_message_iter_open_container - (iter, DBUS_TYPE_VARIANT, DBUS_TYPE_DOUBLE_AS_STRING, &sub)) - { - return FALSE; - } - dbus_message_iter_append_basic (&sub, DBUS_TYPE_DOUBLE, &val); - dbus_message_iter_close_container (iter, &sub); - return TRUE; + DBusMessageIter sub; + + if (!dbus_message_iter_open_container (iter, DBUS_TYPE_VARIANT, DBUS_TYPE_DOUBLE_AS_STRING, &sub)) + { + return FALSE; + } + dbus_message_iter_append_basic (&sub, DBUS_TYPE_DOUBLE, &val); + dbus_message_iter_close_container (iter, &sub); + return TRUE; } dbus_bool_t droute_return_v_string (DBusMessageIter *iter, const char *val) { - DBusMessageIter sub; + DBusMessageIter sub; - if (!val) + if (!val) + val = ""; + if (!g_utf8_validate (val, -1, NULL)) + { + g_warning ("droute: Received bad UTF-8 string"); val = ""; - if (!g_utf8_validate (val, -1, NULL)) - { - g_warning ("droute: Received bad UTF-8 string"); - val = ""; - } - - if (!dbus_message_iter_open_container - (iter, DBUS_TYPE_VARIANT, DBUS_TYPE_STRING_AS_STRING, &sub)) - { - return FALSE; - } - dbus_message_iter_append_basic (&sub, DBUS_TYPE_STRING, &val); - dbus_message_iter_close_container (iter, &sub); - return TRUE; + } + + if (!dbus_message_iter_open_container (iter, DBUS_TYPE_VARIANT, DBUS_TYPE_STRING_AS_STRING, &sub)) + { + return FALSE; + } + dbus_message_iter_append_basic (&sub, DBUS_TYPE_STRING, &val); + dbus_message_iter_close_container (iter, &sub); + return TRUE; } dbus_bool_t droute_return_v_object (DBusMessageIter *iter, const char *path) { - DBusMessageIter sub; - - if (!dbus_message_iter_open_container - (iter, DBUS_TYPE_VARIANT, DBUS_TYPE_OBJECT_PATH_AS_STRING, &sub)) - { - return FALSE; - } - dbus_message_iter_append_basic (&sub, DBUS_TYPE_OBJECT_PATH, &path); - dbus_message_iter_close_container (iter, &sub); - return TRUE; + DBusMessageIter sub; + + if (!dbus_message_iter_open_container (iter, DBUS_TYPE_VARIANT, DBUS_TYPE_OBJECT_PATH_AS_STRING, &sub)) + { + return FALSE; + } + dbus_message_iter_append_basic (&sub, DBUS_TYPE_OBJECT_PATH, &path); + dbus_message_iter_close_container (iter, &sub); + return TRUE; } /*---------------------------------------------------------------------------*/ @@ -101,25 +97,25 @@ droute_return_v_object (DBusMessageIter *iter, const char *path) dbus_int32_t droute_get_v_int32 (DBusMessageIter *iter) { - DBusMessageIter sub; - dbus_int32_t rv; + DBusMessageIter sub; + dbus_int32_t rv; - // TODO- ensure we have the correct type - dbus_message_iter_recurse (iter, &sub); - dbus_message_iter_get_basic (&sub, &rv); - return rv; + // TODO- ensure we have the correct type + dbus_message_iter_recurse (iter, &sub); + dbus_message_iter_get_basic (&sub, &rv); + return rv; } const char * droute_get_v_string (DBusMessageIter *iter) { - DBusMessageIter sub; - char *rv; + DBusMessageIter sub; + char *rv; - // TODO- ensure we have the correct type - dbus_message_iter_recurse (iter, &sub); - dbus_message_iter_get_basic (&sub, &rv); - return rv; + // TODO- ensure we have the correct type + dbus_message_iter_recurse (iter, &sub); + dbus_message_iter_get_basic (&sub, &rv); + return rv; } /*END------------------------------------------------------------------------*/ diff --git a/droute/droute-variant.h b/droute/droute-variant.h index 4fa07193..ca0da2df 100644 --- a/droute/droute-variant.h +++ b/droute/droute-variant.h @@ -24,12 +24,12 @@ #include <dbus/dbus.h> -dbus_bool_t droute_return_v_int32 (DBusMessageIter *iter, dbus_int32_t val); -dbus_bool_t droute_return_v_double (DBusMessageIter *iter, double val); -dbus_bool_t droute_return_v_string (DBusMessageIter *iter, const char *val); -dbus_bool_t droute_return_v_object (DBusMessageIter *iter, const char *path); +dbus_bool_t droute_return_v_int32 (DBusMessageIter *iter, dbus_int32_t val); +dbus_bool_t droute_return_v_double (DBusMessageIter *iter, double val); +dbus_bool_t droute_return_v_string (DBusMessageIter *iter, const char *val); +dbus_bool_t droute_return_v_object (DBusMessageIter *iter, const char *path); -dbus_int32_t droute_get_v_int32 (DBusMessageIter *iter); -const char *droute_get_v_string (DBusMessageIter *iter); +dbus_int32_t droute_get_v_int32 (DBusMessageIter *iter); +const char *droute_get_v_string (DBusMessageIter *iter); -#endif /* _DROUTE_VARIANT_H */ +#endif /* _DROUTE_VARIANT_H */ diff --git a/droute/droute.c b/droute/droute.c index 2c698756..45c0e09e 100644 --- a/droute/droute.c +++ b/droute/droute.c @@ -21,54 +21,54 @@ * Boston, MA 02110-1301, USA. */ +#include <stdio.h> #include <stdlib.h> #include <string.h> -#include <stdio.h> -#include "droute.h" #include "droute-pairhash.h" +#include "droute.h" #define CHUNKS_DEFAULT (512) #define oom() g_error ("D-Bus out of memory, this message will fail anyway") #if defined DROUTE_DEBUG - #define _DROUTE_DEBUG(format, args...) g_print (format , ## args) +#define _DROUTE_DEBUG(format, args...) g_print (format, ##args) #else - #define _DROUTE_DEBUG(format, args...) +#define _DROUTE_DEBUG(format, args...) #endif struct _DRouteContext { - GPtrArray *registered_paths; + GPtrArray *registered_paths; - gchar *introspect_string; + gchar *introspect_string; }; struct _DRoutePath { - DRouteContext *cnx; - gchar *path; - gboolean prefix; - GStringChunk *chunks; - GPtrArray *interfaces; - GPtrArray *introspection; - GHashTable *methods; - GHashTable *properties; - - DRouteIntrospectChildrenFunction introspect_children_cb; - void *introspect_children_data; - void *user_data; - DRouteGetDatumFunction get_datum; - DRouteQueryInterfaceFunction query_interface_cb; + DRouteContext *cnx; + gchar *path; + gboolean prefix; + GStringChunk *chunks; + GPtrArray *interfaces; + GPtrArray *introspection; + GHashTable *methods; + GHashTable *properties; + + DRouteIntrospectChildrenFunction introspect_children_cb; + void *introspect_children_data; + void *user_data; + DRouteGetDatumFunction get_datum; + DRouteQueryInterfaceFunction query_interface_cb; }; /*---------------------------------------------------------------------------*/ typedef struct PropertyPair { - DRoutePropertyFunction get; - DRoutePropertyFunction set; + DRoutePropertyFunction get; + DRoutePropertyFunction set; } PropertyPair; /*---------------------------------------------------------------------------*/ @@ -85,60 +85,60 @@ static DRoutePath * path_new (DRouteContext *cnx, const char *path, gboolean prefix, - void *user_data, + void *user_data, DRouteIntrospectChildrenFunction introspect_children_cb, void *introspect_children_data, DRouteGetDatumFunction get_datum, DRouteQueryInterfaceFunction query_interface_cb) { - DRoutePath *new_path; - - new_path = g_new0 (DRoutePath, 1); - new_path->cnx = cnx; - new_path->path = g_strdup (path); - new_path->prefix = prefix; - new_path->chunks = g_string_chunk_new (CHUNKS_DEFAULT); - new_path->interfaces = g_ptr_array_new (); - new_path->introspection = g_ptr_array_new (); - - new_path->methods = g_hash_table_new_full ((GHashFunc)str_pair_hash, - str_pair_equal, - g_free, - NULL); - - new_path->properties = g_hash_table_new_full ((GHashFunc)str_pair_hash, - str_pair_equal, - g_free, - g_free); - - new_path->introspect_children_cb = introspect_children_cb; - new_path->introspect_children_data = introspect_children_data; - new_path->user_data = user_data; - new_path->get_datum = get_datum; - new_path->query_interface_cb = query_interface_cb; - - return new_path; + DRoutePath *new_path; + + new_path = g_new0 (DRoutePath, 1); + new_path->cnx = cnx; + new_path->path = g_strdup (path); + new_path->prefix = prefix; + new_path->chunks = g_string_chunk_new (CHUNKS_DEFAULT); + new_path->interfaces = g_ptr_array_new (); + new_path->introspection = g_ptr_array_new (); + + new_path->methods = g_hash_table_new_full ((GHashFunc) str_pair_hash, + str_pair_equal, + g_free, + NULL); + + new_path->properties = g_hash_table_new_full ((GHashFunc) str_pair_hash, + str_pair_equal, + g_free, + g_free); + + new_path->introspect_children_cb = introspect_children_cb; + new_path->introspect_children_data = introspect_children_data; + new_path->user_data = user_data; + new_path->get_datum = get_datum; + new_path->query_interface_cb = query_interface_cb; + + return new_path; } static void path_free (DRoutePath *path, gpointer user_data) { - g_free (path->path); - g_string_chunk_free (path->chunks); - g_ptr_array_free (path->interfaces, TRUE); - g_free(g_ptr_array_free (path->introspection, FALSE)); - g_hash_table_destroy (path->methods); - g_hash_table_destroy (path->properties); - g_free (path); + g_free (path->path); + g_string_chunk_free (path->chunks); + g_ptr_array_free (path->interfaces, TRUE); + g_free (g_ptr_array_free (path->introspection, FALSE)); + g_hash_table_destroy (path->methods); + g_hash_table_destroy (path->properties); + g_free (path); } static void * path_get_datum (DRoutePath *path, const gchar *pathstr) { - if (path->get_datum != NULL) - return (path->get_datum) (pathstr, path->user_data); - else - return path->user_data; + if (path->get_datum != NULL) + return (path->get_datum) (pathstr, path->user_data); + else + return path->user_data; } /*---------------------------------------------------------------------------*/ @@ -146,28 +146,27 @@ path_get_datum (DRoutePath *path, const gchar *pathstr) DRouteContext * droute_new () { - DRouteContext *cnx; + DRouteContext *cnx; - cnx = g_new0 (DRouteContext, 1); - cnx->registered_paths = g_ptr_array_new (); + cnx = g_new0 (DRouteContext, 1); + cnx->registered_paths = g_ptr_array_new (); - return cnx; + return cnx; } void droute_free (DRouteContext *cnx) { - g_ptr_array_foreach (cnx->registered_paths, (GFunc) path_free, NULL); - g_ptr_array_free (cnx->registered_paths, TRUE); - g_free (cnx); + g_ptr_array_foreach (cnx->registered_paths, (GFunc) path_free, NULL); + g_ptr_array_free (cnx->registered_paths, TRUE); + g_free (cnx); } /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ -static DBusObjectPathVTable droute_vtable = -{ +static DBusObjectPathVTable droute_vtable = { NULL, &handle_message, NULL, NULL, NULL, NULL @@ -175,73 +174,73 @@ static DBusObjectPathVTable droute_vtable = DRoutePath * droute_add_one (DRouteContext *cnx, - const char *path, - const void *data) + const char *path, + const void *data) { - DRoutePath *new_path; + DRoutePath *new_path; - new_path = path_new (cnx, path, FALSE, (void *)data, NULL, NULL, NULL, - NULL); + new_path = path_new (cnx, path, FALSE, (void *) data, NULL, NULL, NULL, + NULL); - g_ptr_array_add (cnx->registered_paths, new_path); - return new_path; + g_ptr_array_add (cnx->registered_paths, new_path); + return new_path; } DRoutePath * droute_add_many (DRouteContext *cnx, - const char *path, - const void *data, + const char *path, + const void *data, DRouteIntrospectChildrenFunction introspect_children_cb, void *introspect_children_data, const DRouteGetDatumFunction get_datum, const DRouteQueryInterfaceFunction query_interface_cb) { - DRoutePath *new_path; + DRoutePath *new_path; - new_path = path_new (cnx, path, TRUE, (void *) data, - introspect_children_cb, introspect_children_data, - get_datum, query_interface_cb); + new_path = path_new (cnx, path, TRUE, (void *) data, + introspect_children_cb, introspect_children_data, + get_datum, query_interface_cb); - g_ptr_array_add (cnx->registered_paths, new_path); - return new_path; + g_ptr_array_add (cnx->registered_paths, new_path); + return new_path; } /*---------------------------------------------------------------------------*/ void -droute_path_add_interface(DRoutePath *path, - const char *name, - const char *introspect, - const DRouteMethod *methods, - const DRouteProperty *properties) +droute_path_add_interface (DRoutePath *path, + const char *name, + const char *introspect, + const DRouteMethod *methods, + const DRouteProperty *properties) { - gchar *itf; - - g_return_if_fail (name != NULL); + gchar *itf; - itf = g_string_chunk_insert (path->chunks, name); - g_ptr_array_add (path->interfaces, itf); - g_ptr_array_add (path->introspection, (gpointer) introspect); + g_return_if_fail (name != NULL); - for (; methods != NULL && methods->name != NULL; methods++) - { - gchar *meth; + itf = g_string_chunk_insert (path->chunks, name); + g_ptr_array_add (path->interfaces, itf); + g_ptr_array_add (path->introspection, (gpointer) introspect); - meth = g_string_chunk_insert (path->chunks, methods->name); - g_hash_table_insert (path->methods, str_pair_new (itf, meth), methods->func); - } + for (; methods != NULL && methods->name != NULL; methods++) + { + gchar *meth; - for (; properties != NULL && properties->name != NULL; properties++) - { - gchar *prop; - PropertyPair *pair; + meth = g_string_chunk_insert (path->chunks, methods->name); + g_hash_table_insert (path->methods, str_pair_new (itf, meth), methods->func); + } - prop = g_string_chunk_insert (path->chunks, properties->name); - pair = g_new (PropertyPair, 1); - pair->get = properties->get; - pair->set = properties->set; - g_hash_table_insert (path->properties, str_pair_new (itf, prop), pair); - } + for (; properties != NULL && properties->name != NULL; properties++) + { + gchar *prop; + PropertyPair *pair; + + prop = g_string_chunk_insert (path->chunks, properties->name); + pair = g_new (PropertyPair, 1); + pair->get = properties->get; + pair->set = properties->set; + g_hash_table_insert (path->properties, str_pair_new (itf, prop), pair); + } } /*---------------------------------------------------------------------------*/ @@ -251,162 +250,159 @@ droute_path_add_interface(DRoutePath *path, */ static DBusMessage * impl_prop_GetAll (DBusMessage *message, - DRoutePath *path, - const char *pathstr) + DRoutePath *path, + const char *pathstr) { - DBusMessageIter iter, iter_dict, iter_dict_entry; - DBusMessage *reply; - DBusError error; - GHashTableIter prop_iter; - - StrPair *key; - PropertyPair *value; - gchar *iface; - - void *datum = path_get_datum (path, pathstr); - if (!datum) - return droute_object_does_not_exist_error (message); - - dbus_error_init (&error); - if (!dbus_message_get_args - (message, &error, DBUS_TYPE_STRING, &iface, DBUS_TYPE_INVALID)) - { - DBusMessage *ret; - ret = dbus_message_new_error (message, DBUS_ERROR_FAILED, error.message); - dbus_error_free (&error); - return ret; - } - - if (path->query_interface_cb && - !path->query_interface_cb (datum, iface)) - return dbus_message_new_error (message, DBUS_ERROR_UNKNOWN_PROPERTY, "Property unavailable"); - - reply = dbus_message_new_method_return (message); - if (!reply) - oom (); - - dbus_message_iter_init_append (reply, &iter); - if (!dbus_message_iter_open_container - (&iter, DBUS_TYPE_ARRAY, "{sv}", &iter_dict)) - oom (); - - g_hash_table_iter_init (&prop_iter, path->properties); - while (g_hash_table_iter_next (&prop_iter, (gpointer*)&key, (gpointer*)&value)) - { - if (!g_strcmp0 (key->one, iface)) - { - if (!value->get) - continue; - if (!dbus_message_iter_open_container - (&iter_dict, DBUS_TYPE_DICT_ENTRY, NULL, &iter_dict_entry)) - oom (); - dbus_message_iter_append_basic (&iter_dict_entry, DBUS_TYPE_STRING, - &key->two); - (value->get) (&iter_dict_entry, datum); - if (!dbus_message_iter_close_container (&iter_dict, &iter_dict_entry)) - oom (); - } - } - - if (!dbus_message_iter_close_container (&iter, &iter_dict)) - oom (); - return reply; + DBusMessageIter iter, iter_dict, iter_dict_entry; + DBusMessage *reply; + DBusError error; + GHashTableIter prop_iter; + + StrPair *key; + PropertyPair *value; + gchar *iface; + + void *datum = path_get_datum (path, pathstr); + if (!datum) + return droute_object_does_not_exist_error (message); + + dbus_error_init (&error); + if (!dbus_message_get_args (message, &error, DBUS_TYPE_STRING, &iface, DBUS_TYPE_INVALID)) + { + DBusMessage *ret; + ret = dbus_message_new_error (message, DBUS_ERROR_FAILED, error.message); + dbus_error_free (&error); + return ret; + } + + if (path->query_interface_cb && + !path->query_interface_cb (datum, iface)) + return dbus_message_new_error (message, DBUS_ERROR_UNKNOWN_PROPERTY, "Property unavailable"); + + reply = dbus_message_new_method_return (message); + if (!reply) + oom (); + + dbus_message_iter_init_append (reply, &iter); + if (!dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, "{sv}", &iter_dict)) + oom (); + + g_hash_table_iter_init (&prop_iter, path->properties); + while (g_hash_table_iter_next (&prop_iter, (gpointer *) &key, (gpointer *) &value)) + { + if (!g_strcmp0 (key->one, iface)) + { + if (!value->get) + continue; + if (!dbus_message_iter_open_container (&iter_dict, DBUS_TYPE_DICT_ENTRY, NULL, &iter_dict_entry)) + oom (); + dbus_message_iter_append_basic (&iter_dict_entry, DBUS_TYPE_STRING, + &key->two); + (value->get) (&iter_dict_entry, datum); + if (!dbus_message_iter_close_container (&iter_dict, &iter_dict_entry)) + oom (); + } + } + + if (!dbus_message_iter_close_container (&iter, &iter_dict)) + oom (); + return reply; } static DBusMessage * impl_prop_GetSet (DBusMessage *message, - DRoutePath *path, - const char *pathstr, - gboolean get) + DRoutePath *path, + const char *pathstr, + gboolean get) { - DBusMessage *reply = NULL; - DBusError error; - - StrPair pair; - PropertyPair *prop_funcs = NULL; - - void *datum; - - dbus_error_init (&error); - if (!dbus_message_get_args (message, - &error, - DBUS_TYPE_STRING, - &(pair.one), - DBUS_TYPE_STRING, - &(pair.two), - DBUS_TYPE_INVALID)) - { - DBusMessage *ret; - ret = dbus_message_new_error (message, DBUS_ERROR_FAILED, error.message); - dbus_error_free (&error); - return ret; - } - - _DROUTE_DEBUG ("DRoute (handle prop): %s|%s on %s\n", pair.one, pair.two, pathstr); - - prop_funcs = (PropertyPair *) g_hash_table_lookup (path->properties, &pair); - if (!prop_funcs) - { - DBusMessage *ret; - ret = dbus_message_new_error (message, DBUS_ERROR_UNKNOWN_PROPERTY, "Property unavailable"); - dbus_error_free (&error); - return ret; - } - - datum = path_get_datum (path, pathstr); - if (!datum) - return droute_object_does_not_exist_error (message); - - if (get && prop_funcs->get) - { - - DBusMessageIter iter; - - _DROUTE_DEBUG ("DRoute (handle prop Get): %s|%s on %s\n", pair.one, pair.two, pathstr); - - reply = dbus_message_new_method_return (message); - dbus_message_iter_init_append (reply, &iter); - if (!(prop_funcs->get) (&iter, datum)) - { - dbus_message_unref (reply); - reply = dbus_message_new_error (message, DBUS_ERROR_FAILED, "Get failed"); - } - } - else if (!get && prop_funcs->set) - { - DBusMessageIter iter; - - _DROUTE_DEBUG ("DRoute (handle prop Get): %s|%s on %s\n", pair.one, pair.two, pathstr); - - dbus_message_iter_init (message, &iter); - /* Skip the interface and property name */ - dbus_message_iter_next(&iter); - dbus_message_iter_next(&iter); - (prop_funcs->set) (&iter, datum); - - reply = dbus_message_new_method_return (message); - } - else if (!get) - { - reply = dbus_message_new_error (message, DBUS_ERROR_PROPERTY_READ_ONLY, "Property is read-only"); - } - else - { - reply = dbus_message_new_error (message, DBUS_ERROR_FAILED, "Getter or setter unavailable"); - } - - return reply; + DBusMessage *reply = NULL; + DBusError error; + + StrPair pair; + PropertyPair *prop_funcs = NULL; + + void *datum; + + dbus_error_init (&error); + if (!dbus_message_get_args (message, + &error, + DBUS_TYPE_STRING, + &(pair.one), + DBUS_TYPE_STRING, + &(pair.two), + DBUS_TYPE_INVALID)) + { + DBusMessage *ret; + ret = dbus_message_new_error (message, DBUS_ERROR_FAILED, error.message); + dbus_error_free (&error); + return ret; + } + + _DROUTE_DEBUG ("DRoute (handle prop): %s|%s on %s\n", pair.one, pair.two, pathstr); + + prop_funcs = (PropertyPair *) g_hash_table_lookup (path->properties, &pair); + if (!prop_funcs) + { + DBusMessage *ret; + ret = dbus_message_new_error (message, DBUS_ERROR_UNKNOWN_PROPERTY, "Property unavailable"); + dbus_error_free (&error); + return ret; + } + + datum = path_get_datum (path, pathstr); + if (!datum) + return droute_object_does_not_exist_error (message); + + if (get && prop_funcs->get) + { + + DBusMessageIter iter; + + _DROUTE_DEBUG ("DRoute (handle prop Get): %s|%s on %s\n", pair.one, pair.two, pathstr); + + reply = dbus_message_new_method_return (message); + dbus_message_iter_init_append (reply, &iter); + if (!(prop_funcs->get) (&iter, datum)) + { + dbus_message_unref (reply); + reply = dbus_message_new_error (message, DBUS_ERROR_FAILED, "Get failed"); + } + } + else if (!get && prop_funcs->set) + { + DBusMessageIter iter; + + _DROUTE_DEBUG ("DRoute (handle prop Get): %s|%s on %s\n", pair.one, pair.two, pathstr); + + dbus_message_iter_init (message, &iter); + /* Skip the interface and property name */ + dbus_message_iter_next (&iter); + dbus_message_iter_next (&iter); + (prop_funcs->set) (&iter, datum); + + reply = dbus_message_new_method_return (message); + } + else if (!get) + { + reply = dbus_message_new_error (message, DBUS_ERROR_PROPERTY_READ_ONLY, "Property is read-only"); + } + else + { + reply = dbus_message_new_error (message, DBUS_ERROR_FAILED, "Getter or setter unavailable"); + } + + return reply; } static DBusHandlerResult handle_dbus (DBusConnection *bus, - DBusMessage *message, - const gchar *iface, - const gchar *member, - const gchar *pathstr) + DBusMessage *message, + const gchar *iface, + const gchar *member, + const gchar *pathstr) { static int id = 1; - char *id_str = (char *) g_malloc(40); + char *id_str = (char *) g_malloc (40); DBusMessage *reply; if (strcmp (iface, DBUS_INTERFACE_DBUS) != 0 || @@ -416,166 +412,166 @@ handle_dbus (DBusConnection *bus, return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } - /* TODO: Fix this hack (we don't handle wrap-around, for instance) */ - sprintf (id_str, ":1.%d", id++); - reply = dbus_message_new_method_return (message); - dbus_message_append_args (reply, DBUS_TYPE_STRING, &id_str, DBUS_TYPE_INVALID); - dbus_connection_send (bus, reply, NULL); + /* TODO: Fix this hack (we don't handle wrap-around, for instance) */ + sprintf (id_str, ":1.%d", id++); + reply = dbus_message_new_method_return (message); + dbus_message_append_args (reply, DBUS_TYPE_STRING, &id_str, DBUS_TYPE_INVALID); + dbus_connection_send (bus, reply, NULL); dbus_connection_flush (bus); - dbus_message_unref (reply); + dbus_message_unref (reply); g_free (id_str); - return DBUS_HANDLER_RESULT_HANDLED; + return DBUS_HANDLER_RESULT_HANDLED; } static DBusHandlerResult handle_properties (DBusConnection *bus, - DBusMessage *message, - DRoutePath *path, - const gchar *iface, - const gchar *member, - const gchar *pathstr) + DBusMessage *message, + DRoutePath *path, + const gchar *iface, + const gchar *member, + const gchar *pathstr) { - DBusMessage *reply = NULL; - DBusHandlerResult result = DBUS_HANDLER_RESULT_HANDLED; - - if (!g_strcmp0(member, "GetAll")) - reply = impl_prop_GetAll (message, path, pathstr); - else if (!g_strcmp0 (member, "Get")) - reply = impl_prop_GetSet (message, path, pathstr, TRUE); - else if (!g_strcmp0 (member, "Set")) - reply = impl_prop_GetSet (message, path, pathstr, FALSE); - else - result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; - - if (reply) - { - dbus_connection_send (bus, reply, NULL); - dbus_message_unref (reply); - } + DBusMessage *reply = NULL; + DBusHandlerResult result = DBUS_HANDLER_RESULT_HANDLED; + + if (!g_strcmp0 (member, "GetAll")) + reply = impl_prop_GetAll (message, path, pathstr); + else if (!g_strcmp0 (member, "Get")) + reply = impl_prop_GetSet (message, path, pathstr, TRUE); + else if (!g_strcmp0 (member, "Set")) + reply = impl_prop_GetSet (message, path, pathstr, FALSE); + else + result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + + if (reply) + { + dbus_connection_send (bus, reply, NULL); + dbus_message_unref (reply); + } - return result; + return result; } /*---------------------------------------------------------------------------*/ static const char *introspection_header = -"<?xml version=\"1.0\"?>\n"; + "<?xml version=\"1.0\"?>\n"; static const char *introspection_node_element = -"<node name=\"%s\">\n"; + "<node name=\"%s\">\n"; static const char *introspection_footer = -"</node>"; + "</node>"; static DBusHandlerResult handle_introspection (DBusConnection *bus, - DBusMessage *message, - DRoutePath *path, - const gchar *iface, - const gchar *member, - const gchar *pathstr) + DBusMessage *message, + DRoutePath *path, + const gchar *iface, + const gchar *member, + const gchar *pathstr) { - GString *output; - gchar *final; - gint i; - void *datum = NULL; - - DBusMessage *reply; - - _DROUTE_DEBUG ("DRoute (handle introspection): %s\n", pathstr); - - if (g_strcmp0 (member, "Introspect")) - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; - - output = g_string_new(introspection_header); - - g_string_append_printf(output, introspection_node_element, pathstr); - - if (!path->get_datum || (datum = path_get_datum (path, pathstr)) != NULL) - { - for (i=0; i < path->introspection->len; i++) - { - gchar *interface = (gchar *) g_ptr_array_index (path->interfaces, i); - gchar *introspect = (gchar *) g_ptr_array_index (path->introspection, i); - if (path->query_interface_cb && - !path->query_interface_cb (datum, interface)) - continue; - g_string_append (output, introspect); - } - } - - if (path->introspect_children_cb) - { - gchar *children = (*path->introspect_children_cb) (pathstr, path->introspect_children_data); - if (children) - { - g_string_append (output, children); - g_free (children); - } - } - - g_string_append(output, introspection_footer); - final = g_string_free(output, FALSE); - - reply = dbus_message_new_method_return (message); - if (!reply) - oom (); - dbus_message_append_args(reply, DBUS_TYPE_STRING, &final, - DBUS_TYPE_INVALID); - dbus_connection_send (bus, reply, NULL); - - dbus_message_unref (reply); - g_free(final); - return DBUS_HANDLER_RESULT_HANDLED; + GString *output; + gchar *final; + gint i; + void *datum = NULL; + + DBusMessage *reply; + + _DROUTE_DEBUG ("DRoute (handle introspection): %s\n", pathstr); + + if (g_strcmp0 (member, "Introspect")) + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + + output = g_string_new (introspection_header); + + g_string_append_printf (output, introspection_node_element, pathstr); + + if (!path->get_datum || (datum = path_get_datum (path, pathstr)) != NULL) + { + for (i = 0; i < path->introspection->len; i++) + { + gchar *interface = (gchar *) g_ptr_array_index (path->interfaces, i); + gchar *introspect = (gchar *) g_ptr_array_index (path->introspection, i); + if (path->query_interface_cb && + !path->query_interface_cb (datum, interface)) + continue; + g_string_append (output, introspect); + } + } + + if (path->introspect_children_cb) + { + gchar *children = (*path->introspect_children_cb) (pathstr, path->introspect_children_data); + if (children) + { + g_string_append (output, children); + g_free (children); + } + } + + g_string_append (output, introspection_footer); + final = g_string_free (output, FALSE); + + reply = dbus_message_new_method_return (message); + if (!reply) + oom (); + dbus_message_append_args (reply, DBUS_TYPE_STRING, &final, + DBUS_TYPE_INVALID); + dbus_connection_send (bus, reply, NULL); + + dbus_message_unref (reply); + g_free (final); + return DBUS_HANDLER_RESULT_HANDLED; } /*---------------------------------------------------------------------------*/ static DBusHandlerResult handle_other (DBusConnection *bus, - DBusMessage *message, - DRoutePath *path, - const gchar *iface, - const gchar *member, - const gchar *pathstr) + DBusMessage *message, + DRoutePath *path, + const gchar *iface, + const gchar *member, + const gchar *pathstr) { - gint result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; - - StrPair pair; - DRouteFunction func; - DBusMessage *reply = NULL; - - void *datum; - - pair.one = iface; - pair.two = member; - - _DROUTE_DEBUG ("DRoute (handle other): %s|%s on %s\n", member, iface, pathstr); - - func = (DRouteFunction) g_hash_table_lookup (path->methods, &pair); - if (func != NULL) - { - datum = path_get_datum (path, pathstr); - if (!datum) - reply = droute_object_does_not_exist_error (message); - else - reply = (func) (bus, message, datum); - - /* All D-Bus method calls must have a reply. - * If one is not provided presume that the caller has already - * sent one. - */ - if (reply) - { - dbus_connection_send (bus, reply, NULL); - dbus_message_unref (reply); - } - result = DBUS_HANDLER_RESULT_HANDLED; - } - - _DROUTE_DEBUG ("DRoute (handle other) (reply): type %d\n", - dbus_message_get_type(reply)); - return result; + gint result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + + StrPair pair; + DRouteFunction func; + DBusMessage *reply = NULL; + + void *datum; + + pair.one = iface; + pair.two = member; + + _DROUTE_DEBUG ("DRoute (handle other): %s|%s on %s\n", member, iface, pathstr); + + func = (DRouteFunction) g_hash_table_lookup (path->methods, &pair); + if (func != NULL) + { + datum = path_get_datum (path, pathstr); + if (!datum) + reply = droute_object_does_not_exist_error (message); + else + reply = (func) (bus, message, datum); + + /* All D-Bus method calls must have a reply. + * If one is not provided presume that the caller has already + * sent one. + */ + if (reply) + { + dbus_connection_send (bus, reply, NULL); + dbus_message_unref (reply); + } + result = DBUS_HANDLER_RESULT_HANDLED; + } + + _DROUTE_DEBUG ("DRoute (handle other) (reply): type %d\n", + dbus_message_get_type (reply)); + return result; } /*---------------------------------------------------------------------------*/ @@ -583,36 +579,36 @@ handle_other (DBusConnection *bus, static DBusHandlerResult handle_message (DBusConnection *bus, DBusMessage *message, void *user_data) { - DRoutePath *path = (DRoutePath *) user_data; - const gchar *iface = dbus_message_get_interface (message); - const gchar *member = dbus_message_get_member (message); - const gint type = dbus_message_get_type (message); - const gchar *pathstr = dbus_message_get_path (message); - - DBusHandlerResult result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; - - _DROUTE_DEBUG ("DRoute (handle message): %s|%s of type %d on %s\n", member, iface, type, pathstr); - - /* Check for basic reasons not to handle */ - if (type != DBUS_MESSAGE_TYPE_METHOD_CALL || - member == NULL || - iface == NULL) - return result; - - if (!strcmp (pathstr, DBUS_PATH_DBUS)) - result = handle_dbus (bus, message, iface, member, pathstr); - else if (!strcmp (iface, "org.freedesktop.DBus.Properties")) - result = handle_properties (bus, message, path, iface, member, pathstr); - else if (!strcmp (iface, "org.freedesktop.DBus.Introspectable")) - result = handle_introspection (bus, message, path, iface, member, pathstr); - else - result = handle_other (bus, message, path, iface, member, pathstr); + DRoutePath *path = (DRoutePath *) user_data; + const gchar *iface = dbus_message_get_interface (message); + const gchar *member = dbus_message_get_member (message); + const gint type = dbus_message_get_type (message); + const gchar *pathstr = dbus_message_get_path (message); + + DBusHandlerResult result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + + _DROUTE_DEBUG ("DRoute (handle message): %s|%s of type %d on %s\n", member, iface, type, pathstr); + + /* Check for basic reasons not to handle */ + if (type != DBUS_MESSAGE_TYPE_METHOD_CALL || + member == NULL || + iface == NULL) + return result; + + if (!strcmp (pathstr, DBUS_PATH_DBUS)) + result = handle_dbus (bus, message, iface, member, pathstr); + else if (!strcmp (iface, "org.freedesktop.DBus.Properties")) + result = handle_properties (bus, message, path, iface, member, pathstr); + else if (!strcmp (iface, "org.freedesktop.DBus.Introspectable")) + result = handle_introspection (bus, message, path, iface, member, pathstr); + else + result = handle_other (bus, message, path, iface, member, pathstr); #if 0 if (result == DBUS_HANDLER_RESULT_NOT_YET_HANDLED) g_print ("DRoute | Unhandled message: %s|%s of type %d on %s\n", member, iface, type, pathstr); #endif - - return result; + + return result; } /*---------------------------------------------------------------------------*/ @@ -620,20 +616,20 @@ handle_message (DBusConnection *bus, DBusMessage *message, void *user_data) static DBusMessage * droute_object_does_not_exist_error (DBusMessage *message) { - DBusMessage *reply; - gchar *errmsg; - - errmsg= g_strdup_printf ( - "Method \"%s\" with signature \"%s\" on interface \"%s\" could not be processed as object %s does not exist\n", - dbus_message_get_member (message), - dbus_message_get_signature (message), - dbus_message_get_interface (message), - dbus_message_get_path (message)); - reply = dbus_message_new_error (message, - DBUS_ERROR_UNKNOWN_OBJECT, - errmsg); - g_free (errmsg); - return reply; + DBusMessage *reply; + gchar *errmsg; + + errmsg = g_strdup_printf ( + "Method \"%s\" with signature \"%s\" on interface \"%s\" could not be processed as object %s does not exist\n", + dbus_message_get_member (message), + dbus_message_get_signature (message), + dbus_message_get_interface (message), + dbus_message_get_path (message)); + reply = dbus_message_new_error (message, + DBUS_ERROR_UNKNOWN_OBJECT, + errmsg); + g_free (errmsg); + return reply; } /*---------------------------------------------------------------------------*/ @@ -641,65 +637,65 @@ droute_object_does_not_exist_error (DBusMessage *message) DBusMessage * droute_not_yet_handled_error (DBusMessage *message) { - DBusMessage *reply; - gchar *errmsg; - - errmsg= g_strdup_printf ( - "Method \"%s\" with signature \"%s\" on interface \"%s\" doesn't exist\n", - dbus_message_get_member (message), - dbus_message_get_signature (message), - dbus_message_get_interface (message)); - reply = dbus_message_new_error (message, - DBUS_ERROR_UNKNOWN_METHOD, - errmsg); - g_free (errmsg); - return reply; + DBusMessage *reply; + gchar *errmsg; + + errmsg = g_strdup_printf ( + "Method \"%s\" with signature \"%s\" on interface \"%s\" doesn't exist\n", + dbus_message_get_member (message), + dbus_message_get_signature (message), + dbus_message_get_interface (message)); + reply = dbus_message_new_error (message, + DBUS_ERROR_UNKNOWN_METHOD, + errmsg); + g_free (errmsg); + return reply; } DBusMessage * droute_out_of_memory_error (DBusMessage *message) { - DBusMessage *reply; - gchar *errmsg; - - errmsg= g_strdup_printf ( - "Method \"%s\" with signature \"%s\" on interface \"%s\" could not be processed due to lack of memory\n", - dbus_message_get_member (message), - dbus_message_get_signature (message), - dbus_message_get_interface (message)); - reply = dbus_message_new_error (message, - DBUS_ERROR_NO_MEMORY, - errmsg); - g_free (errmsg); - return reply; + DBusMessage *reply; + gchar *errmsg; + + errmsg = g_strdup_printf ( + "Method \"%s\" with signature \"%s\" on interface \"%s\" could not be processed due to lack of memory\n", + dbus_message_get_member (message), + dbus_message_get_signature (message), + dbus_message_get_interface (message)); + reply = dbus_message_new_error (message, + DBUS_ERROR_NO_MEMORY, + errmsg); + g_free (errmsg); + return reply; } DBusMessage * droute_invalid_arguments_error (DBusMessage *message) { - DBusMessage *reply; - gchar *errmsg; - - errmsg= g_strdup_printf ( - "Method \"%s\" with signature \"%s\" on interface \"%s\" was supplied with invalid arguments\n", - dbus_message_get_member (message), - dbus_message_get_signature (message), - dbus_message_get_interface (message)); - reply = dbus_message_new_error (message, - DBUS_ERROR_INVALID_ARGS, - errmsg); - g_free (errmsg); - return reply; + DBusMessage *reply; + gchar *errmsg; + + errmsg = g_strdup_printf ( + "Method \"%s\" with signature \"%s\" on interface \"%s\" was supplied with invalid arguments\n", + dbus_message_get_member (message), + dbus_message_get_signature (message), + dbus_message_get_interface (message)); + reply = dbus_message_new_error (message, + DBUS_ERROR_INVALID_ARGS, + errmsg); + g_free (errmsg); + return reply; } void droute_path_register (DRoutePath *path, DBusConnection *bus) { - if (path->prefix) - dbus_connection_register_fallback (bus, path->path, &droute_vtable, path); - else - dbus_connection_register_object_path (bus, path->path, - &droute_vtable, path); + if (path->prefix) + dbus_connection_register_fallback (bus, path->path, &droute_vtable, path); + else + dbus_connection_register_object_path (bus, path->path, + &droute_vtable, path); } void @@ -711,35 +707,35 @@ droute_path_unregister (DRoutePath *path, DBusConnection *bus) void droute_context_register (DRouteContext *cnx, DBusConnection *bus) { - g_ptr_array_foreach (cnx->registered_paths, (GFunc) droute_path_register, - bus); + g_ptr_array_foreach (cnx->registered_paths, (GFunc) droute_path_register, + bus); } void droute_context_unregister (DRouteContext *cnx, DBusConnection *bus) { - g_ptr_array_foreach (cnx->registered_paths, (GFunc) droute_path_unregister, - bus); + g_ptr_array_foreach (cnx->registered_paths, (GFunc) droute_path_unregister, + bus); } void droute_context_deregister (DRouteContext *cnx, DBusConnection *bus) { - g_ptr_array_foreach (cnx->registered_paths, (GFunc) droute_path_unregister, - bus); + g_ptr_array_foreach (cnx->registered_paths, (GFunc) droute_path_unregister, + bus); } void droute_intercept_dbus (DBusConnection *bus) { - dbus_connection_register_object_path (bus, DBUS_PATH_DBUS, - &droute_vtable, NULL); + dbus_connection_register_object_path (bus, DBUS_PATH_DBUS, + &droute_vtable, NULL); } void droute_unintercept_dbus (DBusConnection *bus) { - dbus_connection_unregister_object_path (bus, DBUS_PATH_DBUS); + dbus_connection_unregister_object_path (bus, DBUS_PATH_DBUS); } /*END------------------------------------------------------------------------*/ diff --git a/droute/droute.h b/droute/droute.h index 506fef1b..3d9e4800 100644 --- a/droute/droute.h +++ b/droute/droute.h @@ -28,52 +28,51 @@ #include <droute/droute-variant.h> - -typedef DBusMessage *(*DRouteFunction) (DBusConnection *, DBusMessage *, void *); -typedef dbus_bool_t (*DRoutePropertyFunction) (DBusMessageIter *, void *); +typedef DBusMessage *(*DRouteFunction) (DBusConnection *, DBusMessage *, void *); +typedef dbus_bool_t (*DRoutePropertyFunction) (DBusMessageIter *, void *); typedef gchar *(*DRouteIntrospectChildrenFunction) (const char *, void *); -typedef void *(*DRouteGetDatumFunction) (const char *, void *); -typedef gboolean (*DRouteQueryInterfaceFunction) (void *, const char *); +typedef void *(*DRouteGetDatumFunction) (const char *, void *); +typedef gboolean (*DRouteQueryInterfaceFunction) (void *, const char *); typedef struct _DRouteMethod DRouteMethod; struct _DRouteMethod { - DRouteFunction func; - const char *name; + DRouteFunction func; + const char *name; }; typedef struct _DRouteProperty DRouteProperty; struct _DRouteProperty { - DRoutePropertyFunction get; - DRoutePropertyFunction set; - const char *name; + DRoutePropertyFunction get; + DRoutePropertyFunction set; + const char *name; }; /*---------------------------------------------------------------------------*/ typedef struct _DRouteContext DRouteContext; -typedef struct _DRoutePath DRoutePath; +typedef struct _DRoutePath DRoutePath; /*---------------------------------------------------------------------------*/ DRouteContext * -droute_new (); +droute_new (); void -droute_free (DRouteContext *cnx); +droute_free (DRouteContext *cnx); DRoutePath * -droute_add_one (DRouteContext *cnx, - const char *path, - const void *data); +droute_add_one (DRouteContext *cnx, + const char *path, + const void *data); DRoutePath * droute_add_many (DRouteContext *cnx, - const char *path, - const void *data, + const char *path, + const void *data, DRouteIntrospectChildrenFunction introspect_children_cb, void *introspect_children_data, const DRouteGetDatumFunction get_datum, @@ -83,17 +82,17 @@ void droute_path_add_interface (DRoutePath *path, const char *name, const char *introspect, - const DRouteMethod *methods, + const DRouteMethod *methods, const DRouteProperty *properties); DBusMessage * -droute_not_yet_handled_error (DBusMessage *message); +droute_not_yet_handled_error (DBusMessage *message); DBusMessage * droute_invalid_arguments_error (DBusMessage *message); DBusMessage * -droute_out_of_memory_error (DBusMessage *message); +droute_out_of_memory_error (DBusMessage *message); void droute_path_register (DRoutePath *path, DBusConnection *bus); diff --git a/registryd/de-marshaller.c b/registryd/de-marshaller.c index f1094846..8c65bfe7 100644 --- a/registryd/de-marshaller.c +++ b/registryd/de-marshaller.c @@ -20,85 +20,93 @@ * Boston, MA 02110-1301, USA. */ -#include <stdlib.h> -#include <glib.h> -#include <glib-object.h> #include <dbus/dbus.h> +#include <glib-object.h> +#include <glib.h> +#include <stdlib.h> #include "de-types.h" -dbus_bool_t spi_dbus_message_iter_get_struct(DBusMessageIter *iter, ...) +dbus_bool_t +spi_dbus_message_iter_get_struct (DBusMessageIter *iter, ...) { va_list args; DBusMessageIter iter_struct; int type; void *ptr; - dbus_message_iter_recurse(iter, &iter_struct); - va_start(args, iter); + dbus_message_iter_recurse (iter, &iter_struct); + va_start (args, iter); for (;;) - { - type = va_arg(args, int); - if (type == DBUS_TYPE_INVALID) break; - if (type != dbus_message_iter_get_arg_type(&iter_struct)) { - va_end(args); - return FALSE; + type = va_arg (args, int); + if (type == DBUS_TYPE_INVALID) + break; + if (type != dbus_message_iter_get_arg_type (&iter_struct)) + { + va_end (args); + return FALSE; + } + ptr = va_arg (args, void *); + dbus_message_iter_get_basic (&iter_struct, ptr); + dbus_message_iter_next (&iter_struct); } - ptr = va_arg(args, void *); - dbus_message_iter_get_basic(&iter_struct, ptr); - dbus_message_iter_next(&iter_struct); - } - dbus_message_iter_next(iter); - va_end(args); + dbus_message_iter_next (iter); + va_end (args); return TRUE; } -dbus_bool_t spi_dbus_message_iter_append_struct(DBusMessageIter *iter, ...) +dbus_bool_t +spi_dbus_message_iter_append_struct (DBusMessageIter *iter, ...) { va_list args; DBusMessageIter iter_struct; int type; void *ptr; - if (!dbus_message_iter_open_container(iter, DBUS_TYPE_STRUCT, NULL, &iter_struct)) return FALSE; - va_start(args, iter); - for (;;) - { - type = va_arg(args, int); - if (type == DBUS_TYPE_INVALID) break; - ptr = va_arg(args, void *); - dbus_message_iter_append_basic(&iter_struct, type, ptr); - } - if (!dbus_message_iter_close_container(iter, &iter_struct)) - { - va_end(args); + if (!dbus_message_iter_open_container (iter, DBUS_TYPE_STRUCT, NULL, &iter_struct)) return FALSE; - } - va_end(args); + va_start (args, iter); + for (;;) + { + type = va_arg (args, int); + if (type == DBUS_TYPE_INVALID) + break; + ptr = va_arg (args, void *); + dbus_message_iter_append_basic (&iter_struct, type, ptr); + } + if (!dbus_message_iter_close_container (iter, &iter_struct)) + { + va_end (args); + return FALSE; + } + va_end (args); return TRUE; } -dbus_bool_t spi_dbus_marshal_deviceEvent(DBusMessage *message, const Accessibility_DeviceEvent *e) +dbus_bool_t +spi_dbus_marshal_deviceEvent (DBusMessage *message, const Accessibility_DeviceEvent *e) { DBusMessageIter iter; - if (!message) return FALSE; - dbus_message_iter_init_append(message, &iter); - return spi_dbus_message_iter_append_struct(&iter, DBUS_TYPE_UINT32, &e->type, DBUS_TYPE_INT32, &e->id, DBUS_TYPE_UINT32, &e->hw_code, DBUS_TYPE_UINT32, &e->modifiers, DBUS_TYPE_INT32, &e->timestamp, DBUS_TYPE_STRING, &e->event_string, DBUS_TYPE_BOOLEAN, &e->is_text, DBUS_TYPE_INVALID); + if (!message) + return FALSE; + dbus_message_iter_init_append (message, &iter); + return spi_dbus_message_iter_append_struct (&iter, DBUS_TYPE_UINT32, &e->type, DBUS_TYPE_INT32, &e->id, DBUS_TYPE_UINT32, &e->hw_code, DBUS_TYPE_UINT32, &e->modifiers, DBUS_TYPE_INT32, &e->timestamp, DBUS_TYPE_STRING, &e->event_string, DBUS_TYPE_BOOLEAN, &e->is_text, DBUS_TYPE_INVALID); } -dbus_bool_t spi_dbus_demarshal_deviceEvent(DBusMessage *message, Accessibility_DeviceEvent *e) +dbus_bool_t +spi_dbus_demarshal_deviceEvent (DBusMessage *message, Accessibility_DeviceEvent *e) { DBusMessageIter iter; dbus_uint16_t hw_code; dbus_uint16_t modifiers; - dbus_message_iter_init(message, &iter); - if (spi_dbus_message_iter_get_struct(&iter, DBUS_TYPE_UINT32, &e->type, DBUS_TYPE_INT32, &e->id, DBUS_TYPE_INT32, &e->hw_code, DBUS_TYPE_INT32, &e->modifiers, DBUS_TYPE_INT32, &e->timestamp, DBUS_TYPE_STRING, &e->event_string, DBUS_TYPE_BOOLEAN, &e->is_text, DBUS_TYPE_INVALID)) + dbus_message_iter_init (message, &iter); + if (spi_dbus_message_iter_get_struct (&iter, DBUS_TYPE_UINT32, &e->type, DBUS_TYPE_INT32, &e->id, DBUS_TYPE_INT32, &e->hw_code, DBUS_TYPE_INT32, &e->modifiers, DBUS_TYPE_INT32, &e->timestamp, DBUS_TYPE_STRING, &e->event_string, DBUS_TYPE_BOOLEAN, &e->is_text, DBUS_TYPE_INVALID)) return TRUE; /* TODO: Perhaps remove the below code for 2.1 */ - if (!spi_dbus_message_iter_get_struct(&iter, DBUS_TYPE_UINT32, &e->type, DBUS_TYPE_INT32, &e->id, DBUS_TYPE_INT16, &hw_code, DBUS_TYPE_INT16, &modifiers, DBUS_TYPE_INT32, &e->timestamp, DBUS_TYPE_STRING, &e->event_string, DBUS_TYPE_BOOLEAN, &e->is_text, DBUS_TYPE_INVALID)) + if (!spi_dbus_message_iter_get_struct (&iter, DBUS_TYPE_UINT32, &e->type, DBUS_TYPE_INT32, &e->id, DBUS_TYPE_INT16, &hw_code, DBUS_TYPE_INT16, &modifiers, DBUS_TYPE_INT32, &e->timestamp, DBUS_TYPE_STRING, &e->event_string, DBUS_TYPE_BOOLEAN, &e->is_text, DBUS_TYPE_INVALID)) return FALSE; e->hw_code = hw_code; e->modifiers = modifiers; diff --git a/registryd/de-marshaller.h b/registryd/de-marshaller.h index 93eaa423..ddaf1360 100644 --- a/registryd/de-marshaller.h +++ b/registryd/de-marshaller.h @@ -29,9 +29,9 @@ #include "de-types.h" -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_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); #endif /* SPI_DE_MARSHALLER_H_ */ diff --git a/registryd/de-types.h b/registryd/de-types.h index d26cc90f..656aded1 100644 --- a/registryd/de-types.h +++ b/registryd/de-types.h @@ -29,45 +29,51 @@ typedef unsigned long Accessibility_ControllerEventMask; -typedef enum { - Accessibility_KEY_PRESSED_EVENT, - Accessibility_KEY_RELEASED_EVENT, - Accessibility_BUTTON_PRESSED_EVENT, - Accessibility_BUTTON_RELEASED_EVENT, +typedef enum +{ + Accessibility_KEY_PRESSED_EVENT, + Accessibility_KEY_RELEASED_EVENT, + Accessibility_BUTTON_PRESSED_EVENT, + Accessibility_BUTTON_RELEASED_EVENT, } Accessibility_EventType; -typedef enum { - Accessibility_KEY_PRESSED, - Accessibility_KEY_RELEASED, +typedef enum +{ + Accessibility_KEY_PRESSED, + Accessibility_KEY_RELEASED, } Accessibility_KeyEventType; -typedef enum { - Accessibility_KEY_PRESS, - Accessibility_KEY_RELEASE, - Accessibility_KEY_PRESSRELEASE, - Accessibility_KEY_SYM, - Accessibility_KEY_STRING, - Accessibility_KEY_LOCKMODIFIERS, - Accessibility_KEY_UNLOCKMODIFIERS, +typedef enum +{ + Accessibility_KEY_PRESS, + Accessibility_KEY_RELEASE, + Accessibility_KEY_PRESSRELEASE, + Accessibility_KEY_SYM, + Accessibility_KEY_STRING, + Accessibility_KEY_LOCKMODIFIERS, + Accessibility_KEY_UNLOCKMODIFIERS, } Accessibility_KeySynthType; -typedef struct { +typedef struct +{ Accessibility_EventType type; dbus_uint32_t id; dbus_uint32_t hw_code; dbus_uint32_t modifiers; dbus_uint32_t timestamp; - char * event_string; + char *event_string; dbus_bool_t is_text; } Accessibility_DeviceEvent; -typedef struct { +typedef struct +{ dbus_bool_t synchronous; dbus_bool_t preemptive; dbus_bool_t global; } Accessibility_EventListenerMode; -typedef struct { +typedef struct +{ dbus_int32_t keycode; dbus_int32_t keysym; char *keystring; diff --git a/registryd/deviceeventcontroller-x11.c b/registryd/deviceeventcontroller-x11.c index 689191f7..d5cae611 100644 --- a/registryd/deviceeventcontroller-x11.c +++ b/registryd/deviceeventcontroller-x11.c @@ -25,13 +25,13 @@ #include <config.h> -#undef SPI_XKB_DEBUG -#undef SPI_DEBUG -#undef SPI_KEYEVENT_DEBUG +#undef SPI_XKB_DEBUG +#undef SPI_DEBUG +#undef SPI_KEYEVENT_DEBUG -#include <string.h> #include <ctype.h> #include <stdio.h> +#include <string.h> #include <sys/time.h> #define XK_MISCELLANY @@ -42,49 +42,50 @@ #include <dbus/dbus.h> -#include "paths.h" -#include "keymasks.h" -#include "de-types.h" #include "de-marshaller.h" +#include "de-types.h" #include "display.h" #include "event-source.h" +#include "keymasks.h" +#include "paths.h" #include "deviceeventcontroller.h" + #include "deviceeventcontroller-x11.h" #include "reentrant-list.h" static void spi_dec_x11_emit_modifier_event (SpiDEController *controller, - guint prev_mask, - guint current_mask); + guint prev_mask, + guint current_mask); #define CHECK_RELEASE_DELAY 20 -#define BIT(c, x) (c[x/8]&(1<<(x%8))) +#define BIT(c, x) (c[x / 8] & (1 << (x % 8))) static guint check_release_handler = 0; static Accessibility_DeviceEvent pressed_event; static void wait_for_release_event (XEvent *event, SpiDEController *controller); static int spi_error_code = 0; -typedef struct { - gint x; - gint y; +typedef struct +{ + gint x; + gint y; } SpiPoint; -static SpiPoint last_mouse_pos_static = {0, 0}; +static SpiPoint last_mouse_pos_static = { 0, 0 }; static SpiPoint *last_mouse_pos = &last_mouse_pos_static; static unsigned int mouse_mask_state = 0; static unsigned int mouse_button_mask = - Button1Mask | Button2Mask | Button3Mask | Button4Mask | Button5Mask; + Button1Mask | Button2Mask | Button3Mask | Button4Mask | Button5Mask; static unsigned int key_modifier_mask = - Mod1Mask | Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask | ShiftMask | LockMask | ControlMask | SPI_KEYMASK_NUMLOCK; + Mod1Mask | Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask | ShiftMask | LockMask | ControlMask | SPI_KEYMASK_NUMLOCK; extern unsigned int _numlock_physical_mask; -static XModifierKeymap* xmkeymap = NULL; - +static XModifierKeymap *xmkeymap = NULL; static int (*x_default_error_handler) (Display *display, XErrorEvent *error_event); -static void spi_controller_register_with_devices (SpiDEController *controller); -static gboolean spi_device_event_controller_forward_key_event (SpiDEController *controller, - const XEvent *event); +static void spi_controller_register_with_devices (SpiDEController *controller); +static gboolean spi_device_event_controller_forward_key_event (SpiDEController *controller, + const XEvent *event); static SpiDEController *saved_controller; @@ -99,66 +100,76 @@ static SpiDEController *saved_controller; static SpiDEControllerPrivate * spi_device_event_controller_get_instance_private (SpiDEController *controller) { - return g_type_instance_get_private ((GTypeInstance *) controller, SPI_DEVICE_EVENT_CONTROLLER_TYPE); + return g_type_instance_get_private ((GTypeInstance *) controller, SPI_DEVICE_EVENT_CONTROLLER_TYPE); } static unsigned int keysym_mod_mask (KeySym keysym, KeyCode keycode) { - /* we really should use XKB and look directly at the keymap */ - /* this is very inelegant */ - Display *display = spi_get_display (); - unsigned int mods_rtn = 0; - unsigned int retval = 0; - KeySym sym_rtn; - - if (XkbLookupKeySym (display, keycode, 0, &mods_rtn, &sym_rtn) && - (sym_rtn == keysym)) { - retval = 0; - } - else if (XkbLookupKeySym (display, keycode, ShiftMask, &mods_rtn, &sym_rtn) && - (sym_rtn == keysym)) { - retval = ShiftMask; - } - else if (XkbLookupKeySym (display, keycode, Mod2Mask, &mods_rtn, &sym_rtn) && - (sym_rtn == keysym)) { - retval = Mod2Mask; - } - else if (XkbLookupKeySym (display, keycode, Mod3Mask, &mods_rtn, &sym_rtn) && - (sym_rtn == keysym)) { - retval = Mod3Mask; - } - else if (XkbLookupKeySym (display, keycode, Mod4Mask, &mods_rtn, &sym_rtn) && - (sym_rtn == keysym)) { - retval = Mod4Mask; - } - else if (XkbLookupKeySym (display, keycode, Mod5Mask, &mods_rtn, &sym_rtn) && - (sym_rtn == keysym)) { - retval = Mod5Mask; - } - else if (XkbLookupKeySym (display, keycode, - ShiftMask | Mod2Mask, &mods_rtn, &sym_rtn) && - (sym_rtn == keysym)) { - retval = (Mod2Mask | ShiftMask); - } - else if (XkbLookupKeySym (display, keycode, - ShiftMask | Mod3Mask, &mods_rtn, &sym_rtn) && - (sym_rtn == keysym)) { - retval = (Mod3Mask | ShiftMask); - } - else if (XkbLookupKeySym (display, keycode, - ShiftMask | Mod4Mask, &mods_rtn, &sym_rtn) && - (sym_rtn == keysym)) { - retval = (Mod4Mask | ShiftMask); - } - else if (XkbLookupKeySym (display, keycode, - ShiftMask | Mod5Mask, &mods_rtn, &sym_rtn) && - (sym_rtn == keysym)) { - retval = (Mod5Mask | ShiftMask); - } - else - retval = 0xFFFF; - return retval; + /* we really should use XKB and look directly at the keymap */ + /* this is very inelegant */ + Display *display = spi_get_display (); + unsigned int mods_rtn = 0; + unsigned int retval = 0; + KeySym sym_rtn; + + if (XkbLookupKeySym (display, keycode, 0, &mods_rtn, &sym_rtn) && + (sym_rtn == keysym)) + { + retval = 0; + } + else if (XkbLookupKeySym (display, keycode, ShiftMask, &mods_rtn, &sym_rtn) && + (sym_rtn == keysym)) + { + retval = ShiftMask; + } + else if (XkbLookupKeySym (display, keycode, Mod2Mask, &mods_rtn, &sym_rtn) && + (sym_rtn == keysym)) + { + retval = Mod2Mask; + } + else if (XkbLookupKeySym (display, keycode, Mod3Mask, &mods_rtn, &sym_rtn) && + (sym_rtn == keysym)) + { + retval = Mod3Mask; + } + else if (XkbLookupKeySym (display, keycode, Mod4Mask, &mods_rtn, &sym_rtn) && + (sym_rtn == keysym)) + { + retval = Mod4Mask; + } + else if (XkbLookupKeySym (display, keycode, Mod5Mask, &mods_rtn, &sym_rtn) && + (sym_rtn == keysym)) + { + retval = Mod5Mask; + } + else if (XkbLookupKeySym (display, keycode, + ShiftMask | Mod2Mask, &mods_rtn, &sym_rtn) && + (sym_rtn == keysym)) + { + retval = (Mod2Mask | ShiftMask); + } + else if (XkbLookupKeySym (display, keycode, + ShiftMask | Mod3Mask, &mods_rtn, &sym_rtn) && + (sym_rtn == keysym)) + { + retval = (Mod3Mask | ShiftMask); + } + else if (XkbLookupKeySym (display, keycode, + ShiftMask | Mod4Mask, &mods_rtn, &sym_rtn) && + (sym_rtn == keysym)) + { + retval = (Mod4Mask | ShiftMask); + } + else if (XkbLookupKeySym (display, keycode, + ShiftMask | Mod5Mask, &mods_rtn, &sym_rtn) && + (sym_rtn == keysym)) + { + retval = (Mod5Mask | ShiftMask); + } + else + retval = 0xFFFF; + return retval; } static gboolean @@ -176,17 +187,17 @@ replace_map_keysym (SpiDEControllerPrivate *priv, KeyCode keycode, KeySym keysym if (desc && desc->map) { gint offset = desc->map->key_sym_map[keycode].offset; - desc->map->syms[offset] = keysym; + desc->map->syms[offset] = keysym; } else { fprintf (stderr, "Error changing key map: empty server structure\n"); - } + } XkbSetMap (dpy, XkbAllMapComponentsMask, desc); /** - * FIXME: the use of XkbChangeMap, and the reuse of the priv->xkb_desc structure, + * FIXME: the use of XkbChangeMap, and the reuse of the priv->xkb_desc structure, * would be far preferable. - * HOWEVER it does not seem to work using XFree 4.3. + * HOWEVER it does not seem to work using XFree 4.3. **/ /* XkbChangeMap (dpy, priv->xkb_desc, priv->changes); */ XFlush (dpy); @@ -210,126 +221,127 @@ spi_dec_reset_reserved (gpointer data) static gint spi_dec_x11_get_keycode (SpiDEController *controller, - gint keysym, - gchar *key_str, - gboolean fix, - guint *modmask) + gint keysym, + gchar *key_str, + gboolean fix, + guint *modmask) { - KeyCode keycode = 0; + KeyCode keycode = 0; if (key_str && key_str[0]) - keysym = XStringToKeysym(key_str); - keycode = XKeysymToKeycode (spi_get_display (), (KeySym) keysym); - if (!keycode && fix) - { - SpiDEControllerPrivate *priv = spi_device_event_controller_get_instance_private (controller); - /* if there's no keycode available, fix it */ - if (replace_map_keysym (priv, priv->reserved_keycode, keysym)) - { - keycode = priv->reserved_keycode; - /* - * queue a timer to restore the old keycode. Ugly, but required - * due to races / asynchronous X delivery. - * Long-term fix is to extend the X keymap here instead of replace entries. - */ - priv->reserved_reset_timeout = g_timeout_add (500, spi_dec_reset_reserved, priv); - g_source_set_name_by_id (priv->reserved_reset_timeout, "[at-spi2-core] spi_dec_reset_reserved"); - } - if (modmask) - *modmask = 0; - return keycode; - } - if (modmask) - *modmask = keysym_mod_mask (keysym, keycode); - return keycode; + keysym = XStringToKeysym (key_str); + keycode = XKeysymToKeycode (spi_get_display (), (KeySym) keysym); + if (!keycode && fix) + { + SpiDEControllerPrivate *priv = spi_device_event_controller_get_instance_private (controller); + /* if there's no keycode available, fix it */ + if (replace_map_keysym (priv, priv->reserved_keycode, keysym)) + { + keycode = priv->reserved_keycode; + /* + * queue a timer to restore the old keycode. Ugly, but required + * due to races / asynchronous X delivery. + * Long-term fix is to extend the X keymap here instead of replace entries. + */ + priv->reserved_reset_timeout = g_timeout_add (500, spi_dec_reset_reserved, priv); + g_source_set_name_by_id (priv->reserved_reset_timeout, "[at-spi2-core] spi_dec_reset_reserved"); + } + if (modmask) + *modmask = 0; + return keycode; + } + if (modmask) + *modmask = keysym_mod_mask (keysym, keycode); + return keycode; } static gboolean spi_dec_button_update_and_emit (SpiDEController *controller, - guint mask_return) + guint mask_return) { gchar event_detail[3]; if ((mask_return & mouse_button_mask) != - (mouse_mask_state & mouse_button_mask)) + (mouse_mask_state & mouse_button_mask)) { int button_number = 0; gboolean is_down = False; - + if (!(mask_return & Button1Mask) && - (mouse_mask_state & Button1Mask)) - { - mouse_mask_state &= ~Button1Mask; - button_number = 1; - } + (mouse_mask_state & Button1Mask)) + { + mouse_mask_state &= ~Button1Mask; + button_number = 1; + } else if ((mask_return & Button1Mask) && - !(mouse_mask_state & Button1Mask)) - { - mouse_mask_state |= Button1Mask; - button_number = 1; - is_down = True; - } + !(mouse_mask_state & Button1Mask)) + { + mouse_mask_state |= Button1Mask; + button_number = 1; + is_down = True; + } else if (!(mask_return & Button2Mask) && - (mouse_mask_state & Button2Mask)) - { - mouse_mask_state &= ~Button2Mask; - button_number = 2; - } + (mouse_mask_state & Button2Mask)) + { + mouse_mask_state &= ~Button2Mask; + button_number = 2; + } else if ((mask_return & Button2Mask) && - !(mouse_mask_state & Button2Mask)) - { - mouse_mask_state |= Button2Mask; - button_number = 2; - is_down = True; - } + !(mouse_mask_state & Button2Mask)) + { + mouse_mask_state |= Button2Mask; + button_number = 2; + is_down = True; + } else if (!(mask_return & Button3Mask) && - (mouse_mask_state & Button3Mask)) - { - mouse_mask_state &= ~Button3Mask; - button_number = 3; - } + (mouse_mask_state & Button3Mask)) + { + mouse_mask_state &= ~Button3Mask; + button_number = 3; + } else if ((mask_return & Button3Mask) && - !(mouse_mask_state & Button3Mask)) - { - mouse_mask_state |= Button3Mask; - button_number = 3; - is_down = True; - } + !(mouse_mask_state & Button3Mask)) + { + mouse_mask_state |= Button3Mask; + button_number = 3; + is_down = True; + } else if (!(mask_return & Button4Mask) && - (mouse_mask_state & Button4Mask)) - { - mouse_mask_state &= ~Button4Mask; - button_number = 4; - } + (mouse_mask_state & Button4Mask)) + { + mouse_mask_state &= ~Button4Mask; + button_number = 4; + } else if ((mask_return & Button4Mask) && - !(mouse_mask_state & Button4Mask)) - { - mouse_mask_state |= Button4Mask; - button_number = 4; - is_down = True; - } + !(mouse_mask_state & Button4Mask)) + { + mouse_mask_state |= Button4Mask; + button_number = 4; + is_down = True; + } else if (!(mask_return & Button5Mask) && - (mouse_mask_state & Button5Mask)) - { - mouse_mask_state &= ~Button5Mask; - button_number = 5; - } + (mouse_mask_state & Button5Mask)) + { + mouse_mask_state &= ~Button5Mask; + button_number = 5; + } else if ((mask_return & Button5Mask) && - !(mouse_mask_state & Button5Mask)) - { - mouse_mask_state |= Button5Mask; - button_number = 5; - is_down = True; - } - if (button_number) { -#ifdef SPI_DEBUG - fprintf (stderr, "Button %d %s\n", - button_number, (is_down) ? "Pressed" : "Released"); + !(mouse_mask_state & Button5Mask)) + { + mouse_mask_state |= Button5Mask; + button_number = 5; + is_down = True; + } + if (button_number) + { +#ifdef SPI_DEBUG + fprintf (stderr, "Button %d %s\n", + button_number, (is_down) ? "Pressed" : "Released"); #endif - snprintf (event_detail, 3, "%d%c", button_number, - (is_down) ? 'p' : 'r'); - dbus_uint32_t x = last_mouse_pos->x, y = last_mouse_pos->y; - spi_dec_dbus_emit(controller, SPI_DBUS_INTERFACE_EVENT_MOUSE, "Button", event_detail, x, y); - } + snprintf (event_detail, 3, "%d%c", button_number, + (is_down) ? 'p' : 'r'); + dbus_uint32_t x = last_mouse_pos->x, y = last_mouse_pos->y; + spi_dec_dbus_emit (controller, SPI_DBUS_INTERFACE_EVENT_MOUSE, "Button", event_detail, x, y); + } return TRUE; } else @@ -339,10 +351,12 @@ spi_dec_button_update_and_emit (SpiDEController *controller, } static guint -spi_dec_x11_mouse_check (SpiDEController *controller, - int *x, int *y, gboolean *moved) +spi_dec_x11_mouse_check (SpiDEController *controller, + int *x, + int *y, + gboolean *moved) { - int win_x_return,win_y_return; + int win_x_return, win_y_return; unsigned int mask_return; Window root_return, child_return; Display *display = spi_get_display (); @@ -352,30 +366,31 @@ spi_dec_x11_mouse_check (SpiDEController *controller, return 0; } - XQueryPointer(display, DefaultRootWindow (display), - &root_return, &child_return, - x, y, - &win_x_return, &win_y_return, &mask_return); - /* + XQueryPointer (display, DefaultRootWindow (display), + &root_return, &child_return, + x, y, + &win_x_return, &win_y_return, &mask_return); + /* * Since many clients grab the pointer, and X goes an automatic * pointer grab on mouse-down, we often must detect mouse button events - * by polling rather than via a button grab. - * The while loop (rather than if) is used since it's possible that + * by polling rather than via a button grab. + * The while loop (rather than if) is used since it's possible that * multiple buttons have changed state since we last checked. */ - if (mask_return != mouse_mask_state) + if (mask_return != mouse_mask_state) { - while (spi_dec_button_update_and_emit (controller, mask_return)); + while (spi_dec_button_update_and_emit (controller, mask_return)) + ; } - if (*x != last_mouse_pos->x || *y != last_mouse_pos->y) + if (*x != last_mouse_pos->x || *y != last_mouse_pos->y) { // TODO: combine these two signals? dbus_uint32_t ix = *x, iy = *y; - spi_dec_dbus_emit(controller, SPI_DBUS_INTERFACE_EVENT_MOUSE, "Abs", "", ix, iy); + spi_dec_dbus_emit (controller, SPI_DBUS_INTERFACE_EVENT_MOUSE, "Abs", "", ix, iy); ix -= last_mouse_pos->x; iy -= last_mouse_pos->y; - spi_dec_dbus_emit(controller, SPI_DBUS_INTERFACE_EVENT_MOUSE, "Rel", "", ix, iy); + spi_dec_dbus_emit (controller, SPI_DBUS_INTERFACE_EVENT_MOUSE, "Rel", "", ix, iy); last_mouse_pos->x = *x; last_mouse_pos->y = *y; *moved = True; @@ -392,13 +407,13 @@ spi_dec_x11_mouse_check (SpiDEController *controller, static int spi_dec_ungrab_mouse (gpointer data) { - Display *display = spi_get_display (); - if (display) - { - XUngrabButton (spi_get_display (), AnyButton, AnyModifier, - XDefaultRootWindow (spi_get_display ())); - } - return FALSE; + Display *display = spi_get_display (); + if (display) + { + XUngrabButton (spi_get_display (), AnyButton, AnyModifier, + XDefaultRootWindow (spi_get_display ())); + } + return FALSE; } #endif @@ -411,14 +426,15 @@ spi_dec_init_mouse_listener (SpiDEController *dec) if (display) { if (XGrabButton (display, AnyButton, AnyModifier, - spi_get_root_window (), - True, ButtonPressMask | ButtonReleaseMask, - GrabModeSync, GrabModeAsync, None, None) != Success) { + spi_get_root_window (), + True, ButtonPressMask | ButtonReleaseMask, + GrabModeSync, GrabModeAsync, None, None) != Success) + { #ifdef SPI_DEBUG - fprintf (stderr, "WARNING: could not grab mouse buttons!\n"); + fprintf (stderr, "WARNING: could not grab mouse buttons!\n"); #endif - ; - } + ; + } XSync (display, False); #ifdef SPI_DEBUG fprintf (stderr, "mouse buttons grabbed\n"); @@ -436,63 +452,63 @@ spi_dec_clear_unlatch_pending (SpiDEController *controller) static void spi_device_event_controller_forward_mouse_event (SpiDEController *controller, - XEvent *xevent) + XEvent *xevent) { gchar event_detail[3]; XButtonEvent *xbutton_event = (XButtonEvent *) xevent; dbus_uint32_t ix, iy; int button = xbutton_event->button; - + unsigned int mouse_button_state = xbutton_event->state; switch (button) { case 1: - mouse_button_state |= Button1Mask; - break; + mouse_button_state |= Button1Mask; + break; case 2: - mouse_button_state |= Button2Mask; - break; + mouse_button_state |= Button2Mask; + break; case 3: - mouse_button_state |= Button3Mask; - break; + mouse_button_state |= Button3Mask; + break; case 4: - mouse_button_state |= Button4Mask; - break; + mouse_button_state |= Button4Mask; + break; case 5: - mouse_button_state |= Button5Mask; - break; + mouse_button_state |= Button5Mask; + break; } last_mouse_pos->x = ((XButtonEvent *) xevent)->x_root; last_mouse_pos->y = ((XButtonEvent *) xevent)->y_root; -#ifdef SPI_DEBUG +#ifdef SPI_DEBUG fprintf (stderr, "mouse button %d %s (%x)\n", - xbutton_event->button, - (xevent->type == ButtonPress) ? "Press" : "Release", - mouse_button_state); + xbutton_event->button, + (xevent->type == ButtonPress) ? "Press" : "Release", + mouse_button_state); #endif snprintf (event_detail, 3, "%d%c", button, - (xevent->type == ButtonPress) ? 'p' : 'r'); + (xevent->type == ButtonPress) ? 'p' : 'r'); - if ((mouse_button_state & mouse_button_mask) != - (mouse_mask_state & mouse_button_mask)) - { + if ((mouse_button_state & mouse_button_mask) != + (mouse_mask_state & mouse_button_mask)) + { if ((mouse_mask_state & key_modifier_mask) != - (mouse_button_state & key_modifier_mask)) - spi_dec_x11_emit_modifier_event (controller, - mouse_mask_state, mouse_button_state); + (mouse_button_state & key_modifier_mask)) + spi_dec_x11_emit_modifier_event (controller, + mouse_mask_state, mouse_button_state); mouse_mask_state = mouse_button_state; ix = last_mouse_pos->x; iy = last_mouse_pos->y; - spi_dec_dbus_emit(controller, SPI_DBUS_INTERFACE_EVENT_MOUSE, "Button", event_detail, ix, iy); + spi_dec_dbus_emit (controller, SPI_DBUS_INTERFACE_EVENT_MOUSE, "Button", event_detail, ix, iy); } XAllowEvents (spi_get_display (), - ReplayPointer, - CurrentTime); + ReplayPointer, + CurrentTime); } static void @@ -512,7 +528,7 @@ global_filter_fn (XEvent *xevent, void *data) gboolean is_consumed; is_consumed = - spi_device_event_controller_forward_key_event (controller, xevent); + spi_device_event_controller_forward_key_event (controller, xevent); if (is_consumed) { @@ -527,10 +543,10 @@ global_filter_fn (XEvent *xevent, void *data) for (i = 0; i < n_events; i++) { XNextEvent (display, &next_event); - if (next_event.type != KeyPress && - next_event.type != KeyRelease) - g_warning ("Unexpected event type %d in queue", next_event.type); - } + if (next_event.type != KeyPress && + next_event.type != KeyRelease) + g_warning ("Unexpected event type %d in queue", next_event.type); + } XAllowEvents (display, AsyncKeyboard, CurrentTime); if (n_events) @@ -552,92 +568,91 @@ global_filter_fn (XEvent *xevent, void *data) } if (xevent->type == priv->xkb_base_event_code) { - XkbAnyEvent * xkb_ev = (XkbAnyEvent *) xevent; + XkbAnyEvent *xkb_ev = (XkbAnyEvent *) xevent; /* ugly but probably necessary...*/ XSynchronize (display, TRUE); if (xkb_ev->xkb_type == XkbStateNotify) { - XkbStateNotifyEvent *xkb_snev = - (XkbStateNotifyEvent *) xkb_ev; - /* check the mouse, to catch mouse events grabbed by - * another client; in case we should revert this XKB delatch - */ - if (!priv->pending_xkb_mod_relatch_mask) - { - int x, y; - gboolean moved; - spi_dec_x11_mouse_check (controller, &x, &y, &moved); - } - /* we check again, since the previous call may have - changed this flag */ - if (priv->pending_xkb_mod_relatch_mask) - { - unsigned int feedback_mask; + XkbStateNotifyEvent *xkb_snev = + (XkbStateNotifyEvent *) xkb_ev; + /* check the mouse, to catch mouse events grabbed by + * another client; in case we should revert this XKB delatch + */ + if (!priv->pending_xkb_mod_relatch_mask) + { + int x, y; + gboolean moved; + spi_dec_x11_mouse_check (controller, &x, &y, &moved); + } + /* we check again, since the previous call may have + changed this flag */ + if (priv->pending_xkb_mod_relatch_mask) + { + unsigned int feedback_mask; #ifdef SPI_XKB_DEBUG - fprintf (stderr, "relatching %x\n", - priv->pending_xkb_mod_relatch_mask); + fprintf (stderr, "relatching %x\n", + priv->pending_xkb_mod_relatch_mask); #endif - /* temporarily turn off the latch bell, if it's on */ - XkbGetControls (display, - XkbAccessXFeedbackMask, - priv->xkb_desc); - feedback_mask = priv->xkb_desc->ctrls->ax_options; - if (feedback_mask & XkbAX_StickyKeysFBMask) - { - XkbControlsChangesRec changes = {XkbAccessXFeedbackMask, - 0, False}; - priv->xkb_desc->ctrls->ax_options - &= ~(XkbAX_StickyKeysFBMask); - XkbChangeControls (display, priv->xkb_desc, &changes); - } - /* TODO: account for lock as well as latch */ - XkbLatchModifiers (display, - XkbUseCoreKbd, - priv->pending_xkb_mod_relatch_mask, - priv->pending_xkb_mod_relatch_mask); - if (feedback_mask & XkbAX_StickyKeysFBMask) - { - XkbControlsChangesRec changes = {XkbAccessXFeedbackMask, - 0, False}; - priv->xkb_desc->ctrls->ax_options = feedback_mask; - XkbChangeControls (display, priv->xkb_desc, &changes); - } + /* temporarily turn off the latch bell, if it's on */ + XkbGetControls (display, + XkbAccessXFeedbackMask, + priv->xkb_desc); + feedback_mask = priv->xkb_desc->ctrls->ax_options; + if (feedback_mask & XkbAX_StickyKeysFBMask) + { + XkbControlsChangesRec changes = { XkbAccessXFeedbackMask, + 0, False }; + priv->xkb_desc->ctrls->ax_options &= ~(XkbAX_StickyKeysFBMask); + XkbChangeControls (display, priv->xkb_desc, &changes); + } + /* TODO: account for lock as well as latch */ + XkbLatchModifiers (display, + XkbUseCoreKbd, + priv->pending_xkb_mod_relatch_mask, + priv->pending_xkb_mod_relatch_mask); + if (feedback_mask & XkbAX_StickyKeysFBMask) + { + XkbControlsChangesRec changes = { XkbAccessXFeedbackMask, + 0, False }; + priv->xkb_desc->ctrls->ax_options = feedback_mask; + XkbChangeControls (display, priv->xkb_desc, &changes); + } #ifdef SPI_XKB_DEBUG - fprintf (stderr, "relatched %x\n", - priv->pending_xkb_mod_relatch_mask); + fprintf (stderr, "relatched %x\n", + priv->pending_xkb_mod_relatch_mask); #endif - priv->pending_xkb_mod_relatch_mask = 0; - } - else - { - priv->xkb_latch_mask = xkb_snev->latched_mods; - } - } + priv->pending_xkb_mod_relatch_mask = 0; + } + else + { + priv->xkb_latch_mask = xkb_snev->latched_mods; + } + } XSynchronize (display, FALSE); } - + return; } static gboolean spi_clear_error_state (void) { - gboolean retval = spi_error_code != 0; - spi_error_code = 0; - return retval; + gboolean retval = spi_error_code != 0; + spi_error_code = 0; + return retval; } static int _spi_controller_device_error_handler (Display *display, XErrorEvent *error) { - if (error->error_code == BadAccess) - { + if (error->error_code == BadAccess) + { g_message ("Could not complete key grab: grab already in use.\n"); spi_error_code = BadAccess; return 0; } - else + else { return (*x_default_error_handler) (display, error); } @@ -649,7 +664,7 @@ spi_controller_register_with_devices (SpiDEController *controller) SpiDEControllerPrivate *priv = spi_device_event_controller_get_instance_private (controller); int event_base, error_base, major_version, minor_version; - if (XTestQueryExtension (spi_get_display(), &event_base, &error_base, &major_version, &minor_version)) + if (XTestQueryExtension (spi_get_display (), &event_base, &error_base, &major_version, &minor_version)) { XTestGrabControl (spi_get_display (), True); } @@ -659,71 +674,71 @@ spi_controller_register_with_devices (SpiDEController *controller) /* register with: (translated) keystroke handler */ priv->have_xkb = XkbQueryExtension (spi_get_display (), - &priv->xkb_major_extension_opcode, - &priv->xkb_base_event_code, - &priv->xkb_base_error_code, NULL, NULL); + &priv->xkb_major_extension_opcode, + &priv->xkb_base_event_code, + &priv->xkb_base_error_code, NULL, NULL); if (priv->have_xkb) { gint i; guint64 reserved = 0; priv->xkb_desc = XkbGetMap (spi_get_display (), XkbKeySymsMask, XkbUseCoreKbd); XkbSelectEvents (spi_get_display (), - XkbUseCoreKbd, - XkbStateNotifyMask, XkbStateNotifyMask); - _numlock_physical_mask = XkbKeysymToModifiers (spi_get_display (), - XK_Num_Lock); + XkbUseCoreKbd, + XkbStateNotifyMask, XkbStateNotifyMask); + _numlock_physical_mask = XkbKeysymToModifiers (spi_get_display (), + XK_Num_Lock); for (i = priv->xkb_desc->max_key_code; i >= priv->xkb_desc->min_key_code; --i) - { - if (priv->xkb_desc->map->key_sym_map[i].kt_index[0] == XkbOneLevelIndex) - { - if (XkbKeycodeToKeysym (spi_get_display (), i, 0, 0) != 0) - { - /* don't use this one if there's a grab client! */ - - /* Runtime errors are generated from these functions, - * that are then quashed. Equivalent to: - * try - * {Blah} - * except - * {;} - */ - - spi_x_error_trap (); - XGrabKey (spi_get_display (), i, 0, - spi_get_root_window (), - TRUE, - GrabModeSync, GrabModeSync); - XSync (spi_get_display (), TRUE); - XUngrabKey (spi_get_display (), i, 0, - spi_get_root_window ()); - if (!spi_x_error_release ()) - { - reserved = i; - break; - } - } - } - } - if (reserved) - { - priv->reserved_keycode = reserved; - priv->reserved_keysym = XkbKeycodeToKeysym (spi_get_display (), reserved, 0, 0); - } + { + if (priv->xkb_desc->map->key_sym_map[i].kt_index[0] == XkbOneLevelIndex) + { + if (XkbKeycodeToKeysym (spi_get_display (), i, 0, 0) != 0) + { + /* don't use this one if there's a grab client! */ + + /* Runtime errors are generated from these functions, + * that are then quashed. Equivalent to: + * try + * {Blah} + * except + * {;} + */ + + spi_x_error_trap (); + XGrabKey (spi_get_display (), i, 0, + spi_get_root_window (), + TRUE, + GrabModeSync, GrabModeSync); + XSync (spi_get_display (), TRUE); + XUngrabKey (spi_get_display (), i, 0, + spi_get_root_window ()); + if (!spi_x_error_release ()) + { + reserved = i; + break; + } + } + } + } + if (reserved) + { + priv->reserved_keycode = reserved; + priv->reserved_keysym = XkbKeycodeToKeysym (spi_get_display (), reserved, 0, 0); + } else - { - priv->reserved_keycode = XKeysymToKeycode (spi_get_display (), XK_numbersign); - priv->reserved_keysym = XK_numbersign; - } + { + priv->reserved_keycode = XKeysymToKeycode (spi_get_display (), XK_numbersign); + priv->reserved_keysym = XK_numbersign; + } #ifdef SPI_RESERVED_DEBUG unsigned sym = 0; sym = XKeycodeToKeysym (spi_get_display (), reserved, 0); fprintf (stderr, "%x\n", sym); - fprintf (stderr, "setting the reserved keycode to %d (%s)\n", - reserved, - XKeysymToString (XKeycodeToKeysym (spi_get_display (), - reserved, 0))); + fprintf (stderr, "setting the reserved keycode to %d (%s)\n", + reserved, + XKeysymToString (XKeycodeToKeysym (spi_get_display (), + reserved, 0))); #endif - } + } spi_set_filter (global_filter_fn, controller); spi_set_events (KeyPressMask | KeyReleaseMask); @@ -737,11 +752,11 @@ spi_keystroke_from_x_key_event (XKeyEvent *x_key_event) Accessibility_DeviceEvent key_event; KeySym keysym; const int cbuf_bytes = 20; - char cbuf [21]; + char cbuf[21]; int nbytes; - nbytes = XLookupString (x_key_event, cbuf, cbuf_bytes, &keysym, NULL); - key_event.id = (dbus_int32_t)(keysym); + nbytes = XLookupString (x_key_event, cbuf, cbuf_bytes, &keysym, NULL); + key_event.id = (dbus_int32_t) (keysym); key_event.hw_code = (dbus_int16_t) x_key_event->keycode; if (((XEvent *) x_key_event)->type == KeyPress) { @@ -750,109 +765,109 @@ spi_keystroke_from_x_key_event (XKeyEvent *x_key_event) else { key_event.type = Accessibility_KEY_RELEASED_EVENT; - } - key_event.modifiers = (dbus_uint16_t)(x_key_event->state); + } + key_event.modifiers = (dbus_uint16_t) (x_key_event->state); key_event.is_text = FALSE; switch (keysym) { - case ' ': - key_event.event_string = g_strdup ("space"); - break; - case XK_Tab: - key_event.event_string = g_strdup ("Tab"); - break; - case XK_BackSpace: - key_event.event_string = g_strdup ("Backspace"); - break; - case XK_Return: - key_event.event_string = g_strdup ("Return"); - break; - case XK_Home: - key_event.event_string = g_strdup ("Home"); - break; - case XK_Page_Down: - key_event.event_string = g_strdup ("Page_Down"); - break; - case XK_Page_Up: - key_event.event_string = g_strdup ("Page_Up"); - break; - case XK_F1: - key_event.event_string = g_strdup ("F1"); - break; - case XK_F2: - key_event.event_string = g_strdup ("F2"); - break; - case XK_F3: - key_event.event_string = g_strdup ("F3"); - break; - case XK_F4: - key_event.event_string = g_strdup ("F4"); - break; - case XK_F5: - key_event.event_string = g_strdup ("F5"); - break; - case XK_F6: - key_event.event_string = g_strdup ("F6"); - break; - case XK_F7: - key_event.event_string = g_strdup ("F7"); - break; - case XK_F8: - key_event.event_string = g_strdup ("F8"); - break; - case XK_F9: - key_event.event_string = g_strdup ("F9"); - break; - case XK_F10: - key_event.event_string = g_strdup ("F10"); - break; - case XK_F11: - key_event.event_string = g_strdup ("F11"); - break; - case XK_F12: - key_event.event_string = g_strdup ("F12"); - break; - case XK_End: - key_event.event_string = g_strdup ("End"); - break; - case XK_Escape: - key_event.event_string = g_strdup ("Escape"); - break; - case XK_Up: - key_event.event_string = g_strdup ("Up"); - break; - case XK_Down: - key_event.event_string = g_strdup ("Down"); - break; - case XK_Left: - key_event.event_string = g_strdup ("Left"); - break; - case XK_Right: - key_event.event_string = g_strdup ("Right"); - break; - default: - if (nbytes > 0) - { - gunichar c; - cbuf[nbytes] = '\0'; /* OK since length is cbuf_bytes+1 */ - key_event.event_string = g_strdup (cbuf); - c = keysym2ucs (keysym); - if (c > 0 && !g_unichar_iscntrl (c)) - { - key_event.is_text = TRUE; - /* incorrect for some composed chars? */ - } - } - else - { - key_event.event_string = g_strdup (""); - } + case ' ': + key_event.event_string = g_strdup ("space"); + break; + case XK_Tab: + key_event.event_string = g_strdup ("Tab"); + break; + case XK_BackSpace: + key_event.event_string = g_strdup ("Backspace"); + break; + case XK_Return: + key_event.event_string = g_strdup ("Return"); + break; + case XK_Home: + key_event.event_string = g_strdup ("Home"); + break; + case XK_Page_Down: + key_event.event_string = g_strdup ("Page_Down"); + break; + case XK_Page_Up: + key_event.event_string = g_strdup ("Page_Up"); + break; + case XK_F1: + key_event.event_string = g_strdup ("F1"); + break; + case XK_F2: + key_event.event_string = g_strdup ("F2"); + break; + case XK_F3: + key_event.event_string = g_strdup ("F3"); + break; + case XK_F4: + key_event.event_string = g_strdup ("F4"); + break; + case XK_F5: + key_event.event_string = g_strdup ("F5"); + break; + case XK_F6: + key_event.event_string = g_strdup ("F6"); + break; + case XK_F7: + key_event.event_string = g_strdup ("F7"); + break; + case XK_F8: + key_event.event_string = g_strdup ("F8"); + break; + case XK_F9: + key_event.event_string = g_strdup ("F9"); + break; + case XK_F10: + key_event.event_string = g_strdup ("F10"); + break; + case XK_F11: + key_event.event_string = g_strdup ("F11"); + break; + case XK_F12: + key_event.event_string = g_strdup ("F12"); + break; + case XK_End: + key_event.event_string = g_strdup ("End"); + break; + case XK_Escape: + key_event.event_string = g_strdup ("Escape"); + break; + case XK_Up: + key_event.event_string = g_strdup ("Up"); + break; + case XK_Down: + key_event.event_string = g_strdup ("Down"); + break; + case XK_Left: + key_event.event_string = g_strdup ("Left"); + break; + case XK_Right: + key_event.event_string = g_strdup ("Right"); + break; + default: + if (nbytes > 0) + { + gunichar c; + cbuf[nbytes] = '\0'; /* OK since length is cbuf_bytes+1 */ + key_event.event_string = g_strdup (cbuf); + c = keysym2ucs (keysym); + if (c > 0 && !g_unichar_iscntrl (c)) + { + key_event.is_text = TRUE; + /* incorrect for some composed chars? */ + } + } + else + { + key_event.event_string = g_strdup (""); + } } key_event.timestamp = (dbus_uint32_t) x_key_event->time; #ifdef SPI_KEYEVENT_DEBUG { - char *pressed_str = "pressed"; + char *pressed_str = "pressed"; char *released_str = "released"; char *state_ptr; @@ -860,26 +875,25 @@ spi_keystroke_from_x_key_event (XKeyEvent *x_key_event) state_ptr = pressed_str; else state_ptr = released_str; - + fprintf (stderr, - "Key %lu %s (%c), modifiers %d; string=%s [%x] %s\n", - (unsigned long) keysym, - state_ptr, - keysym ? (int) keysym : '*', - (int) x_key_event->state, - key_event.event_string, - key_event.event_string[0], - (key_event.is_text == TRUE) ? "(text)" : "(not text)"); + "Key %lu %s (%c), modifiers %d; string=%s [%x] %s\n", + (unsigned long) keysym, + state_ptr, + keysym ? (int) keysym : '*', + (int) x_key_event->state, + key_event.event_string, + key_event.event_string[0], + (key_event.is_text == TRUE) ? "(text)" : "(not text)"); } #endif #ifdef SPI_DEBUG fprintf (stderr, "%s%c\n", - (x_key_event->state & Mod1Mask)?"Alt-":"", - ((x_key_event->state & ShiftMask)^(x_key_event->state & LockMask))? - g_ascii_toupper (keysym) : g_ascii_tolower (keysym)); + (x_key_event->state & Mod1Mask) ? "Alt-" : "", + ((x_key_event->state & ShiftMask) ^ (x_key_event->state & LockMask)) ? g_ascii_toupper (keysym) : g_ascii_tolower (keysym)); fprintf (stderr, "serial: %x Time: %x\n", x_key_event->serial, x_key_event->time); #endif /* SPI_DEBUG */ - return key_event; + return key_event; } static gboolean @@ -888,12 +902,12 @@ spi_dec_x11_grab_key (SpiDEController *controller, Accessibility_ControllerEventMask mod_mask) { XGrabKey (spi_get_display (), - key_val, - mod_mask, - spi_get_root_window (), - True, - GrabModeSync, - GrabModeSync); + key_val, + mod_mask, + spi_get_root_window (), + True, + GrabModeSync, + GrabModeSync); XSync (spi_get_display (), False); return spi_clear_error_state (); } @@ -904,9 +918,9 @@ spi_dec_x11_ungrab_key (SpiDEController *controller, Accessibility_ControllerEventMask mod_mask) { XUngrabKey (spi_get_display (), - key_val, - mod_mask, - spi_get_root_window ()); + key_val, + mod_mask, + spi_get_root_window ()); } static unsigned int @@ -915,26 +929,26 @@ xkb_get_slowkeys_delay (SpiDEController *controller) unsigned int retval = 0; SpiDEControllerPrivate *priv = spi_device_event_controller_get_instance_private (controller); #ifdef HAVE_XKB -#ifdef XKB_HAS_GET_SLOW_KEYS_DELAY +#ifdef XKB_HAS_GET_SLOW_KEYS_DELAY retval = XkbGetSlowKeysDelay (spi_get_display (), - XkbUseCoreKbd, &bounce_delay); + XkbUseCoreKbd, &bounce_delay); #else if (!(priv->xkb_desc == (XkbDescPtr) BadAlloc || priv->xkb_desc == NULL)) { Status s = XkbGetControls (spi_get_display (), - XkbAllControlsMask, priv->xkb_desc); + XkbAllControlsMask, priv->xkb_desc); if (s == Success) { - if (priv->xkb_desc->ctrls->enabled_ctrls & XkbSlowKeysMask) - retval = priv->xkb_desc->ctrls->slow_keys_delay; - } + if (priv->xkb_desc->ctrls->enabled_ctrls & XkbSlowKeysMask) + retval = priv->xkb_desc->ctrls->slow_keys_delay; + } } #endif #endif #ifdef SPI_XKB_DEBUG - fprintf (stderr, "SlowKeys delay: %d\n", (int) retval); + fprintf (stderr, "SlowKeys delay: %d\n", (int) retval); #endif - return retval; + return retval; } static unsigned int @@ -943,19 +957,19 @@ xkb_get_bouncekeys_delay (SpiDEController *controller) unsigned int retval = 0; SpiDEControllerPrivate *priv = spi_device_event_controller_get_instance_private (controller); #ifdef HAVE_XKB -#ifdef XKB_HAS_GET_BOUNCE_KEYS_DELAY +#ifdef XKB_HAS_GET_BOUNCE_KEYS_DELAY retval = XkbGetBounceKeysDelay (spi_get_display (), - XkbUseCoreKbd, &bounce_delay); + XkbUseCoreKbd, &bounce_delay); #else if (!(priv->xkb_desc == (XkbDescPtr) BadAlloc || priv->xkb_desc == NULL)) { Status s = XkbGetControls (spi_get_display (), - XkbAllControlsMask, priv->xkb_desc); + XkbAllControlsMask, priv->xkb_desc); if (s == Success) { - if (priv->xkb_desc->ctrls->enabled_ctrls & XkbBounceKeysMask) - retval = priv->xkb_desc->ctrls->debounce_delay; - } + if (priv->xkb_desc->ctrls->enabled_ctrls & XkbBounceKeysMask) + retval = priv->xkb_desc->ctrls->debounce_delay; + } } #endif #endif @@ -969,210 +983,223 @@ static gboolean spi_dec_x11_synth_keycode_press (SpiDEController *controller, unsigned int keycode) { - unsigned int time = CurrentTime; - unsigned int bounce_delay; -#ifdef THIS_IS_BROKEN - unsigned int elapsed_msec; - struct timeval tv; + unsigned int time = CurrentTime; + unsigned int bounce_delay; +#ifdef THIS_IS_BROKEN + unsigned int elapsed_msec; + struct timeval tv; #endif - SpiDEControllerPrivate *priv = spi_device_event_controller_get_instance_private (controller); - - spi_x_error_trap (); - if (keycode == priv->last_release_keycode) - { - bounce_delay = xkb_get_bouncekeys_delay (controller); - if (bounce_delay) - { + SpiDEControllerPrivate *priv = spi_device_event_controller_get_instance_private (controller); + + spi_x_error_trap (); + if (keycode == priv->last_release_keycode) + { + bounce_delay = xkb_get_bouncekeys_delay (controller); + if (bounce_delay) + { #ifdef THIS_IS_BROKEN - gettimeofday (&tv, NULL); - elapsed_msec = - (tv.tv_sec - priv->last_release_time.tv_sec) * 1000 - + (tv.tv_usec - priv->last_release_time.tv_usec) / 1000; -# ifdef SPI_XKB_DEBUG - fprintf (stderr, "%d ms elapsed (%ld usec)\n", elapsed_msec, - (long) (tv.tv_usec - priv->last_release_time.tv_usec)); -# endif - if (elapsed_msec < bounce_delay) - time = bounce_delay - elapsed_msec + 1; + gettimeofday (&tv, NULL); + elapsed_msec = + (tv.tv_sec - priv->last_release_time.tv_sec) * 1000 + (tv.tv_usec - priv->last_release_time.tv_usec) / 1000; +#ifdef SPI_XKB_DEBUG + fprintf (stderr, "%d ms elapsed (%ld usec)\n", elapsed_msec, + (long) (tv.tv_usec - priv->last_release_time.tv_usec)); +#endif + if (elapsed_msec < bounce_delay) + time = bounce_delay - elapsed_msec + 1; #else - time = bounce_delay + 10; - /* fudge for broken XTest */ + time = bounce_delay + 10; + /* fudge for broken XTest */ #endif -#ifdef SPI_XKB_DEBUG - fprintf (stderr, "waiting %d ms\n", time); +#ifdef SPI_XKB_DEBUG + fprintf (stderr, "waiting %d ms\n", time); #endif - } - } - XTestFakeKeyEvent (spi_get_display (), keycode, True, time); - priv->last_press_keycode = keycode; - XFlush (spi_get_display ()); - XSync (spi_get_display (), False); - gettimeofday (&priv->last_press_time, NULL); - return TRUE; + } + } + XTestFakeKeyEvent (spi_get_display (), keycode, True, time); + priv->last_press_keycode = keycode; + XFlush (spi_get_display ()); + XSync (spi_get_display (), False); + gettimeofday (&priv->last_press_time, NULL); + return TRUE; } static gboolean spi_dec_x11_synth_keycode_release (SpiDEController *controller, - unsigned int keycode) + unsigned int keycode) { - unsigned int time = CurrentTime; - unsigned int slow_delay; + unsigned int time = CurrentTime; + unsigned int slow_delay; #ifdef THIS_IS_BROKEN_DUNNO_WHY - unsigned int elapsed_msec; - struct timeval tv; + unsigned int elapsed_msec; + struct timeval tv; #endif - SpiDEControllerPrivate *priv = spi_device_event_controller_get_instance_private (controller); - - spi_x_error_trap (); - if (keycode == priv->last_press_keycode) - { - slow_delay = xkb_get_slowkeys_delay (controller); - if (slow_delay) - { + SpiDEControllerPrivate *priv = spi_device_event_controller_get_instance_private (controller); + + spi_x_error_trap (); + if (keycode == priv->last_press_keycode) + { + slow_delay = xkb_get_slowkeys_delay (controller); + if (slow_delay) + { #ifdef THIS_IS_BROKEN_DUNNO_WHY - gettimeofday (&tv, NULL); - elapsed_msec = - (tv.tv_sec - priv->last_press_time.tv_sec) * 1000 - + (tv.tv_usec - priv->last_press_time.tv_usec) / 1000; -# ifdef SPI_XKB_DEBUG - fprintf (stderr, "%d ms elapsed (%ld usec)\n", elapsed_msec, - (long) (tv.tv_usec - priv->last_press_time.tv_usec)); -# endif - if (elapsed_msec < slow_delay) - time = slow_delay - elapsed_msec + 1; + gettimeofday (&tv, NULL); + elapsed_msec = + (tv.tv_sec - priv->last_press_time.tv_sec) * 1000 + (tv.tv_usec - priv->last_press_time.tv_usec) / 1000; +#ifdef SPI_XKB_DEBUG + fprintf (stderr, "%d ms elapsed (%ld usec)\n", elapsed_msec, + (long) (tv.tv_usec - priv->last_press_time.tv_usec)); +#endif + if (elapsed_msec < slow_delay) + time = slow_delay - elapsed_msec + 1; #else - time = slow_delay + 10; - /* our XTest seems broken, we have to add slop as above */ + time = slow_delay + 10; + /* our XTest seems broken, we have to add slop as above */ #endif -#ifdef SPI_XKB_DEBUG - fprintf (stderr, "waiting %d ms\n", time); +#ifdef SPI_XKB_DEBUG + fprintf (stderr, "waiting %d ms\n", time); #endif - } - } - XTestFakeKeyEvent (spi_get_display (), keycode, False, time); - priv->last_release_keycode = keycode; - XSync (spi_get_display (), False); - gettimeofday (&priv->last_release_time, NULL); - return TRUE; + } + } + XTestFakeKeyEvent (spi_get_display (), keycode, False, time); + priv->last_release_keycode = keycode; + XSync (spi_get_display (), False); + gettimeofday (&priv->last_release_time, NULL); + return TRUE; } static gboolean spi_dec_x11_lock_modifiers (SpiDEController *controller, unsigned modifiers) { - SpiDEControllerPrivate *priv = spi_device_event_controller_get_instance_private (controller); - - if (priv->have_xkb) { - return XkbLockModifiers (spi_get_display (), XkbUseCoreKbd, - modifiers, modifiers); - } else { - int mod_index; - if (xmkeymap==NULL) - xmkeymap = XGetModifierMapping(spi_get_display ()); - for (mod_index=0;mod_index<8;mod_index++) - if (modifiers & (1<<mod_index)) - spi_dec_x11_synth_keycode_press(controller, xmkeymap->modifiermap[mod_index]); - return TRUE; + SpiDEControllerPrivate *priv = spi_device_event_controller_get_instance_private (controller); + + if (priv->have_xkb) + { + return XkbLockModifiers (spi_get_display (), XkbUseCoreKbd, + modifiers, modifiers); + } + else + { + int mod_index; + if (xmkeymap == NULL) + xmkeymap = XGetModifierMapping (spi_get_display ()); + for (mod_index = 0; mod_index < 8; mod_index++) + if (modifiers & (1 << mod_index)) + spi_dec_x11_synth_keycode_press (controller, xmkeymap->modifiermap[mod_index]); + return TRUE; } } static gboolean spi_dec_x11_unlock_modifiers (SpiDEController *controller, unsigned modifiers) { - SpiDEControllerPrivate *priv = spi_device_event_controller_get_instance_private (controller); - - if (priv->have_xkb) { - return XkbLockModifiers (spi_get_display (), XkbUseCoreKbd, - modifiers, 0); - } else { - int mod_index; - if (xmkeymap==NULL) - xmkeymap = XGetModifierMapping(spi_get_display ()); - - for (mod_index=0;mod_index<8;mod_index++) - if (modifiers & (1<<mod_index)) - spi_dec_x11_synth_keycode_release(controller, xmkeymap->modifiermap[mod_index]); - return TRUE; + SpiDEControllerPrivate *priv = spi_device_event_controller_get_instance_private (controller); + + if (priv->have_xkb) + { + return XkbLockModifiers (spi_get_display (), XkbUseCoreKbd, + modifiers, 0); + } + else + { + int mod_index; + if (xmkeymap == NULL) + xmkeymap = XGetModifierMapping (spi_get_display ()); + + for (mod_index = 0; mod_index < 8; mod_index++) + if (modifiers & (1 << mod_index)) + spi_dec_x11_synth_keycode_release (controller, xmkeymap->modifiermap[mod_index]); + return TRUE; } } static KeySym keysym_for_unichar (SpiDEController *controller, gunichar unichar) { - return (KeySym) ucs2keysym ((long) unichar); + return (KeySym) ucs2keysym ((long) unichar); } static gboolean spi_dec_x11_synth_keystring (SpiDEController *controller, guint synth_type, gint keycode, const char *keystring) { - /* probably we need to create and inject an XIM handler eventually. */ - /* for now, try to match the string to existing - * keycode+modifier states. - */ - KeySym *keysyms; - gint maxlen = 0; - gunichar unichar = 0; - gint i = 0; - gboolean retval = TRUE; - const gchar *c; - KeySym keysym; - - if (!(keystring && *keystring && g_utf8_validate (keystring, -1, &c))) { - retval = FALSE; - } - else { + /* probably we need to create and inject an XIM handler eventually. */ + /* for now, try to match the string to existing + * keycode+modifier states. + */ + KeySym *keysyms; + gint maxlen = 0; + gunichar unichar = 0; + gint i = 0; + gboolean retval = TRUE; + const gchar *c; + KeySym keysym; + + if (!(keystring && *keystring && g_utf8_validate (keystring, -1, &c))) + { + retval = FALSE; + } + else + { #ifdef SPI_DEBUG - fprintf (stderr, "[keystring synthesis attempted on %s]\n", keystring); + fprintf (stderr, "[keystring synthesis attempted on %s]\n", keystring); #endif - maxlen = strlen (keystring) + 1; - keysyms = g_new0 (KeySym, maxlen); - - while (keystring && (unichar = g_utf8_get_char (keystring))) { - char bytes[6]; - gint mbytes; - - mbytes = g_unichar_to_utf8 (unichar, bytes); - bytes[mbytes] = '\0'; + maxlen = strlen (keystring) + 1; + keysyms = g_new0 (KeySym, maxlen); + + while (keystring && (unichar = g_utf8_get_char (keystring))) + { + char bytes[6]; + gint mbytes; + + mbytes = g_unichar_to_utf8 (unichar, bytes); + bytes[mbytes] = '\0'; #ifdef SPI_DEBUG - fprintf (stderr, "[unichar %s]", bytes); + fprintf (stderr, "[unichar %s]", bytes); #endif - keysym = keysym_for_unichar (controller, unichar); - if (keysym == NoSymbol) { + keysym = keysym_for_unichar (controller, unichar); + if (keysym == NoSymbol) + { #ifdef SPI_DEBUG - fprintf (stderr, "no keysym for %s", bytes); + fprintf (stderr, "no keysym for %s", bytes); #endif - retval = FALSE; - break; - } - keysyms[i++] = keysym; - keystring = g_utf8_next_char (keystring); - } - keysyms[i++] = 0; - XSynchronize (spi_get_display (), TRUE); - for (i = 0; keysyms[i]; ++i) { - if (!spi_dec_synth_keysym (controller, keysyms[i])) { + retval = FALSE; + break; + } + keysyms[i++] = keysym; + keystring = g_utf8_next_char (keystring); + } + keysyms[i++] = 0; + XSynchronize (spi_get_display (), TRUE); + for (i = 0; keysyms[i]; ++i) + { + if (!spi_dec_synth_keysym (controller, keysyms[i])) + { #ifdef SPI_DEBUG - fprintf (stderr, "could not synthesize %c\n", - (int) keysyms[i]); + fprintf (stderr, "could not synthesize %c\n", + (int) keysyms[i]); #endif - retval = FALSE; - break; - } - } - XSynchronize (spi_get_display (), FALSE); - - g_free (keysyms); - } - - if (synth_type == Accessibility_KEY_SYM) { - keysym = keycode; - } - else { - keysym = XkbKeycodeToKeysym (spi_get_display (), keycode, 0, 0); - } - if (XkbKeysymToModifiers (spi_get_display (), keysym) == 0) { - spi_dec_clear_unlatch_pending (controller); - } - return retval; + retval = FALSE; + break; + } + } + XSynchronize (spi_get_display (), FALSE); + + g_free (keysyms); + } + + if (synth_type == Accessibility_KEY_SYM) + { + keysym = keycode; + } + else + { + keysym = XkbKeycodeToKeysym (spi_get_display (), keycode, 0, 0); + } + if (XkbKeysymToModifiers (spi_get_display (), keysym) == 0) + { + spi_dec_clear_unlatch_pending (controller); + } + return retval; } static void @@ -1206,7 +1233,7 @@ spi_dec_x11_finalize (SpiDEController *controller) static gboolean spi_device_event_controller_forward_key_event (SpiDEController *controller, - const XEvent *event) + const XEvent *event) { SpiDEControllerPrivate *priv = spi_device_event_controller_get_instance_private (controller); Accessibility_DeviceEvent key_event; @@ -1221,11 +1248,10 @@ spi_device_event_controller_forward_key_event (SpiDEController *controller, /* relay to listeners, and decide whether to consume it or not */ ret = spi_controller_notify_keylisteners (controller, &key_event, TRUE); - g_free(key_event.event_string); + g_free (key_event.event_string); return ret; } - static gboolean is_key_released (long code) { @@ -1241,7 +1267,7 @@ static gboolean check_release (gpointer data) { gboolean released; - Accessibility_DeviceEvent *event = (Accessibility_DeviceEvent *)data; + Accessibility_DeviceEvent *event = (Accessibility_DeviceEvent *) data; KeyCode code = event->hw_code; released = is_key_released (code); @@ -1256,8 +1282,8 @@ check_release (gpointer data) } static void -wait_for_release_event (XEvent *event, - SpiDEController *controller) +wait_for_release_event (XEvent *event, + SpiDEController *controller) { pressed_event = spi_keystroke_from_x_key_event ((XKeyEvent *) event); check_release_handler = g_timeout_add (CHECK_RELEASE_DELAY, check_release, &pressed_event); @@ -1265,25 +1291,24 @@ wait_for_release_event (XEvent *event, } static void -spi_dec_x11_emit_modifier_event (SpiDEController *controller, guint prev_mask, - guint current_mask) +spi_dec_x11_emit_modifier_event (SpiDEController *controller, guint prev_mask, guint current_mask) { dbus_uint32_t d1, d2; #ifdef SPI_XKB_DEBUG - fprintf (stderr, "MODIFIER CHANGE EVENT! %x to %x\n", - prev_mask, current_mask); + fprintf (stderr, "MODIFIER CHANGE EVENT! %x to %x\n", + prev_mask, current_mask); #endif /* set bits for the virtual modifiers like NUMLOCK */ - if (prev_mask & _numlock_physical_mask) + if (prev_mask & _numlock_physical_mask) prev_mask |= SPI_KEYMASK_NUMLOCK; - if (current_mask & _numlock_physical_mask) + if (current_mask & _numlock_physical_mask) current_mask |= SPI_KEYMASK_NUMLOCK; d1 = prev_mask & key_modifier_mask; d2 = current_mask & key_modifier_mask; - spi_dec_dbus_emit(controller, SPI_DBUS_INTERFACE_EVENT_KEYBOARD, "Modifiers", "", d1, d2); + spi_dec_dbus_emit (controller, SPI_DBUS_INTERFACE_EVENT_KEYBOARD, "Modifiers", "", d1, d2); } static void @@ -1298,53 +1323,53 @@ spi_dec_x11_generate_mouse_event (SpiDEController *controller, switch (eventName[0]) { - case 'b': - switch (eventName[1]) - { - /* TODO: check number of buttons before parsing */ - case '1': - button = 1; - break; - case '2': - button = 2; - break; - case '3': - button = 3; - break; - case '4': - button = 4; - break; - case '5': - button = 5; - break; - default: - err = TRUE; - } - if (!err) - { - if (x != -1 && y != -1) - { - XTestFakeMotionEvent (display, DefaultScreen (display), - x, y, 0); - } - XTestFakeButtonEvent (display, button, !(eventName[2] == 'r'), 0); - if (eventName[2] == 'c') - XTestFakeButtonEvent (display, button, FALSE, 1); - else if (eventName[2] == 'd') - { - XTestFakeButtonEvent (display, button, FALSE, 1); - XTestFakeButtonEvent (display, button, TRUE, 2); - XTestFakeButtonEvent (display, button, FALSE, 3); - } - } - break; - case 'r': /* relative motion */ - XTestFakeRelativeMotionEvent (display, x, y, 0); - break; - case 'a': /* absolute motion */ - XTestFakeMotionEvent (display, DefaultScreen (display), - x, y, 0); - break; + case 'b': + switch (eventName[1]) + { + /* TODO: check number of buttons before parsing */ + case '1': + button = 1; + break; + case '2': + button = 2; + break; + case '3': + button = 3; + break; + case '4': + button = 4; + break; + case '5': + button = 5; + break; + default: + err = TRUE; + } + if (!err) + { + if (x != -1 && y != -1) + { + XTestFakeMotionEvent (display, DefaultScreen (display), + x, y, 0); + } + XTestFakeButtonEvent (display, button, !(eventName[2] == 'r'), 0); + if (eventName[2] == 'c') + XTestFakeButtonEvent (display, button, FALSE, 1); + else if (eventName[2] == 'd') + { + XTestFakeButtonEvent (display, button, FALSE, 1); + XTestFakeButtonEvent (display, button, TRUE, 2); + XTestFakeButtonEvent (display, button, FALSE, 3); + } + } + break; + case 'r': /* relative motion */ + XTestFakeRelativeMotionEvent (display, x, y, 0); + break; + case 'a': /* absolute motion */ + XTestFakeMotionEvent (display, DefaultScreen (display), + x, y, 0); + break; } } diff --git a/registryd/deviceeventcontroller-x11.h b/registryd/deviceeventcontroller-x11.h index e66799e4..a39b57d7 100644 --- a/registryd/deviceeventcontroller-x11.h +++ b/registryd/deviceeventcontroller-x11.h @@ -1,13 +1,14 @@ #ifndef _DEVICEEVENTCONTROLLER_X11_H_ #define _DEVICEEVENTCONTROLLER_X11_H_ -#include <glib.h> +#include <X11/XKBlib.h> #include <X11/Xlib.h> #include <X11/Xutil.h> #include <X11/extensions/XTest.h> -#include <X11/XKBlib.h> +#include <glib.h> -typedef struct { +typedef struct +{ Display *xevie_display; unsigned int last_press_keycode; unsigned int last_release_keycode; @@ -22,7 +23,7 @@ typedef struct { XkbDescPtr xkb_desc; KeyCode reserved_keycode; KeySym reserved_keysym; - guint reserved_reset_timeout; + guint reserved_reset_timeout; } SpiDEControllerPrivate; #ifdef HAVE_X11 @@ -30,6 +31,6 @@ void spi_dec_setup_x11 (SpiDEControllerClass *klass); #endif long ucs2keysym (long ucs); -long keysym2ucs(long keysym); +long keysym2ucs (long keysym); #endif /* _DEVICEEVENTCONTROLLER_X11_H_ */ diff --git a/registryd/deviceeventcontroller.c b/registryd/deviceeventcontroller.c index c5d7b9c5..466bae22 100644 --- a/registryd/deviceeventcontroller.c +++ b/registryd/deviceeventcontroller.c @@ -25,27 +25,27 @@ #include "config.h" -#undef SPI_XKB_DEBUG -#undef SPI_DEBUG -#undef SPI_KEYEVENT_DEBUG +#undef SPI_XKB_DEBUG +#undef SPI_DEBUG +#undef SPI_KEYEVENT_DEBUG -#include <string.h> #include <ctype.h> #include <stdio.h> +#include <string.h> #include <sys/time.h> #include <glib.h> #include <dbus/dbus.h> -#include "paths.h" -#include "de-types.h" #include "de-marshaller.h" +#include "de-types.h" #include "keymasks.h" +#include "paths.h" #include "deviceeventcontroller.h" -#include "reentrant-list.h" #include "introspection.h" +#include "reentrant-list.h" #ifdef HAVE_X11 #include "deviceeventcontroller-x11.h" @@ -59,43 +59,43 @@ * Otherwise, there is no private data and so we use a dummy struct. * This is so that G_ADD_PRIVATE() will have a type to work with. */ -typedef struct { +typedef struct +{ int _dummy; } SpiDEControllerPrivate; #endif -typedef struct { - gint x; - gint y; +typedef struct +{ + gint x; + gint y; } SpiPoint; static unsigned int key_modifier_mask = - SPI_KEYMASK_MOD1 | SPI_KEYMASK_MOD2 | SPI_KEYMASK_MOD3 | SPI_KEYMASK_MOD4 | - SPI_KEYMASK_MOD5 | SPI_KEYMASK_SHIFT | SPI_KEYMASK_SHIFTLOCK | - SPI_KEYMASK_CONTROL | SPI_KEYMASK_NUMLOCK; + SPI_KEYMASK_MOD1 | SPI_KEYMASK_MOD2 | SPI_KEYMASK_MOD3 | SPI_KEYMASK_MOD4 | + SPI_KEYMASK_MOD5 | SPI_KEYMASK_SHIFT | SPI_KEYMASK_SHIFTLOCK | + SPI_KEYMASK_CONTROL | SPI_KEYMASK_NUMLOCK; unsigned int _numlock_physical_mask = SPI_KEYMASK_MOD2; /* a guess, will be reset */ - -typedef struct { - guint ref_count : 30; - guint pending_add : 1; - guint pending_remove : 1; +typedef struct +{ + guint ref_count : 30; + guint pending_add : 1; + guint pending_remove : 1; Accessibility_ControllerEventMask mod_mask; - dbus_uint32_t key_val; /* KeyCode */ + dbus_uint32_t key_val; /* KeyCode */ } DEControllerGrabMask; - -gboolean spi_controller_update_key_grabs (SpiDEController *controller, - Accessibility_DeviceEvent *recv); +gboolean spi_controller_update_key_grabs (SpiDEController *controller, + Accessibility_DeviceEvent *recv); static gboolean eventtype_seq_contains_event (dbus_uint32_t types, - const Accessibility_DeviceEvent *event); + const Accessibility_DeviceEvent *event); static gboolean spi_dec_poll_mouse_moving (gpointer data); static gboolean spi_dec_poll_mouse_idle (gpointer data); -G_DEFINE_TYPE_WITH_CODE(SpiDEController, spi_device_event_controller, G_TYPE_OBJECT, - G_ADD_PRIVATE (SpiDEController)) +G_DEFINE_TYPE_WITH_CODE (SpiDEController, spi_device_event_controller, G_TYPE_OBJECT, G_ADD_PRIVATE (SpiDEController)) static gint spi_dec_plat_get_keycode (SpiDEController *controller, @@ -119,8 +119,10 @@ spi_dec_plat_get_keycode (SpiDEController *controller, } static guint -spi_dec_plat_mouse_check (SpiDEController *controller, - int *x, int *y, gboolean *moved) +spi_dec_plat_mouse_check (SpiDEController *controller, + int *x, + int *y, + gboolean *moved) { SpiDEControllerClass *klass; klass = SPI_DEVICE_EVENT_CONTROLLER_GET_CLASS (controller); @@ -158,7 +160,7 @@ spi_dec_plat_ungrab_key (SpiDEController *controller, guint key_val, Accessibili static gboolean spi_dec_plat_synth_keycode_press (SpiDEController *controller, - unsigned int keycode) + unsigned int keycode) { SpiDEControllerClass *klass; klass = SPI_DEVICE_EVENT_CONTROLLER_GET_CLASS (controller); @@ -170,7 +172,7 @@ spi_dec_plat_synth_keycode_press (SpiDEController *controller, static gboolean spi_dec_plat_synth_keycode_release (SpiDEController *controller, - unsigned int keycode) + unsigned int keycode) { SpiDEControllerClass *klass; klass = SPI_DEVICE_EVENT_CONTROLLER_GET_CLASS (controller); @@ -214,8 +216,7 @@ spi_dec_plat_synth_keystring (SpiDEController *controller, guint synth_type, gin } static void -spi_dec_plat_emit_modifier_event (SpiDEController *controller, guint prev_mask, - guint current_mask) +spi_dec_plat_emit_modifier_event (SpiDEController *controller, guint prev_mask, guint current_mask) { SpiDEControllerClass *klass; klass = SPI_DEVICE_EVENT_CONTROLLER_GET_CLASS (controller); @@ -238,19 +239,19 @@ spi_dec_plat_generate_mouse_event (SpiDEController *controller, static DBusMessage * invalid_arguments_error (DBusMessage *message) { - DBusMessage *reply; - gchar *errmsg; - - errmsg= g_strdup_printf ( - "Method \"%s\" with signature \"%s\" on interface \"%s\" was supplied with invalid arguments\n", - dbus_message_get_member (message), - dbus_message_get_signature (message), - dbus_message_get_interface (message)); - reply = dbus_message_new_error (message, - DBUS_ERROR_INVALID_ARGS, - errmsg); - g_free (errmsg); - return reply; + DBusMessage *reply; + gchar *errmsg; + + errmsg = g_strdup_printf ( + "Method \"%s\" with signature \"%s\" on interface \"%s\" was supplied with invalid arguments\n", + dbus_message_get_member (message), + dbus_message_get_signature (message), + dbus_message_get_interface (message)); + reply = dbus_message_new_error (message, + DBUS_ERROR_INVALID_ARGS, + errmsg); + g_free (errmsg); + return reply; } /* Private methods */ @@ -278,22 +279,23 @@ spi_dbus_remove_disconnect_match (DBusConnection *bus, const char *name) { char *match = g_strdup_printf ("interface=%s,member=NameOwnerChanged,arg0=%s", DBUS_INTERFACE_DBUS, name); if (match) - { - DBusError error; - dbus_error_init (&error); - dbus_bus_remove_match (bus, match, &error); - g_free (match); - if (dbus_error_is_set (&error)) - { - dbus_error_free (&error); - return FALSE; - } - else - { - return TRUE; - } - } - else return FALSE; + { + DBusError error; + dbus_error_init (&error); + dbus_bus_remove_match (bus, match, &error); + g_free (match); + if (dbus_error_is_set (&error)) + { + dbus_error_free (&error); + return FALSE; + } + else + { + return TRUE; + } + } + else + return FALSE; } static DEControllerGrabMask * @@ -327,14 +329,13 @@ spi_grab_mask_compare_values (gconstpointer p1, gconstpointer p2) return 0; } else - { + { return ((l1->mod_mask != l2->mod_mask) || (l1->key_val != l2->key_val)); } } void -spi_dec_dbus_emit (SpiDEController *controller, const char *interface, - const char *name, const char *minor, int a1, int a2) +spi_dec_dbus_emit (SpiDEController *controller, const char *interface, const char *name, const char *minor, int a1, int a2) { DBusMessage *signal = NULL; DBusMessageIter iter, iter_dict, iter_variant; @@ -349,11 +350,11 @@ spi_dec_dbus_emit (SpiDEController *controller, const char *interface, dbus_message_iter_append_basic (&iter, DBUS_TYPE_INT32, &a1); dbus_message_iter_append_basic (&iter, DBUS_TYPE_INT32, &a2); dbus_message_iter_open_container (&iter, DBUS_TYPE_VARIANT, "i", &iter_variant); - dbus_message_iter_append_basic (&iter_variant, DBUS_TYPE_INT32, &nil); + dbus_message_iter_append_basic (&iter_variant, DBUS_TYPE_INT32, &nil); dbus_message_iter_close_container (&iter, &iter_variant); dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, "{sv}", &iter_dict); - dbus_message_iter_close_container (&iter, &iter_dict); + dbus_message_iter_close_container (&iter, &iter_dict); dbus_connection_send (controller->bus, signal, NULL); dbus_message_unref (signal); @@ -362,7 +363,7 @@ spi_dec_dbus_emit (SpiDEController *controller, const char *interface, static gboolean spi_dec_poll_mouse_moved (gpointer data) { - SpiDEController *controller = SPI_DEVICE_EVENT_CONTROLLER(data); + SpiDEController *controller = SPI_DEVICE_EVENT_CONTROLLER (data); int x, y; gboolean moved; guint mask_return; @@ -382,7 +383,7 @@ spi_dec_poll_mouse_moved (gpointer data) static gboolean spi_dec_poll_mouse_idle (gpointer data) { - SpiDEController *controller = SPI_DEVICE_EVENT_CONTROLLER(data); + SpiDEController *controller = SPI_DEVICE_EVENT_CONTROLLER (data); if (!controller->have_mouse_event_listener) return FALSE; @@ -393,14 +394,14 @@ spi_dec_poll_mouse_idle (gpointer data) guint id; id = g_timeout_add (20, spi_dec_poll_mouse_moving, controller); g_source_set_name_by_id (id, "[at-spi2-core] spi_dec_poll_mouse_moving"); - return FALSE; + return FALSE; } } static gboolean spi_dec_poll_mouse_moving (gpointer data) { - SpiDEController *controller = SPI_DEVICE_EVENT_CONTROLLER(data); + SpiDEController *controller = SPI_DEVICE_EVENT_CONTROLLER (data); if (!controller->have_mouse_event_listener) return FALSE; @@ -417,10 +418,10 @@ spi_dec_poll_mouse_moving (gpointer data) /** * Eventually we can use this to make the marshalling of mask types - * more sane, but for now we just use this to detect + * more sane, but for now we just use this to detect * the use of 'virtual' masks such as numlock and convert them to * system-specific mask values (i.e. ModMask). - * + * **/ static Accessibility_ControllerEventMask spi_dec_translate_mask (Accessibility_ControllerEventMask mask) @@ -435,61 +436,62 @@ spi_dec_translate_mask (Accessibility_ControllerEventMask mask) tmp_mask = mask ^ SPI_KEYMASK_NUMLOCK; tmp_mask |= _numlock_physical_mask; } - + return tmp_mask; } static DEControllerKeyListener * spi_dec_key_listener_new (const char *bus_name, - const char *path, - GSList *keys, - const Accessibility_ControllerEventMask mask, - const dbus_uint32_t types, - const Accessibility_EventListenerMode *mode) + const char *path, + GSList *keys, + const Accessibility_ControllerEventMask mask, + const dbus_uint32_t types, + const Accessibility_EventListenerMode *mode) { DEControllerKeyListener *key_listener = g_new0 (DEControllerKeyListener, 1); - key_listener->listener.bus_name = g_strdup(bus_name); - key_listener->listener.path = g_strdup(path); + key_listener->listener.bus_name = g_strdup (bus_name); + key_listener->listener.path = g_strdup (path); key_listener->listener.type = SPI_DEVICE_TYPE_KBD; key_listener->keys = keys; key_listener->mask = spi_dec_translate_mask (mask); key_listener->listener.types = types; if (mode) - { - key_listener->mode = (Accessibility_EventListenerMode *) g_malloc(sizeof(Accessibility_EventListenerMode)); - memcpy(key_listener->mode, mode, sizeof(*mode)); - } + { + key_listener->mode = (Accessibility_EventListenerMode *) g_malloc (sizeof (Accessibility_EventListenerMode)); + memcpy (key_listener->mode, mode, sizeof (*mode)); + } else key_listener->mode = NULL; #ifdef SPI_DEBUG g_print ("new listener, with mask %x, is_global %d, keys %p (%d)\n", - (unsigned int) key_listener->mask, + (unsigned int) key_listener->mask, (int) (mode ? mode->global : 0), - (void *) key_listener->keys, - (int) (key_listener->keys ? g_slist_length(key_listener->keys) : 0)); + (void *) key_listener->keys, + (int) (key_listener->keys ? g_slist_length (key_listener->keys) : 0)); #endif - return key_listener; + return key_listener; } -static GSList *keylist_clone (GSList *s) +static GSList * +keylist_clone (GSList *s) { GSList *d = NULL; GSList *l; - for (l = s; l; l = g_slist_next(l)) - { - Accessibility_KeyDefinition *kd = (Accessibility_KeyDefinition *)g_malloc(sizeof(Accessibility_KeyDefinition)); - if (kd) + for (l = s; l; l = g_slist_next (l)) { - Accessibility_KeyDefinition *kds = (Accessibility_KeyDefinition *)l->data; - kd->keycode = kds->keycode; - kd->keysym = kds->keysym; - kd->keystring = g_strdup(kds->keystring); - d = g_slist_append(d, kd); + Accessibility_KeyDefinition *kd = (Accessibility_KeyDefinition *) g_malloc (sizeof (Accessibility_KeyDefinition)); + if (kd) + { + Accessibility_KeyDefinition *kds = (Accessibility_KeyDefinition *) l->data; + kd->keycode = kds->keycode; + kd->keysym = kds->keysym; + kd->keystring = g_strdup (kds->keystring); + d = g_slist_append (d, kd); + } } - } return d; } @@ -504,33 +506,36 @@ spi_key_listener_clone (DEControllerKeyListener *key_listener) clone->mask = key_listener->mask; clone->listener.types = key_listener->listener.types; if (key_listener->mode) - { - clone->mode = (Accessibility_EventListenerMode *)g_malloc(sizeof(Accessibility_EventListenerMode)); - if (clone->mode) memcpy(clone->mode, key_listener->mode, sizeof(Accessibility_EventListenerMode)); - } + { + clone->mode = (Accessibility_EventListenerMode *) g_malloc (sizeof (Accessibility_EventListenerMode)); + if (clone->mode) + memcpy (clone->mode, key_listener->mode, sizeof (Accessibility_EventListenerMode)); + } else clone->mode = NULL; return clone; } -static void keylist_free(GSList *keys) +static void +keylist_free (GSList *keys) { GSList *l; - for (l = keys; l; l = g_slist_next(l)) - { - Accessibility_KeyDefinition *kd = (Accessibility_KeyDefinition *)l->data; - g_free(kd->keystring); - g_free(kd); - } + for (l = keys; l; l = g_slist_next (l)) + { + Accessibility_KeyDefinition *kd = (Accessibility_KeyDefinition *) l->data; + g_free (kd->keystring); + g_free (kd); + } g_slist_free (keys); } static void spi_key_listener_data_free (DEControllerKeyListener *key_listener) { - keylist_free(key_listener->keys); - if (key_listener->mode) g_free(key_listener->mode); + keylist_free (key_listener->keys); + if (key_listener->mode) + g_free (key_listener->mode); g_free (key_listener->listener.bus_name); g_free (key_listener->listener.path); g_free (key_listener); @@ -543,25 +548,25 @@ spi_key_listener_clone_free (DEControllerKeyListener *clone) } static void -spi_dec_listener_free (DEControllerListener *listener) +spi_dec_listener_free (DEControllerListener *listener) { - if (listener->type == SPI_DEVICE_TYPE_KBD) + if (listener->type == SPI_DEVICE_TYPE_KBD) spi_key_listener_data_free ((DEControllerKeyListener *) listener); else - { - g_free (listener->bus_name); - g_free (listener->path); - } + { + g_free (listener->bus_name); + g_free (listener->path); + } } static void -_register_keygrab (SpiDEController *controller, - DEControllerGrabMask *grab_mask) +_register_keygrab (SpiDEController *controller, + DEControllerGrabMask *grab_mask) { GList *l; l = g_list_find_custom (controller->keygrabs_list, grab_mask, - spi_grab_mask_compare_values); + spi_grab_mask_compare_values); if (l) { DEControllerGrabMask *cur_mask = l->data; @@ -570,24 +575,24 @@ _register_keygrab (SpiDEController *controller, if (cur_mask->pending_remove) { cur_mask->pending_remove = FALSE; - } + } } else { controller->keygrabs_list = - g_list_prepend (controller->keygrabs_list, - spi_grab_mask_clone (grab_mask)); + g_list_prepend (controller->keygrabs_list, + spi_grab_mask_clone (grab_mask)); } } static void -_deregister_keygrab (SpiDEController *controller, - DEControllerGrabMask *grab_mask) +_deregister_keygrab (SpiDEController *controller, + DEControllerGrabMask *grab_mask) { GList *l; l = g_list_find_custom (controller->keygrabs_list, grab_mask, - spi_grab_mask_compare_values); + spi_grab_mask_compare_values); if (l) { @@ -597,15 +602,15 @@ _deregister_keygrab (SpiDEController *controller, if (cur_mask->ref_count <= 0) { cur_mask->pending_remove = TRUE; - } + } } } static void -handle_keygrab (SpiDEController *controller, - DEControllerKeyListener *key_listener, - void (*process_cb) (SpiDEController *controller, - DEControllerGrabMask *grab_mask)) +handle_keygrab (SpiDEController *controller, + DEControllerKeyListener *key_listener, + void (*process_cb) (SpiDEController *controller, + DEControllerGrabMask *grab_mask)) { DEControllerGrabMask grab_mask = { 0 }; @@ -622,30 +627,30 @@ handle_keygrab (SpiDEController *controller, { GSList *l; - for (l = key_listener->keys; l; l = g_slist_next(l)) + for (l = key_listener->keys; l; l = g_slist_next (l)) { - Accessibility_KeyDefinition *keydef = l->data; - long key_val; - key_val = spi_dec_plat_get_keycode (controller, keydef->keysym, keydef->keystring, FALSE, NULL); - if (!key_val) - key_val = keydef->keycode; - grab_mask.key_val = key_val; - process_cb (controller, &grab_mask); - } + Accessibility_KeyDefinition *keydef = l->data; + long key_val; + key_val = spi_dec_plat_get_keycode (controller, keydef->keysym, keydef->keystring, FALSE, NULL); + if (!key_val) + key_val = keydef->keycode; + grab_mask.key_val = key_val; + process_cb (controller, &grab_mask); + } } } static gboolean -spi_controller_register_global_keygrabs (SpiDEController *controller, - DEControllerKeyListener *key_listener) +spi_controller_register_global_keygrabs (SpiDEController *controller, + DEControllerKeyListener *key_listener) { handle_keygrab (controller, key_listener, _register_keygrab); return spi_controller_update_key_grabs (controller, NULL); } static void -spi_controller_deregister_global_keygrabs (SpiDEController *controller, - DEControllerKeyListener *key_listener) +spi_controller_deregister_global_keygrabs (SpiDEController *controller, + DEControllerKeyListener *key_listener) { handle_keygrab (controller, key_listener, _deregister_keygrab); spi_controller_update_key_grabs (controller, NULL); @@ -672,49 +677,49 @@ append_keystroke_listener (DBusMessageIter *iter, DEControllerKeyListener *liste dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_UINT32, &d_uint); if (!dbus_message_iter_open_container (&iter_struct, DBUS_TYPE_ARRAY, "(iisi)", &iter_subarray)) - { - dbus_message_iter_close_container (iter, &iter_struct); - return; - } + { + dbus_message_iter_close_container (iter, &iter_struct); + return; + } for (kl = listener->keys; kl; kl = kl->next) - { - Accessibility_KeyDefinition *kd = kl->data; - if (!dbus_message_iter_open_container (&iter_subarray, DBUS_TYPE_STRUCT, - NULL, &iter_substruct)) - break; - dbus_message_iter_append_basic (&iter_substruct, DBUS_TYPE_INT32, &kd->keycode); - dbus_message_iter_append_basic (&iter_substruct, DBUS_TYPE_INT32, &kd->keysym); - dbus_message_iter_append_basic (&iter_substruct, DBUS_TYPE_STRING, &kd->keystring); - dbus_message_iter_append_basic (&iter_substruct, DBUS_TYPE_INT32, &kd->unused); - dbus_message_iter_close_container (&iter_subarray, &iter_substruct); - } + { + Accessibility_KeyDefinition *kd = kl->data; + if (!dbus_message_iter_open_container (&iter_subarray, DBUS_TYPE_STRUCT, + NULL, &iter_substruct)) + break; + dbus_message_iter_append_basic (&iter_substruct, DBUS_TYPE_INT32, &kd->keycode); + dbus_message_iter_append_basic (&iter_substruct, DBUS_TYPE_INT32, &kd->keysym); + dbus_message_iter_append_basic (&iter_substruct, DBUS_TYPE_STRING, &kd->keystring); + dbus_message_iter_append_basic (&iter_substruct, DBUS_TYPE_INT32, &kd->unused); + dbus_message_iter_close_container (&iter_subarray, &iter_substruct); + } dbus_message_iter_close_container (&iter_struct, &iter_subarray); d_uint = listener->mask; dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_UINT32, &d_uint); if (dbus_message_iter_open_container (&iter_struct, DBUS_TYPE_STRUCT, - NULL, &iter_substruct)) - { - if (listener->mode) - { - dbus_message_iter_append_basic (&iter_substruct, DBUS_TYPE_BOOLEAN, - &listener->mode->synchronous); - dbus_message_iter_append_basic (&iter_substruct, DBUS_TYPE_BOOLEAN, - &listener->mode->preemptive); - dbus_message_iter_append_basic (&iter_substruct, DBUS_TYPE_BOOLEAN, - &listener->mode->global); - } - else - { - dbus_bool_t dummy_val = FALSE; - dbus_message_iter_append_basic (&iter_substruct, DBUS_TYPE_BOOLEAN, - &dummy_val); - dbus_message_iter_append_basic (&iter_substruct, DBUS_TYPE_BOOLEAN, - &dummy_val); - dbus_message_iter_append_basic (&iter_substruct, DBUS_TYPE_BOOLEAN, - &dummy_val); - } - dbus_message_iter_close_container (&iter_struct, &iter_substruct); - } + NULL, &iter_substruct)) + { + if (listener->mode) + { + dbus_message_iter_append_basic (&iter_substruct, DBUS_TYPE_BOOLEAN, + &listener->mode->synchronous); + dbus_message_iter_append_basic (&iter_substruct, DBUS_TYPE_BOOLEAN, + &listener->mode->preemptive); + dbus_message_iter_append_basic (&iter_substruct, DBUS_TYPE_BOOLEAN, + &listener->mode->global); + } + else + { + dbus_bool_t dummy_val = FALSE; + dbus_message_iter_append_basic (&iter_substruct, DBUS_TYPE_BOOLEAN, + &dummy_val); + dbus_message_iter_append_basic (&iter_substruct, DBUS_TYPE_BOOLEAN, + &dummy_val); + dbus_message_iter_append_basic (&iter_substruct, DBUS_TYPE_BOOLEAN, + &dummy_val); + } + dbus_message_iter_close_container (&iter_struct, &iter_substruct); + } dbus_message_iter_close_container (iter, &iter_struct); } @@ -726,8 +731,8 @@ notify_keystroke_listener (SpiDEController *controller, const char *path = SPI_DBUS_PATH_DEC; const char *interface = SPI_DBUS_INTERFACE_DEVICE_EVENT_LISTENER; const char *name = (enable - ? "KeystrokeListenerRegistered" - : "KeystrokeListenerDeregistered"); + ? "KeystrokeListenerRegistered" + : "KeystrokeListenerDeregistered"); DBusMessage *signal; DBusMessageIter iter; @@ -741,41 +746,42 @@ notify_keystroke_listener (SpiDEController *controller, } static gboolean -spi_controller_register_device_listener (SpiDEController *controller, - DEControllerListener *listener) +spi_controller_register_device_listener (SpiDEController *controller, + DEControllerListener *listener) { DEControllerKeyListener *key_listener; gboolean retval; - - switch (listener->type) { - case SPI_DEVICE_TYPE_KBD: + + switch (listener->type) + { + case SPI_DEVICE_TYPE_KBD: key_listener = (DEControllerKeyListener *) listener; controller->key_listeners = g_list_prepend (controller->key_listeners, - key_listener); + key_listener); spi_dbus_add_disconnect_match (controller->bus, key_listener->listener.bus_name); if (key_listener->mode->global) { - retval = spi_controller_register_global_keygrabs (controller, key_listener); - } + retval = spi_controller_register_global_keygrabs (controller, key_listener); + } else - retval = TRUE; + retval = TRUE; if (retval) - notify_keystroke_listener (controller, key_listener, TRUE); + notify_keystroke_listener (controller, key_listener, TRUE); break; - default: + default: g_assert_not_reached (); break; - } + } return FALSE; } static void set_reply (DBusPendingCall *pending, void *user_data) { - void **replyptr = (void **)user_data; + void **replyptr = (void **) user_data; - *replyptr = dbus_pending_call_steal_reply (pending); + *replyptr = dbus_pending_call_steal_reply (pending); } static GSList *hung_processes = NULL; @@ -791,15 +797,15 @@ reset_hung_process (DBusPendingCall *pending, void *data) dbus_pending_call_unref (pending); for (l = hung_processes; l; l = l->next) - { - if (!strcmp (l->data, dest)) { - gpointer l_data = l->data; - hung_processes = g_slist_remove (hung_processes, l_data); - g_free (l_data); - break; + if (!strcmp (l->data, dest)) + { + gpointer l_data = l->data; + hung_processes = g_slist_remove (hung_processes, l_data); + g_free (l_data); + break; + } } - } } static gint @@ -817,15 +823,15 @@ reset_hung_process_from_ping (DBusPendingCall *pending, void *data) GSList *l; for (l = hung_processes; l; l = l->next) - { - if (!strcmp (l->data, data)) { - gpointer l_data = l->data; - hung_processes = g_slist_remove (hung_processes, l_data); - g_free (l_data); - break; + if (!strcmp (l->data, data)) + { + gpointer l_data = l->data; + hung_processes = g_slist_remove (hung_processes, l_data); + g_free (l_data); + break; + } } - } g_free (data); dbus_pending_call_unref (pending); } @@ -833,97 +839,97 @@ reset_hung_process_from_ping (DBusPendingCall *pending, void *data) static DBusMessage * send_and_allow_reentry (DBusConnection *bus, DBusMessage *message, int timeout, DBusError *error) { - DBusPendingCall *pending; - DBusMessage *reply = NULL; + DBusPendingCall *pending; + DBusMessage *reply = NULL; struct timeval tv; - if (!dbus_connection_send_with_reply (bus, message, &pending, -1)) + if (!dbus_connection_send_with_reply (bus, message, &pending, -1)) { - return NULL; + return NULL; } - dbus_pending_call_set_notify (pending, set_reply, (void *)&reply, NULL); - gettimeofday (&tv, NULL); - while (!reply) + dbus_pending_call_set_notify (pending, set_reply, (void *) &reply, NULL); + gettimeofday (&tv, NULL); + while (!reply) { if (!dbus_connection_read_write_dispatch (bus, timeout) || time_elapsed (&tv) > timeout) - { - const char *dest = dbus_message_get_destination (message); - GSList *l; - gchar *bus_name_dup; - dbus_message_ref (message); - dbus_pending_call_set_notify (pending, reset_hung_process, message, - (DBusFreeFunction) dbus_message_unref); - message = dbus_message_new_method_call (dest, "/", - "org.freedesktop.DBus.Peer", - "Ping"); - if (!message) - return NULL; - dbus_connection_send_with_reply (bus, message, &pending, -1); - dbus_message_unref (message); - if (!pending) - return NULL; - bus_name_dup = g_strdup (dest); - dbus_pending_call_set_notify (pending, reset_hung_process_from_ping, - bus_name_dup, NULL); - for (l = hung_processes; l; l = l->next) - if (!strcmp (l->data, dest)) + { + const char *dest = dbus_message_get_destination (message); + GSList *l; + gchar *bus_name_dup; + dbus_message_ref (message); + dbus_pending_call_set_notify (pending, reset_hung_process, message, + (DBusFreeFunction) dbus_message_unref); + message = dbus_message_new_method_call (dest, "/", + "org.freedesktop.DBus.Peer", + "Ping"); + if (!message) + return NULL; + dbus_connection_send_with_reply (bus, message, &pending, -1); + dbus_message_unref (message); + if (!pending) return NULL; - hung_processes = g_slist_prepend (hung_processes, g_strdup (dest)); - return NULL; - } + bus_name_dup = g_strdup (dest); + dbus_pending_call_set_notify (pending, reset_hung_process_from_ping, + bus_name_dup, NULL); + for (l = hung_processes; l; l = l->next) + if (!strcmp (l->data, dest)) + return NULL; + hung_processes = g_slist_prepend (hung_processes, g_strdup (dest)); + return NULL; + } } - dbus_pending_call_unref (pending); - return reply; + dbus_pending_call_unref (pending); + return reply; } static gboolean -Accessibility_DeviceEventListener_NotifyEvent(SpiDEController *controller, - DEControllerListener *listener, - const Accessibility_DeviceEvent *key_event) -{ - DBusMessage *message = dbus_message_new_method_call(listener->bus_name, - listener->path, - SPI_DBUS_INTERFACE_DEVICE_EVENT_LISTENER, - "NotifyEvent"); +Accessibility_DeviceEventListener_NotifyEvent (SpiDEController *controller, + DEControllerListener *listener, + const Accessibility_DeviceEvent *key_event) +{ + DBusMessage *message = dbus_message_new_method_call (listener->bus_name, + listener->path, + SPI_DBUS_INTERFACE_DEVICE_EVENT_LISTENER, + "NotifyEvent"); dbus_bool_t consumed = FALSE; GSList *l; gboolean hung = FALSE; for (l = hung_processes; l; l = l->next) - { - if (!strcmp (l->data, listener->bus_name)) { - dbus_message_set_no_reply (message, TRUE); - hung = TRUE; - break; + if (!strcmp (l->data, listener->bus_name)) + { + dbus_message_set_no_reply (message, TRUE); + hung = TRUE; + break; + } } - } - - if (spi_dbus_marshal_deviceEvent(message, key_event)) - { - DBusMessage *reply; - if (hung) + if (spi_dbus_marshal_deviceEvent (message, key_event)) { - dbus_connection_send (controller->bus, message, NULL); - dbus_message_unref (message); - return FALSE; - } + DBusMessage *reply; - reply = send_and_allow_reentry (controller->bus, message, 3000, NULL); - if (reply) - { - dbus_message_get_args(reply, NULL, DBUS_TYPE_BOOLEAN, &consumed, DBUS_TYPE_INVALID); - dbus_message_unref(reply); + if (hung) + { + dbus_connection_send (controller->bus, message, NULL); + dbus_message_unref (message); + return FALSE; + } + + reply = send_and_allow_reentry (controller->bus, message, 3000, NULL); + if (reply) + { + dbus_message_get_args (reply, NULL, DBUS_TYPE_BOOLEAN, &consumed, DBUS_TYPE_INVALID); + dbus_message_unref (reply); + } } - } - dbus_message_unref(message); + dbus_message_unref (message); return consumed; } static gboolean -key_set_contains_key (GSList *key_set, - const Accessibility_DeviceEvent *key_event) +key_set_contains_key (GSList *key_set, + const Accessibility_DeviceEvent *key_event) { gint i; gint len; @@ -938,40 +944,40 @@ key_set_contains_key (GSList *key_set, } len = g_slist_length (key_set); - + if (len == 0) /* special case, means "all keys/any key" */ { #ifdef SPI_DEBUG - g_print ("anykey\n"); + g_print ("anykey\n"); #endif return TRUE; } - for (l = key_set,i = 0; l; l = g_slist_next(l),i++) + for (l = key_set, i = 0; l; l = g_slist_next (l), i++) { Accessibility_KeyDefinition *kd = l->data; -#ifdef SPI_KEYEVENT_DEBUG +#ifdef SPI_KEYEVENT_DEBUG g_print ("key_set[%d] event = %d, code = %d; key_event %d, code %d, string %s\n", - i, - (int) kd->keysym, - (int) kd->keycode, - (int) key_event->id, - (int) key_event->hw_code, - key_event->event_string); + i, + (int) kd->keysym, + (int) kd->keycode, + (int) key_event->id, + (int) key_event->hw_code, + key_event->event_string); #endif if (kd->keysym == (dbus_uint32_t) key_event->id) { return TRUE; - } + } if (kd->keycode == (dbus_uint32_t) key_event->hw_code) { return TRUE; - } + } if (key_event->event_string && key_event->event_string[0] && - !strcmp (kd->keystring, key_event->event_string)) + !strcmp (kd->keystring, key_event->event_string)) { return TRUE; - } + } } return FALSE; @@ -979,7 +985,7 @@ key_set_contains_key (GSList *key_set, static gboolean eventtype_seq_contains_event (dbus_uint32_t types, - const Accessibility_DeviceEvent *event) + const Accessibility_DeviceEvent *event) { if (types == 0) /* special case, means "all events/any event" */ { @@ -991,12 +997,12 @@ eventtype_seq_contains_event (dbus_uint32_t types, static gboolean spi_key_event_matches_listener (const Accessibility_DeviceEvent *key_event, - DEControllerKeyListener *listener, - dbus_bool_t is_system_global) + DEControllerKeyListener *listener, + dbus_bool_t is_system_global) { if (((key_event->modifiers & 0xFF) == (dbus_uint16_t) (listener->mask & 0xFF)) && - key_set_contains_key (listener->keys, key_event) && - eventtype_seq_contains_event (listener->listener.types, key_event) && + key_set_contains_key (listener->keys, key_event) && + eventtype_seq_contains_event (listener->listener.types, key_event) && (is_system_global == listener->mode->global)) { return TRUE; @@ -1008,13 +1014,13 @@ spi_key_event_matches_listener (const Accessibility_DeviceEvent *key_event, } gboolean -spi_controller_notify_keylisteners (SpiDEController *controller, - Accessibility_DeviceEvent *key_event, - dbus_bool_t is_system_global) +spi_controller_notify_keylisteners (SpiDEController *controller, + Accessibility_DeviceEvent *key_event, + dbus_bool_t is_system_global) { - GList *l; - GSList *notify = NULL, *l2; - GList **key_listeners = &controller->key_listeners; + GList *l; + GSList *notify = NULL, *l2; + GList **key_listeners = &controller->key_listeners; gboolean is_consumed; if (!key_listeners) @@ -1024,18 +1030,18 @@ spi_controller_notify_keylisteners (SpiDEController *controller, /* set the NUMLOCK event mask bit if appropriate: see bug #143702 */ if (key_event->modifiers & _numlock_physical_mask) - key_event->modifiers |= SPI_KEYMASK_NUMLOCK; + key_event->modifiers |= SPI_KEYMASK_NUMLOCK; for (l = *key_listeners; l; l = l->next) { - DEControllerKeyListener *key_listener = l->data; + DEControllerKeyListener *key_listener = l->data; - if (spi_key_event_matches_listener (key_event, key_listener, is_system_global)) - { - /* we clone (don't dup) the listener, to avoid refcount inc. */ - notify = g_slist_prepend (notify, - spi_key_listener_clone (key_listener)); - } + if (spi_key_event_matches_listener (key_event, key_listener, is_system_global)) + { + /* we clone (don't dup) the listener, to avoid refcount inc. */ + notify = g_slist_prepend (notify, + spi_key_listener_clone (key_listener)); + } } #ifdef SPI_KEYEVENT_DEBUG @@ -1048,17 +1054,17 @@ spi_controller_notify_keylisteners (SpiDEController *controller, is_consumed = FALSE; for (l2 = notify; l2 && !is_consumed; l2 = l2->next) { - DEControllerKeyListener *key_listener = l2->data; + DEControllerKeyListener *key_listener = l2->data; is_consumed = Accessibility_DeviceEventListener_NotifyEvent (controller, &key_listener->listener, key_event) && - key_listener->mode->preemptive; + key_listener->mode->preemptive; spi_key_listener_clone_free (key_listener); } for (; l2; l2 = l2->next) { - DEControllerKeyListener *key_listener = l2->data; + DEControllerKeyListener *key_listener = l2->data; spi_key_listener_clone_free (key_listener); /* clone doesn't have its own ref, so don't use spi_dec_listener_free */ } @@ -1066,19 +1072,20 @@ spi_controller_notify_keylisteners (SpiDEController *controller, g_slist_free (notify); #ifdef SPI_DEBUG - if (is_consumed) g_message ("consumed\n"); + if (is_consumed) + g_message ("consumed\n"); #endif return is_consumed; } gboolean -spi_controller_update_key_grabs (SpiDEController *controller, - Accessibility_DeviceEvent *recv) +spi_controller_update_key_grabs (SpiDEController *controller, + Accessibility_DeviceEvent *recv) { GList *l, *next; - gboolean update_failed = FALSE; + gboolean update_failed = FALSE; long keycode = 0; - + g_return_val_if_fail (controller != NULL, FALSE); /* @@ -1101,16 +1108,16 @@ spi_controller_update_key_grabs (SpiDEController *controller, next = l->next; re_issue_grab = recv && - (recv->modifiers & grab_mask->mod_mask) && - (grab_mask->key_val == keycode); + (recv->modifiers & grab_mask->mod_mask) && + (grab_mask->key_val == keycode); #ifdef SPI_DEBUG fprintf (stderr, "mask=%lx %lx (%c%c) %s\n", - (long int) grab_mask->key_val, - (long int) grab_mask->mod_mask, - grab_mask->pending_add ? '+' : '.', - grab_mask->pending_remove ? '-' : '.', - re_issue_grab ? "re-issue": ""); + (long int) grab_mask->key_val, + (long int) grab_mask->mod_mask, + grab_mask->pending_add ? '+' : '.', + grab_mask->pending_remove ? '-' : '.', + re_issue_grab ? "re-issue" : ""); #endif do_remove = FALSE; @@ -1118,32 +1125,34 @@ spi_controller_update_key_grabs (SpiDEController *controller, if (grab_mask->pending_add && grab_mask->pending_remove) { do_remove = TRUE; - } + } else if (grab_mask->pending_remove) { #ifdef SPI_DEBUG - fprintf (stderr, "ungrabbing, mask=%x\n", grab_mask->mod_mask); + fprintf (stderr, "ungrabbing, mask=%x\n", grab_mask->mod_mask); #endif - spi_dec_plat_ungrab_key (controller, - grab_mask->key_val, - grab_mask->mod_mask); + spi_dec_plat_ungrab_key (controller, + grab_mask->key_val, + grab_mask->mod_mask); do_remove = TRUE; - } + } else if (grab_mask->pending_add || re_issue_grab) { #ifdef SPI_DEBUG - fprintf (stderr, "grab %d with mask %x\n", grab_mask->key_val, grab_mask->mod_mask); + fprintf (stderr, "grab %d with mask %x\n", grab_mask->key_val, grab_mask->mod_mask); #endif - update_failed = spi_dec_plat_grab_key (controller, - grab_mask->key_val, - grab_mask->mod_mask); - if (update_failed) { - while (grab_mask->ref_count > 0) --grab_mask->ref_count; - do_remove = TRUE; - } - } + update_failed = spi_dec_plat_grab_key (controller, + grab_mask->key_val, + grab_mask->mod_mask); + if (update_failed) + { + while (grab_mask->ref_count > 0) + --grab_mask->ref_count; + do_remove = TRUE; + } + } grab_mask->pending_add = FALSE; grab_mask->pending_remove = FALSE; @@ -1152,15 +1161,14 @@ spi_controller_update_key_grabs (SpiDEController *controller, { g_assert (grab_mask->ref_count <= 0); - controller->keygrabs_list = g_list_delete_link ( - controller->keygrabs_list, l); + controller->keygrabs_list = g_list_delete_link ( + controller->keygrabs_list, l); - spi_grab_mask_free (grab_mask); - } - - } + spi_grab_mask_free (grab_mask); + } + } - return ! update_failed; + return !update_failed; } /* @@ -1170,13 +1178,13 @@ static void spi_device_event_controller_object_finalize (GObject *object) { SpiDEController *controller; - GObjectClass *parent_class = G_OBJECT_CLASS(spi_device_event_controller_parent_class); + GObjectClass *parent_class = G_OBJECT_CLASS (spi_device_event_controller_parent_class); SpiDEControllerClass *klass; controller = SPI_DEVICE_EVENT_CONTROLLER (object); klass = SPI_DEVICE_EVENT_CONTROLLER_GET_CLASS (controller); #ifdef SPI_DEBUG - fprintf(stderr, "spi_device_event_controller_object_finalize called\n"); + fprintf (stderr, "spi_device_event_controller_object_finalize called\n"); #endif if (klass->plat.finalize) klass->plat.finalize (controller); @@ -1197,68 +1205,69 @@ impl_register_keystroke_listener (DBusMessage *message, SpiDEController *control GSList *keys = NULL; dbus_int32_t mask, types; Accessibility_EventListenerMode *mode; - dbus_bool_t ret; + dbus_bool_t ret; DBusMessage *reply = NULL; char *keystring; if (strcmp (dbus_message_get_signature (message), "oa(iisi)uu(bbb)") != 0) return invalid_arguments_error (message); - dbus_message_iter_init(message, &iter); - dbus_message_iter_get_basic(&iter, &path); - dbus_message_iter_next(&iter); - dbus_message_iter_recurse(&iter, &iter_array); - while (dbus_message_iter_get_arg_type(&iter_array) != DBUS_TYPE_INVALID) - { - Accessibility_KeyDefinition *kd = (Accessibility_KeyDefinition *)g_malloc(sizeof(Accessibility_KeyDefinition)); - if (!spi_dbus_message_iter_get_struct(&iter_array, DBUS_TYPE_INT32, &kd->keycode, DBUS_TYPE_INT32, &kd->keysym, DBUS_TYPE_STRING, &keystring, DBUS_TYPE_INVALID)) + dbus_message_iter_init (message, &iter); + dbus_message_iter_get_basic (&iter, &path); + dbus_message_iter_next (&iter); + dbus_message_iter_recurse (&iter, &iter_array); + while (dbus_message_iter_get_arg_type (&iter_array) != DBUS_TYPE_INVALID) { - g_free(kd); - break; + Accessibility_KeyDefinition *kd = (Accessibility_KeyDefinition *) g_malloc (sizeof (Accessibility_KeyDefinition)); + if (!spi_dbus_message_iter_get_struct (&iter_array, DBUS_TYPE_INT32, &kd->keycode, DBUS_TYPE_INT32, &kd->keysym, DBUS_TYPE_STRING, &keystring, DBUS_TYPE_INVALID)) + { + g_free (kd); + break; + } + kd->keystring = g_strdup (keystring); + keys = g_slist_append (keys, kd); } - kd->keystring = g_strdup (keystring); - keys = g_slist_append(keys, kd); - } - dbus_message_iter_next(&iter); - dbus_message_iter_get_basic(&iter, &mask); - dbus_message_iter_next(&iter); - dbus_message_iter_get_basic(&iter, &types); - dbus_message_iter_next(&iter); - mode = (Accessibility_EventListenerMode *)g_malloc(sizeof(Accessibility_EventListenerMode)); + dbus_message_iter_next (&iter); + dbus_message_iter_get_basic (&iter, &mask); + dbus_message_iter_next (&iter); + dbus_message_iter_get_basic (&iter, &types); + dbus_message_iter_next (&iter); + mode = (Accessibility_EventListenerMode *) g_malloc (sizeof (Accessibility_EventListenerMode)); if (mode) - { - spi_dbus_message_iter_get_struct(&iter, DBUS_TYPE_BOOLEAN, &mode->synchronous, DBUS_TYPE_BOOLEAN, &mode->preemptive, DBUS_TYPE_BOOLEAN, &mode->global, DBUS_TYPE_INVALID); - } + { + spi_dbus_message_iter_get_struct (&iter, DBUS_TYPE_BOOLEAN, &mode->synchronous, DBUS_TYPE_BOOLEAN, &mode->preemptive, DBUS_TYPE_BOOLEAN, &mode->global, DBUS_TYPE_INVALID); + } #ifdef SPI_DEBUG fprintf (stderr, "registering keystroke listener %s:%s with maskVal %lu\n", - dbus_message_get_sender(message), path, (unsigned long) mask); + dbus_message_get_sender (message), path, (unsigned long) mask); #endif - dec_listener = spi_dec_key_listener_new (dbus_message_get_sender(message), path, keys, mask, types, mode); + dec_listener = spi_dec_key_listener_new (dbus_message_get_sender (message), path, keys, mask, types, mode); g_free (mode); ret = spi_controller_register_device_listener ( - controller, (DEControllerListener *) dec_listener); + controller, (DEControllerListener *) dec_listener); reply = dbus_message_new_method_return (message); if (reply) - { - dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &ret, DBUS_TYPE_INVALID); - } + { + dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &ret, DBUS_TYPE_INVALID); + } return reply; } -typedef struct { - DBusConnection *bus; - DEControllerListener *listener; +typedef struct +{ + DBusConnection *bus; + DEControllerListener *listener; } RemoveListenerClosure; static SpiReEntrantContinue -remove_listener_cb (GList * const *list, - gpointer user_data) +remove_listener_cb (GList *const *list, + gpointer user_data) { - DEControllerListener *listener = (*list)->data; + DEControllerListener *listener = (*list)->data; RemoveListenerClosure *ctx = user_data; - if (!strcmp(ctx->listener->bus_name, listener->bus_name) && - !strcmp(ctx->listener->path, listener->path)) + if (!strcmp (ctx->listener->bus_name, listener->bus_name) && + !strcmp (ctx->listener->path, listener->path)) { spi_re_entrant_list_delete_link (list); spi_dbus_remove_disconnect_match (ctx->bus, listener->bus_name); @@ -1269,30 +1278,30 @@ remove_listener_cb (GList * const *list, } static SpiReEntrantContinue -copy_key_listener_cb (GList * const *list, - gpointer user_data) +copy_key_listener_cb (GList *const *list, + gpointer user_data) { - DEControllerKeyListener *key_listener = (*list)->data; - RemoveListenerClosure *ctx = user_data; + DEControllerKeyListener *key_listener = (*list)->data; + RemoveListenerClosure *ctx = user_data; - if (!strcmp(ctx->listener->bus_name, key_listener->listener.bus_name) && - !strcmp(ctx->listener->path, key_listener->listener.path)) + if (!strcmp (ctx->listener->bus_name, key_listener->listener.bus_name) && + !strcmp (ctx->listener->path, key_listener->listener.path)) { /* TODO: FIXME aggregate keys in case the listener is registered twice */ - DEControllerKeyListener *ctx_key_listener = - (DEControllerKeyListener *) ctx->listener; - keylist_free (ctx_key_listener->keys); - ctx_key_listener->keys = keylist_clone(key_listener->keys); + DEControllerKeyListener *ctx_key_listener = + (DEControllerKeyListener *) ctx->listener; + keylist_free (ctx_key_listener->keys); + ctx_key_listener->keys = keylist_clone (key_listener->keys); } return SPI_RE_ENTRANT_CONTINUE; } static void -spi_deregister_controller_key_listener (SpiDEController *controller, - DEControllerKeyListener *key_listener) +spi_deregister_controller_key_listener (SpiDEController *controller, + DEControllerKeyListener *key_listener) { - RemoveListenerClosure ctx; + RemoveListenerClosure ctx; ctx.bus = controller->bus; ctx.listener = (DEControllerListener *) spi_key_listener_clone (key_listener); @@ -1300,16 +1309,16 @@ spi_deregister_controller_key_listener (SpiDEController *controller, notify_keystroke_listener (controller, key_listener, FALSE); /* special case, copy keyset from existing controller list entry */ - if (g_slist_length(key_listener->keys) == 0) + if (g_slist_length (key_listener->keys) == 0) { spi_re_entrant_list_foreach (&controller->key_listeners, - copy_key_listener_cb, &ctx); + copy_key_listener_cb, &ctx); } spi_controller_deregister_global_keygrabs (controller, key_listener); spi_re_entrant_list_foreach (&controller->key_listeners, - remove_listener_cb, &ctx); + remove_listener_cb, &ctx); spi_key_listener_clone_free ((DEControllerKeyListener *) ctx.listener); } @@ -1320,16 +1329,16 @@ spi_remove_device_listeners (SpiDEController *controller, const char *bus_name) GList *l, *tmp; for (l = controller->key_listeners; l; l = tmp) - { - DEControllerKeyListener *key_listener = l->data; - tmp = l->next; - if (!strcmp (key_listener->listener.bus_name, bus_name)) { - /* TODO: untangle the below line(s) */ - spi_deregister_controller_key_listener (controller, key_listener); - tmp = controller->key_listeners; + DEControllerKeyListener *key_listener = l->data; + tmp = l->next; + if (!strcmp (key_listener->listener.bus_name, bus_name)) + { + /* TODO: untangle the below line(s) */ + spi_deregister_controller_key_listener (controller, key_listener); + tmp = controller->key_listeners; + } } - } } /* @@ -1346,38 +1355,38 @@ impl_deregister_keystroke_listener (DBusMessage *message, SpiDEController *contr dbus_int32_t mask, type; DBusMessage *reply = NULL; - dbus_message_iter_init(message, &iter); + dbus_message_iter_init (message, &iter); if (strcmp (dbus_message_get_signature (message), "oa(iisi)uu") != 0) - { - g_warning ("Received DeregisterKeystrokeListener with strange signature '%s'", dbus_message_get_signature (message)); - return invalid_arguments_error (message); - } - - dbus_message_iter_get_basic(&iter, &path); - dbus_message_iter_next(&iter); - dbus_message_iter_recurse(&iter, &iter_array); - while (dbus_message_iter_get_arg_type(&iter_array) != DBUS_TYPE_INVALID) - { - Accessibility_KeyDefinition *kd = (Accessibility_KeyDefinition *)g_malloc(sizeof(Accessibility_KeyDefinition)); - char *keystring; + { + g_warning ("Received DeregisterKeystrokeListener with strange signature '%s'", dbus_message_get_signature (message)); + return invalid_arguments_error (message); + } - if (!spi_dbus_message_iter_get_struct(&iter_array, DBUS_TYPE_INT32, &kd->keycode, DBUS_TYPE_INT32, &kd->keysym, DBUS_TYPE_STRING, &keystring, DBUS_TYPE_INVALID)) + dbus_message_iter_get_basic (&iter, &path); + dbus_message_iter_next (&iter); + dbus_message_iter_recurse (&iter, &iter_array); + while (dbus_message_iter_get_arg_type (&iter_array) != DBUS_TYPE_INVALID) { - g_free(kd); - break; + Accessibility_KeyDefinition *kd = (Accessibility_KeyDefinition *) g_malloc (sizeof (Accessibility_KeyDefinition)); + char *keystring; + + if (!spi_dbus_message_iter_get_struct (&iter_array, DBUS_TYPE_INT32, &kd->keycode, DBUS_TYPE_INT32, &kd->keysym, DBUS_TYPE_STRING, &keystring, DBUS_TYPE_INVALID)) + { + g_free (kd); + break; + } + kd->keystring = g_strdup (keystring); + keys = g_slist_append (keys, kd); } - kd->keystring = g_strdup (keystring); - keys = g_slist_append(keys, kd); - } - dbus_message_iter_next(&iter); - dbus_message_iter_get_basic(&iter, &mask); - dbus_message_iter_next(&iter); - dbus_message_iter_get_basic(&iter, &type); - dbus_message_iter_next(&iter); - key_listener = spi_dec_key_listener_new (dbus_message_get_sender(message), path, keys, mask, type, NULL); + dbus_message_iter_next (&iter); + dbus_message_iter_get_basic (&iter, &mask); + dbus_message_iter_next (&iter); + dbus_message_iter_get_basic (&iter, &type); + dbus_message_iter_next (&iter); + key_listener = spi_dec_key_listener_new (dbus_message_get_sender (message), path, keys, mask, type, NULL); #ifdef SPI_DEREGISTER_DEBUG fprintf (stderr, "deregistering keystroke listener %p with maskVal %lu\n", - (void *) l, (unsigned long) mask->value); + (void *) l, (unsigned long) mask->value); #endif spi_deregister_controller_key_listener (controller, key_listener); @@ -1401,9 +1410,9 @@ impl_get_keystroke_listeners (DBusMessage *message, SpiDEController *controller) dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, "(souua(iisi)u(bbb))", &iter_array); for (l = controller->key_listeners; l; l = l->next) - { - append_keystroke_listener (&iter_array, l->data); - } + { + append_keystroke_listener (&iter_array, l->data); + } dbus_message_iter_close_container (&iter, &iter_array); return reply; } @@ -1411,44 +1420,45 @@ impl_get_keystroke_listeners (DBusMessage *message, SpiDEController *controller) static unsigned get_modifier_state (SpiDEController *controller) { - spi_dec_poll_mouse_moved (controller); - return controller->mouse_mask_state; + spi_dec_poll_mouse_moved (controller); + return controller->mouse_mask_state; } gboolean spi_dec_synth_keysym (SpiDEController *controller, long keysym) { - long key_synth_code; - unsigned int modifiers, synth_mods, lock_mods; + long key_synth_code; + unsigned int modifiers, synth_mods, lock_mods; - key_synth_code = spi_dec_plat_get_keycode (controller, keysym, NULL, TRUE, &synth_mods); + key_synth_code = spi_dec_plat_get_keycode (controller, keysym, NULL, TRUE, &synth_mods); - if ((key_synth_code == 0) || (synth_mods == 0xFF)) return FALSE; + if ((key_synth_code == 0) || (synth_mods == 0xFF)) + return FALSE; - /* TODO: set the modifiers accordingly! */ - modifiers = get_modifier_state (controller); - /* side-effect; we may unset mousebutton modifiers here! */ + /* TODO: set the modifiers accordingly! */ + modifiers = get_modifier_state (controller); + /* side-effect; we may unset mousebutton modifiers here! */ - lock_mods = 0; - if (synth_mods != modifiers) { - lock_mods = synth_mods & ~modifiers; - spi_dec_plat_lock_modifiers (controller, lock_mods); - if (modifiers & SPI_KEYMASK_SHIFTLOCK) - spi_dec_plat_unlock_modifiers (controller, SPI_KEYMASK_SHIFTLOCK); - } - spi_dec_plat_synth_keycode_press (controller, key_synth_code); - spi_dec_plat_synth_keycode_release (controller, key_synth_code); + lock_mods = 0; + if (synth_mods != modifiers) + { + lock_mods = synth_mods & ~modifiers; + spi_dec_plat_lock_modifiers (controller, lock_mods); + if (modifiers & SPI_KEYMASK_SHIFTLOCK) + spi_dec_plat_unlock_modifiers (controller, SPI_KEYMASK_SHIFTLOCK); + } + spi_dec_plat_synth_keycode_press (controller, key_synth_code); + spi_dec_plat_synth_keycode_release (controller, key_synth_code); - if (synth_mods != modifiers) { - spi_dec_plat_unlock_modifiers (controller, lock_mods); - if (modifiers & SPI_KEYMASK_SHIFTLOCK) - spi_dec_plat_lock_modifiers (controller, SPI_KEYMASK_SHIFTLOCK); - } - return TRUE; + if (synth_mods != modifiers) + { + spi_dec_plat_unlock_modifiers (controller, lock_mods); + if (modifiers & SPI_KEYMASK_SHIFTLOCK) + spi_dec_plat_lock_modifiers (controller, SPI_KEYMASK_SHIFTLOCK); + } + return TRUE; } - - /* * DBus Accessibility::DEController::RegisterKeystrokeListener * method implementation @@ -1461,14 +1471,14 @@ impl_generate_keyboard_event (DBusMessage *message, SpiDEController *controller) dbus_uint32_t synth_type; DBusMessage *reply = NULL; - if (!dbus_message_get_args(message, NULL, DBUS_TYPE_INT32, &keycode, DBUS_TYPE_STRING, &keystring, DBUS_TYPE_UINT32, &synth_type, DBUS_TYPE_INVALID)) - { - return invalid_arguments_error (message); - } + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &keycode, DBUS_TYPE_STRING, &keystring, DBUS_TYPE_UINT32, &synth_type, DBUS_TYPE_INVALID)) + { + return invalid_arguments_error (message); + } #ifdef SPI_DEBUG - fprintf (stderr, "synthesizing keystroke %ld, type %d\n", - (long) keycode, (int) synth_type); + fprintf (stderr, "synthesizing keystroke %ld, type %d\n", + (long) keycode, (int) synth_type); #endif /* TODO: hide/wrap/remove X dependency */ @@ -1476,39 +1486,39 @@ impl_generate_keyboard_event (DBusMessage *message, SpiDEController *controller) * TODO: when initializing, query for XTest extension before using, * and fall back to XSendEvent() if XTest is not available. */ - + switch (synth_type) { - case Accessibility_KEY_PRESS: - spi_dec_plat_synth_keycode_press (controller, keycode); - break; - case Accessibility_KEY_PRESSRELEASE: - spi_dec_plat_synth_keycode_press (controller, keycode); - case Accessibility_KEY_RELEASE: - spi_dec_plat_synth_keycode_release (controller, keycode); - break; - case Accessibility_KEY_SYM: -#ifdef SPI_XKB_DEBUG - fprintf (stderr, "KeySym synthesis\n"); + case Accessibility_KEY_PRESS: + spi_dec_plat_synth_keycode_press (controller, keycode); + break; + case Accessibility_KEY_PRESSRELEASE: + spi_dec_plat_synth_keycode_press (controller, keycode); + case Accessibility_KEY_RELEASE: + spi_dec_plat_synth_keycode_release (controller, keycode); + break; + case Accessibility_KEY_SYM: +#ifdef SPI_XKB_DEBUG + fprintf (stderr, "KeySym synthesis\n"); #endif - /* - * note: we are using long for 'keycode' - * in our arg list; it can contain either - * a keycode or a keysym. - */ - spi_dec_synth_keysym (controller, keycode); - break; - case Accessibility_KEY_STRING: - if (!spi_dec_plat_synth_keystring (controller, synth_type, keycode, keystring)) - fprintf (stderr, "Keystring synthesis failure, string=%s\n", - keystring); - break; - case Accessibility_KEY_LOCKMODIFIERS: - spi_dec_plat_lock_modifiers (controller, keycode); - break; - case Accessibility_KEY_UNLOCKMODIFIERS: - spi_dec_plat_unlock_modifiers (controller, keycode); - break; + /* + * note: we are using long for 'keycode' + * in our arg list; it can contain either + * a keycode or a keysym. + */ + spi_dec_synth_keysym (controller, keycode); + break; + case Accessibility_KEY_STRING: + if (!spi_dec_plat_synth_keystring (controller, synth_type, keycode, keystring)) + fprintf (stderr, "Keystring synthesis failure, string=%s\n", + keystring); + break; + case Accessibility_KEY_LOCKMODIFIERS: + spi_dec_plat_lock_modifiers (controller, keycode); + break; + case Accessibility_KEY_UNLOCKMODIFIERS: + spi_dec_plat_unlock_modifiers (controller, keycode); + break; } reply = dbus_message_new_method_return (message); return reply; @@ -1518,19 +1528,19 @@ impl_generate_keyboard_event (DBusMessage *message, SpiDEController *controller) static DBusMessage * impl_generate_mouse_event (DBusMessage *message, SpiDEController *controller) { - dbus_int32_t x; - dbus_int32_t y; + dbus_int32_t x; + dbus_int32_t y; char *eventName; DBusMessage *reply = NULL; - if (!dbus_message_get_args(message, NULL, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y, DBUS_TYPE_STRING, &eventName, DBUS_TYPE_INVALID)) - { - return invalid_arguments_error (message); - } + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y, DBUS_TYPE_STRING, &eventName, DBUS_TYPE_INVALID)) + { + return invalid_arguments_error (message); + } #ifdef SPI_DEBUG fprintf (stderr, "generating mouse %s event at %ld, %ld\n", - eventName, (long int) x, (long int) y); + eventName, (long int) x, (long int) y); #endif spi_dec_plat_generate_mouse_event (controller, x, y, eventName); reply = dbus_message_new_method_return (message); @@ -1545,23 +1555,23 @@ impl_notify_listeners_sync (DBusMessage *message, SpiDEController *controller) dbus_bool_t ret; DBusMessage *reply = NULL; - if (!spi_dbus_demarshal_deviceEvent(message, &event)) - { - return invalid_arguments_error (message); - } + if (!spi_dbus_demarshal_deviceEvent (message, &event)) + { + return invalid_arguments_error (message); + } #ifdef SPI_DEBUG g_print ("notifylistening listeners synchronously: controller %p, event id %d\n", - controller, (int) event.id); + controller, (int) event.id); #endif ret = spi_controller_notify_keylisteners (controller, - (Accessibility_DeviceEvent *) - &event, FALSE) ? - TRUE : FALSE; + (Accessibility_DeviceEvent *) &event, FALSE) + ? TRUE + : FALSE; reply = dbus_message_new_method_return (message); if (reply) - { - dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &ret, DBUS_TYPE_INVALID); - } + { + dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &ret, DBUS_TYPE_INVALID); + } return reply; } @@ -1571,16 +1581,15 @@ impl_notify_listeners_async (DBusMessage *message, SpiDEController *controller) Accessibility_DeviceEvent event; DBusMessage *reply = NULL; - if (!spi_dbus_demarshal_deviceEvent(message, &event)) - { - return invalid_arguments_error (message); - } + if (!spi_dbus_demarshal_deviceEvent (message, &event)) + { + return invalid_arguments_error (message); + } #ifdef SPI_DEBUG g_print ("notifylistening listeners asynchronously: controller %p, event id %d\n", - controller, (int) event.id); + controller, (int) event.id); #endif - spi_controller_notify_keylisteners (controller, (Accessibility_DeviceEvent *) - &event, FALSE); + spi_controller_notify_keylisteners (controller, (Accessibility_DeviceEvent *) &event, FALSE); reply = dbus_message_new_method_return (message); return reply; } @@ -1588,7 +1597,7 @@ impl_notify_listeners_async (DBusMessage *message, SpiDEController *controller) static void spi_device_event_controller_class_init (SpiDEControllerClass *klass) { - GObjectClass * object_class = (GObjectClass *) klass; + GObjectClass *object_class = (GObjectClass *) klass; spi_device_event_controller_parent_class = g_type_class_peek_parent (klass); @@ -1612,20 +1621,19 @@ spi_device_event_controller_init (SpiDEController *device_event_controller) klass->plat.init (device_event_controller); } - /*---------------------------------------------------------------------------*/ static const char *introspection_header = -"<?xml version=\"1.0\"?>\n"; + "<?xml version=\"1.0\"?>\n"; static const char *introspection_node_element = -"<node name=\"%s\">\n"; + "<node name=\"%s\">\n"; static const char *introspection_footer = -"</node>"; + "</node>"; static DBusMessage * -impl_Introspect (DBusMessage * message, SpiDEController *controller) +impl_Introspect (DBusMessage *message, SpiDEController *controller) { GString *output; gchar *final; @@ -1634,19 +1642,19 @@ impl_Introspect (DBusMessage * message, SpiDEController *controller) DBusMessage *reply; - output = g_string_new(introspection_header); + output = g_string_new (introspection_header); - g_string_append_printf(output, introspection_node_element, pathstr); + g_string_append_printf (output, introspection_node_element, pathstr); g_string_append (output, spi_org_a11y_atspi_DeviceEventController); - g_string_append(output, introspection_footer); - final = g_string_free(output, FALSE); + g_string_append (output, introspection_footer); + final = g_string_free (output, FALSE); reply = dbus_message_new_method_return (message); - dbus_message_append_args(reply, DBUS_TYPE_STRING, &final, DBUS_TYPE_INVALID); + dbus_message_append_args (reply, DBUS_TYPE_STRING, &final, DBUS_TYPE_INVALID); - g_free(final); + g_free (final); return reply; } @@ -1655,39 +1663,39 @@ impl_Introspect (DBusMessage * message, SpiDEController *controller) static void handle_message (DBusMessage *message, SpiDEController *controller) { - const gchar *iface = dbus_message_get_interface (message); - const gchar *member = dbus_message_get_member (message); + const gchar *iface = dbus_message_get_interface (message); + const gchar *member = dbus_message_get_member (message); DBusHandlerResult result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; DBusMessage *reply = NULL; if (!strcmp (iface, SPI_DBUS_INTERFACE_DEC)) { result = DBUS_HANDLER_RESULT_HANDLED; - if (!strcmp (member, "RegisterKeystrokeListener")) - reply = impl_register_keystroke_listener (message, controller); + if (!strcmp (member, "RegisterKeystrokeListener")) + reply = impl_register_keystroke_listener (message, controller); else if (!strcmp (member, "DeregisterKeystrokeListener")) - reply = impl_deregister_keystroke_listener (message, controller); + reply = impl_deregister_keystroke_listener (message, controller); else if (!strcmp (member, "GetKeystrokeListeners")) - reply = impl_get_keystroke_listeners (message, controller); + reply = impl_get_keystroke_listeners (message, controller); else if (!strcmp (member, "GenerateKeyboardEvent")) - reply = impl_generate_keyboard_event (message, controller); + reply = impl_generate_keyboard_event (message, controller); else if (!strcmp (member, "GenerateMouseEvent")) - reply = impl_generate_mouse_event (message, controller); + reply = impl_generate_mouse_event (message, controller); else if (!strcmp (member, "NotifyListenersSync")) - reply = impl_notify_listeners_sync (message, controller); + reply = impl_notify_listeners_sync (message, controller); else if (!strcmp (member, "NotifyListenersAsync")) - reply = impl_notify_listeners_async (message, controller); + reply = impl_notify_listeners_async (message, controller); else - result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } if (!strcmp (iface, "org.freedesktop.DBus.Introspectable")) { result = DBUS_HANDLER_RESULT_HANDLED; - if (!strcmp (member, "Introspect")) - reply = impl_Introspect (message, controller); + if (!strcmp (member, "Introspect")) + reply = impl_Introspect (message, controller); else - result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } if (result == DBUS_HANDLER_RESULT_HANDLED) @@ -1721,27 +1729,27 @@ static DBusHandlerResult handle_dec_method (DBusConnection *bus, DBusMessage *message, void *user_data) { SpiDEController *controller = SPI_DEVICE_EVENT_CONTROLLER (user_data); - const gchar *iface = dbus_message_get_interface (message); - const gchar *member = dbus_message_get_member (message); - const gint type = dbus_message_get_type (message); + const gchar *iface = dbus_message_get_interface (message); + const gchar *member = dbus_message_get_member (message); + const gint type = dbus_message_get_type (message); /* Check for basic reasons not to handle */ - if (type != DBUS_MESSAGE_TYPE_METHOD_CALL || + if (type != DBUS_MESSAGE_TYPE_METHOD_CALL || member == NULL || - iface == NULL) - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + iface == NULL) + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; dbus_message_ref (message); g_queue_push_tail (controller->message_queue, message); - if (!controller->message_queue_idle) { - controller->message_queue_idle = g_idle_add (message_queue_dispatch, controller); - g_source_set_name_by_id (controller->message_queue_idle, "[at-spi2-core] message_queue_dispatch"); - } + if (!controller->message_queue_idle) + { + controller->message_queue_idle = g_idle_add (message_queue_dispatch, controller); + g_source_set_name_by_id (controller->message_queue_idle, "[at-spi2-core] message_queue_dispatch"); + } return DBUS_HANDLER_RESULT_HANDLED; } -static DBusObjectPathVTable dec_vtable = -{ +static DBusObjectPathVTable dec_vtable = { NULL, &handle_dec_method, NULL, NULL, NULL, NULL diff --git a/registryd/deviceeventcontroller.h b/registryd/deviceeventcontroller.h index a080a13e..a78148ce 100644 --- a/registryd/deviceeventcontroller.h +++ b/registryd/deviceeventcontroller.h @@ -28,19 +28,20 @@ typedef struct _SpiDEController SpiDEController; -#include "registry.h" #include "de-types.h" +#include "registry.h" G_BEGIN_DECLS -#define SPI_DEVICE_EVENT_CONTROLLER_TYPE (spi_device_event_controller_get_type ()) -#define SPI_DEVICE_EVENT_CONTROLLER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), SPI_DEVICE_EVENT_CONTROLLER_TYPE, SpiDEController)) -#define SPI_DEVICE_EVENT_CONTROLLER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), SPI_DEVICE_EVENT_CONTROLLER_TYPE, SpiDEControllerClass)) -#define SPI_IS_DEVICE_EVENT_CONTROLLER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), SPI_DEVICE_EVENT_CONTROLLER_TYPE)) +#define SPI_DEVICE_EVENT_CONTROLLER_TYPE (spi_device_event_controller_get_type ()) +#define SPI_DEVICE_EVENT_CONTROLLER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), SPI_DEVICE_EVENT_CONTROLLER_TYPE, SpiDEController)) +#define SPI_DEVICE_EVENT_CONTROLLER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), SPI_DEVICE_EVENT_CONTROLLER_TYPE, SpiDEControllerClass)) +#define SPI_IS_DEVICE_EVENT_CONTROLLER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), SPI_DEVICE_EVENT_CONTROLLER_TYPE)) #define SPI_IS_DEVICE_EVENT_CONTROLLER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), SPI_DEVICE_EVENT_CONTROLLER_TYPE)) #define SPI_DEVICE_EVENT_CONTROLLER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SPI_DEVICE_EVENT_CONTROLLER_TYPE, SpiDEControllerClass)) -struct _SpiDEController { +struct _SpiDEController +{ GObject parent; DBusConnection *bus; GList *key_listeners; @@ -53,24 +54,27 @@ struct _SpiDEController { gboolean have_mouse_event_listener; }; -typedef enum { +typedef enum +{ SPI_DEVICE_TYPE_KBD, SPI_DEVICE_TYPE_LAST_DEFINED } SpiDeviceTypeCategory; -typedef struct { +typedef struct +{ char *bus_name; char *path; SpiDeviceTypeCategory type; gulong types; } DEControllerListener; -typedef struct { +typedef struct +{ DEControllerListener listener; GSList *keys; Accessibility_ControllerEventMask mask; - Accessibility_EventListenerMode *mode; + Accessibility_EventListenerMode *mode; } DEControllerKeyListener; typedef struct @@ -81,22 +85,22 @@ typedef struct gboolean fix, guint *modmask); - guint (*mouse_check) (SpiDEController *controller, - gint *x, - gint *y, - gboolean *moved); + guint (*mouse_check) (SpiDEController *controller, + gint *x, + gint *y, + gboolean *moved); - gboolean (*register_global_keygrabs) (SpiDEController *controller, - DEControllerKeyListener *key_listener); + gboolean (*register_global_keygrabs) (SpiDEController *controller, + DEControllerKeyListener *key_listener); - void (*deregister_global_keygrabs) (SpiDEController *controller, - DEControllerKeyListener *key_listener); + void (*deregister_global_keygrabs) (SpiDEController *controller, + DEControllerKeyListener *key_listener); gboolean (*synth_keycode_press) (SpiDEController *controller, - guint keycode); + guint keycode); gboolean (*synth_keycode_release) (SpiDEController *controller, - guint keycode); + guint keycode); gboolean (*lock_modifiers) (SpiDEController *controller, unsigned modifiers); @@ -118,8 +122,8 @@ typedef struct Accessibility_ControllerEventMask mod_mask); void (*emit_modifier_event) (SpiDEController *controller, - guint prev_mask, - guint current_mask); + guint prev_mask, + guint current_mask); void (*generate_mouse_event) (SpiDEController *controller, gint x, @@ -130,12 +134,13 @@ typedef struct void (*finalize) (SpiDEController *controller); } SpiDEControllerPlat; -typedef struct { +typedef struct +{ GObjectClass parent_class; SpiDEControllerPlat plat; } SpiDEControllerClass; -GType spi_device_event_controller_get_type (void); +GType spi_device_event_controller_get_type (void); void spi_device_event_controller_start_poll_mouse (SpiDEController *dec); void spi_device_event_controller_stop_poll_mouse (SpiDEController *dec); @@ -145,16 +150,16 @@ void spi_remove_device_listeners (SpiDEController *controller, const char *bus_n SpiDEController *spi_registry_dec_new (DBusConnection *bus); gboolean -spi_controller_notify_keylisteners (SpiDEController *controller, - Accessibility_DeviceEvent *key_event, - dbus_bool_t is_system_global); +spi_controller_notify_keylisteners (SpiDEController *controller, + Accessibility_DeviceEvent *key_event, + dbus_bool_t is_system_global); -gboolean spi_controller_update_key_grabs (SpiDEController *controller, - Accessibility_DeviceEvent *recv); +gboolean spi_controller_update_key_grabs (SpiDEController *controller, + Accessibility_DeviceEvent *recv); gboolean spi_dec_synth_keysym (SpiDEController *controller, long keysym); -void spi_dec_dbus_emit(SpiDEController *controller, const char *interface, const char *name, const char *minor, int a1, int a2); +void spi_dec_dbus_emit (SpiDEController *controller, const char *interface, const char *name, const char *minor, int a1, int a2); G_END_DECLS diff --git a/registryd/display.c b/registryd/display.c index 011f2941..16e1c5da 100644 --- a/registryd/display.c +++ b/registryd/display.c @@ -22,10 +22,10 @@ #include <glib.h> +#include <X11/Xatom.h> #include <X11/Xlib.h> -#include <X11/Xutil.h> #include <X11/Xos.h> -#include <X11/Xatom.h> +#include <X11/Xutil.h> #include <stdio.h> #include <stdlib.h> @@ -34,57 +34,63 @@ static Display *default_display = NULL; -Display *spi_set_display (const char *display_name) +Display * +spi_set_display (const char *display_name) { - /* - * TODO - Should we ever do anything different might need to - * close previous display. - */ - default_display = XOpenDisplay (display_name); - if (!default_display) - { - g_warning ("AT-SPI: Cannot open default display"); - exit (1); - } - return default_display; + /* + * TODO - Should we ever do anything different might need to + * close previous display. + */ + default_display = XOpenDisplay (display_name); + if (!default_display) + { + g_warning ("AT-SPI: Cannot open default display"); + exit (1); + } + return default_display; } -Display *spi_get_display () +Display * +spi_get_display () { - if (!default_display) - spi_set_display (NULL); + if (!default_display) + spi_set_display (NULL); - return default_display; + return default_display; } -Window spi_get_root_window () +Window +spi_get_root_window () { - if (!default_display) - spi_set_display (NULL); + if (!default_display) + spi_set_display (NULL); - return DefaultRootWindow (default_display); + return DefaultRootWindow (default_display); } static int (*old_x_error_handler) (Display *, XErrorEvent *); static int x_error_code; -static int spi_x_error_handler (Display *display, XErrorEvent *error) +static int +spi_x_error_handler (Display *display, XErrorEvent *error) { - if (error->error_code) - x_error_code = error->error_code; - else - x_error_code = 0; - - return 0; + if (error->error_code) + x_error_code = error->error_code; + else + x_error_code = 0; + + return 0; } -void spi_x_error_trap (void) +void +spi_x_error_trap (void) { - old_x_error_handler = XSetErrorHandler (spi_x_error_handler); + old_x_error_handler = XSetErrorHandler (spi_x_error_handler); } -int spi_x_error_release (void) +int +spi_x_error_release (void) { - XSetErrorHandler (old_x_error_handler); - return x_error_code; + XSetErrorHandler (old_x_error_handler); + return x_error_code; } diff --git a/registryd/event-source.c b/registryd/event-source.c index ca4340c5..d73c9b67 100644 --- a/registryd/event-source.c +++ b/registryd/event-source.c @@ -24,36 +24,37 @@ #include "event-source.h" -typedef struct { +typedef struct +{ GSource source; - + Display *display; - GPollFD event_poll_fd; + GPollFD event_poll_fd; } DisplaySource; /*---------------------------------------------------------------------------*/ -static void (*_spi_default_filter) (XEvent*, void*) = NULL; -static void* _spi_default_filter_data = NULL; +static void (*_spi_default_filter) (XEvent *, void *) = NULL; +static void *_spi_default_filter_data = NULL; /*---------------------------------------------------------------------------*/ -static gboolean +static gboolean event_prepare (GSource *source, gint *timeout) { - Display *display = ((DisplaySource *)source)->display; + Display *display = ((DisplaySource *) source)->display; gboolean retval; - + *timeout = -1; retval = XPending (display); - + return retval; } -static gboolean -event_check (GSource *source) +static gboolean +event_check (GSource *source) { - DisplaySource *display_source = (DisplaySource*)source; + DisplaySource *display_source = (DisplaySource *) source; gboolean retval; if (display_source->event_poll_fd.revents & G_IO_IN) @@ -64,12 +65,12 @@ event_check (GSource *source) return retval; } -static gboolean -event_dispatch (GSource *source, GSourceFunc callback, gpointer user_data) +static gboolean +event_dispatch (GSource *source, GSourceFunc callback, gpointer user_data) { - Display *display = ((DisplaySource*)source)->display; + Display *display = ((DisplaySource *) source)->display; XEvent xevent; - + /* TODO - Should this be "if (XPending (display))"? * The effect of this might be to run other main loop functions * before dispatching the next XEvent. @@ -79,19 +80,19 @@ event_dispatch (GSource *source, GSourceFunc callback, gpointer user_data) XNextEvent (display, &xevent); switch (xevent.type) - { - case KeyPress: - case KeyRelease: - break; - default: - if (XFilterEvent (&xevent, None)) - continue; - } - + { + case KeyPress: + case KeyRelease: + break; + default: + if (XFilterEvent (&xevent, None)) + continue; + } + if (_spi_default_filter) { _spi_default_filter (&xevent, _spi_default_filter_data); - } + } } return TRUE; @@ -112,9 +113,9 @@ display_source_new (Display *display) GSource *source = g_source_new (&event_funcs, sizeof (DisplaySource)); DisplaySource *display_source = (DisplaySource *) source; g_source_set_name (source, "[at-spi2-core] display_source_funcs"); - + display_source->display = display; - + return source; } @@ -122,7 +123,7 @@ display_source_new (Display *display) static DisplaySource *spi_display_source = NULL; -void +void spi_events_init (Display *display) { GSource *source; @@ -130,13 +131,13 @@ spi_events_init (Display *display) int connection_number = ConnectionNumber (display); source = display_source_new (display); - spi_display_source = (DisplaySource*) source; + spi_display_source = (DisplaySource *) source; g_source_set_priority (source, G_PRIORITY_DEFAULT); - + spi_display_source->event_poll_fd.fd = connection_number; spi_display_source->event_poll_fd.events = G_IO_IN; - + g_source_add_poll (source, &spi_display_source->event_poll_fd); g_source_set_can_recurse (source, TRUE); g_source_attach (source, NULL); @@ -158,14 +159,14 @@ spi_set_events (long event_mask) { long xevent_mask = StructureNotifyMask | PropertyChangeMask; xevent_mask |= event_mask; - - XSelectInput (spi_display_source->display, + + XSelectInput (spi_display_source->display, DefaultRootWindow (spi_display_source->display), xevent_mask); } void -spi_set_filter (void (*filter) (XEvent*, void*), void* data) +spi_set_filter (void (*filter) (XEvent *, void *), void *data) { _spi_default_filter = filter; _spi_default_filter_data = data; diff --git a/registryd/event-source.h b/registryd/event-source.h index ad080f7d..1ddd34b7 100644 --- a/registryd/event-source.h +++ b/registryd/event-source.h @@ -28,6 +28,6 @@ void spi_events_init (Display *display); void spi_events_uninit (); void spi_set_events (long event_mask); -void spi_set_filter (void (*filter) (XEvent*, void*), void* data); +void spi_set_filter (void (*filter) (XEvent *, void *), void *data); #endif /* SPI_EVENT_SOURCE_H_ */ diff --git a/registryd/keymasks.h b/registryd/keymasks.h index 9f6c2c9f..1ee64b3d 100644 --- a/registryd/keymasks.h +++ b/registryd/keymasks.h @@ -31,21 +31,21 @@ G_BEGIN_DECLS typedef unsigned long SpiKeyMaskType; /* Values taken from Xlib.h */ -#define SPI_KEYMASK_ALT (1<<3) /* Mod1Mask */ -#define SPI_KEYMASK_MOD1 (1<<3) /* Mod1Mask */ -#define SPI_KEYMASK_MOD2 (1<<4) /* Mod2Mask */ -#define SPI_KEYMASK_MOD3 (1<<5) /* Mod3Mask */ -#define SPI_KEYMASK_MOD4 (1<<6) /* Mod4Mask */ -#define SPI_KEYMASK_MOD5 (1<<7) /* Mod5Mask */ -#define SPI_KEYMASK_BUTTON1 (1L<<8) /* Button1Mask */ -#define SPI_KEYMASK_BUTTON2 (1L<<9) /* Button2Mask */ -#define SPI_KEYMASK_BUTTON3 (1L<<10) /* Button3Mask */ -#define SPI_KEYMASK_BUTTON4 (1L<<11) /* Button4Mask */ -#define SPI_KEYMASK_BUTTON5 (1L<<12) /* Button5Mask */ -#define SPI_KEYMASK_CONTROL (1<<2) /* ControlMask */ -#define SPI_KEYMASK_SHIFT (1<<0) /* ShiftMask */ -#define SPI_KEYMASK_SHIFTLOCK (1<<1) /* LockMask */ -#define SPI_KEYMASK_NUMLOCK (1<<14) +#define SPI_KEYMASK_ALT (1 << 3) /* Mod1Mask */ +#define SPI_KEYMASK_MOD1 (1 << 3) /* Mod1Mask */ +#define SPI_KEYMASK_MOD2 (1 << 4) /* Mod2Mask */ +#define SPI_KEYMASK_MOD3 (1 << 5) /* Mod3Mask */ +#define SPI_KEYMASK_MOD4 (1 << 6) /* Mod4Mask */ +#define SPI_KEYMASK_MOD5 (1 << 7) /* Mod5Mask */ +#define SPI_KEYMASK_BUTTON1 (1L << 8) /* Button1Mask */ +#define SPI_KEYMASK_BUTTON2 (1L << 9) /* Button2Mask */ +#define SPI_KEYMASK_BUTTON3 (1L << 10) /* Button3Mask */ +#define SPI_KEYMASK_BUTTON4 (1L << 11) /* Button4Mask */ +#define SPI_KEYMASK_BUTTON5 (1L << 12) /* Button5Mask */ +#define SPI_KEYMASK_CONTROL (1 << 2) /* ControlMask */ +#define SPI_KEYMASK_SHIFT (1 << 0) /* ShiftMask */ +#define SPI_KEYMASK_SHIFTLOCK (1 << 1) /* LockMask */ +#define SPI_KEYMASK_NUMLOCK (1 << 14) #define SPI_KEYMASK_UNMODIFIED 0 G_END_DECLS diff --git a/registryd/paths.h b/registryd/paths.h index a505222a..b4e9ee80 100644 --- a/registryd/paths.h +++ b/registryd/paths.h @@ -24,30 +24,30 @@ #ifndef SPI_PATHS_H_ #define SPI_PATHS_H_ -#define SPI_DBUS_NAME_PREFIX "org.a11y.atspi." -#define SPI_DBUS_PATH_PREFIX "/org/a11y/atspi/" -#define SPI_DBUS_INTERFACE_PREFIX "org.a11y.atspi." +#define SPI_DBUS_NAME_PREFIX "org.a11y.atspi." +#define SPI_DBUS_PATH_PREFIX "/org/a11y/atspi/" +#define SPI_DBUS_INTERFACE_PREFIX "org.a11y.atspi." -#define SPI_DBUS_PATH_NULL SPI_DBUS_PATH_PREFIX "null" -#define SPI_DBUS_PATH_ROOT SPI_DBUS_PATH_PREFIX "accessible/root" +#define SPI_DBUS_PATH_NULL SPI_DBUS_PATH_PREFIX "null" +#define SPI_DBUS_PATH_ROOT SPI_DBUS_PATH_PREFIX "accessible/root" -#define SPI_DBUS_NAME_REGISTRY SPI_DBUS_NAME_PREFIX "Registry" -#define SPI_DBUS_INTERFACE_REGISTRY SPI_DBUS_INTERFACE_PREFIX "Registry" -#define SPI_DBUS_PATH_REGISTRY SPI_DBUS_PATH_PREFIX "registry" +#define SPI_DBUS_NAME_REGISTRY SPI_DBUS_NAME_PREFIX "Registry" +#define SPI_DBUS_INTERFACE_REGISTRY SPI_DBUS_INTERFACE_PREFIX "Registry" +#define SPI_DBUS_PATH_REGISTRY SPI_DBUS_PATH_PREFIX "registry" -#define SPI_DBUS_PATH_DEC SPI_DBUS_PATH_PREFIX "registry/deviceeventcontroller" -#define SPI_DBUS_INTERFACE_DEC SPI_DBUS_INTERFACE_PREFIX "DeviceEventController" +#define SPI_DBUS_PATH_DEC SPI_DBUS_PATH_PREFIX "registry/deviceeventcontroller" +#define SPI_DBUS_INTERFACE_DEC SPI_DBUS_INTERFACE_PREFIX "DeviceEventController" #define SPI_DBUS_INTERFACE_DEVICE_EVENT_LISTENER SPI_DBUS_INTERFACE_PREFIX "DeviceEventListener" -#define SPI_DBUS_PATH_CACHE SPI_DBUS_PATH_PREFIX "cache" -#define SPI_DBUS_INTERFACE_CACHE SPI_DBUS_INTERFACE_PREFIX "Cache" +#define SPI_DBUS_PATH_CACHE SPI_DBUS_PATH_PREFIX "cache" +#define SPI_DBUS_INTERFACE_CACHE SPI_DBUS_INTERFACE_PREFIX "Cache" -#define SPI_DBUS_INTERFACE_ACCESSIBLE SPI_DBUS_INTERFACE_PREFIX "Accessible" -#define SPI_DBUS_INTERFACE_APPLICATION SPI_DBUS_INTERFACE_PREFIX "Application" -#define SPI_DBUS_INTERFACE_COMPONENT SPI_DBUS_INTERFACE_PREFIX "Component" -#define SPI_DBUS_INTERFACE_EVENT_KEYBOARD SPI_DBUS_INTERFACE_PREFIX "Keyboard" -#define SPI_DBUS_INTERFACE_EVENT_MOUSE SPI_DBUS_INTERFACE_PREFIX "Event.Mouse" -#define SPI_DBUS_INTERFACE_EVENT_OBJECT SPI_DBUS_INTERFACE_PREFIX "Event.Object" -#define SPI_DBUS_INTERFACE_SOCKET SPI_DBUS_INTERFACE_PREFIX "Socket" +#define SPI_DBUS_INTERFACE_ACCESSIBLE SPI_DBUS_INTERFACE_PREFIX "Accessible" +#define SPI_DBUS_INTERFACE_APPLICATION SPI_DBUS_INTERFACE_PREFIX "Application" +#define SPI_DBUS_INTERFACE_COMPONENT SPI_DBUS_INTERFACE_PREFIX "Component" +#define SPI_DBUS_INTERFACE_EVENT_KEYBOARD SPI_DBUS_INTERFACE_PREFIX "Keyboard" +#define SPI_DBUS_INTERFACE_EVENT_MOUSE SPI_DBUS_INTERFACE_PREFIX "Event.Mouse" +#define SPI_DBUS_INTERFACE_EVENT_OBJECT SPI_DBUS_INTERFACE_PREFIX "Event.Object" +#define SPI_DBUS_INTERFACE_SOCKET SPI_DBUS_INTERFACE_PREFIX "Socket" #endif /* SPI_PATHS_H_ */ diff --git a/registryd/reentrant-list.c b/registryd/reentrant-list.c index 2c08c42d..b723c76b 100644 --- a/registryd/reentrant-list.c +++ b/registryd/reentrant-list.c @@ -26,9 +26,10 @@ #include "reentrant-list.h" -typedef struct { - GList **list; - GList *iterator; +typedef struct +{ + GList **list; + GList *iterator; } Iteration; static GSList *working_list = NULL; /* of Iteration */ @@ -39,12 +40,12 @@ static GSList *working_list = NULL; /* of Iteration */ * element. */ void -spi_re_entrant_list_delete_link (GList * const *element_ptr) +spi_re_entrant_list_delete_link (GList *const *element_ptr) { - GSList *l; - GList *next; - GList *element; - gboolean first_item; + GSList *l; + GList *next; + GList *element; + gboolean first_item; GList *dummy G_GNUC_UNUSED; g_return_if_fail (element_ptr != NULL); @@ -59,47 +60,48 @@ spi_re_entrant_list_delete_link (GList * const *element_ptr) for (l = working_list; l; l = l->next) { - Iteration *i = l->data; + Iteration *i = l->data; - if (i->iterator == element) - { - i->iterator = next; - } + if (i->iterator == element) + { + i->iterator = next; + } - if (first_item && *(i->list) == element) - { - *(i->list) = next; - } + if (first_item && *(i->list) == element) + { + *(i->list) = next; + } } g_list_free_1 (element); } void -spi_re_entrant_list_foreach (GList **list, - SpiReEntrantFn func, - gpointer user_data) +spi_re_entrant_list_foreach (GList **list, + SpiReEntrantFn func, + gpointer user_data) { - Iteration i; + Iteration i; - if (!list || !*list) - { - return; - } + if (!list || !*list) + { + return; + } - i.list = list; - i.iterator = *list; + i.list = list; + i.iterator = *list; - working_list = g_slist_prepend (working_list, &i); + working_list = g_slist_prepend (working_list, &i); - while (i.iterator) { - GList *l = i.iterator; + while (i.iterator) + { + GList *l = i.iterator; - func (&i.iterator, user_data); + func (&i.iterator, user_data); - if (i.iterator == l) - i.iterator = i.iterator->next; - } + if (i.iterator == l) + i.iterator = i.iterator->next; + } - working_list = g_slist_remove (working_list, &i); + working_list = g_slist_remove (working_list, &i); } diff --git a/registryd/reentrant-list.h b/registryd/reentrant-list.h index e1241561..39f5527a 100644 --- a/registryd/reentrant-list.h +++ b/registryd/reentrant-list.h @@ -28,18 +28,19 @@ G_BEGIN_DECLS -typedef enum { - SPI_RE_ENTRANT_CONTINUE = 0, - SPI_RE_ENTRANT_TERMINATE +typedef enum +{ + SPI_RE_ENTRANT_CONTINUE = 0, + SPI_RE_ENTRANT_TERMINATE } SpiReEntrantContinue; -typedef SpiReEntrantContinue (*SpiReEntrantFn) (GList * const *list, - gpointer user_data); +typedef SpiReEntrantContinue (*SpiReEntrantFn) (GList *const *list, + gpointer user_data); -void spi_re_entrant_list_delete_link (GList * const *element_ptr); -void spi_re_entrant_list_foreach (GList **list, - SpiReEntrantFn func, - gpointer user_data); +void spi_re_entrant_list_delete_link (GList *const *element_ptr); +void spi_re_entrant_list_foreach (GList **list, + SpiReEntrantFn func, + gpointer user_data); G_END_DECLS diff --git a/registryd/registry-main.c b/registryd/registry-main.c index f46886d2..7619c86a 100644 --- a/registryd/registry-main.c +++ b/registryd/registry-main.c @@ -21,38 +21,37 @@ * Boston, MA 02110-1301, USA. */ -#include <stdlib.h> #include <config.h> -#include <string.h> -#include <glib.h> +#include <dlfcn.h> #include <gio/gio.h> +#include <glib.h> #include <stdio.h> -#include <dlfcn.h> +#include <stdlib.h> +#include <string.h> #include <dbus/dbus.h> +#include "atspi/atspi.h" +#include "deviceeventcontroller.h" #include "paths.h" #include "registry.h" -#include "deviceeventcontroller.h" -#include "atspi/atspi.h" static GMainLoop *mainloop; static gchar *dbus_name = NULL; static gboolean use_gnome_session = FALSE; -static GOptionEntry optentries[] = -{ - {"dbus-name", 0, 0, G_OPTION_ARG_STRING, &dbus_name, "Well-known name to register with D-Bus", NULL}, - {"use-gnome-session", 0, 0, G_OPTION_ARG_NONE, &use_gnome_session, "Should register with gnome session manager", NULL}, - {NULL} +static GOptionEntry optentries[] = { + { "dbus-name", 0, 0, G_OPTION_ARG_STRING, &dbus_name, "Well-known name to register with D-Bus", NULL }, + { "use-gnome-session", 0, 0, G_OPTION_ARG_NONE, &use_gnome_session, "Should register with gnome session manager", NULL }, + { NULL } }; -static GDBusProxy *sm_proxy = NULL; -static char *client_id = NULL; -static GDBusProxy *client_proxy = NULL; +static GDBusProxy *sm_proxy = NULL; +static char *client_id = NULL; +static GDBusProxy *client_proxy = NULL; -#define SM_DBUS_NAME "org.gnome.SessionManager" -#define SM_DBUS_PATH "/org/gnome/SessionManager" +#define SM_DBUS_NAME "org.gnome.SessionManager" +#define SM_DBUS_PATH "/org/gnome/SessionManager" #define SM_DBUS_INTERFACE "org.gnome.SessionManager" #define SM_CLIENT_DBUS_INTERFACE "org.gnome.SessionManager.ClientPrivate" @@ -61,71 +60,77 @@ static gboolean register_client (void); static void on_session_signal (GDBusProxy *proxy, - gchar *sender_name, - gchar *signal_name, - GVariant *parameters, - gpointer user_data) + gchar *sender_name, + gchar *signal_name, + GVariant *parameters, + gpointer user_data) { - if (g_strcmp0 (signal_name, "SessionOver") == 0) { - g_main_loop_quit (mainloop); - } else if (g_strcmp0 (signal_name, "SessionRunning") == 0) { - if (!register_client ()) - g_warning ("Unable to register client with session manager"); - } + if (g_strcmp0 (signal_name, "SessionOver") == 0) + { + g_main_loop_quit (mainloop); + } + else if (g_strcmp0 (signal_name, "SessionRunning") == 0) + { + if (!register_client ()) + g_warning ("Unable to register client with session manager"); + } } static gboolean session_manager_connect (void) { - GVariant *res; - gboolean is_running; - - sm_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION, 0, NULL, - SM_DBUS_NAME, - SM_DBUS_PATH, - SM_DBUS_INTERFACE, NULL, NULL); - - res = g_dbus_proxy_call_sync (sm_proxy, - "IsSessionRunning", NULL, - 0, 1000, NULL, NULL); - - if (res) { - g_variant_get (res, "(b)", &is_running); - g_variant_unref (res); - if (is_running) { - if (!register_client ()) - g_warning ("Unable to register client with session manager"); - } + GVariant *res; + gboolean is_running; + + sm_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION, 0, NULL, + SM_DBUS_NAME, + SM_DBUS_PATH, + SM_DBUS_INTERFACE, NULL, NULL); + + res = g_dbus_proxy_call_sync (sm_proxy, + "IsSessionRunning", NULL, + 0, 1000, NULL, NULL); + + if (res) + { + g_variant_get (res, "(b)", &is_running); + g_variant_unref (res); + if (is_running) + { + if (!register_client ()) + g_warning ("Unable to register client with session manager"); } + } - g_signal_connect (G_OBJECT (sm_proxy), "g-signal", - G_CALLBACK (on_session_signal), NULL); + g_signal_connect (G_OBJECT (sm_proxy), "g-signal", + G_CALLBACK (on_session_signal), NULL); - return (sm_proxy != NULL); + return (sm_proxy != NULL); } static gboolean end_session_response (gboolean is_okay, const gchar *reason) { - GVariant *ret; - GError *error = NULL; + GVariant *ret; + GError *error = NULL; - if (!reason) - reason = ""; + if (!reason) + reason = ""; - ret = g_dbus_proxy_call_sync (client_proxy, "EndSessionResponse", - g_variant_new ("(bs)", is_okay, reason), - 0, 1000, NULL, &error); + ret = g_dbus_proxy_call_sync (client_proxy, "EndSessionResponse", + g_variant_new ("(bs)", is_okay, reason), + 0, 1000, NULL, &error); - if (!ret) { - g_warning ("Failed to send session response %s", error->message); - g_error_free (error); - return FALSE; - } - else - g_variant_unref (ret); + if (!ret) + { + g_warning ("Failed to send session response %s", error->message); + g_error_free (error); + return FALSE; + } + else + g_variant_unref (ret); - return TRUE; + return TRUE; } static void @@ -135,73 +140,78 @@ client_proxy_signal_cb (GDBusProxy *proxy, GVariant *parameters, gpointer user_data) { - if (g_strcmp0 (signal_name, "QueryEndSession") == 0) { - g_debug ("Got QueryEndSession signal"); - end_session_response (TRUE, NULL); - } else if (g_strcmp0 (signal_name, "EndSession") == 0) { - g_debug ("Got EndSession signal"); - end_session_response (TRUE, NULL); - g_main_loop_quit (mainloop); - } else if (g_strcmp0 (signal_name, "Stop") == 0) { - g_debug ("Got Stop signal"); - g_main_loop_quit (mainloop); - } + if (g_strcmp0 (signal_name, "QueryEndSession") == 0) + { + g_debug ("Got QueryEndSession signal"); + end_session_response (TRUE, NULL); + } + else if (g_strcmp0 (signal_name, "EndSession") == 0) + { + g_debug ("Got EndSession signal"); + end_session_response (TRUE, NULL); + g_main_loop_quit (mainloop); + } + else if (g_strcmp0 (signal_name, "Stop") == 0) + { + g_debug ("Got Stop signal"); + g_main_loop_quit (mainloop); + } } static gboolean register_client (void) { - GError *error; - GVariant *res; - const char *startup_id; - const char *app_id; - - if (client_proxy) - return TRUE; - - startup_id = g_getenv ("DESKTOP_AUTOSTART_ID"); - if (!startup_id) - startup_id = ""; - app_id = "at-spi-registryd.desktop"; - - error = NULL; - res = g_dbus_proxy_call_sync (sm_proxy, - "RegisterClient", - g_variant_new ("(ss)", app_id, - startup_id), - 0, 1000, NULL, &error); - if (! res) { - const char *message = (error && error->message ? error->message - : "no error"); - g_warning ("Failed to register client: %s", message); - if (error) - g_error_free (error); - return FALSE; - } - g_variant_get (res, "(o)", &client_id); - g_variant_unref (res); + GError *error; + GVariant *res; + const char *startup_id; + const char *app_id; + + if (client_proxy) + return TRUE; + + startup_id = g_getenv ("DESKTOP_AUTOSTART_ID"); + if (!startup_id) + startup_id = ""; + app_id = "at-spi-registryd.desktop"; + + error = NULL; + res = g_dbus_proxy_call_sync (sm_proxy, + "RegisterClient", + g_variant_new ("(ss)", app_id, + startup_id), + 0, 1000, NULL, &error); + if (!res) + { + const char *message = (error && error->message ? error->message + : "no error"); + g_warning ("Failed to register client: %s", message); + if (error) + g_error_free (error); + return FALSE; + } + g_variant_get (res, "(o)", &client_id); + g_variant_unref (res); - client_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION, 0, NULL, - SM_DBUS_NAME, - client_id, - SM_CLIENT_DBUS_INTERFACE, - NULL, NULL); + client_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION, 0, NULL, + SM_DBUS_NAME, + client_id, + SM_CLIENT_DBUS_INTERFACE, + NULL, NULL); - g_signal_connect (client_proxy, "g-signal", - G_CALLBACK (client_proxy_signal_cb), NULL); + g_signal_connect (client_proxy, "g-signal", + G_CALLBACK (client_proxy_signal_cb), NULL); - g_unsetenv ("DESKTOP_AUTOSTART_ID"); + g_unsetenv ("DESKTOP_AUTOSTART_ID"); - return TRUE; + return TRUE; } /*---------------------------------------------------------------------------*/ - /*---------------------------------------------------------------------------*/ typedef GObject *(*gconf_client_get_default_t) (); -typedef gboolean (*gconf_client_get_bool_t)(GObject *, const char *, void *); +typedef gboolean (*gconf_client_get_bool_t) (GObject *, const char *, void *); int main (int argc, char **argv) @@ -217,31 +227,31 @@ main (int argc, char **argv) int ret; /*Parse command options*/ - opt = g_option_context_new(NULL); - g_option_context_add_main_entries(opt, optentries, NULL); + opt = g_option_context_new (NULL); + g_option_context_add_main_entries (opt, optentries, NULL); - if (!g_option_context_parse(opt, &argc, &argv, &err)) + if (!g_option_context_parse (opt, &argc, &argv, &err)) { - g_error("Option parsing failed: %s\n", err->message); + g_error ("Option parsing failed: %s\n", err->message); g_clear_error (&err); } if (dbus_name == NULL) - dbus_name = SPI_DBUS_NAME_REGISTRY; + dbus_name = SPI_DBUS_NAME_REGISTRY; bus = atspi_get_a11y_bus (); if (!bus) - { - return 0; - } + { + return 0; + } mainloop = g_main_loop_new (NULL, FALSE); - atspi_dbus_connection_setup_with_g_main(bus, NULL); + atspi_dbus_connection_setup_with_g_main (bus, NULL); - ret = dbus_bus_request_name(bus, dbus_name, DBUS_NAME_FLAG_DO_NOT_QUEUE, NULL); + ret = dbus_bus_request_name (bus, dbus_name, DBUS_NAME_FLAG_DO_NOT_QUEUE, NULL); if (ret == DBUS_REQUEST_NAME_REPLY_EXISTS) { - exit (0); /* most likely already running */ + exit (0); /* most likely already running */ } else { @@ -254,7 +264,7 @@ main (int argc, char **argv) if (use_gnome_session) { if (!session_manager_connect ()) - g_warning ("Unable to connect to session manager"); + g_warning ("Unable to connect to session manager"); } g_main_loop_run (mainloop); diff --git a/registryd/registry.c b/registryd/registry.c index 6cb10f08..349e92ec 100644 --- a/registryd/registry.c +++ b/registryd/registry.c @@ -23,12 +23,12 @@ */ #include <config.h> -#include <string.h> #include <ctype.h> +#include <string.h> +#include "introspection.h" #include "paths.h" #include "registry.h" -#include "introspection.h" typedef struct { @@ -74,7 +74,7 @@ spi_reference_free (SpiReference *ref) /*---------------------------------------------------------------------------*/ -G_DEFINE_TYPE(SpiRegistry, spi_registry, G_TYPE_OBJECT) +G_DEFINE_TYPE (SpiRegistry, spi_registry, G_TYPE_OBJECT) static void spi_registry_finalize (GObject *object) @@ -106,12 +106,12 @@ spi_registry_init (SpiRegistry *registry) /*---------------------------------------------------------------------------*/ static dbus_bool_t -return_v_string (DBusMessageIter * iter, const gchar * str) +return_v_string (DBusMessageIter *iter, const gchar *str) { DBusMessageIter variant; if (!dbus_message_iter_open_container (iter, DBUS_TYPE_VARIANT, "s", - &variant)) + &variant)) return FALSE; dbus_message_iter_append_basic (&variant, DBUS_TYPE_STRING, &str); @@ -120,12 +120,12 @@ return_v_string (DBusMessageIter * iter, const gchar * str) } static dbus_bool_t -append_reference (DBusMessageIter * iter, SpiReference *ref) +append_reference (DBusMessageIter *iter, SpiReference *ref) { DBusMessageIter iter_struct; if (!dbus_message_iter_open_container (iter, DBUS_TYPE_STRUCT, NULL, - &iter_struct)) + &iter_struct)) return FALSE; dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_STRING, &ref->name); dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_OBJECT_PATH, &ref->path); @@ -174,15 +174,15 @@ emit_children_changed (DBusConnection *bus, DBusMessageIter iter, iter_variant, iter_array; dbus_int32_t unused = 0; - sig = dbus_message_new_signal(SPI_DBUS_PATH_ROOT, - SPI_DBUS_INTERFACE_EVENT_OBJECT, - "ChildrenChanged"); + sig = dbus_message_new_signal (SPI_DBUS_PATH_ROOT, + SPI_DBUS_INTERFACE_EVENT_OBJECT, + "ChildrenChanged"); - dbus_message_iter_init_append(sig, &iter); + dbus_message_iter_init_append (sig, &iter); - dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &operation); - dbus_message_iter_append_basic(&iter, DBUS_TYPE_INT32, &index); - dbus_message_iter_append_basic(&iter, DBUS_TYPE_INT32, &unused); + dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &operation); + dbus_message_iter_append_basic (&iter, DBUS_TYPE_INT32, &index); + dbus_message_iter_append_basic (&iter, DBUS_TYPE_INT32, &unused); dbus_message_iter_open_container (&iter, DBUS_TYPE_VARIANT, "(so)", &iter_variant); @@ -193,8 +193,8 @@ emit_children_changed (DBusConnection *bus, &iter_array); dbus_message_iter_close_container (&iter, &iter_array); - dbus_connection_send(bus, sig, NULL); - dbus_message_unref(sig); + dbus_connection_send (bus, sig, NULL); + dbus_message_unref (sig); } static void @@ -256,11 +256,11 @@ event_is_subtype (gchar **needle, gchar **haystack) static gboolean needs_mouse_poll (char **event) { - if (g_strcmp0 (event [0], "Mouse") != 0) + if (g_strcmp0 (event[0], "Mouse") != 0) return FALSE; - if (!event [1] || !event [1][0]) + if (!event[1] || !event[1][0]) return TRUE; - return (g_strcmp0 (event [1], "Abs") == 0); + return (g_strcmp0 (event[1], "Abs") == 0); } static void @@ -383,23 +383,24 @@ signal_filter (DBusConnection *bus, DBusMessage *message, void *user_data) SpiRegistry *reg = SPI_REGISTRY (user_data); guint res = DBUS_HANDLER_RESULT_HANDLED; - const gint type = dbus_message_get_type (message); + const gint type = dbus_message_get_type (message); const char *iface = dbus_message_get_interface (message); const char *member = dbus_message_get_member (message); if (type != DBUS_MESSAGE_TYPE_SIGNAL) return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; - if (!g_strcmp0(iface, DBUS_INTERFACE_DBUS) && - !g_strcmp0(member, "NameOwnerChanged")) - handle_disconnection (reg, message); + if (!g_strcmp0 (iface, DBUS_INTERFACE_DBUS) && + !g_strcmp0 (member, "NameOwnerChanged")) + handle_disconnection (reg, message); else - res = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + res = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; return res; } -typedef enum { +typedef enum +{ DEMARSHAL_STATUS_SUCCESS, DEMARSHAL_STATUS_INVALID_SIGNATURE, DEMARSHAL_STATUS_INVALID_VALUE, @@ -444,7 +445,7 @@ socket_embed (SpiRegistry *registry, SpiReference *app_root) return spi_reference_new (registry->bus_unique_name, SPI_DBUS_PATH_ROOT); } -static DBusMessage* +static DBusMessage * impl_Embed (DBusMessage *message, SpiRegistry *registry) { SpiReference *app_root = NULL; @@ -468,7 +469,7 @@ impl_Embed (DBusMessage *message, SpiRegistry *registry) return reply; } -static DBusMessage* +static DBusMessage * impl_Unembed (DBusMessage *message, SpiRegistry *registry) { SpiReference *app_reference; @@ -491,7 +492,7 @@ impl_Unembed (DBusMessage *message, SpiRegistry *registry) /*---------------------------------------------------------------------------*/ static DBusMessage * -impl_Contains (DBusMessage * message, SpiRegistry *registry) +impl_Contains (DBusMessage *message, SpiRegistry *registry) { dbus_bool_t retval = FALSE; DBusMessage *reply; @@ -503,7 +504,7 @@ impl_Contains (DBusMessage * message, SpiRegistry *registry) } static DBusMessage * -impl_GetAccessibleAtPoint (DBusMessage * message, SpiRegistry *registry) +impl_GetAccessibleAtPoint (DBusMessage *message, SpiRegistry *registry) { DBusMessage *reply = NULL; DBusMessageIter iter; @@ -518,7 +519,7 @@ impl_GetAccessibleAtPoint (DBusMessage * message, SpiRegistry *registry) } static DBusMessage * -impl_GetExtents (DBusMessage * message, SpiRegistry *registry) +impl_GetExtents (DBusMessage *message, SpiRegistry *registry) { dbus_int32_t x = 0, y = 0, width = 1024, height = 768; DBusMessage *reply; @@ -528,16 +529,16 @@ impl_GetExtents (DBusMessage * message, SpiRegistry *registry) dbus_message_iter_init_append (reply, &iter); dbus_message_iter_open_container (&iter, DBUS_TYPE_STRUCT, NULL, &iter_struct); - dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_INT32, &x); - dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_INT32, &y); - dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_INT32, &width); - dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_INT32, &height); + dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_INT32, &x); + dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_INT32, &y); + dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_INT32, &width); + dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_INT32, &height); dbus_message_iter_close_container (&iter, &iter_struct); return reply; } static DBusMessage * -impl_GetPosition (DBusMessage * message, SpiRegistry *registry) +impl_GetPosition (DBusMessage *message, SpiRegistry *registry) { DBusMessage *reply; dbus_int32_t x = 0, y = 0; @@ -549,7 +550,7 @@ impl_GetPosition (DBusMessage * message, SpiRegistry *registry) } static DBusMessage * -impl_GetSize (DBusMessage * message, SpiRegistry *registry) +impl_GetSize (DBusMessage *message, SpiRegistry *registry) { /* TODO - Get the screen size */ DBusMessage *reply; @@ -564,7 +565,7 @@ impl_GetSize (DBusMessage * message, SpiRegistry *registry) #define LAYER_WIDGET 3; static DBusMessage * -impl_GetLayer (DBusMessage * message, SpiRegistry *registry) +impl_GetLayer (DBusMessage *message, SpiRegistry *registry) { DBusMessage *reply; dbus_uint32_t rv = LAYER_WIDGET; @@ -576,7 +577,7 @@ impl_GetLayer (DBusMessage * message, SpiRegistry *registry) } static DBusMessage * -impl_GetMDIZOrder (DBusMessage * message, SpiRegistry *registry) +impl_GetMDIZOrder (DBusMessage *message, SpiRegistry *registry) { DBusMessage *reply; dbus_int16_t rv = 0; @@ -588,7 +589,7 @@ impl_GetMDIZOrder (DBusMessage * message, SpiRegistry *registry) } static DBusMessage * -impl_GrabFocus (DBusMessage * message, SpiRegistry *registry) +impl_GrabFocus (DBusMessage *message, SpiRegistry *registry) { DBusMessage *reply; dbus_bool_t retval = FALSE; @@ -600,7 +601,7 @@ impl_GrabFocus (DBusMessage * message, SpiRegistry *registry) } static DBusMessage * -impl_GetAlpha (DBusMessage * message, SpiRegistry *registry) +impl_GetAlpha (DBusMessage *message, SpiRegistry *registry) { double rv = 1.0; DBusMessage *reply; @@ -615,21 +616,21 @@ impl_GetAlpha (DBusMessage * message, SpiRegistry *registry) /*---------------------------------------------------------------------------*/ static dbus_bool_t -impl_get_Name (DBusMessageIter * iter, SpiRegistry *registry) +impl_get_Name (DBusMessageIter *iter, SpiRegistry *registry) { const gchar *name = "main"; return return_v_string (iter, name); } static dbus_bool_t -impl_get_Description (DBusMessageIter * iter, SpiRegistry *registry) +impl_get_Description (DBusMessageIter *iter, SpiRegistry *registry) { const gchar *description = ""; return return_v_string (iter, description); } static dbus_bool_t -impl_get_Parent (DBusMessageIter * iter, SpiRegistry *registry) +impl_get_Parent (DBusMessageIter *iter, SpiRegistry *registry) { DBusMessageIter iter_variant; SpiReference *null_ref = spi_reference_null (""); @@ -643,7 +644,7 @@ impl_get_Parent (DBusMessageIter * iter, SpiRegistry *registry) } static dbus_bool_t -impl_get_ChildCount (DBusMessageIter * iter, SpiRegistry *registry) +impl_get_ChildCount (DBusMessageIter *iter, SpiRegistry *registry) { dbus_int32_t rv = registry->apps->len; dbus_bool_t result; @@ -658,19 +659,19 @@ impl_get_ChildCount (DBusMessageIter * iter, SpiRegistry *registry) } static dbus_bool_t -impl_get_ToolkitName (DBusMessageIter * iter, SpiRegistry *registry) +impl_get_ToolkitName (DBusMessageIter *iter, SpiRegistry *registry) { return return_v_string (iter, "at-spi-registry"); } static dbus_bool_t -impl_get_ToolkitVersion (DBusMessageIter * iter, SpiRegistry *registry) +impl_get_ToolkitVersion (DBusMessageIter *iter, SpiRegistry *registry) { return return_v_string (iter, "2.0"); } static DBusMessage * -impl_GetChildAtIndex (DBusMessage * message, SpiRegistry *registry) +impl_GetChildAtIndex (DBusMessage *message, SpiRegistry *registry) { DBusMessage *reply; DBusMessageIter iter; @@ -679,8 +680,7 @@ impl_GetChildAtIndex (DBusMessage * message, SpiRegistry *registry) dbus_int32_t i; dbus_error_init (&error); - if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &i, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, &error, DBUS_TYPE_INT32, &i, DBUS_TYPE_INVALID)) { return dbus_message_new_error (message, DBUS_ERROR_FAILED, "Invalid arguments"); } @@ -704,7 +704,7 @@ impl_GetChildAtIndex (DBusMessage * message, SpiRegistry *registry) } static DBusMessage * -impl_GetChildren (DBusMessage * message, SpiRegistry *registry) +impl_GetChildren (DBusMessage *message, SpiRegistry *registry) { DBusMessage *reply = NULL; DBusMessageIter iter, iter_array; @@ -713,18 +713,18 @@ impl_GetChildren (DBusMessage * message, SpiRegistry *registry) reply = dbus_message_new_method_return (message); dbus_message_iter_init_append (reply, &iter); - dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "(so)", &iter_array); - for (i=0; i < registry->apps->len; i++) + dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, "(so)", &iter_array); + for (i = 0; i < registry->apps->len; i++) { SpiReference *current = g_ptr_array_index (registry->apps, i); append_reference (&iter_array, current); } - dbus_message_iter_close_container(&iter, &iter_array); + dbus_message_iter_close_container (&iter, &iter_array); return reply; } static DBusMessage * -impl_GetIndexInParent (DBusMessage * message, SpiRegistry *registry) +impl_GetIndexInParent (DBusMessage *message, SpiRegistry *registry) { DBusMessage *reply; dbus_uint32_t rv = 0; @@ -735,7 +735,7 @@ impl_GetIndexInParent (DBusMessage * message, SpiRegistry *registry) } static DBusMessage * -impl_GetRelationSet (DBusMessage * message, SpiRegistry *registry) +impl_GetRelationSet (DBusMessage *message, SpiRegistry *registry) { DBusMessage *reply; DBusMessageIter iter, iter_array; @@ -749,10 +749,10 @@ impl_GetRelationSet (DBusMessage * message, SpiRegistry *registry) } static DBusMessage * -impl_GetRole (DBusMessage * message, SpiRegistry *registry) +impl_GetRole (DBusMessage *message, SpiRegistry *registry) { DBusMessage *reply; - dbus_uint32_t rv = 14; /* TODO: Get DESKTOP_FRAME from somewhere */ + dbus_uint32_t rv = 14; /* TODO: Get DESKTOP_FRAME from somewhere */ reply = dbus_message_new_method_return (message); dbus_message_append_args (reply, DBUS_TYPE_UINT32, &rv, DBUS_TYPE_INVALID); @@ -760,7 +760,7 @@ impl_GetRole (DBusMessage * message, SpiRegistry *registry) } static DBusMessage * -impl_GetRoleName (DBusMessage * message, SpiRegistry *registry) +impl_GetRoleName (DBusMessage *message, SpiRegistry *registry) { DBusMessage *reply; const char *role_name = "desktop frame"; @@ -772,7 +772,7 @@ impl_GetRoleName (DBusMessage * message, SpiRegistry *registry) } static DBusMessage * -impl_GetLocalizedRoleName (DBusMessage * message, SpiRegistry *registry) +impl_GetLocalizedRoleName (DBusMessage *message, SpiRegistry *registry) { /* FIXME - Localize this */ DBusMessage *reply; @@ -785,12 +785,12 @@ impl_GetLocalizedRoleName (DBusMessage * message, SpiRegistry *registry) } static DBusMessage * -impl_GetState (DBusMessage * message, SpiRegistry *registry) +impl_GetState (DBusMessage *message, SpiRegistry *registry) { DBusMessage *reply = NULL; DBusMessageIter iter, iter_array; - dbus_uint32_t states[2] = {0, 0}; + dbus_uint32_t states[2] = { 0, 0 }; guint count; reply = dbus_message_new_method_return (message); @@ -807,7 +807,7 @@ impl_GetState (DBusMessage * message, SpiRegistry *registry) } static DBusMessage * -impl_GetAttributes (DBusMessage * message, SpiRegistry *registry) +impl_GetAttributes (DBusMessage *message, SpiRegistry *registry) { DBusMessage *reply = NULL; DBusMessageIter iter, array; @@ -821,7 +821,7 @@ impl_GetAttributes (DBusMessage * message, SpiRegistry *registry) } static DBusMessage * -impl_GetApplication (DBusMessage * message, SpiRegistry *registry) +impl_GetApplication (DBusMessage *message, SpiRegistry *registry) { DBusMessage *reply = NULL; DBusMessageIter iter; @@ -836,7 +836,7 @@ impl_GetApplication (DBusMessage * message, SpiRegistry *registry) } static DBusMessage * -impl_GetInterfaces (DBusMessage * message, SpiRegistry *registry) +impl_GetInterfaces (DBusMessage *message, SpiRegistry *registry) { DBusMessage *reply; DBusMessageIter iter, iter_array; @@ -861,7 +861,7 @@ impl_GetInterfaces (DBusMessage * message, SpiRegistry *registry) } static DBusMessage * -impl_GetItems (DBusMessage * message, SpiRegistry *registry) +impl_GetItems (DBusMessage *message, SpiRegistry *registry) { DBusMessage *reply; DBusMessageIter iter, iter_array; @@ -894,10 +894,10 @@ impl_RegisterEvent (DBusMessage *message, SpiRegistry *registry) if (strcmp (signature, "sas") != 0 && strcmp (signature, "s") != 0 && strcmp (signature, "sass") != 0) - { - g_warning ("got RegisterEvent with invalid signature '%s'", signature); - return NULL; - } + { + g_warning ("got RegisterEvent with invalid signature '%s'", signature); + return NULL; + } dbus_message_iter_init (message, &iter); dbus_message_iter_get_basic (&iter, &orig_name); @@ -910,27 +910,27 @@ impl_RegisterEvent (DBusMessage *message, SpiRegistry *registry) evdata->data = data; if (dbus_message_iter_get_arg_type (&iter) == DBUS_TYPE_ARRAY) - { - dbus_message_iter_recurse (&iter, &iter_array); - while (dbus_message_iter_get_arg_type (&iter_array) != DBUS_TYPE_INVALID) { - const char *property; - dbus_message_iter_get_basic (&iter_array, &property); - evdata->properties = g_slist_append (evdata->properties, - g_strdup (property)); - dbus_message_iter_next (&iter_array); + dbus_message_iter_recurse (&iter, &iter_array); + while (dbus_message_iter_get_arg_type (&iter_array) != DBUS_TYPE_INVALID) + { + const char *property; + dbus_message_iter_get_basic (&iter_array, &property); + evdata->properties = g_slist_append (evdata->properties, + g_strdup (property)); + dbus_message_iter_next (&iter_array); + } + dbus_message_iter_next (&iter); } - dbus_message_iter_next (&iter); - } if (dbus_message_iter_get_arg_type (&iter) == DBUS_TYPE_STRING) - { - const char *app; - dbus_message_iter_get_basic (&iter, &app); - if (app[0]) - evdata->app_bus_name = g_strdup (app); - dbus_message_iter_next (&iter); - } + { + const char *app; + dbus_message_iter_get_basic (&iter, &app); + if (app[0]) + evdata->app_bus_name = g_strdup (app); + dbus_message_iter_next (&iter); + } registry->events = g_list_append (registry->events, evdata); @@ -943,23 +943,23 @@ impl_RegisterEvent (DBusMessage *message, SpiRegistry *registry) SPI_DBUS_INTERFACE_REGISTRY, "EventListenerRegistered"); if (signal) - { - GSList *ls = evdata->properties; - if (evdata->app_bus_name) - dbus_message_set_destination (message, evdata->app_bus_name); - dbus_message_iter_init_append (signal, &iter); - dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &sender); - dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &name); - dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, "s", &iter_array); - while (ls) { - dbus_message_iter_append_basic (&iter_array, DBUS_TYPE_STRING, &ls->data); - ls = g_slist_next (ls); + GSList *ls = evdata->properties; + if (evdata->app_bus_name) + dbus_message_set_destination (message, evdata->app_bus_name); + dbus_message_iter_init_append (signal, &iter); + dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &sender); + dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &name); + dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, "s", &iter_array); + while (ls) + { + dbus_message_iter_append_basic (&iter_array, DBUS_TYPE_STRING, &ls->data); + ls = g_slist_next (ls); + } + dbus_message_iter_close_container (&iter, &iter_array); + dbus_connection_send (registry->bus, signal, NULL); + dbus_message_unref (signal); } - dbus_message_iter_close_container (&iter, &iter_array); - dbus_connection_send (registry->bus, signal, NULL); - dbus_message_unref (signal); - } g_free (name); return dbus_message_new_method_return (message); @@ -973,7 +973,7 @@ impl_DeregisterEvent (DBusMessage *message, SpiRegistry *registry) const char *sender = dbus_message_get_sender (message); if (!dbus_message_get_args (message, NULL, DBUS_TYPE_STRING, &orig_name, - DBUS_TYPE_INVALID)) + DBUS_TYPE_INVALID)) return NULL; name = ensure_proper_format (orig_name); @@ -1005,9 +1005,9 @@ impl_GetRegisteredEvents (DBusMessage *message, SpiRegistry *registry) if (evdata->app_bus_name && strcmp (evdata->app_bus_name, sender) != 0) continue; - str = g_strconcat (evdata->data [0], - ":", (evdata->data [1]? evdata->data [1]: ""), - ":", (evdata->data [1] && evdata->data [2]? evdata->data [2]: ""), NULL); + str = g_strconcat (evdata->data[0], + ":", (evdata->data[1] ? evdata->data[1] : ""), + ":", (evdata->data[1] && evdata->data[2] ? evdata->data[2] : ""), NULL); dbus_message_iter_open_container (&iter_array, DBUS_TYPE_STRUCT, NULL, &iter_struct); dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_STRING, &evdata->listener_bus_name); dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_STRING, &str); @@ -1020,8 +1020,8 @@ impl_GetRegisteredEvents (DBusMessage *message, SpiRegistry *registry) /*---------------------------------------------------------------------------*/ -static void -emit_Available (DBusConnection * bus) +static void +emit_Available (DBusConnection *bus) { DBusMessage *sig; DBusMessageIter iter; @@ -1029,29 +1029,29 @@ emit_Available (DBusConnection * bus) SPI_DBUS_NAME_REGISTRY, SPI_DBUS_PATH_ROOT, }; - - sig = dbus_message_new_signal(SPI_DBUS_PATH_ROOT, SPI_DBUS_INTERFACE_SOCKET, "Available"); - dbus_message_iter_init_append(sig, &iter); + sig = dbus_message_new_signal (SPI_DBUS_PATH_ROOT, SPI_DBUS_INTERFACE_SOCKET, "Available"); + + dbus_message_iter_init_append (sig, &iter); append_reference (&iter, &root_ref); - dbus_connection_send(bus, sig, NULL); - dbus_message_unref(sig); + dbus_connection_send (bus, sig, NULL); + dbus_message_unref (sig); } /*---------------------------------------------------------------------------*/ static const char *introspection_header = -"<?xml version=\"1.0\"?>\n"; + "<?xml version=\"1.0\"?>\n"; static const char *introspection_node_element = -"<node name=\"%s\">\n"; + "<node name=\"%s\">\n"; static const char *introspection_footer = -"</node>"; + "</node>"; static DBusMessage * -impl_Introspect_root (DBusMessage * message, SpiRegistry *registry) +impl_Introspect_root (DBusMessage *message, SpiRegistry *registry) { GString *output; gchar *final; @@ -1060,26 +1060,26 @@ impl_Introspect_root (DBusMessage * message, SpiRegistry *registry) DBusMessage *reply; - output = g_string_new(introspection_header); + output = g_string_new (introspection_header); - g_string_append_printf(output, introspection_node_element, pathstr); + g_string_append_printf (output, introspection_node_element, pathstr); g_string_append (output, spi_org_a11y_atspi_Accessible); g_string_append (output, spi_org_a11y_atspi_Component); g_string_append (output, spi_org_a11y_atspi_Socket); - g_string_append(output, introspection_footer); - final = g_string_free(output, FALSE); + g_string_append (output, introspection_footer); + final = g_string_free (output, FALSE); reply = dbus_message_new_method_return (message); - dbus_message_append_args(reply, DBUS_TYPE_STRING, &final, DBUS_TYPE_INVALID); + dbus_message_append_args (reply, DBUS_TYPE_STRING, &final, DBUS_TYPE_INVALID); - g_free(final); + g_free (final); return reply; } static DBusMessage * -impl_Introspect_registry (DBusMessage * message, SpiRegistry *registry) +impl_Introspect_registry (DBusMessage *message, SpiRegistry *registry) { GString *output; gchar *final; @@ -1088,19 +1088,19 @@ impl_Introspect_registry (DBusMessage * message, SpiRegistry *registry) DBusMessage *reply; - output = g_string_new(introspection_header); + output = g_string_new (introspection_header); - g_string_append_printf(output, introspection_node_element, pathstr); + g_string_append_printf (output, introspection_node_element, pathstr); g_string_append (output, spi_org_a11y_atspi_Registry); - g_string_append(output, introspection_footer); - final = g_string_free(output, FALSE); + g_string_append (output, introspection_footer); + final = g_string_free (output, FALSE); reply = dbus_message_new_method_return (message); - dbus_message_append_args(reply, DBUS_TYPE_STRING, &final, DBUS_TYPE_INVALID); + dbus_message_append_args (reply, DBUS_TYPE_STRING, &final, DBUS_TYPE_INVALID); - g_free(final); + g_free (final); return reply; } @@ -1112,17 +1112,17 @@ handle_method_root (DBusConnection *bus, DBusMessage *message, void *user_data) SpiRegistry *registry = SPI_REGISTRY (user_data); DBusHandlerResult result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; - const gchar *iface = dbus_message_get_interface (message); - const gchar *member = dbus_message_get_member (message); - const gint type = dbus_message_get_type (message); + const gchar *iface = dbus_message_get_interface (message); + const gchar *member = dbus_message_get_member (message); + const gint type = dbus_message_get_type (message); DBusMessage *reply = NULL; /* Check for basic reasons not to handle */ - if (type != DBUS_MESSAGE_TYPE_METHOD_CALL || + if (type != DBUS_MESSAGE_TYPE_METHOD_CALL || member == NULL || - iface == NULL) - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + iface == NULL) + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; if (!strcmp (iface, "org.freedesktop.DBus.Properties")) { @@ -1146,10 +1146,9 @@ handle_method_root (DBusConnection *bus, DBusMessage *message, void *user_data) reply = dbus_message_new_method_return (message); dbus_message_iter_init_append (reply, &iter); - if (!strcmp (prop_iface, SPI_DBUS_INTERFACE_ACCESSIBLE)) { - if (!strcmp (prop_member, "Name")) + if (!strcmp (prop_member, "Name")) impl_get_Name (&iter, registry); else if (!strcmp (prop_member, "Description")) impl_get_Description (&iter, registry); @@ -1159,7 +1158,7 @@ handle_method_root (DBusConnection *bus, DBusMessage *message, void *user_data) impl_get_ChildCount (&iter, registry); else { - dbus_message_unref (reply); + dbus_message_unref (reply); reply = dbus_message_new_error (message, DBUS_ERROR_FAILED, "Property unavailable"); } } @@ -1171,13 +1170,13 @@ handle_method_root (DBusConnection *bus, DBusMessage *message, void *user_data) impl_get_ToolkitVersion (&iter, registry); else { - dbus_message_unref (reply); + dbus_message_unref (reply); reply = dbus_message_new_error (message, DBUS_ERROR_FAILED, "Property unavailable"); } } else { - dbus_message_unref (reply); + dbus_message_unref (reply); reply = dbus_message_new_error (message, DBUS_ERROR_FAILED, "Property unavailable"); } } @@ -1196,75 +1195,75 @@ handle_method_root (DBusConnection *bus, DBusMessage *message, void *user_data) if (!strcmp (iface, SPI_DBUS_INTERFACE_ACCESSIBLE)) { result = DBUS_HANDLER_RESULT_HANDLED; - if (!strcmp (member, "GetChildAtIndex")) - reply = impl_GetChildAtIndex (message, registry); + if (!strcmp (member, "GetChildAtIndex")) + reply = impl_GetChildAtIndex (message, registry); else if (!strcmp (member, "GetChildren")) - reply = impl_GetChildren (message, registry); + reply = impl_GetChildren (message, registry); else if (!strcmp (member, "GetIndexInParent")) - reply = impl_GetIndexInParent (message, registry); + reply = impl_GetIndexInParent (message, registry); else if (!strcmp (member, "GetRelationSet")) - reply = impl_GetRelationSet (message, registry); + reply = impl_GetRelationSet (message, registry); else if (!strcmp (member, "GetRole")) - reply = impl_GetRole (message, registry); + reply = impl_GetRole (message, registry); else if (!strcmp (member, "GetRoleName")) - reply = impl_GetRoleName (message, registry); + reply = impl_GetRoleName (message, registry); else if (!strcmp (member, "GetLocalizedRoleName")) - reply = impl_GetLocalizedRoleName (message, registry); + reply = impl_GetLocalizedRoleName (message, registry); else if (!strcmp (member, "GetState")) - reply = impl_GetState (message, registry); + reply = impl_GetState (message, registry); else if (!strcmp (member, "GetAttributes")) - reply = impl_GetAttributes (message, registry); + reply = impl_GetAttributes (message, registry); else if (!strcmp (member, "GetApplication")) - reply = impl_GetApplication (message, registry); + reply = impl_GetApplication (message, registry); else if (!strcmp (member, "GetInterfaces")) - reply = impl_GetInterfaces (message, registry); + reply = impl_GetInterfaces (message, registry); else - result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } if (!strcmp (iface, SPI_DBUS_INTERFACE_COMPONENT)) { result = DBUS_HANDLER_RESULT_HANDLED; - if (!strcmp (member, "Contains")) - reply = impl_Contains (message, registry); + if (!strcmp (member, "Contains")) + reply = impl_Contains (message, registry); else if (!strcmp (member, "GetAccessibleAtPoint")) - reply = impl_GetAccessibleAtPoint (message, registry); + reply = impl_GetAccessibleAtPoint (message, registry); else if (!strcmp (member, "GetExtents")) - reply = impl_GetExtents (message, registry); + reply = impl_GetExtents (message, registry); else if (!strcmp (member, "GetPosition")) - reply = impl_GetPosition (message, registry); + reply = impl_GetPosition (message, registry); else if (!strcmp (member, "GetSize")) - reply = impl_GetSize (message, registry); + reply = impl_GetSize (message, registry); else if (!strcmp (member, "GetLayer")) - reply = impl_GetLayer (message, registry); + reply = impl_GetLayer (message, registry); else if (!strcmp (member, "GetMDIZOrder")) - reply = impl_GetMDIZOrder (message, registry); + reply = impl_GetMDIZOrder (message, registry); else if (!strcmp (member, "GrabFocus")) - reply = impl_GrabFocus (message, registry); + reply = impl_GrabFocus (message, registry); else if (!strcmp (member, "GetAlpha")) - reply = impl_GetAlpha (message, registry); + reply = impl_GetAlpha (message, registry); else - result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } if (!strcmp (iface, SPI_DBUS_INTERFACE_SOCKET)) { result = DBUS_HANDLER_RESULT_HANDLED; - if (!strcmp (member, "Embed")) - reply = impl_Embed (message, registry); + if (!strcmp (member, "Embed")) + reply = impl_Embed (message, registry); else if (!strcmp (member, "Unembed")) - reply = impl_Unembed (message, registry); + reply = impl_Unembed (message, registry); else - result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } if (!strcmp (iface, "org.freedesktop.DBus.Introspectable")) { result = DBUS_HANDLER_RESULT_HANDLED; - if (!strcmp (member, "Introspect")) - reply = impl_Introspect_root (message, registry); + if (!strcmp (member, "Introspect")) + reply = impl_Introspect_root (message, registry); else - result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } if (result == DBUS_HANDLER_RESULT_HANDLED) @@ -1283,7 +1282,7 @@ handle_method_root (DBusConnection *bus, DBusMessage *message, void *user_data) g_print ("Registry | Unhandled message : %s|%s\n", iface, member); } #endif - + return result; } @@ -1293,25 +1292,25 @@ handle_method_cache (DBusConnection *bus, DBusMessage *message, void *user_data) SpiRegistry *registry = SPI_REGISTRY (user_data); DBusHandlerResult result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; - const gchar *iface = dbus_message_get_interface (message); - const gchar *member = dbus_message_get_member (message); - const gint type = dbus_message_get_type (message); + const gchar *iface = dbus_message_get_interface (message); + const gchar *member = dbus_message_get_member (message); + const gint type = dbus_message_get_type (message); DBusMessage *reply = NULL; /* Check for basic reasons not to handle */ - if (type != DBUS_MESSAGE_TYPE_METHOD_CALL || + if (type != DBUS_MESSAGE_TYPE_METHOD_CALL || member == NULL || - iface == NULL) - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + iface == NULL) + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; if (!strcmp (iface, SPI_DBUS_INTERFACE_CACHE)) { result = DBUS_HANDLER_RESULT_HANDLED; - if (!strcmp (member, "GetItems")) - reply = impl_GetItems (message, registry); + if (!strcmp (member, "GetItems")) + reply = impl_GetItems (message, registry); else - result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } if (result == DBUS_HANDLER_RESULT_HANDLED) @@ -1333,38 +1332,38 @@ handle_method_registry (DBusConnection *bus, DBusMessage *message, void *user_da SpiRegistry *registry = SPI_REGISTRY (user_data); DBusHandlerResult result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; - const gchar *iface = dbus_message_get_interface (message); - const gchar *member = dbus_message_get_member (message); - const gint type = dbus_message_get_type (message); + const gchar *iface = dbus_message_get_interface (message); + const gchar *member = dbus_message_get_member (message); + const gint type = dbus_message_get_type (message); DBusMessage *reply = NULL; /* Check for basic reasons not to handle */ - if (type != DBUS_MESSAGE_TYPE_METHOD_CALL || + if (type != DBUS_MESSAGE_TYPE_METHOD_CALL || member == NULL || - iface == NULL) - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + iface == NULL) + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; if (!strcmp (iface, SPI_DBUS_INTERFACE_REGISTRY)) { result = DBUS_HANDLER_RESULT_HANDLED; - if (!strcmp(member, "RegisterEvent")) - reply = impl_RegisterEvent (message, registry); - else if (!strcmp(member, "DeregisterEvent")) + if (!strcmp (member, "RegisterEvent")) + reply = impl_RegisterEvent (message, registry); + else if (!strcmp (member, "DeregisterEvent")) reply = impl_DeregisterEvent (message, registry); - else if (!strcmp(member, "GetRegisteredEvents")) + else if (!strcmp (member, "GetRegisteredEvents")) reply = impl_GetRegisteredEvents (message, registry); else - result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } if (!strcmp (iface, "org.freedesktop.DBus.Introspectable")) { result = DBUS_HANDLER_RESULT_HANDLED; - if (!strcmp (member, "Introspect")) - reply = impl_Introspect_registry (message, registry); + if (!strcmp (member, "Introspect")) + reply = impl_Introspect_registry (message, registry); else - result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } if (result == DBUS_HANDLER_RESULT_HANDLED) @@ -1383,35 +1382,32 @@ handle_method_registry (DBusConnection *bus, DBusMessage *message, void *user_da g_print ("Registry | Unhandled message : %s|%s\n", iface, member); } #endif - + return result; } /*---------------------------------------------------------------------------*/ -static DBusObjectPathVTable root_vtable = -{ +static DBusObjectPathVTable root_vtable = { NULL, &handle_method_root, NULL, NULL, NULL, NULL }; -static DBusObjectPathVTable registry_vtable = -{ +static DBusObjectPathVTable registry_vtable = { NULL, &handle_method_registry, NULL, NULL, NULL, NULL }; -static DBusObjectPathVTable cache_vtable = -{ +static DBusObjectPathVTable cache_vtable = { NULL, &handle_method_cache, NULL, NULL, NULL, NULL }; static gchar *app_sig_match_name_owner = - "type='signal', interface='org.freedesktop.DBus', member='NameOwnerChanged'"; + "type='signal', interface='org.freedesktop.DBus', member='NameOwnerChanged'"; SpiRegistry * spi_registry_new (DBusConnection *bus, SpiDEController *dec) diff --git a/registryd/registry.h b/registryd/registry.h index a66233e5..96569f2e 100644 --- a/registryd/registry.h +++ b/registryd/registry.h @@ -24,8 +24,8 @@ #ifndef SPI_REGISTRY_H_ #define SPI_REGISTRY_H_ -#include <glib.h> #include <glib-object.h> +#include <glib.h> #include <dbus/dbus.h> @@ -36,16 +36,17 @@ typedef struct _SpiRegistryClass SpiRegistryClass; G_BEGIN_DECLS -#define SPI_REGISTRY_TYPE (spi_registry_get_type ()) -#define SPI_REGISTRY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), SPI_REGISTRY_TYPE, SpiRegistry)) -#define SPI_REGISTRY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), SPI_REGISTRY_TYPE, SpiRegistryClass)) -#define SPI_IS_REGISTRY(o) (G_TYPE_CHECK__INSTANCE_TYPE ((o), SPI_REGISTRY_TYPE)) +#define SPI_REGISTRY_TYPE (spi_registry_get_type ()) +#define SPI_REGISTRY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), SPI_REGISTRY_TYPE, SpiRegistry)) +#define SPI_REGISTRY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), SPI_REGISTRY_TYPE, SpiRegistryClass)) +#define SPI_IS_REGISTRY(o) (G_TYPE_CHECK__INSTANCE_TYPE ((o), SPI_REGISTRY_TYPE)) #define SPI_IS_REGISTRY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), SPI_REGISTRY_TYPE)) -struct _SpiRegistry { - GObject parent; +struct _SpiRegistry +{ + GObject parent; SpiDEController *dec; - GPtrArray *apps; + GPtrArray *apps; dbus_int32_t id; DBusConnection *bus; @@ -53,12 +54,13 @@ struct _SpiRegistry { GList *events; }; -struct _SpiRegistryClass { +struct _SpiRegistryClass +{ GObjectClass parent_class; }; -GType spi_registry_get_type (void); -SpiRegistry *spi_registry_new (DBusConnection *bus, SpiDEController *dec); +GType spi_registry_get_type (void); +SpiRegistry *spi_registry_new (DBusConnection *bus, SpiDEController *dec); G_END_DECLS diff --git a/registryd/ucs2keysym.c b/registryd/ucs2keysym.c index 29a92f3e..bcc3e702 100644 --- a/registryd/ucs2keysym.c +++ b/registryd/ucs2keysym.c @@ -31,13 +31,14 @@ * */ +#include "deviceeventcontroller.h" /* for prototype */ #include <X11/X.h> -#include "deviceeventcontroller.h" /* for prototype */ /* DO NOT UPATE BY HAND! * This table can be regenerated from Xorg's keysymdef.h with the ucs2keysym.sh * script. */ -struct codepair { +struct codepair +{ unsigned short keysym; unsigned short ucs; } keysymtab[] = { @@ -823,56 +824,62 @@ struct codepair { { 0x0ef5, 0x3186 }, /* Hangul_YeorinHieuh ㆆ HANGUL LETTER YEORINHIEUH */ { 0x0ef6, 0x318d }, /* Hangul_AraeA ㆍ HANGUL LETTER ARAEA */ { 0x0ef7, 0x318e }, /* Hangul_AraeAE ㆎ HANGUL LETTER ARAEAE */ - }; +}; -long ucs2keysym (long ucs) +long +ucs2keysym (long ucs) { - int min = 0; - int max = sizeof(keysymtab) / sizeof(struct codepair) - 1; - int mid; - - /* first check for Latin-1 characters (1:1 mapping) */ - if ((ucs >= 0x0020 && ucs <= 0x007e) || - (ucs >= 0x00a0 && ucs <= 0x00ff)) - return ucs; + int min = 0; + int max = sizeof (keysymtab) / sizeof (struct codepair) - 1; + int mid; + + /* first check for Latin-1 characters (1:1 mapping) */ + if ((ucs >= 0x0020 && ucs <= 0x007e) || + (ucs >= 0x00a0 && ucs <= 0x00ff)) + return ucs; - /* binary search in table */ - while (max >= min) { - mid = (min + max) / 2; - if (keysymtab[mid].ucs < ucs) - min = mid + 1; - else if (keysymtab[mid].ucs > ucs) - max = mid - 1; - else { - /* found it */ - return keysymtab[mid].keysym; - } + /* binary search in table */ + while (max >= min) + { + mid = (min + max) / 2; + if (keysymtab[mid].ucs < ucs) + min = mid + 1; + else if (keysymtab[mid].ucs > ucs) + max = mid - 1; + else + { + /* found it */ + return keysymtab[mid].keysym; + } } - /* no matching keysym value found, return UCS2 with bit set */ - return ucs | 0x01000000; + /* no matching keysym value found, return UCS2 with bit set */ + return ucs | 0x01000000; } -long keysym2ucs(long keysym) +long +keysym2ucs (long keysym) { - int i; + int i; - /* first check for Latin-1 characters (1:1 mapping) */ - if ((keysym >= 0x0020 && keysym <= 0x007e) || - (keysym >= 0x00a0 && keysym <= 0x00ff)) - return (long) keysym; + /* first check for Latin-1 characters (1:1 mapping) */ + if ((keysym >= 0x0020 && keysym <= 0x007e) || + (keysym >= 0x00a0 && keysym <= 0x00ff)) + return (long) keysym; - /* also check for directly encoded 24-bit UCS characters */ - if ((keysym & 0xff000000) == 0x01000000) - return keysym & 0x00ffffff; + /* also check for directly encoded 24-bit UCS characters */ + if ((keysym & 0xff000000) == 0x01000000) + return keysym & 0x00ffffff; - for (i = 0; i < sizeof(keysymtab) / sizeof(keysymtab[0]); i++) { - if (keysymtab[i].keysym == keysym) { - /* found it */ - return keysymtab[i].ucs; - } + for (i = 0; i < sizeof (keysymtab) / sizeof (keysymtab[0]); i++) + { + if (keysymtab[i].keysym == keysym) + { + /* found it */ + return keysymtab[i].ucs; + } } - /* no matching Unicode value found */ - return -1; + /* no matching Unicode value found */ + return -1; } diff --git a/tests/at-spi2-atk/atk-object-xml-loader.c b/tests/at-spi2-atk/atk-object-xml-loader.c index d7077bbf..dc35abaa 100644 --- a/tests/at-spi2-atk/atk-object-xml-loader.c +++ b/tests/at-spi2-atk/atk-object-xml-loader.c @@ -20,11 +20,11 @@ * Boston, MA 02110-1301, USA. */ -#include <stdlib.h> -#include <string.h> #include <glib.h> #include <libxml/parser.h> #include <libxml/tree.h> +#include <stdlib.h> +#include <string.h> #include "my-atk.h" @@ -43,7 +43,7 @@ #define ACC_VALUE_NODE ((const xmlChar *) "accessible_value") #define ACTION_NODE ((const xmlChar *) "action") #define DOCUMENT_NODE ((const xmlChar *) "document") -#define INTERFACE_NODE ((const xmlChar *) "interface") +#define INTERFACE_NODE ((const xmlChar *) "interface") #define RELATION_NODE ((const xmlChar *) "relation") #define STATE_NODE ((const xmlChar *) "state") #define COMPONENT_NODE ((const xmlChar *) "component") @@ -101,26 +101,28 @@ MyAtkObject *relation_target = NULL; -static double atof_get_prop (xmlNode *node, const xmlChar *attr) +static double +atof_get_prop (xmlNode *node, const xmlChar *attr) { double ret; xmlChar *str = xmlGetProp (node, attr); if (!str) return 0; - ret = atof ((const char *)str); - xmlFree(str); + ret = atof ((const char *) str); + xmlFree (str); return ret; } -static int atoi_get_prop (xmlNode *node, const xmlChar *attr) +static int +atoi_get_prop (xmlNode *node, const xmlChar *attr) { int ret; xmlChar *str = xmlGetProp (node, attr); if (!str) return 0; - ret = atoi ((const char *)str); - xmlFree(str); + ret = atoi ((const char *) str); + xmlFree (str); return ret; } @@ -135,8 +137,8 @@ get_atk_attribute (xmlNode *node, const xmlChar *attr) return NULL; str = xmlGetProp (node, attr); - tmp->name = g_strdup ((const char *)attr); - tmp->value = g_strdup ((const char *)str); + tmp->name = g_strdup ((const char *) attr); + tmp->value = g_strdup ((const char *) str); xmlFree (str); return tmp; @@ -210,162 +212,175 @@ create_atk_object_from_element (xmlNode *element) if (!xmlStrcmp (element->name, ACC_VALUE_NODE)) type = MY_TYPE_ATK_VALUE; - obj = g_object_new (type, "accessible-name", name, "accessible-description", description, - "accessible-role", atk_role_for_name ((const gchar *)role), + "accessible-role", atk_role_for_name ((const gchar *) role), NULL); - xmlFree(name); - xmlFree(description); - xmlFree(role); + xmlFree (name); + xmlFree (description); + xmlFree (role); name = NULL; description = NULL; role = NULL; child_node = element->xmlChildrenNode; - while (child_node != NULL) { - if (!xmlStrcmp (child_node->name, ACCESSIBLE_NODE) || - !xmlStrcmp (child_node->name, ACC_ACTION_NODE) || - !xmlStrcmp (child_node->name, ACC_COMPONENT_NODE) || - !xmlStrcmp (child_node->name, ACC_DOCUMENT_NODE) || - !xmlStrcmp (child_node->name, ACC_EDIT_TEXT_NODE) || - !xmlStrcmp (child_node->name, ACC_HYPERLINK_NODE) || - !xmlStrcmp (child_node->name, ACC_HYPERTEXT_NODE) || - !xmlStrcmp (child_node->name, ACC_IMAGE_NODE) || - !xmlStrcmp (child_node->name, ACC_SELECTION_NODE) || - !xmlStrcmp (child_node->name, ACC_TABLE_NODE) || - !xmlStrcmp (child_node->name, ACC_TABLE_CELL_NODE) || - !xmlStrcmp (child_node->name, ACC_TEXT_NODE) || - !xmlStrcmp (child_node->name, ACC_VALUE_NODE)) { - child_obj = create_atk_object_from_element (child_node); - my_atk_object_add_child (obj, child_obj); - } - child_node2 = child_node->xmlChildrenNode; - while (child_node2 != NULL) { - if (!xmlStrcmp (child_node2->name, RELATION_NODE)) { - xmlChar *relation_target_name = xmlGetProp (child_node2, RELATION_TARGET_NAME_ATTR); - relation_type = atoi_get_prop (child_node2, RELATION_TYPE_ATTR); - relation_set = atk_object_ref_relation_set (ATK_OBJECT (child_obj)); - array[0] = ATK_OBJECT (obj); - relation = atk_relation_new (array, 1, relation_type); - atk_relation_new (array, 1, relation_type); - atk_relation_set_add (relation_set, relation); - g_object_unref (relation); - g_object_unref (relation_set); - xmlFree (relation_target_name); - } - if (!xmlStrcmp (child_node2->name, STATE_NODE)) { - xmlChar *state_enum = xmlGetProp (child_node2, STATE_TYPE_ATTR); - - state_set = atk_object_ref_state_set (ATK_OBJECT (child_obj)); - state_type = atk_state_type_for_name ((const gchar *)state_enum); - atk_state_set_add_state (state_set, state_type); - g_object_unref (state_set); - xmlFree (state_enum); - } - if (!xmlStrcmp (child_node2->name, ACTION_NODE)) { - xmlChar *action_name = xmlGetProp (child_node2, ACTION_NAME_ATTR); - xmlChar *action_des = xmlGetProp (child_node2, ACTION_DES_ATTR); - xmlChar *action_key_bind = xmlGetProp (child_node2, ACTION_KEY_BIND_ATTR); - - my_atk_action_add_action (child_obj, (const gchar *)action_name, - (const gchar *)action_des, - (const gchar *)action_key_bind); - xmlFree (action_key_bind); - xmlFree (action_des); - xmlFree (action_name); - } - if (!xmlStrcmp (child_node2->name, COMPONENT_NODE)) { - x_extent = atoi_get_prop (child_node2, COMP_X_ATTR); - y_extent = atoi_get_prop (child_node2, COMP_Y_ATTR); - w_extent = atoi_get_prop (child_node2, COMP_WIDTH_ATTR); - h_extent = atoi_get_prop (child_node2, COMP_HEIGHT_ATTR); - layer = atoi_get_prop (child_node2, COMP_LAYER_ATTR); - zorder = atoi_get_prop (child_node2, COMP_ZORDER_ATTR); - alpha = atof_get_prop (child_node2, COMP_ALPHA_ATTR); - atk_component_set_extents (ATK_COMPONENT (child_obj), - x_extent, - y_extent, - w_extent, - h_extent, - ATK_XY_SCREEN); - my_atk_component_set_layer (ATK_COMPONENT (child_obj), layer); - my_atk_component_set_mdi_zorder (ATK_COMPONENT (child_obj), zorder); - my_atk_component_set_alpha (ATK_COMPONENT (child_obj), alpha); - } - if (!xmlStrcmp (child_node2->name, DOCUMENT_NODE)) { - my_atk_set_document (ATK_DOCUMENT(child_obj), - atoi_get_prop (child_node2, PAGE_ATTR), - atoi_get_prop (child_node2, PAGE_NUM_ATTR)); - } - if (!xmlStrcmp (child_node2->name, HYPERLINK_NODE)) { - xmlChar *text = xmlGetProp (child_node2, TEXT_TEXT_ATTR); - - my_atk_set_hypertext (ATK_HYPERTEXT (child_obj), (const gchar *)text); - xmlFree (text); - } - if (!xmlStrcmp (child_node2->name, HYPERTEXT_NODE)) { - xmlChar *text = xmlGetProp (child_node2, TEXT_TEXT_ATTR); - - my_atk_set_hypertext (ATK_HYPERTEXT (child_obj), (const gchar *)text); - xmlFree (text); - } - if (!xmlStrcmp (child_node2->name, IMAGE_NODE)) { - xmlChar *image_des = xmlGetProp (child_node2, IMAGE_DES_ATTR); - xmlChar *image_locale = xmlGetProp (child_node2, IMAGE_LOCALE_ATTR); - x_size = atoi_get_prop (child_node2, COMP_X_ATTR); - y_size = atoi_get_prop (child_node2, COMP_Y_ATTR); - width = atoi_get_prop (child_node2, COMP_WIDTH_ATTR); - height = atoi_get_prop (child_node2, COMP_HEIGHT_ATTR); - - my_atk_set_image (ATK_IMAGE (child_obj), - (const gchar *)image_des, - x_size, - y_size, - width, - height, - (const gchar *)image_locale); - xmlFree (image_locale); - xmlFree (image_des); - } - if (!xmlStrcmp (child_node2->name, TEXT_NODE)) { - xmlChar *text = xmlGetProp (child_node2, TEXT_TEXT_ATTR); - AtkAttributeSet *attrSet = NULL; - AtkAttribute *a1 = get_atk_attribute (child_node2, TEXT_BOLD_ATTR); - AtkAttribute *a2 = get_atk_attribute (child_node2, TEXT_UNDERLINE_ATTR); - AtkAttribute *a3 = get_atk_attribute (child_node2, TEXT_DUMMY_ATTR); - attrSet = g_slist_append(NULL, a1); - attrSet = g_slist_append(attrSet, a2); - attrSet = g_slist_append(attrSet, a3); - my_atk_set_text (ATK_TEXT (child_obj), - (const gchar *)text, - atoi_get_prop (child_node2, COMP_X_ATTR), - atoi_get_prop (child_node2, COMP_Y_ATTR), - atoi_get_prop (child_node2, COMP_WIDTH_ATTR), - atoi_get_prop (child_node2, COMP_HEIGHT_ATTR), - attrSet); - xmlFree (text); - } - if (!xmlStrcmp (child_node2->name, TABLE_CELL_NODE)) { - my_atk_set_table_cell (ATK_TABLE_CELL (child_obj), - atoi_get_prop (child_node2, CELL_X_ATTR), - atoi_get_prop (child_node2, CELL_Y_ATTR), - atoi_get_prop (child_node2, ROW_SPAN_ATTR), - atoi_get_prop (child_node2, COLUMN_SPAN_ATTR)); - } - if (!xmlStrcmp (child_node2->name, VALUE_NODE)) { - my_atk_set_value (ATK_VALUE(child_obj), - atof_get_prop (child_node2, MIN_ATTR), - atof_get_prop (child_node2, CURRENT_ATTR), - atof_get_prop (child_node2, MAX_ATTR), - atof_get_prop (child_node2, STEP_ATTR)); - } - child_node2 = child_node2->next; + while (child_node != NULL) + { + if (!xmlStrcmp (child_node->name, ACCESSIBLE_NODE) || + !xmlStrcmp (child_node->name, ACC_ACTION_NODE) || + !xmlStrcmp (child_node->name, ACC_COMPONENT_NODE) || + !xmlStrcmp (child_node->name, ACC_DOCUMENT_NODE) || + !xmlStrcmp (child_node->name, ACC_EDIT_TEXT_NODE) || + !xmlStrcmp (child_node->name, ACC_HYPERLINK_NODE) || + !xmlStrcmp (child_node->name, ACC_HYPERTEXT_NODE) || + !xmlStrcmp (child_node->name, ACC_IMAGE_NODE) || + !xmlStrcmp (child_node->name, ACC_SELECTION_NODE) || + !xmlStrcmp (child_node->name, ACC_TABLE_NODE) || + !xmlStrcmp (child_node->name, ACC_TABLE_CELL_NODE) || + !xmlStrcmp (child_node->name, ACC_TEXT_NODE) || + !xmlStrcmp (child_node->name, ACC_VALUE_NODE)) + { + child_obj = create_atk_object_from_element (child_node); + my_atk_object_add_child (obj, child_obj); + } + child_node2 = child_node->xmlChildrenNode; + while (child_node2 != NULL) + { + if (!xmlStrcmp (child_node2->name, RELATION_NODE)) + { + xmlChar *relation_target_name = xmlGetProp (child_node2, RELATION_TARGET_NAME_ATTR); + relation_type = atoi_get_prop (child_node2, RELATION_TYPE_ATTR); + relation_set = atk_object_ref_relation_set (ATK_OBJECT (child_obj)); + array[0] = ATK_OBJECT (obj); + relation = atk_relation_new (array, 1, relation_type); + atk_relation_new (array, 1, relation_type); + atk_relation_set_add (relation_set, relation); + g_object_unref (relation); + g_object_unref (relation_set); + xmlFree (relation_target_name); + } + if (!xmlStrcmp (child_node2->name, STATE_NODE)) + { + xmlChar *state_enum = xmlGetProp (child_node2, STATE_TYPE_ATTR); + + state_set = atk_object_ref_state_set (ATK_OBJECT (child_obj)); + state_type = atk_state_type_for_name ((const gchar *) state_enum); + atk_state_set_add_state (state_set, state_type); + g_object_unref (state_set); + xmlFree (state_enum); + } + if (!xmlStrcmp (child_node2->name, ACTION_NODE)) + { + xmlChar *action_name = xmlGetProp (child_node2, ACTION_NAME_ATTR); + xmlChar *action_des = xmlGetProp (child_node2, ACTION_DES_ATTR); + xmlChar *action_key_bind = xmlGetProp (child_node2, ACTION_KEY_BIND_ATTR); + + my_atk_action_add_action (child_obj, (const gchar *) action_name, + (const gchar *) action_des, + (const gchar *) action_key_bind); + xmlFree (action_key_bind); + xmlFree (action_des); + xmlFree (action_name); + } + if (!xmlStrcmp (child_node2->name, COMPONENT_NODE)) + { + x_extent = atoi_get_prop (child_node2, COMP_X_ATTR); + y_extent = atoi_get_prop (child_node2, COMP_Y_ATTR); + w_extent = atoi_get_prop (child_node2, COMP_WIDTH_ATTR); + h_extent = atoi_get_prop (child_node2, COMP_HEIGHT_ATTR); + layer = atoi_get_prop (child_node2, COMP_LAYER_ATTR); + zorder = atoi_get_prop (child_node2, COMP_ZORDER_ATTR); + alpha = atof_get_prop (child_node2, COMP_ALPHA_ATTR); + atk_component_set_extents (ATK_COMPONENT (child_obj), + x_extent, + y_extent, + w_extent, + h_extent, + ATK_XY_SCREEN); + my_atk_component_set_layer (ATK_COMPONENT (child_obj), layer); + my_atk_component_set_mdi_zorder (ATK_COMPONENT (child_obj), zorder); + my_atk_component_set_alpha (ATK_COMPONENT (child_obj), alpha); + } + if (!xmlStrcmp (child_node2->name, DOCUMENT_NODE)) + { + my_atk_set_document (ATK_DOCUMENT (child_obj), + atoi_get_prop (child_node2, PAGE_ATTR), + atoi_get_prop (child_node2, PAGE_NUM_ATTR)); + } + if (!xmlStrcmp (child_node2->name, HYPERLINK_NODE)) + { + xmlChar *text = xmlGetProp (child_node2, TEXT_TEXT_ATTR); + + my_atk_set_hypertext (ATK_HYPERTEXT (child_obj), (const gchar *) text); + xmlFree (text); + } + if (!xmlStrcmp (child_node2->name, HYPERTEXT_NODE)) + { + xmlChar *text = xmlGetProp (child_node2, TEXT_TEXT_ATTR); + + my_atk_set_hypertext (ATK_HYPERTEXT (child_obj), (const gchar *) text); + xmlFree (text); + } + if (!xmlStrcmp (child_node2->name, IMAGE_NODE)) + { + xmlChar *image_des = xmlGetProp (child_node2, IMAGE_DES_ATTR); + xmlChar *image_locale = xmlGetProp (child_node2, IMAGE_LOCALE_ATTR); + x_size = atoi_get_prop (child_node2, COMP_X_ATTR); + y_size = atoi_get_prop (child_node2, COMP_Y_ATTR); + width = atoi_get_prop (child_node2, COMP_WIDTH_ATTR); + height = atoi_get_prop (child_node2, COMP_HEIGHT_ATTR); + + my_atk_set_image (ATK_IMAGE (child_obj), + (const gchar *) image_des, + x_size, + y_size, + width, + height, + (const gchar *) image_locale); + xmlFree (image_locale); + xmlFree (image_des); + } + if (!xmlStrcmp (child_node2->name, TEXT_NODE)) + { + xmlChar *text = xmlGetProp (child_node2, TEXT_TEXT_ATTR); + AtkAttributeSet *attrSet = NULL; + AtkAttribute *a1 = get_atk_attribute (child_node2, TEXT_BOLD_ATTR); + AtkAttribute *a2 = get_atk_attribute (child_node2, TEXT_UNDERLINE_ATTR); + AtkAttribute *a3 = get_atk_attribute (child_node2, TEXT_DUMMY_ATTR); + attrSet = g_slist_append (NULL, a1); + attrSet = g_slist_append (attrSet, a2); + attrSet = g_slist_append (attrSet, a3); + my_atk_set_text (ATK_TEXT (child_obj), + (const gchar *) text, + atoi_get_prop (child_node2, COMP_X_ATTR), + atoi_get_prop (child_node2, COMP_Y_ATTR), + atoi_get_prop (child_node2, COMP_WIDTH_ATTR), + atoi_get_prop (child_node2, COMP_HEIGHT_ATTR), + attrSet); + xmlFree (text); + } + if (!xmlStrcmp (child_node2->name, TABLE_CELL_NODE)) + { + my_atk_set_table_cell (ATK_TABLE_CELL (child_obj), + atoi_get_prop (child_node2, CELL_X_ATTR), + atoi_get_prop (child_node2, CELL_Y_ATTR), + atoi_get_prop (child_node2, ROW_SPAN_ATTR), + atoi_get_prop (child_node2, COLUMN_SPAN_ATTR)); + } + if (!xmlStrcmp (child_node2->name, VALUE_NODE)) + { + my_atk_set_value (ATK_VALUE (child_obj), + atof_get_prop (child_node2, MIN_ATTR), + atof_get_prop (child_node2, CURRENT_ATTR), + atof_get_prop (child_node2, MAX_ATTR), + atof_get_prop (child_node2, STEP_ATTR)); + } + child_node2 = child_node2->next; + } + child_node = child_node->next; } - child_node = child_node->next; - } return obj; } diff --git a/tests/at-spi2-atk/atk-object-xml-loader.h b/tests/at-spi2-atk/atk-object-xml-loader.h index 7b401f5f..b6d04ca8 100644 --- a/tests/at-spi2-atk/atk-object-xml-loader.h +++ b/tests/at-spi2-atk/atk-object-xml-loader.h @@ -23,9 +23,9 @@ #ifndef ATK_OBJECT_XML_LOADER_H #define ATK_OBJECT_XML_LOADER_H -#include <glib.h> #include "my-atk.h" +#include <glib.h> -MyAtkObject * atk_object_xml_parse (gchar *filename); +MyAtkObject *atk_object_xml_parse (gchar *filename); #endif /*ATK_OBJECT_XML_LOADER_H*/ diff --git a/tests/at-spi2-atk/atk_suite.c b/tests/at-spi2-atk/atk_suite.c index c39c6da2..f70e8cb8 100644 --- a/tests/at-spi2-atk/atk_suite.c +++ b/tests/at-spi2-atk/atk_suite.c @@ -20,14 +20,14 @@ * Boston, MA 02110-1301, USA. */ -#include <stdlib.h> -#include <stdio.h> +#include "atk_suite.h" +#include "atk_test_util.h" #include <glib.h> +#include <stdio.h> +#include <stdlib.h> #include <string.h> #include <sys/wait.h> #include <unistd.h> -#include "atk_suite.h" -#include "atk_test_util.h" static void atk_suite_build (void) @@ -51,7 +51,7 @@ atk_suite_build (void) } int -main(int argc, char **argv) +main (int argc, char **argv) { g_test_init (&argc, &argv, NULL); diff --git a/tests/at-spi2-atk/atk_suite.h b/tests/at-spi2-atk/atk_suite.h index bd33f426..0ae2e6f1 100644 --- a/tests/at-spi2-atk/atk_suite.h +++ b/tests/at-spi2-atk/atk_suite.h @@ -25,21 +25,21 @@ #include <atspi/atspi.h> -#define ATK_TEST_PATH_ACCESSIBLE (const char *)"/Accessible" -#define ATK_TEST_PATH_ACTION (const char *)"/Action" -#define ATK_TEST_PATH_COMP (const char *)"/Component" -#define ATK_TEST_PATH_COLLECTION (const char *)"/Collection" -#define ATK_TEST_PATH_DOC (const char *)"/Document" -#define ATK_TEST_PATH_EDIT_TEXT (const char *)"/Editable_Text" -#define ATK_TEST_PATH_HYPERLINK (const char *)"/Hyperlink" -#define ATK_TEST_PATH_HYPERTEXT (const char *)"/Hypertext" -#define ATK_TEST_PATH_IMAGE (const char *)"/Image" -#define ATK_TEST_PATH_SELECTION (const char *)"/Selection" -#define ATK_TEST_PATH_STATE_SET (const char *)"/State_Set" -#define ATK_TEST_PATH_TABLE (const char *)"/Table" -#define ATK_TEST_PATH_TABLE_CELL (const char *)"/Table_Cell" -#define ATK_TEST_PATH_TEXT (const char *)"/Text" -#define ATK_TEST_PATH_VALUE (const char *)"/Value" +#define ATK_TEST_PATH_ACCESSIBLE (const char *) "/Accessible" +#define ATK_TEST_PATH_ACTION (const char *) "/Action" +#define ATK_TEST_PATH_COMP (const char *) "/Component" +#define ATK_TEST_PATH_COLLECTION (const char *) "/Collection" +#define ATK_TEST_PATH_DOC (const char *) "/Document" +#define ATK_TEST_PATH_EDIT_TEXT (const char *) "/Editable_Text" +#define ATK_TEST_PATH_HYPERLINK (const char *) "/Hyperlink" +#define ATK_TEST_PATH_HYPERTEXT (const char *) "/Hypertext" +#define ATK_TEST_PATH_IMAGE (const char *) "/Image" +#define ATK_TEST_PATH_SELECTION (const char *) "/Selection" +#define ATK_TEST_PATH_STATE_SET (const char *) "/State_Set" +#define ATK_TEST_PATH_TABLE (const char *) "/Table" +#define ATK_TEST_PATH_TABLE_CELL (const char *) "/Table_Cell" +#define ATK_TEST_PATH_TEXT (const char *) "/Text" +#define ATK_TEST_PATH_VALUE (const char *) "/Value" void atk_test_accessible (void); void atk_test_action (void); diff --git a/tests/at-spi2-atk/atk_test_accessible.c b/tests/at-spi2-atk/atk_test_accessible.c index e6afd9f9..74579c9b 100644 --- a/tests/at-spi2-atk/atk_test_accessible.c +++ b/tests/at-spi2-atk/atk_test_accessible.c @@ -23,7 +23,7 @@ #include "atk_suite.h" #include "atk_test_util.h" -#define DATA_FILE TESTS_DATA_DIR"/test-accessible.xml" +#define DATA_FILE TESTS_DATA_DIR "/test-accessible.xml" static void teardown_accessible_test (gpointer fixture, gconstpointer user_data) @@ -42,7 +42,7 @@ static void atk_test_accessible_get_description (gpointer fixture, gconstpointer user_data) { AtspiAccessible *obj = get_root_obj (DATA_FILE); - g_assert_cmpstr (atspi_accessible_get_description (obj, NULL), ==, "Root of the accessible tree" ); + g_assert_cmpstr (atspi_accessible_get_description (obj, NULL), ==, "Root of the accessible tree"); } static void @@ -50,23 +50,23 @@ atk_test_accessible_get_child_count (gpointer fixture, gconstpointer user_data) { AtspiAccessible *obj = get_root_obj (DATA_FILE); gint child_c = atspi_accessible_get_child_count (obj, NULL); - g_assert_cmpint ( 3, ==, child_c ); + g_assert_cmpint (3, ==, child_c); } static void atk_test_accessible_get_parent (gpointer fixture, gconstpointer user_data) { AtspiAccessible *obj = get_root_obj (DATA_FILE); - AtspiAccessible *child = atspi_accessible_get_child_at_index (obj, 0, NULL ); - AtspiAccessible *parent = atspi_accessible_get_parent (child, NULL ); - g_assert (parent == obj ); + AtspiAccessible *child = atspi_accessible_get_child_at_index (obj, 0, NULL); + AtspiAccessible *parent = atspi_accessible_get_parent (child, NULL); + g_assert (parent == obj); } static void atk_test_accessible_get_child_at_index (gpointer fixture, gconstpointer user_data) { AtspiAccessible *obj = get_root_obj (DATA_FILE); - AtspiAccessible *child = atspi_accessible_get_child_at_index (obj, 1, NULL ); + AtspiAccessible *child = atspi_accessible_get_child_at_index (obj, 1, NULL); g_assert_cmpstr (atspi_accessible_get_name (child, NULL), ==, "obj2"); } @@ -86,7 +86,7 @@ atk_test_accessible_get_relation_set_1 (gpointer fixture, gconstpointer user_dat AtspiAccessible *child1 = atspi_accessible_get_child_at_index (obj, 1, NULL); AtspiAccessible *child = atspi_accessible_get_child_at_index (child1, 0, NULL); GArray *rel_set = atspi_accessible_get_relation_set (child, NULL); - g_assert_cmpint (rel_set->len, == , 1); + g_assert_cmpint (rel_set->len, ==, 1); } static void @@ -96,14 +96,15 @@ atk_test_accessible_get_relation_set_2 (gpointer fixture, gconstpointer user_dat AtspiAccessible *obj2 = atspi_accessible_get_child_at_index (obj, 1, NULL); AtspiAccessible *obj2_1 = atspi_accessible_get_child_at_index (obj2, 0, NULL); GArray *rel_set = atspi_accessible_get_relation_set (obj2_1, NULL); - int i=0; - for (i = 0; i < rel_set->len; i++) { - AtspiRelation *a = g_array_index (rel_set, AtspiRelation *, i); - g_assert_cmpint (atspi_relation_get_relation_type (a), == , ATSPI_RELATION_CONTROLLER_FOR ); - g_assert_cmpint (atspi_relation_get_n_targets (a), ==, 1); - AtspiAccessible *target = atspi_relation_get_target (a, 0); - g_assert_cmpstr (atspi_accessible_get_name (target,NULL), == , "obj2"); - } + int i = 0; + for (i = 0; i < rel_set->len; i++) + { + AtspiRelation *a = g_array_index (rel_set, AtspiRelation *, i); + g_assert_cmpint (atspi_relation_get_relation_type (a), ==, ATSPI_RELATION_CONTROLLER_FOR); + g_assert_cmpint (atspi_relation_get_n_targets (a), ==, 1); + AtspiAccessible *target = atspi_relation_get_target (a, 0); + g_assert_cmpstr (atspi_accessible_get_name (target, NULL), ==, "obj2"); + } } static void @@ -144,11 +145,12 @@ atk_test_accessible_get_state_set (gpointer fixture, gconstpointer user_data) }; g_assert_cmpint (states_arr->len, ==, 2); int i = 0; - for (i = 0; i < states_arr->len; ++i) { - g_assert_cmpint (valid_states[i], ==, g_array_index (states_arr, AtspiStateType, i)); - g_assert (atspi_state_set_contains (states, ATSPI_STATE_MODAL)); - g_assert (atspi_state_set_contains(states, ATSPI_STATE_MULTI_LINE)); - } + for (i = 0; i < states_arr->len; ++i) + { + g_assert_cmpint (valid_states[i], ==, g_array_index (states_arr, AtspiStateType, i)); + g_assert (atspi_state_set_contains (states, ATSPI_STATE_MODAL)); + g_assert (atspi_state_set_contains (states, ATSPI_STATE_MULTI_LINE)); + } } static void @@ -185,15 +187,15 @@ static void atk_test_accessible_get_attributes_as_array (gpointer fixture, gconstpointer user_data) { AtspiAccessible *obj = get_root_obj (DATA_FILE); - GArray *attr_arr = atspi_accessible_get_attributes_as_array ( obj, NULL); + GArray *attr_arr = atspi_accessible_get_attributes_as_array (obj, NULL); int i; g_assert_cmpint (attr_arr->len, ==, 2); - for(i = 0; i < attr_arr->len; ++i) { - const char *pair = g_array_index (attr_arr, gchar *, i); + for (i = 0; i < attr_arr->len; ++i) + { + const char *pair = g_array_index (attr_arr, gchar *, i); - g_assert (strcmp (pair, "atspi1:test1") == 0 - || strcmp (pair, "atspi2:test2") == 0); - } + g_assert (strcmp (pair, "atspi1:test1") == 0 || strcmp (pair, "atspi2:test2") == 0); + } } static void @@ -362,7 +364,7 @@ atk_test_check_cache_cleared (AtspiAccessible *obj) g_assert_cmpint (obj->cached_properties, ==, ATSPI_CACHE_NONE); GPtrArray *array = obj->children; int i; - for (i=0; i<array->len; i++) + for (i = 0; i < array->len; i++) atk_test_check_cache_cleared (g_ptr_array_index (array, i)); } diff --git a/tests/at-spi2-atk/atk_test_action.c b/tests/at-spi2-atk/atk_test_action.c index 78a68f09..18990c64 100644 --- a/tests/at-spi2-atk/atk_test_action.c +++ b/tests/at-spi2-atk/atk_test_action.c @@ -23,7 +23,7 @@ #include "atk_suite.h" #include "atk_test_util.h" -#define DATA_FILE TESTS_DATA_DIR"/test-action.xml" +#define DATA_FILE TESTS_DATA_DIR "/test-action.xml" static void teardown_action_test (gpointer fixture, gconstpointer user_data) @@ -36,7 +36,7 @@ atk_test_action_sample_get_interface (gpointer fixture, gconstpointer user_data) { AtspiAccessible *obj = get_root_obj (DATA_FILE); g_assert_cmpstr (atspi_accessible_get_name (obj, NULL), ==, "root_object"); - AtspiAccessible *child = atspi_accessible_get_child_at_index (obj,1, NULL); + AtspiAccessible *child = atspi_accessible_get_child_at_index (obj, 1, NULL); AtspiAction *iface = atspi_accessible_get_action_iface (child); g_assert (iface != NULL); } @@ -45,52 +45,52 @@ static void atk_test_action_get_action_description (gpointer fixture, gconstpointer user_data) { AtspiAccessible *obj = get_root_obj (DATA_FILE); - AtspiAccessible *child = atspi_accessible_get_child_at_index (obj,1, NULL); + AtspiAccessible *child = atspi_accessible_get_child_at_index (obj, 1, NULL); AtspiAction *action = atspi_accessible_get_action_iface (child); - g_assert_cmpstr (atspi_action_get_action_description (action, 0, NULL), == ,"action1 description"); + g_assert_cmpstr (atspi_action_get_action_description (action, 0, NULL), ==, "action1 description"); } static void atk_test_action_get_action_name (gpointer fixture, gconstpointer user_data) { AtspiAccessible *obj = get_root_obj (DATA_FILE); - AtspiAccessible *child = atspi_accessible_get_child_at_index (obj,1, NULL); + AtspiAccessible *child = atspi_accessible_get_child_at_index (obj, 1, NULL); AtspiAction *action = atspi_accessible_get_action_iface (child); - g_assert_cmpstr (atspi_action_get_action_name (action, 0, NULL), == ,"action1"); + g_assert_cmpstr (atspi_action_get_action_name (action, 0, NULL), ==, "action1"); } static void atk_test_action_get_n_actions (gpointer fixture, gconstpointer user_data) { AtspiAccessible *obj = get_root_obj (DATA_FILE); - AtspiAccessible *child = atspi_accessible_get_child_at_index (obj,1, NULL); + AtspiAccessible *child = atspi_accessible_get_child_at_index (obj, 1, NULL); AtspiAction *action = atspi_accessible_get_action_iface (child); - g_assert_cmpint (atspi_action_get_n_actions (action, NULL), == , 2); + g_assert_cmpint (atspi_action_get_n_actions (action, NULL), ==, 2); } static void atk_test_action_get_key_binding (gpointer fixture, gconstpointer user_data) { AtspiAccessible *obj = get_root_obj (DATA_FILE); - AtspiAccessible *child = atspi_accessible_get_child_at_index (obj,1, NULL); + AtspiAccessible *child = atspi_accessible_get_child_at_index (obj, 1, NULL); AtspiAction *action = atspi_accessible_get_action_iface (child); - g_assert_cmpstr (atspi_action_get_key_binding (action, 0, NULL), == ,"action1 key binding"); + g_assert_cmpstr (atspi_action_get_key_binding (action, 0, NULL), ==, "action1 key binding"); } static void atk_test_action_get_localized_name (gpointer fixture, gconstpointer user_data) { AtspiAccessible *obj = get_root_obj (DATA_FILE); - AtspiAccessible *child = atspi_accessible_get_child_at_index (obj,1, NULL); + AtspiAccessible *child = atspi_accessible_get_child_at_index (obj, 1, NULL); AtspiAction *action = atspi_accessible_get_action_iface (child); - g_assert_cmpstr (atspi_action_get_localized_name (action, 0, NULL), == ,"action1"); + g_assert_cmpstr (atspi_action_get_localized_name (action, 0, NULL), ==, "action1"); } static void atk_test_action_do_action (gpointer fixture, gconstpointer user_data) { AtspiAccessible *obj = get_root_obj (DATA_FILE); - AtspiAccessible *child = atspi_accessible_get_child_at_index (obj,1, NULL); + AtspiAccessible *child = atspi_accessible_get_child_at_index (obj, 1, NULL); AtspiAction *action = atspi_accessible_get_action_iface (child); g_assert (action != NULL); atspi_action_do_action (action, 0, NULL); diff --git a/tests/at-spi2-atk/atk_test_collection.c b/tests/at-spi2-atk/atk_test_collection.c index 9232eb60..184a0663 100644 --- a/tests/at-spi2-atk/atk_test_collection.c +++ b/tests/at-spi2-atk/atk_test_collection.c @@ -20,11 +20,10 @@ * Boston, MA 02110-1301, USA. */ - #include "atk_suite.h" #include "atk_test_util.h" -#define DATA_FILE TESTS_DATA_DIR"/test-collection.xml" +#define DATA_FILE TESTS_DATA_DIR "/test-collection.xml" static void teardown_collection_test (gpointer fixture, gconstpointer user_data) @@ -62,18 +61,18 @@ atk_test_collection_get_matches (gpointer fixture, gconstpointer user_data) ATSPI_Collection_MATCH_ALL, FALSE); GArray *ret = atspi_collection_get_matches (iface, - rule, - ATSPI_Collection_SORT_ORDER_CANONICAL, - 0, - FALSE, - NULL); + rule, + ATSPI_Collection_SORT_ORDER_CANONICAL, + 0, + FALSE, + NULL); g_assert_cmpint (2, ==, ret->len); AtspiAccessible *get = NULL; get = g_array_index (ret, AtspiAccessible *, 0); - g_assert_cmpstr("obj1", ==, atspi_accessible_get_name (get, NULL)); + g_assert_cmpstr ("obj1", ==, atspi_accessible_get_name (get, NULL)); get = g_array_index (ret, AtspiAccessible *, 1); - g_assert_cmpstr("obj3", ==, atspi_accessible_get_name (get, NULL)); + g_assert_cmpstr ("obj3", ==, atspi_accessible_get_name (get, NULL)); } static void @@ -99,18 +98,18 @@ atk_test_collection_get_matches_to (gpointer fixture, gconstpointer user_data) ATSPI_Collection_MATCH_ALL, FALSE); GArray *ret = atspi_collection_get_matches_to (iface, - child1, - rule, - ATSPI_Collection_SORT_ORDER_CANONICAL, - ATSPI_Collection_TREE_INORDER, - TRUE, - 0, - FALSE, - NULL); + child1, + rule, + ATSPI_Collection_SORT_ORDER_CANONICAL, + ATSPI_Collection_TREE_INORDER, + TRUE, + 0, + FALSE, + NULL); g_assert_cmpint (1, ==, ret->len); AtspiAccessible *get = NULL; get = g_array_index (ret, AtspiAccessible *, 0); - g_assert_cmpstr("obj1", ==, atspi_accessible_get_name (get, NULL)); + g_assert_cmpstr ("obj1", ==, atspi_accessible_get_name (get, NULL)); } static void @@ -136,34 +135,32 @@ atk_test_collection_get_matches_from (gpointer fixture, gconstpointer user_data) ATSPI_Collection_MATCH_ALL, FALSE); GArray *ret = atspi_collection_get_matches_from (iface, - child1, - rule, - ATSPI_Collection_SORT_ORDER_CANONICAL, - ATSPI_Collection_TREE_INORDER, - 0, - FALSE, - NULL); + child1, + rule, + ATSPI_Collection_SORT_ORDER_CANONICAL, + ATSPI_Collection_TREE_INORDER, + 0, + FALSE, + NULL); g_assert_cmpint (3, ==, ret->len); AtspiAccessible *get = NULL; get = g_array_index (ret, AtspiAccessible *, 0); - g_assert_cmpstr("obj2/1", ==, atspi_accessible_get_name (get, NULL)); + g_assert_cmpstr ("obj2/1", ==, atspi_accessible_get_name (get, NULL)); get = g_array_index (ret, AtspiAccessible *, 1); - g_assert_cmpstr("obj3", ==, atspi_accessible_get_name (get, NULL)); + g_assert_cmpstr ("obj3", ==, atspi_accessible_get_name (get, NULL)); get = g_array_index (ret, AtspiAccessible *, 2); - g_assert_cmpstr("obj3", ==, atspi_accessible_get_name (get, NULL)); + g_assert_cmpstr ("obj3", ==, atspi_accessible_get_name (get, NULL)); } - void -atk_test_collection (void ) +atk_test_collection (void) { g_test_add_vtable (ATK_TEST_PATH_COLLECTION "/atk_test_collection_get_collection_iface", - 0, NULL, NULL, atk_test_collection_get_collection_iface, teardown_collection_test ); + 0, NULL, NULL, atk_test_collection_get_collection_iface, teardown_collection_test); g_test_add_vtable (ATK_TEST_PATH_COLLECTION "/atk_test_collection_get_matches", - 0, NULL, NULL, atk_test_collection_get_matches, teardown_collection_test ); + 0, NULL, NULL, atk_test_collection_get_matches, teardown_collection_test); g_test_add_vtable (ATK_TEST_PATH_COLLECTION "/atk_test_collection_get_matches_to", - 0, NULL, NULL, atk_test_collection_get_matches_to, teardown_collection_test ); + 0, NULL, NULL, atk_test_collection_get_matches_to, teardown_collection_test); g_test_add_vtable (ATK_TEST_PATH_COLLECTION "/atk_test_collection_get_matches_from", - 0, NULL, NULL, atk_test_collection_get_matches_from, teardown_collection_test ); + 0, NULL, NULL, atk_test_collection_get_matches_from, teardown_collection_test); } - diff --git a/tests/at-spi2-atk/atk_test_component.c b/tests/at-spi2-atk/atk_test_component.c index b4b6a86e..82c6bebe 100644 --- a/tests/at-spi2-atk/atk_test_component.c +++ b/tests/at-spi2-atk/atk_test_component.c @@ -23,7 +23,7 @@ #include "atk_suite.h" #include "atk_test_util.h" -#define DATA_FILE TESTS_DATA_DIR"/test-component.xml" +#define DATA_FILE TESTS_DATA_DIR "/test-component.xml" static void teardown_component_test (gpointer fixture, gconstpointer user_data) @@ -62,10 +62,10 @@ atk_test_component_get_accessible_at_point (gpointer fixture, gconstpointer user g_assert (iface != NULL); AtspiAccessible *r = atspi_component_get_accessible_at_point (iface, - 400, - 300, - ATSPI_COORD_TYPE_SCREEN, - NULL); + 400, + 300, + ATSPI_COORD_TYPE_SCREEN, + NULL); g_assert (r != NULL); } diff --git a/tests/at-spi2-atk/atk_test_document.c b/tests/at-spi2-atk/atk_test_document.c index af219b4b..b0224803 100644 --- a/tests/at-spi2-atk/atk_test_document.c +++ b/tests/at-spi2-atk/atk_test_document.c @@ -23,7 +23,7 @@ #include "atk_suite.h" #include "atk_test_util.h" -#define DATA_FILE TESTS_DATA_DIR"/test-document.xml" +#define DATA_FILE TESTS_DATA_DIR "/test-document.xml" static void teardown_document_test (gpointer fixture, gconstpointer user_data) @@ -97,7 +97,7 @@ atk_test_document_get_attributes (gpointer fixture, gconstpointer user_data) } void -atk_test_document(void ) +atk_test_document (void) { g_test_add_vtable (ATK_TEST_PATH_ACCESSIBLE "/atk_test_document_get_document_iface", 0, NULL, NULL, atk_test_document_get_document_iface, teardown_document_test); @@ -106,5 +106,5 @@ atk_test_document(void ) g_test_add_vtable (ATK_TEST_PATH_ACCESSIBLE "/atk_test_document_get_attribute_value", 0, NULL, NULL, atk_test_document_get_attribute_value, teardown_document_test); g_test_add_vtable (ATK_TEST_PATH_ACCESSIBLE "/atk_test_document_get_attributes", - 0, NULL, NULL, atk_test_document_get_attributes, teardown_document_test ); + 0, NULL, NULL, atk_test_document_get_attributes, teardown_document_test); } diff --git a/tests/at-spi2-atk/atk_test_editable_text.c b/tests/at-spi2-atk/atk_test_editable_text.c index 8e8baaad..9758bf1c 100644 --- a/tests/at-spi2-atk/atk_test_editable_text.c +++ b/tests/at-spi2-atk/atk_test_editable_text.c @@ -23,7 +23,7 @@ #include "atk_suite.h" #include "atk_test_util.h" -#define DATA_FILE TESTS_DATA_DIR"/test-editable-text.xml" +#define DATA_FILE TESTS_DATA_DIR "/test-editable-text.xml" static void teardown_editable_text_test (gpointer fixture, gconstpointer user_data) @@ -107,7 +107,7 @@ atk_test_editable_text_paste_text (gpointer fixture, gconstpointer user_data) } void -atk_test_editable_text(void ) +atk_test_editable_text (void) { g_test_add_vtable (ATK_TEST_PATH_EDIT_TEXT "/atk_test_editable_text_get_editable_text_iface", 0, NULL, NULL, atk_test_editable_text_get_editable_text_iface, teardown_editable_text_test); diff --git a/tests/at-spi2-atk/atk_test_hyperlink.c b/tests/at-spi2-atk/atk_test_hyperlink.c index ce3dc780..c3293fce 100644 --- a/tests/at-spi2-atk/atk_test_hyperlink.c +++ b/tests/at-spi2-atk/atk_test_hyperlink.c @@ -18,10 +18,10 @@ * Boston, MA 02110-1301, USA. */ -#include "atk_test_util.h" #include "atk_suite.h" +#include "atk_test_util.h" -#define DATA_FILE TESTS_DATA_DIR"/test-hypertext.xml" +#define DATA_FILE TESTS_DATA_DIR "/test-hypertext.xml" static void atk_test_hyperlink_get_n_anchors (gpointer fixture, gconstpointer user_data) @@ -70,7 +70,7 @@ atk_test_hyperlink_get_object (gpointer fixture, gconstpointer user_data) AtspiText *at = atspi_accessible_get_text_iface (acc); g_assert (at); gchar *text = atspi_text_get_text (at, 0, 12, NULL); - g_assert_cmpstr (text,==,"pinkbike.com"); + g_assert_cmpstr (text, ==, "pinkbike.com"); g_free (text); } @@ -105,7 +105,7 @@ atk_test_hyperlink_get_start_index (gpointer fixture, gconstpointer user_data) AtspiHypertext *obj1 = atspi_accessible_get_hypertext_iface (child); g_assert (obj1); AtspiHyperlink *obj = atspi_hypertext_get_link (obj1, 1, NULL); - g_assert (obj); + g_assert (obj); gint n = atspi_hyperlink_get_start_index (obj, NULL); g_assert_cmpint (n, ==, 69); } @@ -146,20 +146,20 @@ teardown_hyperlink_test (gpointer fixture, gconstpointer user_data) } void -atk_test_hyperlink(void) +atk_test_hyperlink (void) { - g_test_add_vtable(ATK_TEST_PATH_HYPERTEXT "/atk_test_hyperlink_get_n_anchors", - 0, NULL, NULL, atk_test_hyperlink_get_n_anchors, teardown_hyperlink_test ); - g_test_add_vtable(ATK_TEST_PATH_HYPERTEXT "/atk_test_hyperlink_get_uri", - 0, NULL, NULL, atk_test_hyperlink_get_uri, teardown_hyperlink_test); - g_test_add_vtable(ATK_TEST_PATH_HYPERTEXT "/atk_test_hyperlink_get_object", - 0, NULL, NULL, atk_test_hyperlink_get_object, teardown_hyperlink_test); - g_test_add_vtable(ATK_TEST_PATH_HYPERTEXT "/atk_test_hyperlink_get_index_range", - 0, NULL, NULL, atk_test_hyperlink_get_index_range, teardown_hyperlink_test); - g_test_add_vtable(ATK_TEST_PATH_HYPERTEXT "/atk_test_hyperlink_get_start_index", - 0, NULL, NULL, atk_test_hyperlink_get_start_index, teardown_hyperlink_test); - g_test_add_vtable(ATK_TEST_PATH_HYPERTEXT "/atk_test_hyperlink_get_end_index", - 0, NULL, NULL, atk_test_hyperlink_get_end_index, teardown_hyperlink_test); - g_test_add_vtable(ATK_TEST_PATH_HYPERTEXT "/atk_test_hyperlink_is_valid", - 0, NULL, NULL, atk_test_hyperlink_is_valid, teardown_hyperlink_test); + g_test_add_vtable (ATK_TEST_PATH_HYPERTEXT "/atk_test_hyperlink_get_n_anchors", + 0, NULL, NULL, atk_test_hyperlink_get_n_anchors, teardown_hyperlink_test); + g_test_add_vtable (ATK_TEST_PATH_HYPERTEXT "/atk_test_hyperlink_get_uri", + 0, NULL, NULL, atk_test_hyperlink_get_uri, teardown_hyperlink_test); + g_test_add_vtable (ATK_TEST_PATH_HYPERTEXT "/atk_test_hyperlink_get_object", + 0, NULL, NULL, atk_test_hyperlink_get_object, teardown_hyperlink_test); + g_test_add_vtable (ATK_TEST_PATH_HYPERTEXT "/atk_test_hyperlink_get_index_range", + 0, NULL, NULL, atk_test_hyperlink_get_index_range, teardown_hyperlink_test); + g_test_add_vtable (ATK_TEST_PATH_HYPERTEXT "/atk_test_hyperlink_get_start_index", + 0, NULL, NULL, atk_test_hyperlink_get_start_index, teardown_hyperlink_test); + g_test_add_vtable (ATK_TEST_PATH_HYPERTEXT "/atk_test_hyperlink_get_end_index", + 0, NULL, NULL, atk_test_hyperlink_get_end_index, teardown_hyperlink_test); + g_test_add_vtable (ATK_TEST_PATH_HYPERTEXT "/atk_test_hyperlink_is_valid", + 0, NULL, NULL, atk_test_hyperlink_is_valid, teardown_hyperlink_test); } diff --git a/tests/at-spi2-atk/atk_test_hypertext.c b/tests/at-spi2-atk/atk_test_hypertext.c index 57f42d46..68b8fe55 100644 --- a/tests/at-spi2-atk/atk_test_hypertext.c +++ b/tests/at-spi2-atk/atk_test_hypertext.c @@ -18,10 +18,10 @@ * Boston, MA 02110-1301, USA. */ -#include "atk_test_util.h" #include "atk_suite.h" +#include "atk_test_util.h" -#define DATA_FILE TESTS_DATA_DIR"/test-hypertext.xml" +#define DATA_FILE TESTS_DATA_DIR "/test-hypertext.xml" static void atk_test_hypertext_get_n_links (gpointer fixture, gconstpointer user_data) @@ -87,9 +87,9 @@ void atk_test_hypertext (void) { g_test_add_vtable (ATK_TEST_PATH_HYPERTEXT "/atk_test_hypertext_get_n_links", - 0, NULL, NULL, atk_test_hypertext_get_n_links, teardown_hypertext_test ); + 0, NULL, NULL, atk_test_hypertext_get_n_links, teardown_hypertext_test); g_test_add_vtable (ATK_TEST_PATH_HYPERTEXT "/atk_test_hypertext_get_links", - 0, NULL, NULL, atk_test_hypertext_get_link, teardown_hypertext_test ); + 0, NULL, NULL, atk_test_hypertext_get_link, teardown_hypertext_test); g_test_add_vtable (ATK_TEST_PATH_HYPERTEXT "/atk_test_hypertext_get_link_index", - 0, NULL, NULL, atk_test_hypertext_get_link_index, teardown_hypertext_test ); + 0, NULL, NULL, atk_test_hypertext_get_link_index, teardown_hypertext_test); } diff --git a/tests/at-spi2-atk/atk_test_image.c b/tests/at-spi2-atk/atk_test_image.c index e3ff9468..ff42c4cd 100644 --- a/tests/at-spi2-atk/atk_test_image.c +++ b/tests/at-spi2-atk/atk_test_image.c @@ -23,7 +23,7 @@ #include "atk_suite.h" #include "atk_test_util.h" -#define DATA_FILE TESTS_DATA_DIR"/test-image.xml" +#define DATA_FILE TESTS_DATA_DIR "/test-image.xml" static void teardown_image_test (gpointer fixture, gconstpointer user_data) @@ -36,7 +36,7 @@ atk_test_image_sample_get_interface (gpointer fixture, gconstpointer user_data) { AtspiAccessible *obj = get_root_obj (DATA_FILE); g_assert_cmpstr (atspi_accessible_get_name (obj, NULL), ==, "root_object"); - AtspiAccessible *child = atspi_accessible_get_child_at_index (obj,1, NULL); + AtspiAccessible *child = atspi_accessible_get_child_at_index (obj, 1, NULL); AtspiImage *iface = atspi_accessible_get_image_iface (child); g_assert (iface != NULL); } @@ -45,11 +45,11 @@ static void atk_test_image_get_image_description (gpointer fixture, gconstpointer user_data) { AtspiAccessible *obj = get_root_obj (DATA_FILE); - AtspiAccessible *child = atspi_accessible_get_child_at_index (obj,1, NULL); + AtspiAccessible *child = atspi_accessible_get_child_at_index (obj, 1, NULL); AtspiImage *image = atspi_accessible_get_image_iface (child); gchar *desc = atspi_image_get_image_description (image, NULL); g_assert (desc); - g_assert_cmpstr (desc, == ,"image description"); + g_assert_cmpstr (desc, ==, "image description"); g_free (desc); } @@ -57,13 +57,13 @@ static void atk_test_image_get_image_size (gpointer fixture, gconstpointer user_data) { AtspiAccessible *obj = get_root_obj (DATA_FILE); - AtspiAccessible *child = atspi_accessible_get_child_at_index (obj,1, NULL); + AtspiAccessible *child = atspi_accessible_get_child_at_index (obj, 1, NULL); AtspiImage *image = atspi_accessible_get_image_iface (child); AtspiPoint *p = atspi_image_get_image_size (image, NULL); g_assert (p); - g_assert_cmpint (p->x,==,100); - g_assert_cmpint (p->y,==,50); + g_assert_cmpint (p->x, ==, 100); + g_assert_cmpint (p->y, ==, 50); g_free (p); } @@ -71,12 +71,12 @@ static void atk_test_image_get_image_position (gpointer fixture, gconstpointer user_data) { AtspiAccessible *obj = get_root_obj (DATA_FILE); - AtspiAccessible *child = atspi_accessible_get_child_at_index (obj,1, NULL); + AtspiAccessible *child = atspi_accessible_get_child_at_index (obj, 1, NULL); AtspiImage *image = atspi_accessible_get_image_iface (child); AtspiPoint *p = atspi_image_get_image_position (image, ATSPI_COORD_TYPE_SCREEN, NULL); g_assert (p); - g_assert_cmpint (p->x,==,500); - g_assert_cmpint (p->y,==,50); + g_assert_cmpint (p->x, ==, 500); + g_assert_cmpint (p->y, ==, 50); g_free (p); } @@ -84,7 +84,7 @@ static void atk_test_image_get_image_extents (gpointer fixture, gconstpointer user_data) { AtspiAccessible *obj = get_root_obj (DATA_FILE); - AtspiAccessible *child = atspi_accessible_get_child_at_index (obj,1, NULL); + AtspiAccessible *child = atspi_accessible_get_child_at_index (obj, 1, NULL); AtspiImage *image = atspi_accessible_get_image_iface (child); AtspiRect *r = atspi_image_get_image_extents (image, ATSPI_COORD_TYPE_SCREEN, NULL); g_assert (r); @@ -101,12 +101,12 @@ static void atk_test_image_get_image_locale (gpointer fixture, gconstpointer user_data) { AtspiAccessible *obj = get_root_obj (DATA_FILE); - AtspiAccessible *child = atspi_accessible_get_child_at_index (obj,1, NULL); + AtspiAccessible *child = atspi_accessible_get_child_at_index (obj, 1, NULL); AtspiImage *image = atspi_accessible_get_image_iface (child); gchar *locale = atspi_image_get_image_locale (image, NULL); g_assert (locale); - g_assert_cmpstr (locale, ==,"image_locale"); + g_assert_cmpstr (locale, ==, "image_locale"); g_free (locale); } diff --git a/tests/at-spi2-atk/atk_test_selection.c b/tests/at-spi2-atk/atk_test_selection.c index 12a87cf5..3c2b2b3e 100644 --- a/tests/at-spi2-atk/atk_test_selection.c +++ b/tests/at-spi2-atk/atk_test_selection.c @@ -23,7 +23,7 @@ #include "atk_suite.h" #include "atk_test_util.h" -#define DATA_FILE TESTS_DATA_DIR"/test-selection.xml" +#define DATA_FILE TESTS_DATA_DIR "/test-selection.xml" static void teardown_selection_test (gpointer fixture, gconstpointer user_data) @@ -61,16 +61,17 @@ atk_test_selection_get_selected_child (gpointer fixture, gconstpointer user_data AtspiAccessible *child = atspi_accessible_get_child_at_index (obj, 0, NULL); AtspiSelection *iface = atspi_accessible_get_selection_iface (child); g_assert (iface != NULL); - gchar* valid_names[] = { "obj2/1", "obj2/2", "obj3/1"}; + gchar *valid_names[] = { "obj2/1", "obj2/2", "obj3/1" }; AtspiAccessible *o = NULL; - int i=0; + int i = 0; int selected_count = atspi_selection_get_n_selected_children (iface, NULL); g_assert_cmpint (selected_count, ==, 3); - for (i=0; i<selected_count; i++) { - o = atspi_selection_get_selected_child (iface, i, NULL); - g_assert_cmpstr (atspi_accessible_get_name (o, NULL), ==, valid_names[i]); - } + for (i = 0; i < selected_count; i++) + { + o = atspi_selection_get_selected_child (iface, i, NULL); + g_assert_cmpstr (atspi_accessible_get_name (o, NULL), ==, valid_names[i]); + } } static void @@ -139,7 +140,7 @@ atk_test_selection_is_child_selected (gpointer fixture, gconstpointer user_data) g_assert (atspi_selection_is_child_selected (iface, 0, NULL)); g_assert (atspi_selection_is_child_selected (iface, 1, NULL)); g_assert (atspi_selection_is_child_selected (iface, 4, NULL)); - g_assert (!atspi_selection_is_child_selected (iface, 2, NULL)); + g_assert (!atspi_selection_is_child_selected (iface, 2, NULL)); g_assert (!atspi_selection_is_child_selected (iface, 3, NULL)); } @@ -192,5 +193,4 @@ atk_test_selection (void) 0, NULL, NULL, atk_test_selection_select_all, teardown_selection_test); g_test_add_vtable (ATK_TEST_PATH_SELECTION "/atk_test_selection_clear_selection", 0, NULL, NULL, atk_test_selection_clear_selection, teardown_selection_test); - } diff --git a/tests/at-spi2-atk/atk_test_state_set.c b/tests/at-spi2-atk/atk_test_state_set.c index 8d0c0216..06f86dbb 100644 --- a/tests/at-spi2-atk/atk_test_state_set.c +++ b/tests/at-spi2-atk/atk_test_state_set.c @@ -23,7 +23,7 @@ #include "atk_suite.h" #include "atk_test_util.h" -#define DATA_FILE TESTS_DATA_DIR"/test-accessible.xml" +#define DATA_FILE TESTS_DATA_DIR "/test-accessible.xml" static void teardown_state_set_test (gpointer fixture, gconstpointer user_data) @@ -45,11 +45,12 @@ atk_test_accessible_get_state_set (gpointer fixture, gconstpointer user_data) }; g_assert_cmpint (states_arr->len, ==, 2); int i = 0; - for (i = 0; i < states_arr->len; ++i) { - g_assert_cmpint (valid_states[i], ==, g_array_index (states_arr, AtspiStateType, i)); - g_assert (atspi_state_set_contains (states, ATSPI_STATE_MODAL)); - g_assert (atspi_state_set_contains (states, ATSPI_STATE_MULTI_LINE)); - } + for (i = 0; i < states_arr->len; ++i) + { + g_assert_cmpint (valid_states[i], ==, g_array_index (states_arr, AtspiStateType, i)); + g_assert (atspi_state_set_contains (states, ATSPI_STATE_MODAL)); + g_assert (atspi_state_set_contains (states, ATSPI_STATE_MULTI_LINE)); + } } static void @@ -102,7 +103,6 @@ atk_test_state_set_add (gpointer fixture, gconstpointer user_data) atspi_state_set_add (states, ATSPI_STATE_FOCUSABLE); g_assert (atspi_state_set_contains (states, ATSPI_STATE_FOCUSABLE)); - } static void @@ -237,4 +237,3 @@ atk_test_state_set (void) g_test_add_vtable (ATK_TEST_PATH_STATE_SET "/atk_test_state_set_remove", 0, NULL, NULL, atk_test_state_set_remove, teardown_state_set_test); } - diff --git a/tests/at-spi2-atk/atk_test_table.c b/tests/at-spi2-atk/atk_test_table.c index f610ba12..8a673bcc 100644 --- a/tests/at-spi2-atk/atk_test_table.c +++ b/tests/at-spi2-atk/atk_test_table.c @@ -18,10 +18,10 @@ * Boston, MA 02110-1301, USA. */ -#include "atk_test_util.h" #include "atk_suite.h" +#include "atk_test_util.h" -#define DATA_FILE TESTS_DATA_DIR"/test-table.xml" +#define DATA_FILE TESTS_DATA_DIR "/test-table.xml" static void atk_test_table_get_caption (gpointer fixture, gconstpointer user_data) @@ -34,7 +34,6 @@ atk_test_table_get_caption (gpointer fixture, gconstpointer user_data) AtspiAccessible *acc = atspi_table_get_caption (obj, NULL); g_assert (acc); g_assert_cmpstr ("caption name", ==, atspi_accessible_get_name (acc, NULL)); - } static void @@ -269,8 +268,8 @@ atk_test_table_get_selected_rows (gpointer fixture, gconstpointer user_data) GArray *array = atspi_table_get_selected_rows (obj, NULL); g_assert (array); g_assert_cmpint (array->len, ==, 2); - g_assert_cmpint (g_array_index (array,gint, 0), ==, 0); - g_assert_cmpint (g_array_index (array,gint, 1), ==, 2); + g_assert_cmpint (g_array_index (array, gint, 0), ==, 0); + g_assert_cmpint (g_array_index (array, gint, 1), ==, 2); g_array_free (array, TRUE); } @@ -299,7 +298,7 @@ atk_test_table_get_n_selected_columns (gpointer fixture, gconstpointer user_data g_assert (child); AtspiTable *obj = atspi_accessible_get_table_iface (child); - g_assert(obj); + g_assert (obj); gint cnt = atspi_table_get_n_selected_columns (obj, NULL); g_assert_cmpint (cnt, ==, 1); } @@ -421,7 +420,7 @@ teardown_table_test (gpointer fixture, gconstpointer user_data) } void -atk_test_table(void) +atk_test_table (void) { g_test_add_vtable (ATK_TEST_PATH_TABLE "/atk_test_table_get_caption", 0, NULL, NULL, atk_test_table_get_caption, teardown_table_test); @@ -439,8 +438,8 @@ atk_test_table(void) 0, NULL, NULL, atk_test_table_get_row_at_index, teardown_table_test); g_test_add_vtable (ATK_TEST_PATH_TABLE "/atk_test_table_get_column_at_index", 0, NULL, NULL, atk_test_table_get_column_at_index, teardown_table_test); - g_test_add_vtable (ATK_TEST_PATH_TABLE "/atk_test_table_get_row_description", - 0, NULL, NULL, atk_test_table_get_row_description, teardown_table_test); + g_test_add_vtable (ATK_TEST_PATH_TABLE "/atk_test_table_get_row_description", + 0, NULL, NULL, atk_test_table_get_row_description, teardown_table_test); g_test_add_vtable (ATK_TEST_PATH_TABLE "/atk_test_table_get_column_description", 0, NULL, NULL, atk_test_table_get_column_description, teardown_table_test); g_test_add_vtable (ATK_TEST_PATH_TABLE "/atk_test_table_get_row_extent_at", diff --git a/tests/at-spi2-atk/atk_test_table_cell.c b/tests/at-spi2-atk/atk_test_table_cell.c index 90f861dd..efb35eab 100644 --- a/tests/at-spi2-atk/atk_test_table_cell.c +++ b/tests/at-spi2-atk/atk_test_table_cell.c @@ -18,10 +18,10 @@ * Boston, MA 02110-1301, USA. */ -#include "atk_test_util.h" #include "atk_suite.h" +#include "atk_test_util.h" -#define DATA_FILE TESTS_DATA_DIR"/test-table.xml" +#define DATA_FILE TESTS_DATA_DIR "/test-table.xml" static void atk_test_accessible_get_table_cell (gpointer fixture, gconstpointer user_data) @@ -207,6 +207,4 @@ atk_test_table_cell (void) 0, NULL, NULL, atk_test_table_cell_get_position, teardown_table_cell_test); g_test_add_vtable (ATK_TEST_PATH_TABLE_CELL "/atk_test_table_cell_get_table", 0, NULL, NULL, atk_test_table_cell_get_table, teardown_table_cell_test); - - } diff --git a/tests/at-spi2-atk/atk_test_text.c b/tests/at-spi2-atk/atk_test_text.c index 17db2e31..085380c1 100644 --- a/tests/at-spi2-atk/atk_test_text.c +++ b/tests/at-spi2-atk/atk_test_text.c @@ -20,16 +20,18 @@ * Boston, MA 02110-1301, USA. */ -#include "atk_test_util.h" #include "atk_suite.h" +#include "atk_test_util.h" -#define DATA_FILE TESTS_DATA_DIR"/test-text.xml" +#define DATA_FILE TESTS_DATA_DIR "/test-text.xml" -static gboolean GHRunc_find (gpointer key, gpointer value, gpointer user_data) +static gboolean +GHRunc_find (gpointer key, gpointer value, gpointer user_data) { - if (!g_strcmp0 (key, user_data)) { - return TRUE; - } + if (!g_strcmp0 (key, user_data)) + { + return TRUE; + } return FALSE; } @@ -70,7 +72,7 @@ atk_test_text_get_caret_offset (gpointer fixture, gconstpointer user_data) AtspiText *obj = atspi_accessible_get_text_iface (child); gint pos = atspi_text_get_caret_offset (obj, NULL); - g_assert_cmpint (pos,==,-1); + g_assert_cmpint (pos, ==, -1); } static void @@ -201,10 +203,10 @@ atk_test_text_set_selection (gpointer fixture, gconstpointer user_data) g_assert (child); AtspiText *obj = atspi_accessible_get_text_iface (child); - g_assert_true(atspi_text_add_selection (obj, 9, 14, NULL)); - g_assert_true(atspi_text_add_selection (obj, 14, 15, NULL)); - g_assert_true(atspi_text_set_selection (obj, 0, 1, 2, NULL)); - g_assert_true(atspi_text_set_selection (obj, 1, 3, 4, NULL)); + g_assert_true (atspi_text_add_selection (obj, 9, 14, NULL)); + g_assert_true (atspi_text_add_selection (obj, 14, 15, NULL)); + g_assert_true (atspi_text_set_selection (obj, 0, 1, 2, NULL)); + g_assert_true (atspi_text_set_selection (obj, 1, 3, 4, NULL)); AtspiRange *range = atspi_text_get_selection (obj, 0, NULL); g_assert (range); @@ -292,14 +294,14 @@ atk_test_text_get_attribute_run (gpointer fixture, gconstpointer user_data) gint start_offset = 0; gint end_offset = 0; - GHashTable *tab = atspi_text_get_attribute_run (obj, 0, FALSE, &start_offset, &end_offset , NULL); + GHashTable *tab = atspi_text_get_attribute_run (obj, 0, FALSE, &start_offset, &end_offset, NULL); g_assert (tab); - g_assert_cmpstr ((const char*) g_hash_table_find (tab, GHRunc_find, "text_test_attr1"), ==, "on"); - g_assert_cmpstr ((const char*) g_hash_table_find (tab, GHRunc_find, "text_test_attr2"), ==, "off"); - g_assert_cmpint (start_offset, == , 5); - g_assert_cmpint (end_offset, == , 10); + g_assert_cmpstr ((const char *) g_hash_table_find (tab, GHRunc_find, "text_test_attr1"), ==, "on"); + g_assert_cmpstr ((const char *) g_hash_table_find (tab, GHRunc_find, "text_test_attr2"), ==, "off"); + g_assert_cmpint (start_offset, ==, 5); + g_assert_cmpint (end_offset, ==, 10); g_hash_table_destroy (tab); } @@ -315,9 +317,9 @@ atk_test_text_get_defualt_attributes (gpointer fixture, gconstpointer user_data) GHashTable *tab = atspi_text_get_default_attributes (obj, NULL); g_assert (tab); - g_assert_cmpstr ((const char*) g_hash_table_find (tab, GHRunc_find, "bold_text"), ==, "on"); - g_assert_cmpstr ((const char*) g_hash_table_find (tab, GHRunc_find, "underline_text"), ==, "off"); - g_assert_cmpstr ((const char*) g_hash_table_find (tab, GHRunc_find, "dummy_text"), ==, ""); + g_assert_cmpstr ((const char *) g_hash_table_find (tab, GHRunc_find, "bold_text"), ==, "on"); + g_assert_cmpstr ((const char *) g_hash_table_find (tab, GHRunc_find, "underline_text"), ==, "off"); + g_assert_cmpstr ((const char *) g_hash_table_find (tab, GHRunc_find, "dummy_text"), ==, ""); g_hash_table_destroy (tab); } @@ -332,14 +334,14 @@ atk_test_text_get_text_attributes (gpointer fixture, gconstpointer user_data) gint start_offset = 0; gint end_offset = 0; - GHashTable *tab = atspi_text_get_text_attributes (obj, 0, &start_offset, &end_offset, NULL); + GHashTable *tab = atspi_text_get_text_attributes (obj, 0, &start_offset, &end_offset, NULL); g_assert (tab); - g_assert_cmpstr ((const char*) g_hash_table_find (tab, GHRunc_find, "text_test_attr1"), ==, "on"); - g_assert_cmpstr ((const char*) g_hash_table_find (tab, GHRunc_find, "text_test_attr2"), ==, "off"); - g_assert_cmpint (start_offset, == , 5); - g_assert_cmpint (end_offset, == , 10); + g_assert_cmpstr ((const char *) g_hash_table_find (tab, GHRunc_find, "text_test_attr1"), ==, "on"); + g_assert_cmpstr ((const char *) g_hash_table_find (tab, GHRunc_find, "text_test_attr2"), ==, "off"); + g_assert_cmpint (start_offset, ==, 5); + g_assert_cmpint (end_offset, ==, 10); g_hash_table_destroy (tab); } @@ -414,19 +416,19 @@ atk_test_text_get_bounded_ranges (gpointer fixture, gconstpointer user_data) GArray *array = atspi_text_get_bounded_ranges (obj, 15, 21, 100, 50, ATSPI_COORD_TYPE_SCREEN, ATSPI_TEXT_CLIP_MAX, ATSPI_TEXT_CLIP_MIN, NULL); g_assert (array); - AtspiTextRange *range = &g_array_index (array, AtspiTextRange, 0); + AtspiTextRange *range = &g_array_index (array, AtspiTextRange, 0); g_assert_cmpint (g_array_get_element_size (array), ==, sizeof (AtspiTextRange)); g_assert_cmpint (range->start_offset, ==, 0); g_assert_cmpint (range->end_offset, ==, 5); g_assert_cmpstr (range->content, ==, "text0"); - range = &g_array_index (array, AtspiTextRange, 1); + range = &g_array_index (array, AtspiTextRange, 1); g_assert_cmpint (g_array_get_element_size (array), ==, sizeof (AtspiTextRange)); g_assert_cmpint (range->start_offset, ==, 6); g_assert_cmpint (range->end_offset, ==, 10); g_assert_cmpstr (range->content, ==, "it w"); - g_array_free (array,TRUE); + g_array_free (array, TRUE); } static void @@ -455,9 +457,9 @@ atk_test_text (void) g_test_add_vtable (ATK_TEST_PATH_TEXT "/atk_test_text_set_caret_offset", 0, NULL, NULL, atk_test_text_set_caret_offset, teardown_text_test); g_test_add_vtable (ATK_TEST_PATH_TEXT "/atk_test_text_get_string_at_offset_s1", - 0, NULL, NULL, atk_test_text_get_string_at_offset_s1, teardown_text_test ); + 0, NULL, NULL, atk_test_text_get_string_at_offset_s1, teardown_text_test); g_test_add_vtable (ATK_TEST_PATH_TEXT "/atk_test_text_get_string_at_offset_s2", - 0, NULL, NULL, atk_test_text_get_string_at_offset_s2, teardown_text_test ); + 0, NULL, NULL, atk_test_text_get_string_at_offset_s2, teardown_text_test); g_test_add_vtable (ATK_TEST_PATH_TEXT "/atk_test_text_get_character_at_offset", 0, NULL, NULL, atk_test_text_get_character_at_offset, teardown_text_test); g_test_add_vtable (ATK_TEST_PATH_TEXT "/atk_test_text_get_character_extents", @@ -473,9 +475,9 @@ atk_test_text (void) g_test_add_vtable (ATK_TEST_PATH_TEXT "/atk_test_text_get_selection", 0, NULL, NULL, atk_test_text_get_selection, teardown_text_test); g_test_add_vtable (ATK_TEST_PATH_TEXT "/atk_test_text_add_selection", - 0, NULL, NULL, atk_test_text_add_selection, teardown_text_test ); + 0, NULL, NULL, atk_test_text_add_selection, teardown_text_test); g_test_add_vtable (ATK_TEST_PATH_TEXT "/atk_test_text_remove_selection", - 0, NULL, NULL, atk_test_text_remove_selection, teardown_text_test ); + 0, NULL, NULL, atk_test_text_remove_selection, teardown_text_test); g_test_add_vtable (ATK_TEST_PATH_TEXT "/atk_test_text_set_selection", 0, NULL, NULL, atk_test_text_set_selection, teardown_text_test); } diff --git a/tests/at-spi2-atk/atk_test_util.c b/tests/at-spi2-atk/atk_test_util.c index 366725c4..1f80d459 100644 --- a/tests/at-spi2-atk/atk_test_util.c +++ b/tests/at-spi2-atk/atk_test_util.c @@ -20,17 +20,19 @@ * Boston, MA 02110-1301, USA. */ -#include <signal.h> #include "atk_test_util.h" +#include <signal.h> pid_t child_pid; -static void assert_clean_exit (int sig) +static void +assert_clean_exit (int sig) { kill (child_pid, SIGTERM); } -void clean_exit_on_fail () +void +clean_exit_on_fail () { signal (SIGABRT, assert_clean_exit); } @@ -39,77 +41,89 @@ void run_app (const char *file_name) { child_pid = fork (); - if (child_pid == 0) { - execlp (TESTS_BUILD_DIR "/app-test", - TESTS_BUILD_DIR "/app-test", - "--test-data-file", - file_name, - NULL); - _exit (EXIT_SUCCESS); - } - if (child_pid) fprintf(stderr, "child_pid %d\n", child_pid); + if (child_pid == 0) + { + execlp (TESTS_BUILD_DIR "/app-test", + TESTS_BUILD_DIR "/app-test", + "--test-data-file", + file_name, + NULL); + _exit (EXIT_SUCCESS); + } + if (child_pid) + fprintf (stderr, "child_pid %d\n", child_pid); } -static AtspiAccessible *try_get_root_obj (AtspiAccessible *obj) +static AtspiAccessible * +try_get_root_obj (AtspiAccessible *obj) { gchar *name; int i; gint child_count = atspi_accessible_get_child_count (obj, NULL); - if (child_count < 1) { - return NULL; - } - - for (i = 0; i < child_count; i++) { - AtspiAccessible *child = atspi_accessible_get_child_at_index (obj, i, NULL); - if (!child) - continue; - if ((name = atspi_accessible_get_name (child, NULL)) != NULL) { - if (!strcmp (name, "root_object")) { - g_free(name); - return child; - } - g_free(name); + if (child_count < 1) + { + return NULL; + } + + for (i = 0; i < child_count; i++) + { + AtspiAccessible *child = atspi_accessible_get_child_at_index (obj, i, NULL); + if (!child) + continue; + if ((name = atspi_accessible_get_name (child, NULL)) != NULL) + { + if (!strcmp (name, "root_object")) + { + g_free (name); + return child; + } + g_free (name); + } + g_object_unref (child); } - g_object_unref (child); - } return NULL; } -AtspiAccessible * get_root_obj (const char *file_name) +AtspiAccessible * +get_root_obj (const char *file_name) { int tries = 0; AtspiAccessible *child; struct timespec timeout = { .tv_sec = 0, .tv_nsec = 10 * 1000000 }; AtspiAccessible *obj = NULL; - fprintf(stderr, "run_app: %s\n", file_name); + fprintf (stderr, "run_app: %s\n", file_name); run_app (file_name); obj = atspi_get_desktop (0); /* Wait for application to start, up to 100 times 10ms. */ while (++tries <= 100) - { - child = try_get_root_obj (obj); - if (child) - return child; - - nanosleep(&timeout, NULL); - } - - if (atspi_accessible_get_child_count (obj, NULL) < 1) { - g_test_message ("Fail, test application not found\n"); - } else { - g_test_message ("test object not found\n"); - } + { + child = try_get_root_obj (obj); + if (child) + return child; + + nanosleep (&timeout, NULL); + } + + if (atspi_accessible_get_child_count (obj, NULL) < 1) + { + g_test_message ("Fail, test application not found\n"); + } + else + { + g_test_message ("test object not found\n"); + } g_test_fail (); kill (child_pid, SIGTERM); return NULL; } -void terminate_app (void) +void +terminate_app (void) { int tries = 0; @@ -123,13 +137,13 @@ void terminate_app (void) /* Wait for application to stop, up to 100 times 10ms. */ while (++tries <= 100) - { - child = try_get_root_obj (obj); - if (child == NULL) - return; + { + child = try_get_root_obj (obj); + if (child == NULL) + return; - nanosleep(&timeout, NULL); - } + nanosleep (&timeout, NULL); + } g_test_message ("Fail, test application still running\n"); g_test_fail (); diff --git a/tests/at-spi2-atk/atk_test_util.h b/tests/at-spi2-atk/atk_test_util.h index 98a2c014..6fc3ecf5 100644 --- a/tests/at-spi2-atk/atk_test_util.h +++ b/tests/at-spi2-atk/atk_test_util.h @@ -20,22 +20,18 @@ * Boston, MA 02110-1301, USA. */ - #ifndef _ATK_TEST_UTIL_H #define _ATK_TEST_UTIL_H -#include <stdio.h> -#include <unistd.h> -#include <sys/time.h> +#include "atk_suite.h" #include <glib.h> +#include <locale.h> #include <stdio.h> #include <stdlib.h> -#include <unistd.h> #include <string.h> +#include <sys/time.h> #include <sys/wait.h> #include <unistd.h> -#include <locale.h> -#include "atk_suite.h" extern pid_t child_pid; diff --git a/tests/at-spi2-atk/atk_test_value.c b/tests/at-spi2-atk/atk_test_value.c index b6fc4224..d592d903 100644 --- a/tests/at-spi2-atk/atk_test_value.c +++ b/tests/at-spi2-atk/atk_test_value.c @@ -18,10 +18,10 @@ * Boston, MA 02110-1301, USA. */ -#include "atk_test_util.h" #include "atk_suite.h" +#include "atk_test_util.h" -#define DATA_FILE TESTS_DATA_DIR"/test-value.xml" +#define DATA_FILE TESTS_DATA_DIR "/test-value.xml" static void atk_test_value_get_value_iface (gpointer fixture, gconstpointer user_data) @@ -118,17 +118,17 @@ void atk_test_value (void) { g_test_add_vtable (ATK_TEST_PATH_VALUE "/atk_test_value_get_value_iface", - 0, NULL, NULL, atk_test_value_get_value_iface, teardown_value_test ); + 0, NULL, NULL, atk_test_value_get_value_iface, teardown_value_test); g_test_add_vtable (ATK_TEST_PATH_VALUE "/atk_test_value_get_minimum_value", - 0, NULL, NULL, atk_test_value_get_minimum_value, teardown_value_test ); + 0, NULL, NULL, atk_test_value_get_minimum_value, teardown_value_test); g_test_add_vtable (ATK_TEST_PATH_VALUE "/atk_test_value_get_current_value", - 0, NULL, NULL, atk_test_value_get_current_value, teardown_value_test ); + 0, NULL, NULL, atk_test_value_get_current_value, teardown_value_test); g_test_add_vtable (ATK_TEST_PATH_VALUE "/atk_test_value_get_maximum_value", - 0, NULL, NULL, atk_test_value_get_maximum_value, teardown_value_test ); + 0, NULL, NULL, atk_test_value_get_maximum_value, teardown_value_test); g_test_add_vtable (ATK_TEST_PATH_VALUE "/atk_test_value_set_current_value", - 0, NULL, NULL, atk_test_value_set_current_value, teardown_value_test ); + 0, NULL, NULL, atk_test_value_set_current_value, teardown_value_test); g_test_add_vtable (ATK_TEST_PATH_VALUE "/atk_test_value_get_minimum_increment", - 0, NULL, NULL, atk_test_value_get_minimum_increment, teardown_value_test ); + 0, NULL, NULL, atk_test_value_get_minimum_increment, teardown_value_test); g_test_add_vtable (ATK_TEST_PATH_VALUE "/atk_test_value_get_text", - 0, NULL, NULL, atk_test_value_get_text, teardown_value_test ); + 0, NULL, NULL, atk_test_value_get_text, teardown_value_test); } diff --git a/tests/at-spi2-atk/dummyatk/my-atk-action.c b/tests/at-spi2-atk/dummyatk/my-atk-action.c index a4fd39fd..40a0abf6 100644 --- a/tests/at-spi2-atk/dummyatk/my-atk-action.c +++ b/tests/at-spi2-atk/dummyatk/my-atk-action.c @@ -20,16 +20,17 @@ * Boston, MA 02110-1301, USA. */ +#include <atk/atk.h> #include <stdio.h> #include <string.h> -#include <atk/atk.h> -#include "my-atk-object.h" #include "my-atk-action.h" +#include "my-atk-object.h" typedef struct _MyAtkActionInfo MyAtkActionInfo; -struct _MyAtkActionInfo { +struct _MyAtkActionInfo +{ gchar *name; gchar *description; gchar *keybinding; @@ -39,19 +40,20 @@ struct _MyAtkActionInfo { static void atk_action_interface_init (AtkActionIface *iface); -struct _MyAtkActionPrivate { +struct _MyAtkActionPrivate +{ GQueue *action_queue; guint action_idle_handler; - GList *action_list; + GList *action_list; GList *children; }; G_DEFINE_TYPE_WITH_CODE (MyAtkAction, my_atk_action, MY_TYPE_ATK_OBJECT, - G_IMPLEMENT_INTERFACE(ATK_TYPE_ACTION, - atk_action_interface_init) - G_ADD_PRIVATE (MyAtkAction)); + G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, + atk_action_interface_init) + G_ADD_PRIVATE (MyAtkAction)); static void my_atk_action_initialize (AtkObject *obj, gpointer data) @@ -105,7 +107,7 @@ _my_atk_action_get_action_info (MyAtkAction *action, gint i) return node_data; } -static const gchar* +static const gchar * my_atk_action_description_get (AtkAction *action, gint i) { MyAtkAction *my_action = NULL; @@ -142,7 +144,7 @@ my_atk_action_description_set (AtkAction *action, gint i, const char *des) return TRUE; } -static const gchar* +static const gchar * my_atk_action_name_get (AtkAction *action, gint i) { MyAtkAction *my_action = NULL; @@ -159,7 +161,7 @@ my_atk_action_name_get (AtkAction *action, gint i) return strdup (info->name); } -static const gchar* +static const gchar * my_atk_action_localized_name_get (AtkAction *action, gint i) { MyAtkAction *my_action = NULL; @@ -205,7 +207,8 @@ my_atk_action_get_keybinding (AtkAction *action, gint i) return strdup (info->keybinding); } -void perform_action (AtkObject *obj) +void +perform_action (AtkObject *obj) { AtkStateSet *state_set1 = atk_object_ref_state_set (obj); atk_state_set_add_state (state_set1, ATK_STATE_ACTIVE); @@ -221,10 +224,11 @@ my_atk_action_do_action (AtkAction *action, gint i) return FALSE; } -guint my_atk_action_add_action (MyAtkAction *action, - const gchar *action_name, - const gchar *action_description, - const gchar *action_keybinding) +guint +my_atk_action_add_action (MyAtkAction *action, + const gchar *action_name, + const gchar *action_description, + const gchar *action_keybinding) { MyAtkActionInfo *info = NULL; MyAtkActionPrivate *priv = NULL; @@ -248,12 +252,12 @@ atk_action_interface_init (AtkActionIface *iface) { g_return_if_fail (iface); - iface->do_action = my_atk_action_do_action; + iface->do_action = my_atk_action_do_action; - iface->get_n_actions = my_atk_action_get_n_actions; - iface->get_description = my_atk_action_description_get; - iface->get_keybinding = my_atk_action_get_keybinding; - iface->get_name = my_atk_action_name_get; - iface->set_description = my_atk_action_description_set; + iface->get_n_actions = my_atk_action_get_n_actions; + iface->get_description = my_atk_action_description_get; + iface->get_keybinding = my_atk_action_get_keybinding; + iface->get_name = my_atk_action_name_get; + iface->set_description = my_atk_action_description_set; iface->get_localized_name = my_atk_action_localized_name_get; } diff --git a/tests/at-spi2-atk/dummyatk/my-atk-action.h b/tests/at-spi2-atk/dummyatk/my-atk-action.h index f16d7b85..9ffdd01f 100644 --- a/tests/at-spi2-atk/dummyatk/my-atk-action.h +++ b/tests/at-spi2-atk/dummyatk/my-atk-action.h @@ -23,33 +23,34 @@ #ifndef MY_ATK_ACTION_H #define MY_ATK_ACTION_H -#include <glib.h> -#include <glib-object.h> #include <atk/atk.h> +#include <glib-object.h> +#include <glib.h> #include "my-atk-object.h" -#define MY_TYPE_ATK_ACTION (my_atk_action_get_type ()) -#define MY_ATK_ACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MY_TYPE_ATK_ACTION, MyAtkAction)) -#define MY_ATK_ACTION_CLASS(vtable) (G_TYPE_CHECK_CLASS_CAST ((vtable), MY_TYPE_ATK_ACTION, MyAtkActionClass)) -#define MY_IS_ATK_ACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MY_TYPE_ATK_ACTION)) +#define MY_TYPE_ATK_ACTION (my_atk_action_get_type ()) +#define MY_ATK_ACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MY_TYPE_ATK_ACTION, MyAtkAction)) +#define MY_ATK_ACTION_CLASS(vtable) (G_TYPE_CHECK_CLASS_CAST ((vtable), MY_TYPE_ATK_ACTION, MyAtkActionClass)) +#define MY_IS_ATK_ACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MY_TYPE_ATK_ACTION)) #define MY_IS_ATK_ACTION_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE ((vtable), MY_TYPE_ATK_ACTION)) -#define MY_ATK_ACTION_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), MY_TYPE_ATK_ACTION, MyAtkActionClass)) +#define MY_ATK_ACTION_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), MY_TYPE_ATK_ACTION, MyAtkActionClass)) typedef struct _MyAtkAction MyAtkAction; typedef struct _MyAtkActionPrivate MyAtkActionPrivate; typedef struct _MyAtkActionClass MyAtkActionClass; -typedef void (* MyAtkActionFunc) (MyAtkAction *action); +typedef void (*MyAtkActionFunc) (MyAtkAction *action); -struct _MyAtkAction { +struct _MyAtkAction +{ MyAtkObject parent; MyAtkActionPrivate *priv; - gint last_performed_action;//this field is changed when action is performed - + gint last_performed_action; // this field is changed when action is performed }; -struct _MyAtkActionClass { +struct _MyAtkActionClass +{ MyAtkObjectClass parent; }; diff --git a/tests/at-spi2-atk/dummyatk/my-atk-component.c b/tests/at-spi2-atk/dummyatk/my-atk-component.c index f7a2cf01..06283695 100644 --- a/tests/at-spi2-atk/dummyatk/my-atk-component.c +++ b/tests/at-spi2-atk/dummyatk/my-atk-component.c @@ -20,11 +20,12 @@ * Boston, MA 02110-1301, USA. */ +#include <atk/atk.h> #include <stdio.h> #include <string.h> -#include <atk/atk.h> #include "my-atk-object.h" + #include "my-atk-component.h" typedef struct _MyAtkComponentInfo MyAtkComponentInfo; @@ -35,7 +36,7 @@ G_DEFINE_TYPE_WITH_CODE (MyAtkComponent, my_atk_component, MY_TYPE_ATK_OBJECT, G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT, - atk_component_interface_init)); + atk_component_interface_init)); void my_atk_component_set_layer (AtkComponent *component, @@ -70,10 +71,10 @@ my_atk_component_set_alpha (AtkComponent *component, static void my_atk_component_get_extents (AtkComponent *component, - gint *width, - gint *height, - gint *x, - gint *y, + gint *width, + gint *height, + gint *x, + gint *y, AtkCoordType coord_type) { g_return_if_fail (MY_IS_ATK_COMPONENT (component)); @@ -87,23 +88,24 @@ my_atk_component_get_extents (AtkComponent *component, static gboolean my_atk_component_set_extents (AtkComponent *component, - gint x, - gint y, - gint width, - gint height, + gint x, + gint y, + gint width, + gint height, AtkCoordType coord_type) { g_return_val_if_fail (MY_IS_ATK_COMPONENT (component), FALSE); MyAtkComponent *self = MY_ATK_COMPONENT (component); - if (self->extent_may_change) { - self->extent.width = width; - self->extent.height = height; - self->extent.x = x; - self->extent.y = y; - return TRUE; - } + if (self->extent_may_change) + { + self->extent.width = width; + self->extent.height = height; + self->extent.x = x; + self->extent.y = y; + return TRUE; + } return FALSE; } @@ -126,26 +128,28 @@ my_atk_component_contains (AtkComponent *component, static AtkObject * my_atk_component_ref_accessible_at_point (AtkComponent *component, - gint x, - gint y, - AtkCoordType coord_type) + gint x, + gint y, + AtkCoordType coord_type) { g_return_val_if_fail (MY_IS_ATK_COMPONENT (component), NULL); - gint count,i; + gint count, i; count = atk_object_get_n_accessible_children (ATK_OBJECT (component)); - for (i = 0; i < count; i++) { - AtkObject *obj; - obj = atk_object_ref_accessible_child (ATK_OBJECT (component), i); - - if (obj != NULL) { - if (atk_component_contains (ATK_COMPONENT (obj), x, y, coord_type)) - return obj; - else - g_object_unref (obj); + for (i = 0; i < count; i++) + { + AtkObject *obj; + obj = atk_object_ref_accessible_child (ATK_OBJECT (component), i); + + if (obj != NULL) + { + if (atk_component_contains (ATK_COMPONENT (obj), x, y, coord_type)) + return obj; + else + g_object_unref (obj); + } } - } return NULL; } @@ -212,7 +216,7 @@ my_atk_component_finalize (GObject *object) } static void -my_atk_component_init(MyAtkComponent *obj) +my_atk_component_init (MyAtkComponent *obj) { obj->extent.x = 0; obj->extent.y = 0; diff --git a/tests/at-spi2-atk/dummyatk/my-atk-component.h b/tests/at-spi2-atk/dummyatk/my-atk-component.h index 2f169cee..722d1f5a 100644 --- a/tests/at-spi2-atk/dummyatk/my-atk-component.h +++ b/tests/at-spi2-atk/dummyatk/my-atk-component.h @@ -20,25 +20,25 @@ * Boston, MA 02110-1301, USA. */ - #ifndef MY_ATK_COMPONENT_H #define MY_ATK_COMPONENT_H #include <atk/atk.h> -#define MY_TYPE_ATK_COMPONENT (my_atk_component_get_type ()) -#define MY_ATK_COMPONENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MY_TYPE_ATK_COMPONENT, MyAtkComponent)) -#define MY_ATK_COMPONENT_CLASS(vtable) (G_TYPE_CHECK_CLASS_CAST ((vtable), MY_TYPE_ATK_COMPONENT, MyAtkComponentClass)) -#define MY_IS_ATK_COMPONENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MY_TYPE_ATK_COMPONENT)) +#define MY_TYPE_ATK_COMPONENT (my_atk_component_get_type ()) +#define MY_ATK_COMPONENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MY_TYPE_ATK_COMPONENT, MyAtkComponent)) +#define MY_ATK_COMPONENT_CLASS(vtable) (G_TYPE_CHECK_CLASS_CAST ((vtable), MY_TYPE_ATK_COMPONENT, MyAtkComponentClass)) +#define MY_IS_ATK_COMPONENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MY_TYPE_ATK_COMPONENT)) #define MY_IS_ATK_COMPONENT_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE ((vtable), MY_TYPE_ATK_COMPONENT)) -#define MY_ATK_COMPONENT_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), MY_TYPE_ATK_COMPONENT, MyAtkComponentClass)) +#define MY_ATK_COMPONENT_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), MY_TYPE_ATK_COMPONENT, MyAtkComponentClass)) typedef struct _MyAtkComponent MyAtkComponent; typedef struct _MyAtkComponentClass MyAtkComponentClass; -typedef void (* MyAtkComponentFunc) (MyAtkComponent *component); +typedef void (*MyAtkComponentFunc) (MyAtkComponent *component); -struct _MyAtkComponent { +struct _MyAtkComponent +{ MyAtkObject parent; AtkRectangle extent; gboolean extent_may_change; @@ -48,7 +48,8 @@ struct _MyAtkComponent { gdouble alpha; }; -struct _MyAtkComponentClass { +struct _MyAtkComponentClass +{ MyAtkObjectClass parent; }; diff --git a/tests/at-spi2-atk/dummyatk/my-atk-document.c b/tests/at-spi2-atk/dummyatk/my-atk-document.c index 3df1610d..d0cf3082 100644 --- a/tests/at-spi2-atk/dummyatk/my-atk-document.c +++ b/tests/at-spi2-atk/dummyatk/my-atk-document.c @@ -20,11 +20,11 @@ * Boston, MA 02110-1301, USA. */ -#include <glib-object.h> #include <atk/atk.h> +#include <glib-object.h> -#include "my-atk-object.h" #include "my-atk-document.h" +#include "my-atk-object.h" static void atk_document_interface_init (AtkDocumentIface *iface); @@ -32,13 +32,13 @@ G_DEFINE_TYPE_WITH_CODE (MyAtkDocument, my_atk_document, MY_TYPE_ATK_OBJECT, G_IMPLEMENT_INTERFACE (ATK_TYPE_DOCUMENT, - atk_document_interface_init)); + atk_document_interface_init)); void my_atk_set_document (AtkDocument *obj, gint page, gint page_num) { - g_return_if_fail (MY_IS_ATK_DOCUMENT(obj)); - MyAtkDocument *self = MY_ATK_DOCUMENT (obj); + g_return_if_fail (MY_IS_ATK_DOCUMENT (obj)); + MyAtkDocument *self = MY_ATK_DOCUMENT (obj); self->pages = page; self->current_page = page_num; @@ -81,13 +81,15 @@ my_atk_document_get_document_attribute_value (AtkDocument *document, const gchar GSList *cur_attr = (GSList *) attr; AtkAttribute *at; - while (cur_attr) { - at = (AtkAttribute *) cur_attr->data; - if (!g_strcmp0 (at->name, value)) { - return at->value; + while (cur_attr) + { + at = (AtkAttribute *) cur_attr->data; + if (!g_strcmp0 (at->name, value)) + { + return at->value; + } + cur_attr = cur_attr->next; } - cur_attr = cur_attr->next; - } return NULL; } @@ -113,13 +115,14 @@ const gchar * my_atk_document_get_document_locale (AtkDocument *document) { - return g_strdup("document_locale"); + return g_strdup ("document_locale"); } static void -atk_document_interface_init(AtkDocumentIface *iface) +atk_document_interface_init (AtkDocumentIface *iface) { - if(!iface) return; + if (!iface) + return; iface->get_document_locale = my_atk_document_get_document_locale; iface->get_document_attributes = my_atk_document_get_document_attributes; @@ -130,23 +133,22 @@ atk_document_interface_init(AtkDocumentIface *iface) } static void -my_atk_document_initialize(AtkObject *obj, gpointer data) +my_atk_document_initialize (AtkObject *obj, gpointer data) { } static void -my_atk_document_finalize(GObject *object) +my_atk_document_finalize (GObject *object) { } static void -my_atk_document_class_init(MyAtkDocumentClass *my_class) +my_atk_document_class_init (MyAtkDocumentClass *my_class) { - AtkObjectClass *atk_class = ATK_OBJECT_CLASS(my_class); - GObjectClass *gobject_class = G_OBJECT_CLASS(my_class); + AtkObjectClass *atk_class = ATK_OBJECT_CLASS (my_class); + GObjectClass *gobject_class = G_OBJECT_CLASS (my_class); gobject_class->finalize = my_atk_document_finalize; atk_class->initialize = my_atk_document_initialize; } - diff --git a/tests/at-spi2-atk/dummyatk/my-atk-document.h b/tests/at-spi2-atk/dummyatk/my-atk-document.h index 90e16a0f..ea94418c 100644 --- a/tests/at-spi2-atk/dummyatk/my-atk-document.h +++ b/tests/at-spi2-atk/dummyatk/my-atk-document.h @@ -23,26 +23,27 @@ #ifndef MY_ATK_DOCUMENT_H #define MY_ATK_DOCUMENT_H -#include <glib.h> -#include <glib-object.h> -#include <atk/atk.h> #include "my-atk-object.h" +#include <atk/atk.h> +#include <glib-object.h> +#include <glib.h> -#define MY_TYPE_ATK_DOCUMENT (my_atk_document_get_type ()) -#define MY_ATK_DOCUMENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MY_TYPE_ATK_DOCUMENT, MyAtkDocument)) -#define MY_ATK_DOCUMENT_CLASS(vdocument) (G_TYPE_CHECK_CLASS_CAST ((vdocument), MY_TYPE_ATK_DOCUMENT, MyAtkDocumentClass)) -#define MY_IS_ATK_DOCUMENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MY_TYPE_ATK_DOCUMENT)) +#define MY_TYPE_ATK_DOCUMENT (my_atk_document_get_type ()) +#define MY_ATK_DOCUMENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MY_TYPE_ATK_DOCUMENT, MyAtkDocument)) +#define MY_ATK_DOCUMENT_CLASS(vdocument) (G_TYPE_CHECK_CLASS_CAST ((vdocument), MY_TYPE_ATK_DOCUMENT, MyAtkDocumentClass)) +#define MY_IS_ATK_DOCUMENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MY_TYPE_ATK_DOCUMENT)) #define MY_IS_ATK_DOCUMENT_CLASS(vdocument) (G_TYPE_CHECK_CLASS_TYPE ((vdocument), MY_TYPE_ATK_DOCUMENT)) -#define MY_ATK_DOCUMENT_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), MY_TYPE_ATK_DOCUMENT, MyAtkDocumentClass)) +#define MY_ATK_DOCUMENT_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), MY_TYPE_ATK_DOCUMENT, MyAtkDocumentClass)) // default string values -#define DEF_LOCALE_TEXT "en-US" -#define DEF_TYPE_TEXT "default type" +#define DEF_LOCALE_TEXT "en-US" +#define DEF_TYPE_TEXT "default type" typedef struct _MyAtkDocument MyAtkDocument; typedef struct _MyAtkDocumentClass MyAtkDocumentClass; -struct _MyAtkDocument { +struct _MyAtkDocument +{ MyAtkObject parent; gboolean disposed; gchar *locale; @@ -52,7 +53,8 @@ struct _MyAtkDocument { AtkAttributeSet *attributes; }; -struct _MyAtkDocumentClass { +struct _MyAtkDocumentClass +{ MyAtkObjectClass parent; }; diff --git a/tests/at-spi2-atk/dummyatk/my-atk-editable-text.c b/tests/at-spi2-atk/dummyatk/my-atk-editable-text.c index ee376ae3..b013a3ea 100644 --- a/tests/at-spi2-atk/dummyatk/my-atk-editable-text.c +++ b/tests/at-spi2-atk/dummyatk/my-atk-editable-text.c @@ -20,13 +20,13 @@ * Boston, MA 02110-1301, USA. */ +#include <atk/atk.h> +#include <glib-object.h> #include <stdio.h> #include <string.h> -#include <glib-object.h> -#include <atk/atk.h> -#include "my-atk-object.h" #include "my-atk-editable-text.h" +#include "my-atk-object.h" typedef struct _MyAtkEditableTextInfo MyAtkEditableTextInfo; @@ -36,7 +36,7 @@ G_DEFINE_TYPE_WITH_CODE (MyAtkEditableText, my_atk_editable_text, MY_TYPE_ATK_OBJECT, G_IMPLEMENT_INTERFACE (ATK_TYPE_EDITABLE_TEXT, - atk_editable_text_interface_init)); + atk_editable_text_interface_init)); guint my_atk_set_editable_text (AtkEditableText *editable_text, const gchar *text) @@ -53,60 +53,60 @@ my_atk_editable_text_init (MyAtkEditableText *obj) } static gboolean -my_atk_set_editable_text_set_run_attributes (AtkEditableText *text, - AtkAttributeSet *attrib_set, - gint start_offset, - gint end_offset) +my_atk_set_editable_text_set_run_attributes (AtkEditableText *text, + AtkAttributeSet *attrib_set, + gint start_offset, + gint end_offset) { return FALSE; } static void -my_atk_set_editable_text_set_text_contents (AtkEditableText *text, - const gchar *string) +my_atk_set_editable_text_set_text_contents (AtkEditableText *text, + const gchar *string) { } static void -my_atk_set_editable_text_insert_text (AtkEditableText *text, - const gchar *string, - gint length, - gint *position) +my_atk_set_editable_text_insert_text (AtkEditableText *text, + const gchar *string, + gint length, + gint *position) { } static void -my_atk_set_editable_text_copy_text (AtkEditableText *text, - gint start_pos, - gint end_pos) +my_atk_set_editable_text_copy_text (AtkEditableText *text, + gint start_pos, + gint end_pos) { } static void -my_atk_set_editable_text_cut_text (AtkEditableText *text, - gint start_pos, - gint end_pos) +my_atk_set_editable_text_cut_text (AtkEditableText *text, + gint start_pos, + gint end_pos) { } static void -my_atk_set_editable_text_delete_text (AtkEditableText *text, - gint start_pos, - gint end_pos) +my_atk_set_editable_text_delete_text (AtkEditableText *text, + gint start_pos, + gint end_pos) { } static void -my_atk_set_editable_text_paste_text (AtkEditableText *text, - gint position) +my_atk_set_editable_text_paste_text (AtkEditableText *text, + gint position) { } - static void atk_editable_text_interface_init (AtkEditableTextIface *iface) { - if (!iface) return; + if (!iface) + return; iface->set_run_attributes = my_atk_set_editable_text_set_run_attributes; iface->set_text_contents = my_atk_set_editable_text_set_text_contents; iface->insert_text = my_atk_set_editable_text_insert_text; diff --git a/tests/at-spi2-atk/dummyatk/my-atk-editable-text.h b/tests/at-spi2-atk/dummyatk/my-atk-editable-text.h index 45b7f82d..853a5313 100644 --- a/tests/at-spi2-atk/dummyatk/my-atk-editable-text.h +++ b/tests/at-spi2-atk/dummyatk/my-atk-editable-text.h @@ -23,30 +23,32 @@ #ifndef MY_ATK_EDITABLE_TEXT_H_ #define MY_ATK_EDITABLE_TEXT_H_ -#include <glib.h> -#include <glib-object.h> #include <atk/atk.h> +#include <glib-object.h> +#include <glib.h> #include "my-atk-object.h" -#define MY_TYPE_ATK_EDITABLE_TEXT (my_atk_editable_text_get_type ()) -#define MY_ATK_EDITABLE_TEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MY_TYPE_ATK_EDITABLE_TEXT, MyAtkEditableText)) -#define MY_ATK_EDITABLE_TEXT_CLASS(vtable) (G_TYPE_CHECK_CLASS_CAST ((vtable), MY_TYPE_ATK_EDITABLE_TEXT, MyAtkEditableTextClass)) -#define MY_IS_ATK_EDITABLE_TEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MY_TYPE_ATK_EDITABLE_TEXT)) +#define MY_TYPE_ATK_EDITABLE_TEXT (my_atk_editable_text_get_type ()) +#define MY_ATK_EDITABLE_TEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MY_TYPE_ATK_EDITABLE_TEXT, MyAtkEditableText)) +#define MY_ATK_EDITABLE_TEXT_CLASS(vtable) (G_TYPE_CHECK_CLASS_CAST ((vtable), MY_TYPE_ATK_EDITABLE_TEXT, MyAtkEditableTextClass)) +#define MY_IS_ATK_EDITABLE_TEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MY_TYPE_ATK_EDITABLE_TEXT)) #define MY_IS_ATK_EDITABLE_TEXT_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE ((vtable), MY_TYPE_ATK_EDITABLE_TEXT)) -#define MY_ATK_EDITABLE_TEXT_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), MY_TYPE_ATK_EDITABLE_TEXT, MyAtkEditableTextClass)) +#define MY_ATK_EDITABLE_TEXT_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), MY_TYPE_ATK_EDITABLE_TEXT, MyAtkEditableTextClass)) typedef struct _MyAtkEditableText MyAtkEditableText; typedef struct _MyAtkEditableTextClass MyAtkEditableTextClass; -typedef void (* MyAtkEditableTextFunc) (MyAtkEditableText *editable_text); +typedef void (*MyAtkEditableTextFunc) (MyAtkEditableText *editable_text); -struct _MyAtkEditableText { +struct _MyAtkEditableText +{ MyAtkObject parent; gchar *text; }; -struct _MyAtkEditableTextClass { +struct _MyAtkEditableTextClass +{ MyAtkObjectClass parent; }; diff --git a/tests/at-spi2-atk/dummyatk/my-atk-hyperlink.c b/tests/at-spi2-atk/dummyatk/my-atk-hyperlink.c index b8a35f10..0e7b6ac4 100644 --- a/tests/at-spi2-atk/dummyatk/my-atk-hyperlink.c +++ b/tests/at-spi2-atk/dummyatk/my-atk-hyperlink.c @@ -18,13 +18,13 @@ * Boston, MA 02110-1301, USA. */ -#include <glib.h> -#include <string.h> #include <atk/atk.h> +#include <glib.h> #include <stdio.h> +#include <string.h> -#include "my-atk-object.h" #include "my-atk-hyperlink.h" +#include "my-atk-object.h" #include "my-atk-text.h" typedef struct _MyAtkHyperlinkInfo MyAtkHyperlinkInfo; @@ -52,7 +52,7 @@ new_MyAtkHyperlink (void) return g_object_new (MY_TYPE_ATK_HYPERLINK, NULL); } -static gchar* +static gchar * my_atk_hyperlink_get_uri (AtkHyperlink *obj, gint i) { MyAtkHyperlink *self = MY_ATK_HYPERLINK (obj); @@ -144,7 +144,7 @@ my_atk_hyperlink_link_activated (AtkHyperlink *obj) static void my_atk_hyperlink_init (MyAtkHyperlink *self) { - self->uri =NULL; + self->uri = NULL; self->start = -1; self->end = -1; self->state = FALSE; @@ -157,17 +157,18 @@ my_atk_hyperlink_set_property (GObject *obj, const GValue *value, GParamSpec *spec) { - switch (id) { - case 1: - break; - case 2: - break; - case 3: - break; - default: - //G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, id, pspec); - break; - } + switch (id) + { + case 1: + break; + case 2: + break; + case 3: + break; + default: + // G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, id, pspec); + break; + } } static void @@ -188,22 +189,21 @@ my_atk_hyperlink_class_init (MyAtkHyperlinkClass *my_class) { GObjectClass *gobject_class = G_OBJECT_CLASS (my_class); AtkHyperlinkClass *iface = ATK_HYPERLINK_CLASS (my_class); - const gchar *inst_tab[] = {"accessible-name", "accessible-description", "accessible-role", NULL}; + const gchar *inst_tab[] = { "accessible-name", "accessible-description", "accessible-role", NULL }; gobject_class->finalize = my_atk_hyperlink_class_finalize; gobject_class->set_property = my_atk_hyperlink_set_property; gobject_class->get_property = my_atk_hyperlink_get_property; gint i; - for (i = 0; inst_tab[i] != NULL ; i++) + for (i = 0; inst_tab[i] != NULL; i++) g_object_class_install_property (gobject_class, - i+1, + i + 1, g_param_spec_string (inst_tab[i], - inst_tab[i], - inst_tab[i], - NULL, - G_PARAM_READWRITE) - ); + inst_tab[i], + inst_tab[i], + NULL, + G_PARAM_READWRITE)); iface->get_uri = my_atk_hyperlink_get_uri; iface->get_object = my_atk_hyperlink_get_object; diff --git a/tests/at-spi2-atk/dummyatk/my-atk-hyperlink.h b/tests/at-spi2-atk/dummyatk/my-atk-hyperlink.h index 8bdbae5c..9886b584 100644 --- a/tests/at-spi2-atk/dummyatk/my-atk-hyperlink.h +++ b/tests/at-spi2-atk/dummyatk/my-atk-hyperlink.h @@ -21,23 +21,24 @@ #ifndef MY_ATK_HYPERLINK_H_ #define MY_ATK_HYPERLINK_H_ -#include <glib.h> -#include <glib-object.h> #include <atk/atk.h> +#include <glib-object.h> +#include <glib.h> #include "my-atk-object.h" -#define MY_TYPE_ATK_HYPERLINK (my_atk_hyperlink_get_type ()) -#define MY_ATK_HYPERLINK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MY_TYPE_ATK_HYPERLINK, MyAtkHyperlink)) -#define MY_ATK_HYPERLINK_CLASS(vtable) (G_TYPE_CHECK_CLASS_CAST ((vtable), MY_TYPE_ATK_HYPERLINK, MyAtkHyperlinkClass)) -#define MY_IS_ATK_HYPERLINK(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MY_TYPE_ATK_HYPERLINK)) +#define MY_TYPE_ATK_HYPERLINK (my_atk_hyperlink_get_type ()) +#define MY_ATK_HYPERLINK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MY_TYPE_ATK_HYPERLINK, MyAtkHyperlink)) +#define MY_ATK_HYPERLINK_CLASS(vtable) (G_TYPE_CHECK_CLASS_CAST ((vtable), MY_TYPE_ATK_HYPERLINK, MyAtkHyperlinkClass)) +#define MY_IS_ATK_HYPERLINK(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MY_TYPE_ATK_HYPERLINK)) #define MY_IS_ATK_HYPERLINK_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE ((vtable), MY_TYPE_ATK_HYPERLINK)) -#define MY_ATK_HYPERLINK_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), MY_TYPE_ATK_HYPERLINK, MyAtkHyperlinkClass)) +#define MY_ATK_HYPERLINK_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), MY_TYPE_ATK_HYPERLINK, MyAtkHyperlinkClass)) typedef struct _MyAtkHyperlink MyAtkHyperlink; typedef struct _MyAtkHyperlinkClass MyAtkHyperlinkClass; -struct _MyAtkHyperlink { +struct _MyAtkHyperlink +{ MyAtkObject parent; gchar *uri; gint start; @@ -46,13 +47,14 @@ struct _MyAtkHyperlink { gboolean selected; }; -struct _MyAtkHyperlinkClass { +struct _MyAtkHyperlinkClass +{ MyAtkObjectClass parent; }; GType my_atk_hyperlink_get_type (void); -MyAtkHyperlink * new_MyAtkHyperlink (void); +MyAtkHyperlink *new_MyAtkHyperlink (void); gint my_atk_set_hyperlink (AtkHyperlink *obj, const gchar *uri, gint start, gint end); diff --git a/tests/at-spi2-atk/dummyatk/my-atk-hypertext.c b/tests/at-spi2-atk/dummyatk/my-atk-hypertext.c index 4f350227..11b6545b 100644 --- a/tests/at-spi2-atk/dummyatk/my-atk-hypertext.c +++ b/tests/at-spi2-atk/dummyatk/my-atk-hypertext.c @@ -18,14 +18,14 @@ * Boston, MA 02110-1301, USA. */ -#include <glib.h> -#include <string.h> #include <atk/atk.h> +#include <glib.h> #include <stdio.h> +#include <string.h> -#include "my-atk-object.h" -#include "my-atk-hypertext.h" #include "my-atk-hyperlink.h" +#include "my-atk-hypertext.h" +#include "my-atk-object.h" typedef struct _MyAtkHypertextInfo MyAtkHypertextInfo; @@ -36,7 +36,7 @@ G_DEFINE_TYPE_WITH_CODE (MyAtkHypertext, my_atk_hypertext, MY_TYPE_ATK_OBJECT, G_IMPLEMENT_INTERFACE (ATK_TYPE_HYPERTEXT, - atk_hypertext_interface_init)); + atk_hypertext_interface_init)); gint my_atk_set_hypertext (AtkHypertext *obj, const gchar *text) @@ -44,7 +44,7 @@ my_atk_set_hypertext (AtkHypertext *obj, const gchar *text) MyAtkHypertext *self = MY_ATK_HYPERTEXT (obj); MyAtkHyperlink *link; gchar *ptr; - const gchar *fstr= "href="; + const gchar *fstr = "href="; gint len = strlen (fstr); gint text_len = strlen (text); gint index = 0; @@ -54,27 +54,32 @@ my_atk_set_hypertext (AtkHypertext *obj, const gchar *text) if (text_len < len) return -1; - while (text) { - ptr = g_strstr_len (text + index, text_len - index, fstr); - index = ptr - text + len; - if (ptr) { - if (text_len < index || index < len) + while (text) + { + ptr = g_strstr_len (text + index, text_len - index, fstr); + index = ptr - text + len; + if (ptr) + { + if (text_len < index || index < len) + break; + if (text[index] == '\'') + { + start_offset = index + 1; + while (++index < text_len && text[index] != '\'') + ; + if (text[index] != '\'') + break; + link = new_MyAtkHyperlink (); + my_atk_set_hyperlink (ATK_HYPERLINK (link), + g_strndup (text + start_offset, index - start_offset), + start_offset, + index); + g_ptr_array_add (self->array, link); + } + } + else break; - if (text[index] == '\'') { - start_offset = index + 1; - while (++index < text_len && text[index] != '\''); - if (text[index] != '\'') - break; - link = new_MyAtkHyperlink (); - my_atk_set_hyperlink (ATK_HYPERLINK (link), - g_strndup (text + start_offset, index - start_offset), - start_offset, - index); - g_ptr_array_add (self->array, link); - } - } else - break; - } + } return self->array->len > 0 ? 0 : -1; } @@ -85,7 +90,6 @@ my_atk_hypertext_get_n_links (AtkHypertext *obj) MyAtkHypertext *self = MY_ATK_HYPERTEXT (obj); g_return_val_if_fail (MY_IS_ATK_HYPERTEXT (obj), -1); return self->array->len; - } static AtkHyperlink * @@ -107,11 +111,12 @@ my_atk_hypertext_get_link_index (AtkHypertext *obj, gint char_index) MyAtkHyperlink *link; g_return_val_if_fail (MY_IS_ATK_HYPERTEXT (obj), -1); - for (i = 0; i < self->array->len; i++) { - link = g_ptr_array_index (self->array, i); - if (link->start <= char_index && char_index <= link->end) - return i; - } + for (i = 0; i < self->array->len; i++) + { + link = g_ptr_array_index (self->array, i); + if (link->start <= char_index && char_index <= link->end) + return i; + } return -1; } @@ -130,7 +135,8 @@ GDestroyNotifyGOBJptrArray (gpointer data) static void atk_hypertext_interface_init (AtkHypertextIface *iface) { - if (!iface) return; + if (!iface) + return; iface->get_n_links = my_atk_hypertext_get_n_links; iface->get_link = my_atk_hypertext_get_link; iface->get_link_index = my_atk_hypertext_get_link_index; @@ -154,10 +160,10 @@ my_atk_hypertext_class_finalize (GObject *obj) } static void -my_atk_hypertext_class_init(MyAtkHypertextClass *my_class) +my_atk_hypertext_class_init (MyAtkHypertextClass *my_class) { - AtkObjectClass *atk_class = ATK_OBJECT_CLASS(my_class); - GObjectClass *gobject_class = G_OBJECT_CLASS(my_class); + AtkObjectClass *atk_class = ATK_OBJECT_CLASS (my_class); + GObjectClass *gobject_class = G_OBJECT_CLASS (my_class); gobject_class->finalize = my_atk_hypertext_class_finalize; diff --git a/tests/at-spi2-atk/dummyatk/my-atk-hypertext.h b/tests/at-spi2-atk/dummyatk/my-atk-hypertext.h index 5a00a6fa..e71d8610 100644 --- a/tests/at-spi2-atk/dummyatk/my-atk-hypertext.h +++ b/tests/at-spi2-atk/dummyatk/my-atk-hypertext.h @@ -21,27 +21,29 @@ #ifndef MY_ATK_HYPERTEXT_H_ #define MY_ATK_HYPERTEXT_H_ -#include <glib.h> -#include <glib-object.h> #include <atk/atk.h> +#include <glib-object.h> +#include <glib.h> #include "my-atk-object.h" -#define MY_TYPE_ATK_HYPERTEXT (my_atk_hypertext_get_type ()) -#define MY_ATK_HYPERTEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MY_TYPE_ATK_HYPERTEXT, MyAtkHypertext)) -#define MY_ATK_HYPERTEXT_CLASS(vtable) (G_TYPE_CHECK_CLASS_CAST ((vtable), MY_TYPE_ATK_HYPERTEXT, MyAtkHypertextClass)) -#define MY_IS_ATK_HYPERTEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MY_TYPE_ATK_HYPERTEXT)) +#define MY_TYPE_ATK_HYPERTEXT (my_atk_hypertext_get_type ()) +#define MY_ATK_HYPERTEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MY_TYPE_ATK_HYPERTEXT, MyAtkHypertext)) +#define MY_ATK_HYPERTEXT_CLASS(vtable) (G_TYPE_CHECK_CLASS_CAST ((vtable), MY_TYPE_ATK_HYPERTEXT, MyAtkHypertextClass)) +#define MY_IS_ATK_HYPERTEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MY_TYPE_ATK_HYPERTEXT)) #define MY_IS_ATK_HYPERTEXT_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE ((vtable), MY_TYPE_ATK_HYPERTEXT)) -#define MY_ATK_HYPERTEXT_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), MY_TYPE_ATK_HYPERTEXT, MyAtkHypertextClass)) +#define MY_ATK_HYPERTEXT_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), MY_TYPE_ATK_HYPERTEXT, MyAtkHypertextClass)) typedef struct _MyAtkHypertext MyAtkHypertext; typedef struct _MyAtkHypertextClass MyAtkHypertextClass; -struct _MyAtkHypertext { +struct _MyAtkHypertext +{ MyAtkObject parent; GPtrArray *array; }; -struct _MyAtkHypertextClass { +struct _MyAtkHypertextClass +{ MyAtkObjectClass parent; }; diff --git a/tests/at-spi2-atk/dummyatk/my-atk-image.c b/tests/at-spi2-atk/dummyatk/my-atk-image.c index 09b71913..1a54c1d9 100644 --- a/tests/at-spi2-atk/dummyatk/my-atk-image.c +++ b/tests/at-spi2-atk/dummyatk/my-atk-image.c @@ -20,13 +20,12 @@ * Boston, MA 02110-1301, USA. */ - +#include <atk/atk.h> #include <stdio.h> #include <string.h> -#include <atk/atk.h> -#include "my-atk-object.h" #include "my-atk-image.h" +#include "my-atk-object.h" typedef struct _MyAtkImageInfo MyAtkImageInfo; @@ -36,7 +35,7 @@ G_DEFINE_TYPE_WITH_CODE (MyAtkImage, my_atk_image, MY_TYPE_ATK_OBJECT, G_IMPLEMENT_INTERFACE (ATK_TYPE_IMAGE, - atk_image_interface_init)); + atk_image_interface_init)); guint my_atk_set_image (AtkImage *image, @@ -73,7 +72,8 @@ my_atk_image_init (MyAtkImage *obj) self->locale = NULL; } -void my_atk_image_get_image_position (AtkImage *obj, gint *x, gint *y, AtkCoordType coord_type) +void +my_atk_image_get_image_position (AtkImage *obj, gint *x, gint *y, AtkCoordType coord_type) { g_return_if_fail (MY_IS_ATK_IMAGE (obj)); @@ -82,7 +82,7 @@ void my_atk_image_get_image_position (AtkImage *obj, gint *x, gint *y, AtkCoordT *y = self->y; } -const gchar* +const gchar * my_atk_image_get_image_description (AtkImage *obj) { g_return_val_if_fail (MY_IS_ATK_IMAGE (obj), NULL); @@ -92,7 +92,8 @@ my_atk_image_get_image_description (AtkImage *obj) return g_strdup (self->description); } -void my_atk_image_get_image_size (AtkImage *obj, gint *width, gint *height) +void +my_atk_image_get_image_size (AtkImage *obj, gint *width, gint *height) { g_return_if_fail (MY_IS_ATK_IMAGE (obj)); @@ -102,7 +103,7 @@ void my_atk_image_get_image_size (AtkImage *obj, gint *width, gint *height) } gboolean -my_atk_image_set_image_description (AtkImage *obj, const gchar * desc) +my_atk_image_set_image_description (AtkImage *obj, const gchar *desc) { g_return_val_if_fail (MY_IS_ATK_IMAGE (obj), FALSE); @@ -114,7 +115,7 @@ my_atk_image_set_image_description (AtkImage *obj, const gchar * desc) return TRUE; } -const gchar* +const gchar * my_atk_image_get_image_locale (AtkImage *obj) { g_return_val_if_fail (MY_IS_ATK_IMAGE (obj), NULL); @@ -127,7 +128,8 @@ my_atk_image_get_image_locale (AtkImage *obj) static void atk_image_interface_init (AtkImageIface *iface) { - if (!iface) return; + if (!iface) + return; iface->get_image_position = my_atk_image_get_image_position; iface->set_image_description = my_atk_image_set_image_description; iface->get_image_description = my_atk_image_get_image_description; diff --git a/tests/at-spi2-atk/dummyatk/my-atk-image.h b/tests/at-spi2-atk/dummyatk/my-atk-image.h index 29802159..38b4049a 100644 --- a/tests/at-spi2-atk/dummyatk/my-atk-image.h +++ b/tests/at-spi2-atk/dummyatk/my-atk-image.h @@ -23,25 +23,26 @@ #ifndef MY_ATK_IMAGE_H_ #define MY_ATK_IMAGE_H_ -#include <glib.h> -#include <glib-object.h> #include <atk/atk.h> +#include <glib-object.h> +#include <glib.h> #include "my-atk-object.h" -#define MY_TYPE_ATK_IMAGE (my_atk_image_get_type ()) -#define MY_ATK_IMAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MY_TYPE_ATK_IMAGE, MyAtkImage)) -#define MY_ATK_IMAGE_CLASS(vtable) (G_TYPE_CHECK_CLASS_CAST ((vtable), MY_TYPE_ATK_IMAGE, MyAtkImageClass)) -#define MY_IS_ATK_IMAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MY_TYPE_ATK_IMAGE)) +#define MY_TYPE_ATK_IMAGE (my_atk_image_get_type ()) +#define MY_ATK_IMAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MY_TYPE_ATK_IMAGE, MyAtkImage)) +#define MY_ATK_IMAGE_CLASS(vtable) (G_TYPE_CHECK_CLASS_CAST ((vtable), MY_TYPE_ATK_IMAGE, MyAtkImageClass)) +#define MY_IS_ATK_IMAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MY_TYPE_ATK_IMAGE)) #define MY_IS_ATK_IMAGE_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE ((vtable), MY_TYPE_ATK_IMAGE)) -#define MY_ATK_IMAGE_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), MY_TYPE_ATK_IMAGE, MyAtkImageClass)) +#define MY_ATK_IMAGE_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), MY_TYPE_ATK_IMAGE, MyAtkImageClass)) typedef struct _MyAtkImage MyAtkImage; typedef struct _MyAtkImageClass MyAtkImageClass; -typedef void (* MyAtkImageFunc) (MyAtkImage *image); +typedef void (*MyAtkImageFunc) (MyAtkImage *image); -struct _MyAtkImage { +struct _MyAtkImage +{ MyAtkObject parent; gchar *description; gint x; @@ -51,7 +52,8 @@ struct _MyAtkImage { gchar *locale; }; -struct _MyAtkImageClass { +struct _MyAtkImageClass +{ MyAtkObjectClass parent; }; diff --git a/tests/at-spi2-atk/dummyatk/my-atk-object.c b/tests/at-spi2-atk/dummyatk/my-atk-object.c index 70950456..72bfc309 100644 --- a/tests/at-spi2-atk/dummyatk/my-atk-object.c +++ b/tests/at-spi2-atk/dummyatk/my-atk-object.c @@ -20,8 +20,8 @@ * Boston, MA 02110-1301, USA. */ -#include <stdio.h> #include <atk/atk.h> +#include <stdio.h> #include "my-atk-object.h" @@ -31,8 +31,9 @@ G_DEFINE_TYPE (MyAtkObject, my_atk_object, ATK_TYPE_OBJECT); -void my_atk_object_add_child (MyAtkObject* parent, - MyAtkObject* child) +void +my_atk_object_add_child (MyAtkObject *parent, + MyAtkObject *child) { g_ptr_array_add (parent->children, child); g_object_ref_sink (child); @@ -44,20 +45,23 @@ void my_atk_object_add_child (MyAtkObject* parent, child); } -void my_atk_object_remove_child (MyAtkObject* parent, - MyAtkObject* child) +void +my_atk_object_remove_child (MyAtkObject *parent, + MyAtkObject *child) { gint i; - for (i = parent->children->len - 1; i >= 0; i--) { - if (g_ptr_array_index (parent->children, i) == child) - break; - } + for (i = parent->children->len - 1; i >= 0; i--) + { + if (g_ptr_array_index (parent->children, i) == child) + break; + } g_return_if_fail (i < 0); g_ptr_array_remove_index (parent->children, i); g_signal_emit_by_name (parent, "children-changed::remove", i, child); } -static void my_atk_object_set_parent(AtkObject *accessible, AtkObject *parent) +static void +my_atk_object_set_parent (AtkObject *accessible, AtkObject *parent) { MyAtkObject *self = MY_ATK_OBJECT (accessible); AtkObject *parent_old = atk_object_get_parent (accessible); @@ -72,42 +76,48 @@ static void my_atk_object_set_parent(AtkObject *accessible, AtkObject *parent) my_atk_object_remove_child (MY_ATK_OBJECT (parent_old), self); } -static gint my_atk_object_get_n_children (AtkObject *accessible) +static gint +my_atk_object_get_n_children (AtkObject *accessible) { MyAtkObject *self = MY_ATK_OBJECT (accessible); return self->children->len; } -static AtkObject* my_atk_object_ref_child (AtkObject *accessible, gint i) +static AtkObject * +my_atk_object_ref_child (AtkObject *accessible, gint i) { MyAtkObject *self = MY_ATK_OBJECT (accessible); g_return_val_if_fail (i >= 0 || i <= self->children->len, NULL); - AtkObject* child = ATK_OBJECT (g_ptr_array_index (self->children, i)); + AtkObject *child = ATK_OBJECT (g_ptr_array_index (self->children, i)); return (child == NULL) ? NULL : g_object_ref (child); } -static gint my_atk_object_get_index_in_parent (AtkObject *accessible) +static gint +my_atk_object_get_index_in_parent (AtkObject *accessible) { AtkObject *parent = atk_object_get_parent (accessible); - if (parent == NULL) return -1; /*root object so no parent*/ + if (parent == NULL) + return -1; /*root object so no parent*/ MyAtkObject *parent_my = MY_ATK_OBJECT (parent); int i = parent_my->children->len; - for (; i>=0; i--) { - if (g_ptr_array_index (parent_my->children,i) == accessible) - break; - } + for (; i >= 0; i--) + { + if (g_ptr_array_index (parent_my->children, i) == accessible) + break; + } - g_return_val_if_fail (i>=0, -1); + g_return_val_if_fail (i >= 0, -1); return i; } -static AtkRelationSet *my_atk_object_ref_relation_set (AtkObject* accessible) +static AtkRelationSet * +my_atk_object_ref_relation_set (AtkObject *accessible) { MyAtkObject *obj = MY_ATK_OBJECT (accessible); if (obj->relation_set == NULL) @@ -115,7 +125,8 @@ static AtkRelationSet *my_atk_object_ref_relation_set (AtkObject* accessible) return g_object_ref (ATK_RELATION_SET (obj->relation_set)); } -static AtkStateSet *my_atk_object_ref_state_set (AtkObject *accessible) +static AtkStateSet * +my_atk_object_ref_state_set (AtkObject *accessible) { MyAtkObject *obj = MY_ATK_OBJECT (accessible); if (obj->state_set == NULL) @@ -123,7 +134,8 @@ static AtkStateSet *my_atk_object_ref_state_set (AtkObject *accessible) return g_object_ref (ATK_STATE_SET (obj->state_set)); } -static AtkAttributeSet *my_atk_object_get_attributes (AtkObject *accessible) +static AtkAttributeSet * +my_atk_object_get_attributes (AtkObject *accessible) { AtkAttributeSet *attributes = NULL; AtkAttribute *attr; @@ -141,12 +153,14 @@ static AtkAttributeSet *my_atk_object_get_attributes (AtkObject *accessible) return attributes; } -static void my_atk_object_init (MyAtkObject *self) +static void +my_atk_object_init (MyAtkObject *self) { self->children = g_ptr_array_new_full (10, g_object_unref); } -static void my_atk_object_class_init (MyAtkObjectClass *my_class) +static void +my_atk_object_class_init (MyAtkObjectClass *my_class) { AtkObjectClass *object_class = ATK_OBJECT_CLASS (my_class); @@ -157,5 +171,4 @@ static void my_atk_object_class_init (MyAtkObjectClass *my_class) object_class->ref_state_set = my_atk_object_ref_state_set; object_class->get_attributes = my_atk_object_get_attributes; object_class->ref_relation_set = my_atk_object_ref_relation_set; - } diff --git a/tests/at-spi2-atk/dummyatk/my-atk-object.h b/tests/at-spi2-atk/dummyatk/my-atk-object.h index da408e0b..0213bcce 100644 --- a/tests/at-spi2-atk/dummyatk/my-atk-object.h +++ b/tests/at-spi2-atk/dummyatk/my-atk-object.h @@ -20,41 +20,42 @@ * Boston, MA 02110-1301, USA. */ - #ifndef MY_ATK_OBJECT_H #define MY_ATK_OBJECT_H #include <atk/atk.h> -#define MY_TYPE_ATK_OBJECT (my_atk_object_get_type ()) -#define MY_ATK_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MY_TYPE_ATK_OBJECT, MyAtkObject)) -#define MY_ATK_OBJECT_CLASS(vtable) (G_TYPE_CHECK_CLASS_CAST ((vtable), MY_TYPE_ATK_OBJECT, MyAtkObjectClass)) -#define MY_IS_ATK_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MY_TYPE_ATK_OBJECT)) +#define MY_TYPE_ATK_OBJECT (my_atk_object_get_type ()) +#define MY_ATK_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MY_TYPE_ATK_OBJECT, MyAtkObject)) +#define MY_ATK_OBJECT_CLASS(vtable) (G_TYPE_CHECK_CLASS_CAST ((vtable), MY_TYPE_ATK_OBJECT, MyAtkObjectClass)) +#define MY_IS_ATK_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MY_TYPE_ATK_OBJECT)) #define MY_IS_ATK_OBJECT_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE ((vtable), MY_TYPE_ATK_OBJECT)) -#define MY_ATK_OBJECT_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), MY_TYPE_ATK_OBJECT, MyAtkObjectClass)) +#define MY_ATK_OBJECT_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), MY_TYPE_ATK_OBJECT, MyAtkObjectClass)) typedef struct _MyAtkObject MyAtkObject; typedef struct _MyAtkObjectClass MyAtkObjectClass; -struct _MyAtkObject { +struct _MyAtkObject +{ AtkObject parent; AtkStateSet *state_set; AtkRelationSet *relation_set; - GPtrArray* children; + GPtrArray *children; gint id; gboolean selected; }; -struct _MyAtkObjectClass { +struct _MyAtkObjectClass +{ AtkObjectClass parent; }; GType my_atk_object_get_type (); -void my_atk_object_add_child (MyAtkObject* parent, - MyAtkObject* child); +void my_atk_object_add_child (MyAtkObject *parent, + MyAtkObject *child); -void my_atk_object_remove_child (MyAtkObject* parent, - MyAtkObject* child); +void my_atk_object_remove_child (MyAtkObject *parent, + MyAtkObject *child); #endif /*MY_ATK_OBJECT_H*/ diff --git a/tests/at-spi2-atk/dummyatk/my-atk-selection.c b/tests/at-spi2-atk/dummyatk/my-atk-selection.c index 18a9eefc..0564a3ee 100644 --- a/tests/at-spi2-atk/dummyatk/my-atk-selection.c +++ b/tests/at-spi2-atk/dummyatk/my-atk-selection.c @@ -20,9 +20,9 @@ * Boston, MA 02110-1301, USA. */ +#include <atk/atk.h> #include <stdio.h> #include <string.h> -#include <atk/atk.h> #include "my-atk-object.h" #include "my-atk-selection.h" @@ -33,7 +33,7 @@ G_DEFINE_TYPE_WITH_CODE (MyAtkSelection, my_atk_selection, MY_TYPE_ATK_OBJECT, G_IMPLEMENT_INTERFACE (ATK_TYPE_SELECTION, - atk_selection_interface_init)); + atk_selection_interface_init)); static void my_atk_selection_init (MyAtkSelection *obj) @@ -43,7 +43,7 @@ my_atk_selection_init (MyAtkSelection *obj) static gboolean my_atk_selection_add_selection (AtkSelection *selection, gint i) { - MyAtkSelection *self = MY_ATK_SELECTION(selection); + MyAtkSelection *self = MY_ATK_SELECTION (selection); if (!self) return FALSE; @@ -56,7 +56,7 @@ my_atk_selection_add_selection (AtkSelection *selection, gint i) static gboolean my_atk_selection_clear_selection (AtkSelection *selection) { - MyAtkSelection *self = MY_ATK_SELECTION(selection); + MyAtkSelection *self = MY_ATK_SELECTION (selection); if (!self) return FALSE; AtkObject *child = NULL; @@ -64,18 +64,19 @@ my_atk_selection_clear_selection (AtkSelection *selection) int i; int childs = atk_object_get_n_accessible_children (ATK_OBJECT (selection)); - for (i=0; i<childs; i++) { - child = atk_object_ref_accessible_child (ATK_OBJECT (selection), i); - states = atk_object_ref_state_set (child); - atk_state_set_remove_state (states, ATK_STATE_SELECTED); - } + for (i = 0; i < childs; i++) + { + child = atk_object_ref_accessible_child (ATK_OBJECT (selection), i); + states = atk_object_ref_state_set (child); + atk_state_set_remove_state (states, ATK_STATE_SELECTED); + } return TRUE; } -static AtkObject* +static AtkObject * my_atk_selection_ref_selection (AtkSelection *selection, gint no) { - MyAtkSelection *self = MY_ATK_SELECTION(selection); + MyAtkSelection *self = MY_ATK_SELECTION (selection); if (!self) return FALSE; AtkObject *child = NULL; @@ -84,12 +85,13 @@ my_atk_selection_ref_selection (AtkSelection *selection, gint no) int i; int childs = atk_object_get_n_accessible_children (ATK_OBJECT (selection)); - for (i=0; i<childs; i++) { - child = atk_object_ref_accessible_child (ATK_OBJECT (selection), i); - states = atk_object_ref_state_set (child); - if (atk_state_set_contains_state (states, ATK_STATE_SELECTED)) - g_array_append_val (array, child); - } + for (i = 0; i < childs; i++) + { + child = atk_object_ref_accessible_child (ATK_OBJECT (selection), i); + states = atk_object_ref_state_set (child); + if (atk_state_set_contains_state (states, ATK_STATE_SELECTED)) + g_array_append_val (array, child); + } return g_array_index (array, AtkObject *, no); } @@ -97,28 +99,28 @@ my_atk_selection_ref_selection (AtkSelection *selection, gint no) static gint my_atk_selection_get_selection_count (AtkSelection *selection) { - MyAtkSelection *self = MY_ATK_SELECTION(selection); + MyAtkSelection *self = MY_ATK_SELECTION (selection); if (!self) return FALSE; AtkObject *child = NULL; AtkStateSet *states = NULL; - int i, ret=0; + int i, ret = 0; int childs = atk_object_get_n_accessible_children (ATK_OBJECT (selection)); - for (i=0; i<childs; i++) { - child = atk_object_ref_accessible_child (ATK_OBJECT (selection), i); - states = atk_object_ref_state_set (child); - if (atk_state_set_contains_state (states, ATK_STATE_SELECTED)) - ret++; - - } + for (i = 0; i < childs; i++) + { + child = atk_object_ref_accessible_child (ATK_OBJECT (selection), i); + states = atk_object_ref_state_set (child); + if (atk_state_set_contains_state (states, ATK_STATE_SELECTED)) + ret++; + } return ret; } static gboolean my_atk_selection_is_child_selected (AtkSelection *selection, gint i) { - MyAtkSelection *self = MY_ATK_SELECTION(selection); + MyAtkSelection *self = MY_ATK_SELECTION (selection); if (!self) return FALSE; AtkObject *child = NULL; @@ -133,7 +135,7 @@ my_atk_selection_is_child_selected (AtkSelection *selection, gint i) static gboolean my_atk_selection_remove_selection (AtkSelection *selection, gint no) { - MyAtkSelection *self = MY_ATK_SELECTION(selection); + MyAtkSelection *self = MY_ATK_SELECTION (selection); AtkObject *child = NULL; AtkStateSet *states = NULL; GArray *array = NULL; @@ -147,12 +149,13 @@ my_atk_selection_remove_selection (AtkSelection *selection, gint no) array = g_array_new (FALSE, FALSE, sizeof (AtkObject *)); childs = atk_object_get_n_accessible_children (ATK_OBJECT (selection)); - for (i=0; i<childs; i++) { - child = atk_object_ref_accessible_child (ATK_OBJECT (selection), i); - states = atk_object_ref_state_set (child); - if (atk_state_set_contains_state (states, ATK_STATE_SELECTED)) - g_array_append_val (array, child); - } + for (i = 0; i < childs; i++) + { + child = atk_object_ref_accessible_child (ATK_OBJECT (selection), i); + states = atk_object_ref_state_set (child); + if (atk_state_set_contains_state (states, ATK_STATE_SELECTED)) + g_array_append_val (array, child); + } g_object_unref (states); o = g_array_index (array, AtkObject *, no); @@ -171,7 +174,7 @@ my_atk_selection_remove_selection (AtkSelection *selection, gint no) static gboolean my_atk_selection_select_all_selection (AtkSelection *selection) { - MyAtkSelection *self = MY_ATK_SELECTION(selection); + MyAtkSelection *self = MY_ATK_SELECTION (selection); AtkObject *child = NULL; AtkStateSet *states = NULL; int i; @@ -181,13 +184,14 @@ my_atk_selection_select_all_selection (AtkSelection *selection) return FALSE; childs = atk_object_get_n_accessible_children (ATK_OBJECT (selection)); - for (i=0; i<childs; i++) { - child = atk_object_ref_accessible_child (ATK_OBJECT (selection), i); - states = atk_object_ref_state_set (child); - atk_state_set_add_state (states, ATK_STATE_SELECTED); - g_object_unref (states); - g_object_unref (child); - } + for (i = 0; i < childs; i++) + { + child = atk_object_ref_accessible_child (ATK_OBJECT (selection), i); + states = atk_object_ref_state_set (child); + atk_state_set_add_state (states, ATK_STATE_SELECTED); + g_object_unref (states); + g_object_unref (child); + } g_object_unref (self); return TRUE; @@ -196,7 +200,8 @@ my_atk_selection_select_all_selection (AtkSelection *selection) static void atk_selection_interface_init (AtkSelectionIface *iface) { - if(!iface) return; + if (!iface) + return; iface->add_selection = my_atk_selection_add_selection; iface->clear_selection = my_atk_selection_clear_selection; @@ -220,8 +225,8 @@ my_atk_selection_finalize (GObject *obj) static void my_atk_selection_class_init (MyAtkSelectionClass *my_class) { - AtkObjectClass *atk_class = ATK_OBJECT_CLASS(my_class); - GObjectClass *gobject_class = G_OBJECT_CLASS(my_class); + AtkObjectClass *atk_class = ATK_OBJECT_CLASS (my_class); + GObjectClass *gobject_class = G_OBJECT_CLASS (my_class); gobject_class->finalize = my_atk_selection_finalize; diff --git a/tests/at-spi2-atk/dummyatk/my-atk-selection.h b/tests/at-spi2-atk/dummyatk/my-atk-selection.h index ee2e04dd..8f85b325 100644 --- a/tests/at-spi2-atk/dummyatk/my-atk-selection.h +++ b/tests/at-spi2-atk/dummyatk/my-atk-selection.h @@ -23,18 +23,18 @@ #ifndef MY_ATK_SELECTION_H #define MY_ATK_SELECTION_H -#include <glib.h> -#include <glib-object.h> #include <atk/atk.h> +#include <glib-object.h> +#include <glib.h> #include "my-atk-object.h" -#define MY_TYPE_ATK_SELECTION (my_atk_selection_get_type ()) -#define MY_ATK_SELECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MY_TYPE_ATK_SELECTION, MyAtkSelection)) -#define MY_ATK_SELECTION_CLASS(vtable) (G_TYPE_CHECK_CLASS_CAST ((vtable), MY_TYPE_ATK_SELECTION, MyAtkSelectionClass)) -#define MY_IS_ATK_SELECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MY_TYPE_ATK_SELECTION)) +#define MY_TYPE_ATK_SELECTION (my_atk_selection_get_type ()) +#define MY_ATK_SELECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MY_TYPE_ATK_SELECTION, MyAtkSelection)) +#define MY_ATK_SELECTION_CLASS(vtable) (G_TYPE_CHECK_CLASS_CAST ((vtable), MY_TYPE_ATK_SELECTION, MyAtkSelectionClass)) +#define MY_IS_ATK_SELECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MY_TYPE_ATK_SELECTION)) #define MY_IS_ATK_SELECTION_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE ((vtable), MY_TYPE_ATK_SELECTION)) -#define MY_ATK_SELECTION_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), MY_TYPE_ATK_SELECTION, MyAtkSelectionClass)) +#define MY_ATK_SELECTION_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), MY_TYPE_ATK_SELECTION, MyAtkSelectionClass)) /* Number of child objects for the MyAtkSelection instance */ #define TEST_SELECTION_NCHILDREN 10 @@ -42,15 +42,17 @@ typedef struct _MyAtkSelection MyAtkSelection; typedef struct _MyAtkSelectionClass MyAtkSelectionClass; -struct _MyAtkSelection { +struct _MyAtkSelection +{ MyAtkObject parent; -// gboolean disposed; + // gboolean disposed; // gboolean multisel_supported; // MyAtkObject* child[TEST_SELECTION_NCHILDREN]; // gboolean is_selected[TEST_SELECTION_NCHILDREN]; }; -struct _MyAtkSelectionClass { +struct _MyAtkSelectionClass +{ MyAtkObjectClass parent; }; @@ -58,4 +60,3 @@ GType my_atk_selection_get_type (void); guint my_atk_selection_set (MyAtkSelection *selection); #endif /*MY_ATK_SELECTION_H*/ - diff --git a/tests/at-spi2-atk/dummyatk/my-atk-table-cell.c b/tests/at-spi2-atk/dummyatk/my-atk-table-cell.c index 03c1217a..7efeb51a 100644 --- a/tests/at-spi2-atk/dummyatk/my-atk-table-cell.c +++ b/tests/at-spi2-atk/dummyatk/my-atk-table-cell.c @@ -18,13 +18,13 @@ * Boston, MA 02110-1301, USA. */ +#include <atk/atk.h> #include <glib.h> #include <string.h> -#include <atk/atk.h> #include "my-atk-object.h" -#include "my-atk-table.h" #include "my-atk-table-cell.h" +#include "my-atk-table.h" typedef struct _MyAtkTableCellInfo MyAtkTableCellInfo; @@ -34,7 +34,7 @@ G_DEFINE_TYPE_WITH_CODE (MyAtkTableCell, my_atk_tablecell, MY_TYPE_ATK_OBJECT, G_IMPLEMENT_INTERFACE (ATK_TYPE_TABLE_CELL, - atk_tablecell_interface_init)); + atk_tablecell_interface_init)); gboolean my_atk_set_table_cell (AtkTableCell *cell, gint x, gint y, gint row_span, gint column_span) @@ -54,7 +54,6 @@ my_atk_set_table_cell (AtkTableCell *cell, gint x, gint y, gint row_span, gint c self->column_span = 1; return TRUE; - } gboolean my_atk_set_tablecell (MyAtkTableCell *self, gpointer value, const gchar *row_desc, MyAtkObject *parent_table, gboolean selected, gint *xy) @@ -99,12 +98,14 @@ my_atk_tablecell_get_column_header_cells (AtkTableCell *obj) AtkObject *child = NULL; GPtrArray *ret = g_ptr_array_new_full (atk_table_get_n_columns ATK_TABLE (tab), g_object_unref); - for (i = 0; i < all_child; i++) { - child = atk_object_ref_accessible_child (ATK_OBJECT (tab), i); - if (atk_object_get_role (child) == ATK_ROLE_TABLE_COLUMN_HEADER) { - g_ptr_array_add (ret, child); + for (i = 0; i < all_child; i++) + { + child = atk_object_ref_accessible_child (ATK_OBJECT (tab), i); + if (atk_object_get_role (child) == ATK_ROLE_TABLE_COLUMN_HEADER) + { + g_ptr_array_add (ret, child); + } } - } return ret; } @@ -126,7 +127,7 @@ my_atk_tablecell_get_row_span (AtkTableCell *obj) } static gboolean -my_atk_tablecell_get_position (AtkTableCell *obj, gint *row , gint *column) +my_atk_tablecell_get_position (AtkTableCell *obj, gint *row, gint *column) { MyAtkTableCell *self = MY_ATK_TABLE_CELL (obj); g_return_val_if_fail (MY_IS_ATK_TABLE_CELL (obj), FALSE); @@ -148,12 +149,14 @@ my_atk_tablecell_get_row_header_cells (AtkTableCell *obj) AtkObject *child = NULL; GPtrArray *ret = g_ptr_array_new_full (atk_table_get_n_columns ATK_TABLE (tab), g_object_unref); - for (i = 0; i < all_child; i++) { - child = atk_object_ref_accessible_child (ATK_OBJECT (tab), i); - if (atk_object_get_role (child) == ATK_ROLE_TABLE_ROW_HEADER) { - g_ptr_array_add (ret, child); + for (i = 0; i < all_child; i++) + { + child = atk_object_ref_accessible_child (ATK_OBJECT (tab), i); + if (atk_object_get_role (child) == ATK_ROLE_TABLE_ROW_HEADER) + { + g_ptr_array_add (ret, child); + } } - } return ret; } @@ -161,7 +164,8 @@ my_atk_tablecell_get_row_header_cells (AtkTableCell *obj) static void atk_tablecell_interface_init (AtkTableCellIface *iface) { - if (!iface) return; + if (!iface) + return; iface->get_column_span = my_atk_tablecell_get_column_span; iface->get_column_header_cells = my_atk_tablecell_get_column_header_cells; iface->get_position = my_atk_tablecell_get_position; diff --git a/tests/at-spi2-atk/dummyatk/my-atk-table-cell.h b/tests/at-spi2-atk/dummyatk/my-atk-table-cell.h index e6c231bd..3d98137a 100644 --- a/tests/at-spi2-atk/dummyatk/my-atk-table-cell.h +++ b/tests/at-spi2-atk/dummyatk/my-atk-table-cell.h @@ -21,22 +21,23 @@ #ifndef MY_ATK_TABLE_CELL_H_ #define MY_ATK_TABLE_CELL_H_ -#include <glib.h> -#include <glib-object.h> #include <atk/atk.h> +#include <glib-object.h> +#include <glib.h> #include "my-atk-object.h" -#define MY_TYPE_ATK_TABLE_CELL (my_atk_tablecell_get_type ()) -#define MY_ATK_TABLE_CELL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MY_TYPE_ATK_TABLE_CELL, MyAtkTableCell)) -#define MY_ATK_TABLE_CELL_CLASS (vtablecell) (G_TYPE_CHECK_CLASS_CAST ((vtablecell), MY_TYPE_ATK_TABLE_CELL, MyAtkTableCellClass)) -#define MY_IS_ATK_TABLE_CELL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MY_TYPE_ATK_TABLE_CELL)) +#define MY_TYPE_ATK_TABLE_CELL (my_atk_tablecell_get_type ()) +#define MY_ATK_TABLE_CELL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MY_TYPE_ATK_TABLE_CELL, MyAtkTableCell)) +#define MY_ATK_TABLE_CELL_CLASS (vtablecell) (G_TYPE_CHECK_CLASS_CAST ((vtablecell), MY_TYPE_ATK_TABLE_CELL, MyAtkTableCellClass)) +#define MY_IS_ATK_TABLE_CELL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MY_TYPE_ATK_TABLE_CELL)) #define MY_IS_ATK_TABLE_CELL_CLASS (vtablecell) (G_TYPE_CHECK_CLASS_TYPE ((vtablecell), MY_TYPE_ATK_TABLE_CELL)) -#define MY_ATK_TABLE_CELL_GET_CLASS (inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), MY_TYPE_ATK_TABLE_CELL, MyAtkTableCellClass)) +#define MY_ATK_TABLE_CELL_GET_CLASS (inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), MY_TYPE_ATK_TABLE_CELL, MyAtkTableCellClass)) typedef struct _MyAtkTableCell MyAtkTableCell; typedef struct _MyAtkTableCellClass MyAtkTableCellClass; -struct _MyAtkTableCell { +struct _MyAtkTableCell +{ MyAtkObject parent; MyAtkObject *parent_table; gpointer value; @@ -50,7 +51,8 @@ struct _MyAtkTableCell { gint xy[2]; }; -struct _MyAtkTableCellClass { +struct _MyAtkTableCellClass +{ MyAtkObjectClass parent; }; diff --git a/tests/at-spi2-atk/dummyatk/my-atk-table.c b/tests/at-spi2-atk/dummyatk/my-atk-table.c index 15f74112..85f1672a 100644 --- a/tests/at-spi2-atk/dummyatk/my-atk-table.c +++ b/tests/at-spi2-atk/dummyatk/my-atk-table.c @@ -18,13 +18,13 @@ * Boston, MA 02110-1301, USA. */ +#include <atk/atk.h> #include <glib.h> #include <string.h> -#include <atk/atk.h> #include "my-atk-object.h" -#include "my-atk-table.h" #include "my-atk-table-cell.h" +#include "my-atk-table.h" typedef struct _MyAtkTableInfo MyAtkTableInfo; @@ -35,8 +35,7 @@ G_DEFINE_TYPE_WITH_CODE (MyAtkTable, my_atk_table, MY_TYPE_ATK_OBJECT, G_IMPLEMENT_INTERFACE (ATK_TYPE_TABLE, - atk_table_interface_init)); - + atk_table_interface_init)); static gint my_atk_table_get_index_at (AtkTable *obj, gint row, gint column) @@ -50,18 +49,22 @@ my_atk_table_get_index_at (AtkTable *obj, gint row, gint column) AtkObject *child = NULL; MyAtkTableCell *cell = NULL; - for (i = 0; i < all_child; i++) { - child = atk_object_ref_accessible_child (ATK_OBJECT (obj), i); - if (atk_object_get_role (child) == ATK_ROLE_TABLE_CELL) { - if (index_first_cell == -1) { - index_first_cell = i; - } - cell = MY_ATK_TABLE_CELL (child); - if (cell->x == column && cell->y == row) { - ret = i-index_first_cell; - } + for (i = 0; i < all_child; i++) + { + child = atk_object_ref_accessible_child (ATK_OBJECT (obj), i); + if (atk_object_get_role (child) == ATK_ROLE_TABLE_CELL) + { + if (index_first_cell == -1) + { + index_first_cell = i; + } + cell = MY_ATK_TABLE_CELL (child); + if (cell->x == column && cell->y == row) + { + ret = i - index_first_cell; + } + } } - } return ret; } @@ -77,12 +80,14 @@ my_atk_table_get_column_at_index (AtkTable *obj, gint index) columns = atk_table_get_n_columns (ATK_TABLE (table)); rows = atk_table_get_n_rows (ATK_TABLE (table)); - for (i = 0; i < rows; i++) { - for (j = 0; j < columns; j++) { - if (index == my_atk_table_get_index_at (obj, i, j)) - return j; + for (i = 0; i < rows; i++) + { + for (j = 0; j < columns; j++) + { + if (index == my_atk_table_get_index_at (obj, i, j)) + return j; + } } - } return -1; } @@ -98,12 +103,14 @@ my_atk_table_get_row_at_index (AtkTable *obj, gint index) columns = atk_table_get_n_columns (ATK_TABLE (table)); rows = atk_table_get_n_rows (ATK_TABLE (table)); - for (i = 0; i < rows; i++) { - for (j = 0; j < columns; j++) { - if (index == my_atk_table_get_index_at (obj, i, j)) - return i; + for (i = 0; i < rows; i++) + { + for (j = 0; j < columns; j++) + { + if (index == my_atk_table_get_index_at (obj, i, j)) + return i; + } } - } return -1; } @@ -113,15 +120,16 @@ my_atk_table_get_n_columns (AtkTable *obj) { MyAtkTable *self = MY_ATK_TABLE (obj); g_return_val_if_fail (MY_IS_ATK_TABLE (obj), -1); - gint i, all_child, ret=0; + gint i, all_child, ret = 0; all_child = MY_ATK_OBJECT (self)->children->len; AtkObject *child = NULL; - for (i = 0; i < all_child; i++) { - child = atk_object_ref_accessible_child (ATK_OBJECT (obj), i); - if (atk_object_get_role (child) == ATK_ROLE_TABLE_COLUMN_HEADER) - ret++; - } + for (i = 0; i < all_child; i++) + { + child = atk_object_ref_accessible_child (ATK_OBJECT (obj), i); + if (atk_object_get_role (child) == ATK_ROLE_TABLE_COLUMN_HEADER) + ret++; + } return ret; } @@ -130,19 +138,20 @@ my_atk_table_get_n_rows (AtkTable *obj) { MyAtkTable *self = MY_ATK_TABLE (obj); g_return_val_if_fail (MY_IS_ATK_TABLE (obj), -1); - gint i, all_child, ret=0; + gint i, all_child, ret = 0; all_child = MY_ATK_OBJECT (self)->children->len; AtkObject *child = NULL; - for (i = 0; i < all_child; i++) { - child = atk_object_ref_accessible_child (ATK_OBJECT (obj), i); - if (atk_object_get_role (child) == ATK_ROLE_TABLE_ROW_HEADER) - ret++; - } + for (i = 0; i < all_child; i++) + { + child = atk_object_ref_accessible_child (ATK_OBJECT (obj), i); + if (atk_object_get_role (child) == ATK_ROLE_TABLE_ROW_HEADER) + ret++; + } return ret; } -static AtkObject* +static AtkObject * my_atk_table_get_caption (AtkTable *obj) { MyAtkTable *self = MY_ATK_TABLE (obj); @@ -153,15 +162,16 @@ my_atk_table_get_caption (AtkTable *obj) all_child = MY_ATK_OBJECT (self)->children->len; AtkObject *child = NULL; - for (i = 0; i < all_child; i++) { - child = atk_object_ref_accessible_child (ATK_OBJECT (obj), i); - if (atk_object_get_role (child) == ATK_ROLE_CAPTION) - caption = child; - } + for (i = 0; i < all_child; i++) + { + child = atk_object_ref_accessible_child (ATK_OBJECT (obj), i); + if (atk_object_get_role (child) == ATK_ROLE_CAPTION) + caption = child; + } return caption ? caption : NULL; } -static AtkObject* +static AtkObject * my_atk_table_ref_at (AtkTable *obj, gint row, gint column) { MyAtkTable *self = MY_ATK_TABLE (obj); @@ -173,14 +183,16 @@ my_atk_table_ref_at (AtkTable *obj, gint row, gint column) AtkObject *child = NULL; MyAtkTableCell *cell = NULL; - for (i = 0; i < all_child; i++) { - child = atk_object_ref_accessible_child (ATK_OBJECT (obj), i); - if (atk_object_get_role (child) == ATK_ROLE_TABLE_CELL) { - cell = MY_ATK_TABLE_CELL (child); - if (cell->x == column && cell->y == row) - ret = ATK_OBJECT (cell); + for (i = 0; i < all_child; i++) + { + child = atk_object_ref_accessible_child (ATK_OBJECT (obj), i); + if (atk_object_get_role (child) == ATK_ROLE_TABLE_CELL) + { + cell = MY_ATK_TABLE_CELL (child); + if (cell->x == column && cell->y == row) + ret = ATK_OBJECT (cell); + } } - } return ret ? ret : NULL; } @@ -190,17 +202,18 @@ my_atk_table_get_row_description (AtkTable *obj, gint index) MyAtkTable *self = MY_ATK_TABLE (obj); g_return_val_if_fail (MY_IS_ATK_TABLE (obj), NULL); gint i, all_child; - GPtrArray *ret = g_ptr_array_new_full ( my_atk_table_get_n_rows (obj), - g_object_unref); + GPtrArray *ret = g_ptr_array_new_full (my_atk_table_get_n_rows (obj), + g_object_unref); all_child = MY_ATK_OBJECT (self)->children->len; AtkObject *child = NULL; - for (i = 0; i < all_child; i++) { - child = atk_object_ref_accessible_child (ATK_OBJECT (obj), i); - if (atk_object_get_role (child) == ATK_ROLE_TABLE_ROW_HEADER) - g_ptr_array_add (ret, child); - } + for (i = 0; i < all_child; i++) + { + child = atk_object_ref_accessible_child (ATK_OBJECT (obj), i); + if (atk_object_get_role (child) == ATK_ROLE_TABLE_ROW_HEADER) + g_ptr_array_add (ret, child); + } child = g_ptr_array_index (ret, index); return g_strdup (atk_object_get_description (child)); @@ -214,14 +227,15 @@ my_atk_table_get_column_description (AtkTable *obj, gint index) gint i, all_child; GPtrArray *ret = g_ptr_array_new_full (my_atk_table_get_n_columns (obj), g_object_unref); - all_child = MY_ATK_OBJECT(self)->children->len; + all_child = MY_ATK_OBJECT (self)->children->len; AtkObject *child = NULL; - for (i = 0; i < all_child; i++) { - child = atk_object_ref_accessible_child (ATK_OBJECT (obj), i); - if (atk_object_get_role (child) == ATK_ROLE_TABLE_COLUMN_HEADER) - g_ptr_array_add (ret, child); - } + for (i = 0; i < all_child; i++) + { + child = atk_object_ref_accessible_child (ATK_OBJECT (obj), i); + if (atk_object_get_role (child) == ATK_ROLE_TABLE_COLUMN_HEADER) + g_ptr_array_add (ret, child); + } child = g_ptr_array_index (ret, index); return g_strdup (atk_object_get_description (child)); @@ -247,7 +261,7 @@ my_atk_table_test_table_get_column_extent_at (AtkTable *obj, gint row, gint col) return self->column_span; } -static AtkObject* +static AtkObject * my_atk_table_get_row_header (AtkTable *obj, gint row) { MyAtkTable *self = MY_ATK_TABLE (obj); @@ -259,17 +273,18 @@ my_atk_table_get_row_header (AtkTable *obj, gint row) AtkObject *child = NULL; AtkObject *c = NULL; - for (i = 0; i < all_child; i++) { - child = atk_object_ref_accessible_child (ATK_OBJECT (obj), i); - if (atk_object_get_role (child) == ATK_ROLE_TABLE_ROW_HEADER) - g_ptr_array_add (ret, child); - } + for (i = 0; i < all_child; i++) + { + child = atk_object_ref_accessible_child (ATK_OBJECT (obj), i); + if (atk_object_get_role (child) == ATK_ROLE_TABLE_ROW_HEADER) + g_ptr_array_add (ret, child); + } c = ATK_OBJECT (g_ptr_array_index (ret, row)); return atk_object_ref_accessible_child (c, 0); } -static AtkObject* +static AtkObject * my_atk_table_get_column_header (AtkTable *obj, gint col) { MyAtkTable *self = MY_ATK_TABLE (obj); @@ -281,11 +296,12 @@ my_atk_table_get_column_header (AtkTable *obj, gint col) AtkObject *child = NULL; AtkObject *c = NULL; - for (i = 0; i < all_child; i++) { - child = atk_object_ref_accessible_child (ATK_OBJECT (obj), i); - if (atk_object_get_role (child) == ATK_ROLE_TABLE_COLUMN_HEADER) - g_ptr_array_add (ret, child); - } + for (i = 0; i < all_child; i++) + { + child = atk_object_ref_accessible_child (ATK_OBJECT (obj), i); + if (atk_object_get_role (child) == ATK_ROLE_TABLE_COLUMN_HEADER) + g_ptr_array_add (ret, child); + } c = g_ptr_array_index (ret, col); return atk_object_ref_accessible_child (c, 0); @@ -303,17 +319,20 @@ my_atk_table_get_selected_rows (AtkTable *obj, gint **selected) GArray *array = g_array_new (FALSE, FALSE, sizeof (gint)); all_child = MY_ATK_OBJECT (self)->children->len; - for (i=0; i<all_child; i++) { - child = atk_object_ref_accessible_child (ATK_OBJECT (obj), i); - if (atk_object_get_role (child) == ATK_ROLE_TABLE_ROW_HEADER) { - ss = atk_object_ref_state_set (child); - if (atk_state_set_contains_state (ss, ATK_STATE_SELECTED)) { - ret++; - g_array_append_val (array, row); - } - row++; + for (i = 0; i < all_child; i++) + { + child = atk_object_ref_accessible_child (ATK_OBJECT (obj), i); + if (atk_object_get_role (child) == ATK_ROLE_TABLE_ROW_HEADER) + { + ss = atk_object_ref_state_set (child); + if (atk_state_set_contains_state (ss, ATK_STATE_SELECTED)) + { + ret++; + g_array_append_val (array, row); + } + row++; + } } - } if (selected) *selected = (gint *) g_array_free (array, FALSE); return ret; @@ -331,17 +350,20 @@ my_atk_table_get_selected_columns (AtkTable *obj, gint **selected) GArray *array = g_array_new (FALSE, FALSE, sizeof (gint)); all_child = MY_ATK_OBJECT (self)->children->len; - for (i=0; i<all_child; i++) { - child = atk_object_ref_accessible_child (ATK_OBJECT (obj), i); - if (atk_object_get_role (child) == ATK_ROLE_TABLE_COLUMN_HEADER) { - ss = atk_object_ref_state_set (child); - if (atk_state_set_contains_state (ss, ATK_STATE_SELECTED)) { - ret++; - g_array_append_val (array, column); - } - column++; + for (i = 0; i < all_child; i++) + { + child = atk_object_ref_accessible_child (ATK_OBJECT (obj), i); + if (atk_object_get_role (child) == ATK_ROLE_TABLE_COLUMN_HEADER) + { + ss = atk_object_ref_state_set (child); + if (atk_state_set_contains_state (ss, ATK_STATE_SELECTED)) + { + ret++; + g_array_append_val (array, column); + } + column++; + } } - } if (selected) *selected = (gint *) g_array_free (array, FALSE); return ret; @@ -359,11 +381,12 @@ my_atk_table_is_row_selected (AtkTable *obj, gint row) GPtrArray *ret = g_ptr_array_new_full (my_atk_table_get_n_rows (obj), g_object_unref); all_child = MY_ATK_OBJECT (self)->children->len; - for (i = 0; i < all_child; i++) { - child = atk_object_ref_accessible_child (ATK_OBJECT (obj), i); - if (atk_object_get_role (child) == ATK_ROLE_TABLE_ROW_HEADER) - g_ptr_array_add (ret, child); - } + for (i = 0; i < all_child; i++) + { + child = atk_object_ref_accessible_child (ATK_OBJECT (obj), i); + if (atk_object_get_role (child) == ATK_ROLE_TABLE_ROW_HEADER) + g_ptr_array_add (ret, child); + } c = g_ptr_array_index (ret, row); ss = atk_object_ref_state_set (c); if (atk_state_set_contains_state (ss, ATK_STATE_SELECTED)) @@ -383,11 +406,12 @@ my_atk_table_is_column_selected (AtkTable *obj, gint col) GPtrArray *ret = g_ptr_array_new_full (my_atk_table_get_n_columns (obj), g_object_unref); all_child = MY_ATK_OBJECT (self)->children->len; - for (i = 0; i < all_child; i++) { - child = atk_object_ref_accessible_child (ATK_OBJECT (obj), i); - if (atk_object_get_role (child) == ATK_ROLE_TABLE_COLUMN_HEADER) - g_ptr_array_add (ret, child); - } + for (i = 0; i < all_child; i++) + { + child = atk_object_ref_accessible_child (ATK_OBJECT (obj), i); + if (atk_object_get_role (child) == ATK_ROLE_TABLE_COLUMN_HEADER) + g_ptr_array_add (ret, child); + } c = g_ptr_array_index (ret, col); ss = atk_object_ref_state_set (c); if (atk_state_set_contains_state (ss, ATK_STATE_SELECTED)) @@ -417,19 +441,23 @@ my_atk_table_add_column_selection (AtkTable *obj, gint col) AtkStateSet *ss = NULL; all_child = MY_ATK_OBJECT (self)->children->len; - for (i = 0; i < all_child; i++) { - child = atk_object_ref_accessible_child (ATK_OBJECT (obj), i); - if (atk_object_get_role (child) == ATK_ROLE_TABLE_COLUMN_HEADER) { - if (col == counter) { - ss = atk_object_ref_state_set (child); - if (!atk_state_set_contains_state (ss, ATK_STATE_SELECTED)) { - atk_state_set_add_state (ss, ATK_STATE_SELECTED); - return TRUE; + for (i = 0; i < all_child; i++) + { + child = atk_object_ref_accessible_child (ATK_OBJECT (obj), i); + if (atk_object_get_role (child) == ATK_ROLE_TABLE_COLUMN_HEADER) + { + if (col == counter) + { + ss = atk_object_ref_state_set (child); + if (!atk_state_set_contains_state (ss, ATK_STATE_SELECTED)) + { + atk_state_set_add_state (ss, ATK_STATE_SELECTED); + return TRUE; + } + } + counter++; } - } - counter++; } - } return FALSE; } @@ -443,19 +471,23 @@ my_atk_table_add_row_selection (AtkTable *obj, gint row) AtkStateSet *ss = NULL; all_child = MY_ATK_OBJECT (self)->children->len; - for (i = 0; i < all_child; i++) { - child = atk_object_ref_accessible_child (ATK_OBJECT (obj), i); - if (atk_object_get_role (child) == ATK_ROLE_TABLE_ROW_HEADER) { - if (row == counter) { - ss = atk_object_ref_state_set (child); - if (!atk_state_set_contains_state (ss, ATK_STATE_SELECTED)) { - atk_state_set_add_state (ss, ATK_STATE_SELECTED); - return TRUE; + for (i = 0; i < all_child; i++) + { + child = atk_object_ref_accessible_child (ATK_OBJECT (obj), i); + if (atk_object_get_role (child) == ATK_ROLE_TABLE_ROW_HEADER) + { + if (row == counter) + { + ss = atk_object_ref_state_set (child); + if (!atk_state_set_contains_state (ss, ATK_STATE_SELECTED)) + { + atk_state_set_add_state (ss, ATK_STATE_SELECTED); + return TRUE; + } + } + counter++; } - } - counter++; } - } return FALSE; } @@ -469,19 +501,23 @@ my_atk_table_remove_column_selection (AtkTable *obj, gint col) AtkStateSet *ss = NULL; all_child = MY_ATK_OBJECT (self)->children->len; - for (i = 0; i < all_child; i++) { - child = atk_object_ref_accessible_child (ATK_OBJECT (obj), i); - if (atk_object_get_role (child) == ATK_ROLE_TABLE_COLUMN_HEADER) { - if (col == counter) { - ss = atk_object_ref_state_set (child); - if (atk_state_set_contains_state (ss, ATK_STATE_SELECTED)) { - atk_state_set_remove_state (ss, ATK_STATE_SELECTED); - return TRUE; + for (i = 0; i < all_child; i++) + { + child = atk_object_ref_accessible_child (ATK_OBJECT (obj), i); + if (atk_object_get_role (child) == ATK_ROLE_TABLE_COLUMN_HEADER) + { + if (col == counter) + { + ss = atk_object_ref_state_set (child); + if (atk_state_set_contains_state (ss, ATK_STATE_SELECTED)) + { + atk_state_set_remove_state (ss, ATK_STATE_SELECTED); + return TRUE; + } + } + counter++; } - } - counter++; } - } return FALSE; } @@ -495,19 +531,23 @@ my_atk_table_remove_row_selection (AtkTable *obj, gint row) AtkStateSet *ss = NULL; all_child = MY_ATK_OBJECT (self)->children->len; - for (i = 0; i < all_child; i++) { - child = atk_object_ref_accessible_child (ATK_OBJECT (obj), i); - if (atk_object_get_role (child) == ATK_ROLE_TABLE_ROW_HEADER) { - if (row == counter) { - ss = atk_object_ref_state_set (child); - if (atk_state_set_contains_state (ss, ATK_STATE_SELECTED)) { - atk_state_set_remove_state (ss, ATK_STATE_SELECTED); - return TRUE; + for (i = 0; i < all_child; i++) + { + child = atk_object_ref_accessible_child (ATK_OBJECT (obj), i); + if (atk_object_get_role (child) == ATK_ROLE_TABLE_ROW_HEADER) + { + if (row == counter) + { + ss = atk_object_ref_state_set (child); + if (atk_state_set_contains_state (ss, ATK_STATE_SELECTED)) + { + atk_state_set_remove_state (ss, ATK_STATE_SELECTED); + return TRUE; + } + } + counter++; } - } - counter++; } - } return FALSE; } @@ -519,13 +559,14 @@ my_atk_table_get_summary (AtkTable *obj) gint i, all_child; AtkObject *summary = NULL; - all_child = MY_ATK_OBJECT(self)->children->len; + all_child = MY_ATK_OBJECT (self)->children->len; AtkObject *child = NULL; - for (i=0; i<all_child; i++) { - child = atk_object_ref_accessible_child (ATK_OBJECT (obj), i); - if (atk_object_get_role (child) == ATK_ROLE_HEADING) - summary = child; - } + for (i = 0; i < all_child; i++) + { + child = atk_object_ref_accessible_child (ATK_OBJECT (obj), i); + if (atk_object_get_role (child) == ATK_ROLE_HEADING) + summary = child; + } return summary ? summary : NULL; } @@ -598,7 +639,8 @@ static void atk_table_interface_init (AtkTableIface *iface) { - if (!iface) return; + if (!iface) + return; iface->ref_at = my_atk_table_ref_at; @@ -651,7 +693,6 @@ my_atk_table_init (MyAtkTable *self) self->column_headers = g_ptr_array_new_with_free_func (GDestroyNotifyGPTRARRAYptrArray); self->selected = FALSE; self->col_desc = NULL; - } static void diff --git a/tests/at-spi2-atk/dummyatk/my-atk-table.h b/tests/at-spi2-atk/dummyatk/my-atk-table.h index de580400..caed3900 100644 --- a/tests/at-spi2-atk/dummyatk/my-atk-table.h +++ b/tests/at-spi2-atk/dummyatk/my-atk-table.h @@ -21,22 +21,23 @@ #ifndef MY_ATK_TABLE_H_ #define MY_ATK_TABLE_H_ -#include <glib.h> -#include <glib-object.h> #include <atk/atk.h> +#include <glib-object.h> +#include <glib.h> #include "my-atk-object.h" -#define MY_TYPE_ATK_TABLE (my_atk_table_get_type ()) -#define MY_ATK_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MY_TYPE_ATK_TABLE, MyAtkTable)) -#define MY_ATK_TABLE_CLASS(vtable) (G_TYPE_CHECK_CLASS_CAST ((vtable), MY_TYPE_ATK_TABLE, MyAtkTableClass)) -#define MY_IS_ATK_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MY_TYPE_ATK_TABLE)) +#define MY_TYPE_ATK_TABLE (my_atk_table_get_type ()) +#define MY_ATK_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MY_TYPE_ATK_TABLE, MyAtkTable)) +#define MY_ATK_TABLE_CLASS(vtable) (G_TYPE_CHECK_CLASS_CAST ((vtable), MY_TYPE_ATK_TABLE, MyAtkTableClass)) +#define MY_IS_ATK_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MY_TYPE_ATK_TABLE)) #define MY_IS_ATK_TABLE_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE ((vtable), MY_TYPE_ATK_TABLE)) -#define MY_ATK_TABLE_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), MY_TYPE_ATK_TABLE, MyAtkTableClass)) +#define MY_ATK_TABLE_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), MY_TYPE_ATK_TABLE, MyAtkTableClass)) typedef struct _MyAtkTable MyAtkTable; typedef struct _MyAtkTableClass MyAtkTableClass; -struct _MyAtkTable { +struct _MyAtkTable +{ MyAtkObject parent; MyAtkTable *parent_table; GPtrArray *table; @@ -47,7 +48,8 @@ struct _MyAtkTable { gboolean selected; }; -struct _MyAtkTableClass { +struct _MyAtkTableClass +{ MyAtkObjectClass parent; }; @@ -57,12 +59,12 @@ guint my_atk_set_table (AtkTable *obj, gchar *col_header, gchar *row_header, gchar *col_desc, - gchar* row_desc, + gchar *row_desc, gchar *value, gboolean selected, gboolean selected_col); -AtkObject* +AtkObject * test_get_cell_from_table (AtkTable *obj, gint row); #endif /* MY_ATK_TABLE_H_ */ diff --git a/tests/at-spi2-atk/dummyatk/my-atk-text.c b/tests/at-spi2-atk/dummyatk/my-atk-text.c index d7389fb8..5185c99a 100644 --- a/tests/at-spi2-atk/dummyatk/my-atk-text.c +++ b/tests/at-spi2-atk/dummyatk/my-atk-text.c @@ -20,10 +20,10 @@ * Boston, MA 02110-1301, USA. */ -#include <stdio.h> +#include <atk/atk.h> #include <glib.h> +#include <stdio.h> #include <string.h> -#include <atk/atk.h> #include "my-atk-object.h" #include "my-atk-text.h" @@ -34,7 +34,8 @@ static void atk_text_interface_init (AtkTextIface *iface); typedef struct _MyAtkTextSelection MyAtkTextSelection; -struct _MyAtkTextSelection { +struct _MyAtkTextSelection +{ gint start; gint end; }; @@ -43,7 +44,7 @@ G_DEFINE_TYPE_WITH_CODE (MyAtkText, my_atk_text, MY_TYPE_ATK_OBJECT, G_IMPLEMENT_INTERFACE (ATK_TYPE_TEXT, - atk_text_interface_init)); + atk_text_interface_init)); guint my_atk_set_text (AtkText *obj, @@ -92,7 +93,8 @@ my_atk_text_get_character_count (AtkText *obj) { g_return_val_if_fail (MY_IS_ATK_TEXT (obj), -1); gchar *str = MY_ATK_TEXT (obj)->text; - if (!str) return 0; + if (!str) + return 0; return (gint) strlen (str); } @@ -181,11 +183,11 @@ my_atk_text_get_selection (AtkText *obj, gint selection_num, gint *start_offset, if (!it) return NULL; - str = my_atk_text_get_text (obj, ((MyAtkTextSelection *)it->data)->start, ((MyAtkTextSelection *)it->data)->end); + str = my_atk_text_get_text (obj, ((MyAtkTextSelection *) it->data)->start, ((MyAtkTextSelection *) it->data)->end); if (!str) return NULL; - *start_offset = ((MyAtkTextSelection *)it->data)->start; - *end_offset = ((MyAtkTextSelection *)it->data)->end; + *start_offset = ((MyAtkTextSelection *) it->data)->start; + *end_offset = ((MyAtkTextSelection *) it->data)->end; return str; } @@ -205,8 +207,8 @@ my_atk_text_set_selection (AtkText *obj, gint selection_num, gint start_offset, if (!it) return FALSE; - ((MyAtkTextSelection *)it->data)->start = start_offset; - ((MyAtkTextSelection *)it->data)->end = end_offset; + ((MyAtkTextSelection *) it->data)->start = start_offset; + ((MyAtkTextSelection *) it->data)->end = end_offset; return TRUE; } @@ -266,7 +268,8 @@ my_atk_text_get_run_attributes (AtkText *obj, gint offset, gint *start_offset, g return attributes; } -static void setSentenceStartEnd (MyAtkText *self,gint *_offset, gint *start_offset, gint*end_offset, const gchar *fstr) +static void +setSentenceStartEnd (MyAtkText *self, gint *_offset, gint *start_offset, gint *end_offset, const gchar *fstr) { gchar *p_str_begin = NULL; gchar *p_str_end = NULL; @@ -276,39 +279,51 @@ static void setSentenceStartEnd (MyAtkText *self,gint *_offset, gint *start_offs /* * In case if offset is in the middle of the word rewind to 1 character before. */ - for (; g_ascii_isalpha (self->text[offset]) && 0 < offset; offset--); + for (; g_ascii_isalpha (self->text[offset]) && 0 < offset; offset--) + ; /* * if [char] rewind to word after by passing none alpha * else try to find last [string] in range [0,offset] * if found then correct position * else not found so this is first sentence find first word */ - if (self->text[offset] == fstr[0]) { - for (; !g_ascii_isalpha (self->text[offset]) && offset < length; offset++); - p_str_begin = self->text + offset; - } else { - p_str_begin = g_strrstr_len (self->text, offset, fstr); - if (p_str_begin) { - for (; !g_ascii_isalpha (self->text[offset]) && length < offset; offset++); - } else { - for (offset = 0; !g_ascii_isalpha (self->text[offset]) && length < offset; offset++); - star_correction = 0; + if (self->text[offset] == fstr[0]) + { + for (; !g_ascii_isalpha (self->text[offset]) && offset < length; offset++) + ; + p_str_begin = self->text + offset; + } + else + { + p_str_begin = g_strrstr_len (self->text, offset, fstr); + if (p_str_begin) + { + for (; !g_ascii_isalpha (self->text[offset]) && length < offset; offset++) + ; + } + else + { + for (offset = 0; !g_ascii_isalpha (self->text[offset]) && length < offset; offset++) + ; + star_correction = 0; + } + p_str_begin = self->text + offset; } - p_str_begin = self->text + offset; - } /* * try find ending * if not found set ending at text end. * */ p_str_end = g_strstr_len (self->text + offset, length - offset, fstr); - if (!p_str_end) { - p_str_end = self->text + (length -1); - } - if (p_str_begin && p_str_end) { - *start_offset = p_str_begin - self->text + star_correction; - *end_offset = p_str_end - self->text + 1; - *_offset = offset; - } + if (!p_str_end) + { + p_str_end = self->text + (length - 1); + } + if (p_str_begin && p_str_end) + { + *start_offset = p_str_begin - self->text + star_correction; + *end_offset = p_str_end - self->text + 1; + *_offset = offset; + } } static gchar * @@ -322,43 +337,49 @@ my_atk_text_get_string_at_offset (AtkText *obj, gint offset, AtkTextGranularity *start_offset = -1; *end_offset = -1; - switch (granularity) { - case ATK_TEXT_GRANULARITY_CHAR: - *start_offset = offset; - *end_offset = *start_offset + 1; - break; - case ATK_TEXT_GRANULARITY_WORD: - length = strlen (self->text); - for (; !g_ascii_isalpha (self->text[offset]) && offset < length ; offset++); - for (cnt = offset; cnt < length; cnt++) { - if (!g_ascii_isalpha (self->text[cnt])) { - *start_offset = offset; - *end_offset = cnt - 1; - myoffset = 1; - break; - } - } - for (cnt = offset; 0 < cnt; cnt--) { - if (!g_ascii_isalpha (self->text[cnt])) { - *start_offset = cnt + 1; - break; - } + switch (granularity) + { + case ATK_TEXT_GRANULARITY_CHAR: + *start_offset = offset; + *end_offset = *start_offset + 1; + break; + case ATK_TEXT_GRANULARITY_WORD: + length = strlen (self->text); + for (; !g_ascii_isalpha (self->text[offset]) && offset < length; offset++) + ; + for (cnt = offset; cnt < length; cnt++) + { + if (!g_ascii_isalpha (self->text[cnt])) + { + *start_offset = offset; + *end_offset = cnt - 1; + myoffset = 1; + break; + } + } + for (cnt = offset; 0 < cnt; cnt--) + { + if (!g_ascii_isalpha (self->text[cnt])) + { + *start_offset = cnt + 1; + break; + } + } + break; + case ATK_TEXT_GRANULARITY_SENTENCE: + setSentenceStartEnd (self, &offset, start_offset, end_offset, "."); + break; + case ATK_TEXT_GRANULARITY_LINE: + setSentenceStartEnd (self, &offset, start_offset, end_offset, "/n"); + break; + case ATK_TEXT_GRANULARITY_PARAGRAPH: + /* Not implemented */ + *start_offset = 0; + *end_offset = 0; + break; + default: + break; } - break; - case ATK_TEXT_GRANULARITY_SENTENCE: - setSentenceStartEnd (self, &offset, start_offset, end_offset, "."); - break; - case ATK_TEXT_GRANULARITY_LINE: - setSentenceStartEnd (self, &offset, start_offset, end_offset, "/n"); - break; - case ATK_TEXT_GRANULARITY_PARAGRAPH: - /* Not implemented */ - *start_offset = 0; - *end_offset = 0; - break; - default: - break; - } return my_atk_text_get_text (obj, *start_offset, *end_offset + myoffset); } @@ -373,12 +394,12 @@ my_atk_get_bounded_ranges (AtkText *obj, AtkTextRectangle *rect, AtkCoordType ct (*range)->end_offset = 5; (*range)->content = my_atk_text_get_text (obj, (*range)->start_offset, (*range)->end_offset); - *(range+1) = g_new (AtkTextRange, 1); - (*(range+1))->start_offset = 6; - (*(range+1))->end_offset = 10; - (*(range+1))->content = my_atk_text_get_text (obj, (*(range+1))->start_offset, (*(range+1))->end_offset); + *(range + 1) = g_new (AtkTextRange, 1); + (*(range + 1))->start_offset = 6; + (*(range + 1))->end_offset = 10; + (*(range + 1))->content = my_atk_text_get_text (obj, (*(range + 1))->start_offset, (*(range + 1))->end_offset); - *(range+2) = NULL; + *(range + 2) = NULL; return range; } @@ -386,7 +407,8 @@ my_atk_get_bounded_ranges (AtkText *obj, AtkTextRectangle *rect, AtkCoordType ct static void atk_text_interface_init (AtkTextIface *iface) { - if (!iface) return; + if (!iface) + return; iface->get_text = my_atk_text_get_text; iface->get_character_count = my_atk_text_get_character_count; @@ -395,7 +417,7 @@ atk_text_interface_init (AtkTextIface *iface) iface->get_character_at_offset = my_atk_text_get_character_at_offset; iface->get_character_extents = my_atk_text_get_character_extents; iface->get_range_extents = my_atk_text_get_range_extents; - iface->get_n_selections = my_atk_text_get_n_selections; + iface->get_n_selections = my_atk_text_get_n_selections; iface->add_selection = my_atk_text_add_selection; iface->get_selection = my_atk_text_get_selection; iface->set_selection = my_atk_text_set_selection; @@ -412,7 +434,7 @@ my_atk_text_init (MyAtkText *self) { self->text = NULL; self->caret_offset = -1; - self->x =-1; + self->x = -1; self->y = -1; self->width = -1; self->height = -1; diff --git a/tests/at-spi2-atk/dummyatk/my-atk-text.h b/tests/at-spi2-atk/dummyatk/my-atk-text.h index 8dcc5872..2a70cb1d 100644 --- a/tests/at-spi2-atk/dummyatk/my-atk-text.h +++ b/tests/at-spi2-atk/dummyatk/my-atk-text.h @@ -23,24 +23,25 @@ #ifndef MY_ATK_TEXT_H_ #define MY_ATK_TEXT_H_ -#include <glib.h> -#include <glib-object.h> #include <atk/atk.h> +#include <glib-object.h> +#include <glib.h> #include "my-atk-object.h" -#define MY_TYPE_ATK_TEXT (my_atk_text_get_type ()) -#define MY_ATK_TEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MY_TYPE_ATK_TEXT, MyAtkText)) -#define MY_ATK_TEXT_CLASS(vtable) (G_TYPE_CHECK_CLASS_CAST ((vtable), MY_TYPE_ATK_TEXT, MyAtkTextClass)) -#define MY_IS_ATK_TEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MY_TYPE_ATK_TEXT)) +#define MY_TYPE_ATK_TEXT (my_atk_text_get_type ()) +#define MY_ATK_TEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MY_TYPE_ATK_TEXT, MyAtkText)) +#define MY_ATK_TEXT_CLASS(vtable) (G_TYPE_CHECK_CLASS_CAST ((vtable), MY_TYPE_ATK_TEXT, MyAtkTextClass)) +#define MY_IS_ATK_TEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MY_TYPE_ATK_TEXT)) #define MY_IS_ATK_TEXT_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE ((vtable), MY_TYPE_ATK_TEXT)) -#define MY_ATK_TEXT_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), MY_TYPE_ATK_TEXT, MyAtkTextClass)) +#define MY_ATK_TEXT_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), MY_TYPE_ATK_TEXT, MyAtkTextClass)) typedef struct _MyAtkText MyAtkText; typedef struct _MyAtkTextClass MyAtkTextClass; -typedef void (* MyAtkTextFunc) (MyAtkText *obj); +typedef void (*MyAtkTextFunc) (MyAtkText *obj); -struct _MyAtkText { +struct _MyAtkText +{ MyAtkObject parent; gchar *text; gint caret_offset; @@ -52,7 +53,8 @@ struct _MyAtkText { AtkAttributeSet *attributes; }; -struct _MyAtkTextClass { +struct _MyAtkTextClass +{ MyAtkObjectClass parent; }; diff --git a/tests/at-spi2-atk/dummyatk/my-atk-value.c b/tests/at-spi2-atk/dummyatk/my-atk-value.c index 2b0b790d..acd48bee 100644 --- a/tests/at-spi2-atk/dummyatk/my-atk-value.c +++ b/tests/at-spi2-atk/dummyatk/my-atk-value.c @@ -18,10 +18,10 @@ * Boston, MA 02110-1301, USA. */ -#include <glib.h> -#include <string.h> #include <atk/atk.h> +#include <glib.h> #include <stdio.h> +#include <string.h> #include "my-atk-object.h" #include "my-atk-value.h" @@ -34,7 +34,7 @@ G_DEFINE_TYPE_WITH_CODE (MyAtkValue, my_atk_value, MY_TYPE_ATK_OBJECT, G_IMPLEMENT_INTERFACE (ATK_TYPE_VALUE, - atk_value_interface_init)); + atk_value_interface_init)); guint my_atk_set_value (AtkValue *obj, gdouble min, gdouble cur, gdouble max, gdouble step) @@ -60,7 +60,7 @@ my_atk_value_get_value_and_text (AtkValue *obj, gdouble *value, gchar **text) *text = g_strdup_printf ("%f", self->cur); } -static AtkRange* +static AtkRange * my_atk_value_get_range (AtkValue *obj) { MyAtkValue *self = MY_ATK_VALUE (obj); @@ -77,7 +77,7 @@ my_atk_value_get_increment (AtkValue *obj) return self->step; } -static GSList* +static GSList * my_atk_value_get_sub_ranges (AtkValue *obj) { g_return_val_if_fail (MY_IS_ATK_VALUE (obj), NULL); @@ -91,7 +91,7 @@ my_atk_value_set_value (AtkValue *obj, const gdouble val) MyAtkValue *self = MY_ATK_VALUE (obj); g_return_if_fail (MY_IS_ATK_VALUE (obj)); - if ( self->min < val && val < self->max ) + if (self->min < val && val < self->max) self->cur = val; return; } @@ -99,7 +99,8 @@ my_atk_value_set_value (AtkValue *obj, const gdouble val) static void atk_value_interface_init (AtkValueIface *iface) { - if (!iface) return; + if (!iface) + return; iface->get_value_and_text = my_atk_value_get_value_and_text; iface->get_range = my_atk_value_get_range; iface->get_increment = my_atk_value_get_increment; @@ -127,10 +128,10 @@ my_atk_value_class_finalize (GObject *obj) } static void -my_atk_value_class_init(MyAtkValueClass *my_class) +my_atk_value_class_init (MyAtkValueClass *my_class) { - AtkObjectClass *atk_class = ATK_OBJECT_CLASS(my_class); - GObjectClass *gobject_class = G_OBJECT_CLASS(my_class); + AtkObjectClass *atk_class = ATK_OBJECT_CLASS (my_class); + GObjectClass *gobject_class = G_OBJECT_CLASS (my_class); gobject_class->finalize = my_atk_value_class_finalize; diff --git a/tests/at-spi2-atk/dummyatk/my-atk-value.h b/tests/at-spi2-atk/dummyatk/my-atk-value.h index 47e9dacd..9cdc6d2c 100644 --- a/tests/at-spi2-atk/dummyatk/my-atk-value.h +++ b/tests/at-spi2-atk/dummyatk/my-atk-value.h @@ -21,22 +21,23 @@ #ifndef MY_ATK_VALUE_H_ #define MY_ATK_VALUE_H_ -#include <glib.h> -#include <glib-object.h> #include <atk/atk.h> +#include <glib-object.h> +#include <glib.h> #include "my-atk-object.h" -#define MY_TYPE_ATK_VALUE (my_atk_value_get_type ()) -#define MY_ATK_VALUE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MY_TYPE_ATK_VALUE, MyAtkValue)) -#define MY_ATK_VALUE_CLASS(vtable) (G_TYPE_CHECK_CLASS_CAST ((vtable), MY_TYPE_ATK_VALUE, MyAtkValueClass)) -#define MY_IS_ATK_VALUE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MY_TYPE_ATK_VALUE)) +#define MY_TYPE_ATK_VALUE (my_atk_value_get_type ()) +#define MY_ATK_VALUE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MY_TYPE_ATK_VALUE, MyAtkValue)) +#define MY_ATK_VALUE_CLASS(vtable) (G_TYPE_CHECK_CLASS_CAST ((vtable), MY_TYPE_ATK_VALUE, MyAtkValueClass)) +#define MY_IS_ATK_VALUE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MY_TYPE_ATK_VALUE)) #define MY_IS_ATK_VALUE_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE ((vtable), MY_TYPE_ATK_VALUE)) -#define MY_ATK_VALUE_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), MY_TYPE_ATK_VALUE, MyAtkValueClass)) +#define MY_ATK_VALUE_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), MY_TYPE_ATK_VALUE, MyAtkValueClass)) typedef struct _MyAtkValue MyAtkValue; typedef struct _MyAtkValueClass MyAtkValueClass; -struct _MyAtkValue { +struct _MyAtkValue +{ MyAtkObject parent; gdouble min; gdouble cur; @@ -44,7 +45,8 @@ struct _MyAtkValue { gdouble step; }; -struct _MyAtkValueClass { +struct _MyAtkValueClass +{ MyAtkObjectClass parent; }; diff --git a/tests/at-spi2-atk/dummyatk/my-atk.h b/tests/at-spi2-atk/dummyatk/my-atk.h index 9cfbc025..af2d8394 100644 --- a/tests/at-spi2-atk/dummyatk/my-atk.h +++ b/tests/at-spi2-atk/dummyatk/my-atk.h @@ -24,17 +24,17 @@ #define MY_ATK_H #include "my-atk-action.h" -#include "my-atk-object.h" #include "my-atk-component.h" #include "my-atk-document.h" #include "my-atk-editable-text.h" #include "my-atk-hyperlink.h" #include "my-atk-hypertext.h" #include "my-atk-image.h" -#include "my-atk-table.h" +#include "my-atk-object.h" +#include "my-atk-selection.h" #include "my-atk-table-cell.h" +#include "my-atk-table.h" #include "my-atk-text.h" -#include "my-atk-selection.h" #include "my-atk-value.h" #endif /*MY_ATK_H*/ diff --git a/tests/at-spi2-atk/test-application.c b/tests/at-spi2-atk/test-application.c index d2fb14bb..e28926b0 100644 --- a/tests/at-spi2-atk/test-application.c +++ b/tests/at-spi2-atk/test-application.c @@ -28,16 +28,16 @@ * and as such provide all the application state for the test. */ +#include "atk-object-xml-loader.h" +#include "my-atk.h" +#include <atk-bridge.h> +#include <atk/atk.h> +#include <glib-unix.h> +#include <glib.h> +#include <signal.h> #include <stdio.h> -#include <string.h> #include <stdlib.h> -#include <signal.h> -#include <glib.h> -#include <glib-unix.h> -#include <atk/atk.h> -#include <atk-bridge.h> -#include "my-atk.h" -#include "atk-object-xml-loader.h" +#include <string.h> static AtkObject *root_accessible; @@ -50,10 +50,11 @@ test_init (gchar *path) { gchar *td; - if (path == NULL) { - g_print ("No test data file provided\n"); - exit (EXIT_FAILURE); - } + if (path == NULL) + { + g_print ("No test data file provided\n"); + exit (EXIT_FAILURE); + } tdata_path = path; td = g_build_path (G_DIR_SEPARATOR_S, tdata_path, NULL, NULL); @@ -91,8 +92,8 @@ setup_atk_util (void) } static GOptionEntry optentries[] = { - {"test-data-file", 0, 0, G_OPTION_ARG_STRING, &tdata_path, "Path to file of test data", NULL}, - {NULL} + { "test-data-file", 0, 0, G_OPTION_ARG_STRING, &tdata_path, "Path to file of test data", NULL }, + { NULL } }; static gboolean @@ -103,7 +104,8 @@ sigterm_received_cb (gpointer user_data) return G_SOURCE_REMOVE; } -int main (int argc, char *argv[]) +int +main (int argc, char *argv[]) { GOptionContext *opt; GError *err = NULL; @@ -112,7 +114,7 @@ int main (int argc, char *argv[]) g_option_context_set_ignore_unknown_options (opt, TRUE); if (!g_option_context_parse (opt, &argc, &argv, &err)) - g_error("Option parsing failed: %s\n", err->message); + g_error ("Option parsing failed: %s\n", err->message); setup_atk_util (); test_init (tdata_path); diff --git a/tests/atk/testdocument.c b/tests/atk/testdocument.c index 7cacbbd1..17fd1a38 100644 --- a/tests/atk/testdocument.c +++ b/tests/atk/testdocument.c @@ -22,15 +22,15 @@ #define EXPECTED_NUMBER 5 -#define TEST_TYPE_DOCUMENT (test_document_get_type ()) -#define TEST_DOCUMENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TEST_TYPE_DOCUMENT, TestDocument)) -#define TEST_DOCUMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TEST_TYPE_DOCUMENT, TestDocumentClass)) -#define TEST_IS_DOCUMENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TEST_TYPE_DOCUMENT)) -#define TEST_IS_DOCUMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TEST_TYPE_DOCUMENT)) -#define TEST_DOCUMENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TEST_TYPE_DOCUMENT, TestDocumentClass)) +#define TEST_TYPE_DOCUMENT (test_document_get_type ()) +#define TEST_DOCUMENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TEST_TYPE_DOCUMENT, TestDocument)) +#define TEST_DOCUMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TEST_TYPE_DOCUMENT, TestDocumentClass)) +#define TEST_IS_DOCUMENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TEST_TYPE_DOCUMENT)) +#define TEST_IS_DOCUMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TEST_TYPE_DOCUMENT)) +#define TEST_DOCUMENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TEST_TYPE_DOCUMENT, TestDocumentClass)) -typedef struct _TestDocument TestDocument; -typedef struct _TestDocumentClass TestDocumentClass; +typedef struct _TestDocument TestDocument; +typedef struct _TestDocumentClass TestDocumentClass; struct _TestDocument { @@ -44,7 +44,7 @@ struct _TestDocumentClass AtkObjectClass parent_class; }; -GType test_document_get_type (void) G_GNUC_CONST; +GType test_document_get_type (void) G_GNUC_CONST; static void test_document_interface_init (AtkDocumentIface *iface); G_DEFINE_TYPE_WITH_CODE (TestDocument, @@ -73,7 +73,7 @@ document_page_changed_cb (AtkDocument *document, gint page_number, gpointer data) { - TestDocument* test_document = TEST_DOCUMENT (document); + TestDocument *test_document = TEST_DOCUMENT (document); g_print ("Page-changed callback, page_number = %i\n", page_number); test_document->number_emissions++; @@ -82,17 +82,19 @@ document_page_changed_cb (AtkDocument *document, static gboolean document_emit_page_changed (gpointer data) { - TestDocument* test_document = TEST_DOCUMENT (data); + TestDocument *test_document = TEST_DOCUMENT (data); static gint next_page = 1; g_print ("Moving to next page. Emitting page-change, page_number = %i\n", next_page); g_signal_emit_by_name (test_document, "page-changed", next_page++, NULL); - if (next_page > EXPECTED_NUMBER) { - g_main_loop_quit (test_document->loop); - return G_SOURCE_REMOVE; - } else + if (next_page > EXPECTED_NUMBER) + { + g_main_loop_quit (test_document->loop); + return G_SOURCE_REMOVE; + } + else return G_SOURCE_CONTINUE; } @@ -119,8 +121,8 @@ test_page_changed (void) } int -main (gint argc, - char* argv[]) +main (gint argc, + char *argv[]) { g_test_init (&argc, &argv, NULL); g_test_add_func ("/atk/document/page_changed", test_page_changed); diff --git a/tests/atk/testrelation.c b/tests/atk/testrelation.c index fc3d7cba..c95b0e35 100644 --- a/tests/atk/testrelation.c +++ b/tests/atk/testrelation.c @@ -31,7 +31,7 @@ test_relation (void) AtkRelationSet *set; AtkRelation *relation; gint n_relations; - GPtrArray *array; + GPtrArray *array; name = atk_relation_type_get_name (ATK_RELATION_LABEL_FOR); g_assert_cmpstr (name, ==, "label-for"); @@ -67,7 +67,7 @@ test_relation (void) g_assert_nonnull (set); n_relations = atk_relation_set_get_n_relations (set); g_assert_cmpint (n_relations, ==, 1); - relation = atk_relation_set_get_relation (set, 0); + relation = atk_relation_set_get_relation (set, 0); g_assert_nonnull (relation); type1 = atk_relation_get_relation_type (relation); g_assert_cmpint (type1, ==, ATK_RELATION_LABEL_FOR); @@ -111,11 +111,11 @@ test_text_attr (void) } int -main (gint argc, - char* argv[]) +main (gint argc, + char *argv[]) { g_test_init (&argc, &argv, NULL); - g_test_add_func ("/atk/relation/relation", test_relation); + g_test_add_func ("/atk/relation/relation", test_relation); g_test_add_func ("/atk/relation/text_attr", test_text_attr); return g_test_run (); diff --git a/tests/atk/testrole.c b/tests/atk/testrole.c index 265e3d48..80f3fd45 100644 --- a/tests/atk/testrole.c +++ b/tests/atk/testrole.c @@ -45,8 +45,8 @@ test_role (void) } int -main (gint argc, - char* argv[]) +main (gint argc, + char *argv[]) { g_test_init (&argc, &argv, NULL); g_test_add_func ("/atk/role/roles", test_role); diff --git a/tests/atk/teststateset.c b/tests/atk/teststateset.c index 3deb54d8..86f3b9eb 100644 --- a/tests/atk/teststateset.c +++ b/tests/atk/teststateset.c @@ -21,8 +21,8 @@ #include <string.h> -static void test_state_set (void); -static void test_state (void); +static void test_state_set (void); +static void test_state (void); static void test_state_set (void) @@ -49,7 +49,7 @@ test_state_set (void) g_assert_true (atk_state_set_contains_state (state_set1, ATK_STATE_VISIBLE)); g_assert_true (atk_state_set_contains_state (state_set1, ATK_STATE_BUSY)); g_assert_false (atk_state_set_contains_state (state_set1, ATK_STATE_VERTICAL)); - + atk_state_set_remove_state (state_set1, ATK_STATE_BUSY); g_assert_false (atk_state_set_contains_state (state_set1, ATK_STATE_BUSY)); g_assert_true (atk_state_set_contains_state (state_set1, ATK_STATE_VISIBLE)); @@ -59,8 +59,8 @@ test_state_set (void) state_array[0] = ATK_STATE_SINGLE_LINE; state_array[1] = ATK_STATE_VISIBLE; state_array[2] = ATK_STATE_VERTICAL; - - state_set2 = atk_state_set_new(); + + state_set2 = atk_state_set_new (); atk_state_set_add_states (state_set2, state_array, 3); state_set3 = atk_state_set_and_sets (state_set1, state_set2); @@ -71,7 +71,7 @@ test_state_set (void) atk_state_set_remove_state (state_set1, ATK_STATE_VISIBLE); state_set3 = atk_state_set_and_sets (state_set1, state_set2); g_assert_null (state_set3); - + state_set3 = atk_state_set_or_sets (state_set1, state_set2); g_assert_true (atk_state_set_contains_state (state_set3, ATK_STATE_VISIBLE)); g_assert_false (atk_state_set_contains_state (state_set3, ATK_STATE_INVALID)); @@ -114,16 +114,16 @@ test_state (void) /* * Check that a non-existent type returns NULL */ - g_assert_null (atk_state_type_get_name (ATK_STATE_LAST_DEFINED +2)); + g_assert_null (atk_state_type_get_name (ATK_STATE_LAST_DEFINED + 2)); } int -main (gint argc, - char* argv[]) +main (gint argc, + char *argv[]) { g_test_init (&argc, &argv, NULL); g_test_add_func ("/atk/state/state_set", test_state_set); - g_test_add_func ("/atk/state/state", test_state); + g_test_add_func ("/atk/state/state", test_state); return g_test_run (); } diff --git a/tests/atk/testvalue.c b/tests/atk/testvalue.c index 441f7f14..5990aea0 100644 --- a/tests/atk/testvalue.c +++ b/tests/atk/testvalue.c @@ -55,15 +55,15 @@ gboolean test_success = TRUE; GObject *my_value; -#define TEST_TYPE_VALUE (test_value_get_type ()) -#define TEST_VALUE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TEST_TYPE_VALUE, TestValue)) -#define TEST_VALUE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TEST_TYPE_VALUE, TestValueClass)) -#define TEST_IS_VALUE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TEST_TYPE_VALUE)) -#define TEST_IS_VALUE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TEST_TYPE_VALUE)) -#define TEST_VALUE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TEST_TYPE_VALUE, TestValueClass)) +#define TEST_TYPE_VALUE (test_value_get_type ()) +#define TEST_VALUE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TEST_TYPE_VALUE, TestValue)) +#define TEST_VALUE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TEST_TYPE_VALUE, TestValueClass)) +#define TEST_IS_VALUE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TEST_TYPE_VALUE)) +#define TEST_IS_VALUE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TEST_TYPE_VALUE)) +#define TEST_VALUE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TEST_TYPE_VALUE, TestValueClass)) -typedef struct _TestValue TestValue; -typedef struct _TestValueClass TestValueClass; +typedef struct _TestValue TestValue; +typedef struct _TestValueClass TestValueClass; struct _TestValue { @@ -80,7 +80,7 @@ struct _TestValueClass AtkObjectClass parent_class; }; -GType test_value_get_type (void) G_GNUC_CONST; +GType test_value_get_type (void) G_GNUC_CONST; static void test_value_interface_init (AtkValueIface *iface); G_DEFINE_TYPE_WITH_CODE (TestValue, @@ -99,8 +99,7 @@ test_value_init (TestValue *value) { } - -static const gchar* +static const gchar * get_description (gdouble value) { const gchar *description = NULL; @@ -111,7 +110,8 @@ get_description (gdouble value) description = atk_value_type_get_localized_name (ATK_VALUE_MEDIUM); else if (value < HIGH_THRESHOLD) description = atk_value_type_get_localized_name (ATK_VALUE_HIGH); - else description = atk_value_type_get_localized_name (ATK_VALUE_VERY_HIGH); + else + description = atk_value_type_get_localized_name (ATK_VALUE_VERY_HIGH); return description; } @@ -134,7 +134,7 @@ test_value_get_value_and_text (AtkValue *value, *description = g_strdup (get_description (self->value)); } -AtkRange* +AtkRange * test_value_get_range (AtkValue *value) { AtkRange *result; @@ -142,8 +142,8 @@ test_value_get_range (AtkValue *value) g_return_val_if_fail (TEST_IS_VALUE (value), NULL); result = atk_range_new (LOWER_LIMIT, - UPPER_LIMIT, - NULL); + UPPER_LIMIT, + NULL); return result; } @@ -156,7 +156,7 @@ test_value_get_increment (AtkValue *value) return INCREMENT; } -GSList* +GSList * test_value_get_sub_ranges (AtkValue *value) { GSList *result = NULL; @@ -204,12 +204,13 @@ test_value_set_value (AtkValue *value, if (new_value > UPPER_LIMIT) new_value = UPPER_LIMIT; - if (new_value != self->value) { - gchar *description = g_strdup (get_description (new_value)); - self->value = new_value; - g_signal_emit_by_name (value, "value-changed", new_value, description, NULL); - g_free (description); - } + if (new_value != self->value) + { + gchar *description = g_strdup (get_description (new_value)); + self->value = new_value; + g_signal_emit_by_name (value, "value-changed", new_value, description, NULL); + g_free (description); + } } static void @@ -228,7 +229,7 @@ value_page_changed_cb (AtkValue *value, gchar *new_description, gpointer data) { - TestValue* test_value = TEST_VALUE (value); + TestValue *test_value = TEST_VALUE (value); g_print ("value-changed callback=(%f,%s)\n", new_value, new_description); test_value->number_emissions++; @@ -241,15 +242,17 @@ value_page_changed_cb (AtkValue *value, static gboolean do_value_changed (gpointer data) { - TestValue* test_value = TEST_VALUE (data); + TestValue *test_value = TEST_VALUE (data); atk_value_set_value (ATK_VALUE (test_value), test_value->value + INCREMENT); - if (test_value->number_emissions == EXPECTED_NUMBER) { - g_main_loop_quit (test_value->loop); - return G_SOURCE_REMOVE; - } else + if (test_value->number_emissions == EXPECTED_NUMBER) + { + g_main_loop_quit (test_value->loop); + return G_SOURCE_REMOVE; + } + else return G_SOURCE_CONTINUE; } @@ -274,12 +277,11 @@ test_page_changed (void) } int -main (gint argc, - char* argv[]) +main (gint argc, + char *argv[]) { g_test_init (&argc, &argv, NULL); g_test_add_func ("/atk/value/page_changed", test_page_changed); return g_test_run (); } - diff --git a/tests/atspi/memory.c b/tests/atspi/memory.c index ca078e39..e5533309 100644 --- a/tests/atspi/memory.c +++ b/tests/atspi/memory.c @@ -1,8 +1,8 @@ #include "atspi/atspi.h" #include <stdio.h> #include <stdlib.h> -#include <unistd.h> #include <string.h> +#include <unistd.h> pid_t child_pid; AtspiEventListener *listener; @@ -27,12 +27,12 @@ basic (AtspiAccessible *obj) printf ("ok, getting children\n"); count = atspi_accessible_get_child_count (obj, &error); for (i = 0; i < count; i++) - { - accessible = atspi_accessible_get_child_at_index (obj, i, &error); - printf ("ok %d\n", i); - if (accessible) - g_object_unref (accessible); - } + { + accessible = atspi_accessible_get_child_at_index (obj, i, &error); + printf ("ok %d\n", i); + if (accessible) + g_object_unref (accessible); + } printf ("ok\n"); } @@ -55,29 +55,29 @@ void on_event (AtspiEvent *event, void *data) { if (atspi_accessible_get_role (event->source, NULL) == ATSPI_ROLE_DESKTOP_FRAME) - { - printf ("memory: event: %s\n", event->type); - if (strstr (event->type, "add")) - { - AtspiAccessible *desktop = atspi_get_desktop (0); - guint id; - basic (desktop); - g_object_unref (desktop); - id = g_timeout_add (3000, kill_child, NULL); - g_source_set_name_by_id (id, "[at-spi2-core] kill_child"); - } - else { - guint id; - id = g_idle_add (end, NULL); - g_source_set_name_by_id (id, "[at-spi2-core] end"); + printf ("memory: event: %s\n", event->type); + if (strstr (event->type, "add")) + { + AtspiAccessible *desktop = atspi_get_desktop (0); + guint id; + basic (desktop); + g_object_unref (desktop); + id = g_timeout_add (3000, kill_child, NULL); + g_source_set_name_by_id (id, "[at-spi2-core] kill_child"); + } + else + { + guint id; + id = g_idle_add (end, NULL); + g_source_set_name_by_id (id, "[at-spi2-core] end"); + } } - } g_boxed_free (ATSPI_TYPE_EVENT, event); } int -main() +main () { atspi_init (); diff --git a/tests/atspi/test-application.c b/tests/atspi/test-application.c index 621d1de4..ec847dee 100644 --- a/tests/atspi/test-application.c +++ b/tests/atspi/test-application.c @@ -25,10 +25,10 @@ * registry and then waiting to get killed by some external force. */ -#include <stdio.h> -#include <glib.h> -#include <dbus/dbus.h> #include <atspi/atspi.h> +#include <dbus/dbus.h> +#include <glib.h> +#include <stdio.h> static GMainLoop *mainloop; @@ -44,13 +44,12 @@ register_app () const gchar *name; gchar *path; - /* Set up D-Bus connection and register bus name */ dbus_error_init (&error); connection = atspi_get_a11y_bus (); if (!connection) { - printf("Couldn't get a11y bus!\n"); + printf ("Couldn't get a11y bus!\n"); return -1; } @@ -73,10 +72,10 @@ register_app () g_free (path); - reply = dbus_connection_send_with_reply_and_block(connection, message, -1, &error); + reply = dbus_connection_send_with_reply_and_block (connection, message, -1, &error); if (!reply) { - printf("Did not get a reply from the registry.\n"); + printf ("Did not get a reply from the registry.\n"); dbus_message_unref (message); dbus_error_free (&error); return -1; @@ -88,13 +87,15 @@ register_app () return 0; } -int main (int argc, char *argv[]) +int +main (int argc, char *argv[]) { int ret = register_app (); - if (ret) { - printf("Failed to send dbus signals. Aborting.\n"); - return ret; - } + if (ret) + { + printf ("Failed to send dbus signals. Aborting.\n"); + return ret; + } // This keeps the test-application runnig indefinitely, i.e. // until killed by an external signal. |