From e9d9fedb0c914825a3ccd8b390deb52a93800415 Mon Sep 17 00:00:00 2001 From: Mark Doffman Date: Sat, 2 Jan 2010 07:54:20 -0800 Subject: [PATCH] Code style enforcement. All files in atk-adaptor now use gnu style indentation. 'indent --no-tabs' --- atk-adaptor/accessible-adaptor.c | 202 ++++++------ atk-adaptor/accessible-marshaller.c | 276 ++++++++-------- atk-adaptor/accessible-marshaller.h | 33 +- atk-adaptor/accessible-register.c | 544 ++++++++++++++++---------------- atk-adaptor/accessible-register.h | 29 +- atk-adaptor/action-adaptor.c | 150 +++++---- atk-adaptor/adaptors.h | 30 +- atk-adaptor/application-adaptor.c | 12 +- atk-adaptor/bridge.c | 268 ++++++++-------- atk-adaptor/bridge.h | 6 +- atk-adaptor/collection-adaptor.c | 378 +++++++++++----------- atk-adaptor/component-adaptor.c | 9 +- atk-adaptor/document-adaptor.c | 10 +- atk-adaptor/editabletext-adaptor.c | 6 +- atk-adaptor/event.c | 448 ++++++++++++++------------ atk-adaptor/event.h | 4 +- atk-adaptor/hyperlink-adaptor.c | 11 +- atk-adaptor/hypertext-adaptor.c | 9 +- atk-adaptor/image-adaptor.c | 12 +- atk-adaptor/relation-adaptor.c | 48 ++- atk-adaptor/selection-adaptor.c | 8 +- atk-adaptor/streamablecontent-adaptor.c | 220 +++++++------ atk-adaptor/table-adaptor.c | 12 +- atk-adaptor/text-adaptor.c | 45 +-- atk-adaptor/tree-adaptor.c | 65 ++-- atk-adaptor/tree-adaptor.h | 6 +- atk-adaptor/value-adaptor.c | 49 ++- 27 files changed, 1487 insertions(+), 1403 deletions(-) diff --git a/atk-adaptor/accessible-adaptor.c b/atk-adaptor/accessible-adaptor.c index 74a15fe..434223e 100644 --- a/atk-adaptor/accessible-adaptor.c +++ b/atk-adaptor/accessible-adaptor.c @@ -31,7 +31,7 @@ #include "accessible-register.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; @@ -41,7 +41,7 @@ impl_get_Name (DBusMessageIter *iter, void *user_data) } static dbus_bool_t -impl_set_Name (DBusMessageIter *iter, void *user_data) +impl_set_Name (DBusMessageIter * iter, void *user_data) { AtkObject *object = (AtkObject *) user_data; const char *name = droute_get_v_string (iter); @@ -53,7 +53,7 @@ impl_set_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; @@ -63,7 +63,7 @@ impl_get_Description (DBusMessageIter *iter, void *user_data) } static dbus_bool_t -impl_set_Description (DBusMessageIter *iter, void *user_data) +impl_set_Description (DBusMessageIter * iter, void *user_data) { AtkObject *object = (AtkObject *) user_data; const char *description = droute_get_v_string (iter); @@ -75,19 +75,18 @@ impl_set_Description (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 *object = (AtkObject *) user_data; g_return_val_if_fail (ATK_IS_OBJECT (user_data), FALSE); return spi_dbus_return_v_object (iter, - atk_object_get_parent (object), - FALSE); + atk_object_get_parent (object), FALSE); } 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; @@ -99,9 +98,8 @@ impl_get_ChildCount (DBusMessageIter *iter, void *user_data) } 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; DBusError error; @@ -111,7 +109,8 @@ impl_GetChildAtIndex (DBusConnection *bus, dbus_error_init (&error); g_return_val_if_fail (ATK_IS_OBJECT (user_data), droute_not_yet_handled_error (message)); - 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 droute_invalid_arguments_error (message); } @@ -120,9 +119,8 @@ 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; @@ -134,7 +132,8 @@ impl_GetChildren (DBusConnection *bus, droute_not_yet_handled_error (message)); count = atk_object_get_n_accessible_children (object); reply = dbus_message_new_method_return (message); - if (!reply) goto oom; + if (!reply) + goto oom; dbus_message_iter_init_append (reply, &iter); if (!dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, "o", &iter_array)) @@ -144,13 +143,13 @@ impl_GetChildren (DBusConnection *bus, AtkObject *child = atk_object_ref_accessible_child (object, i); char *path = atk_dbus_object_to_path (child, FALSE); if (path) - { - dbus_message_iter_append_basic (&iter_array, DBUS_TYPE_OBJECT_PATH, - &path); - g_free (path); - } + { + dbus_message_iter_append_basic (&iter_array, DBUS_TYPE_OBJECT_PATH, + &path); + g_free (path); + } if (child) - g_object_unref (child); + g_object_unref (child); } if (!dbus_message_iter_close_container (&iter, &iter_array)) goto oom; @@ -161,9 +160,8 @@ 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_uint32_t rv; @@ -176,13 +174,13 @@ impl_GetIndexInParent (DBusConnection *bus, if (reply) { dbus_message_append_args (reply, DBUS_TYPE_UINT32, &rv, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID); } return reply; } static gboolean -spi_init_relation_type_table (Accessibility_RelationType *types) +spi_init_relation_type_table (Accessibility_RelationType * types) { gint i; @@ -201,8 +199,10 @@ spi_init_relation_type_table (Accessibility_RelationType *types) types[ATK_RELATION_EMBEDS] = Accessibility_RELATION_EMBEDS; types[ATK_RELATION_EMBEDDED_BY] = Accessibility_RELATION_EMBEDDED_BY; types[ATK_RELATION_POPUP_FOR] = Accessibility_RELATION_POPUP_FOR; - types[ATK_RELATION_PARENT_WINDOW_OF] = Accessibility_RELATION_PARENT_WINDOW_OF; - types[ATK_RELATION_DESCRIPTION_FOR] = Accessibility_RELATION_DESCRIPTION_FOR; + types[ATK_RELATION_PARENT_WINDOW_OF] = + Accessibility_RELATION_PARENT_WINDOW_OF; + types[ATK_RELATION_DESCRIPTION_FOR] = + Accessibility_RELATION_DESCRIPTION_FOR; types[ATK_RELATION_DESCRIBED_BY] = Accessibility_RELATION_DESCRIBED_BY; return TRUE; @@ -212,11 +212,12 @@ static Accessibility_RelationType spi_relation_type_from_atk_relation_type (AtkRelationType type) { static gboolean is_initialized = FALSE; - static Accessibility_RelationType spi_relation_type_table [ATK_RELATION_LAST_DEFINED]; + static Accessibility_RelationType + spi_relation_type_table[ATK_RELATION_LAST_DEFINED]; Accessibility_RelationType spi_type; if (!is_initialized) - is_initialized = spi_init_relation_type_table (spi_relation_type_table); + is_initialized = spi_init_relation_type_table (spi_relation_type_table); if (type > ATK_RELATION_NULL && type < ATK_RELATION_LAST_DEFINED) spi_type = spi_relation_type_table[type]; @@ -226,9 +227,8 @@ 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; @@ -240,49 +240,55 @@ impl_GetRelationSet (DBusConnection *bus, g_return_val_if_fail (ATK_IS_OBJECT (user_data), droute_not_yet_handled_error (message)); reply = dbus_message_new_method_return (message); - if (!reply) return NULL; + if (!reply) + 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)) - { - goto oom; - } - count = atk_relation_set_get_n_relations (set); - for (i = 0; i < count; i++) - { - AtkRelation *r = atk_relation_set_get_relation (set, i); - AtkRelationType rt; - GPtrArray *target; - dbus_uint32_t type; - if (!r) continue; - 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)) - { - 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, DBUS_TYPE_ARRAY, "(ua(so))", &iter_array)) { goto oom; } - for (j = 0; j < target->len; j++) + count = atk_relation_set_get_n_relations (set); + for (i = 0; i < count; i++) { - AtkObject *obj = target->pdata[j]; - char *path; - if (!obj) continue; - path = atk_dbus_object_to_path (obj, FALSE); - if (!path) - { - g_warning ("Unknown object in relation type %d\n", type); - continue; - } - spi_dbus_append_name_and_path_inner (&iter_targets, NULL, path); + AtkRelation *r = atk_relation_set_get_relation (set, i); + AtkRelationType rt; + GPtrArray *target; + dbus_uint32_t type; + if (!r) + continue; + 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)) + { + 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)) + { + goto oom; + } + for (j = 0; j < target->len; j++) + { + AtkObject *obj = target->pdata[j]; + char *path; + if (!obj) + continue; + path = atk_dbus_object_to_path (obj, FALSE); + if (!path) + { + g_warning ("Unknown object in relation type %d\n", type); + continue; + } + spi_dbus_append_name_and_path_inner (&iter_targets, NULL, path); + } + dbus_message_iter_close_container (&iter_struct, &iter_targets); + dbus_message_iter_close_container (&iter_array, &iter_struct); } - dbus_message_iter_close_container (&iter_struct, &iter_targets); - dbus_message_iter_close_container (&iter_array, &iter_struct); - } dbus_message_iter_close_container (&iter, &iter_array); oom: // TODO: handle out of memory */ @@ -417,7 +423,7 @@ spi_accessible_role_from_atk_role (AtkRole role) } 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; @@ -432,7 +438,7 @@ impl_GetRole (DBusConnection *bus, DBusMessage *message, void *user_data) if (reply) { dbus_message_append_args (reply, DBUS_TYPE_UINT32, &rv, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID); } return reply; } @@ -442,14 +448,13 @@ impl_get_role_str (void *datum) { g_return_val_if_fail (ATK_IS_OBJECT (datum), g_strdup ("")); return g_strdup_printf ("%d", - spi_accessible_role_from_atk_role - (atk_object_get_role ((AtkObject *) datum))); + spi_accessible_role_from_atk_role + (atk_object_get_role ((AtkObject *) datum))); } 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; @@ -466,15 +471,14 @@ impl_GetRoleName (DBusConnection *bus, if (reply) { dbus_message_append_args (reply, DBUS_TYPE_STRING, &role_name, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID); } return reply; } 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; @@ -491,22 +495,20 @@ impl_GetLocalizedRoleName (DBusConnection *bus, if (reply) { dbus_message_append_args (reply, DBUS_TYPE_STRING, &role_name, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID); } return reply; } 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; - DBusMessage *reply = NULL; + DBusMessage *reply = NULL; DBusMessageIter iter, iter_array; - dbus_uint32_t states [2]; + dbus_uint32_t states[2]; guint count; @@ -520,16 +522,16 @@ impl_GetState (DBusConnection *bus, dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, "u", &iter_array); for (count = 0; count < 2; count++) { - dbus_message_iter_append_basic (&iter_array, DBUS_TYPE_UINT32, &states[count]); + dbus_message_iter_append_basic (&iter_array, DBUS_TYPE_UINT32, + &states[count]); } dbus_message_iter_close_container (&iter, &iter_array); return reply; } 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; DBusMessage *reply = NULL; @@ -553,18 +555,16 @@ impl_GetAttributes (DBusConnection *bus, } static DBusMessage * -impl_GetApplication (DBusConnection *bus, - DBusMessage *message, - void *user_data) +impl_GetApplication (DBusConnection * bus, + DBusMessage * message, void *user_data) { AtkObject *root = atk_get_root (); return spi_dbus_return_object (message, root, FALSE, FALSE); } 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; gint role; @@ -578,7 +578,8 @@ impl_GetInterfaces (DBusConnection *bus, if (reply) { dbus_message_iter_init_append (reply, &iter); - dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, "s", &iter_array); + dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, "s", + &iter_array); append_atk_object_interfaces (object, &iter_array); dbus_message_iter_close_container (&iter, &iter_array); } @@ -631,10 +632,9 @@ static DRouteProperty properties[] = { }; void -spi_initialize_accessible (DRoutePath *path) +spi_initialize_accessible (DRoutePath * path) { droute_path_add_interface (path, SPI_DBUS_INTERFACE_ACCESSIBLE, - methods, - properties); + methods, properties); }; diff --git a/atk-adaptor/accessible-marshaller.c b/atk-adaptor/accessible-marshaller.c index b715e03..f087171 100644 --- a/atk-adaptor/accessible-marshaller.c +++ b/atk-adaptor/accessible-marshaller.c @@ -34,7 +34,8 @@ /*---------------------------------------------------------------------------*/ void -spi_dbus_append_name_and_path_inner (DBusMessageIter *iter, const char *bus_name, const char *path) +spi_dbus_append_name_and_path_inner (DBusMessageIter * iter, + const char *bus_name, const char *path) { DBusMessageIter iter_struct; @@ -43,7 +44,8 @@ spi_dbus_append_name_and_path_inner (DBusMessageIter *iter, const char *bus_name if (!path) path = SPI_DBUS_PATH_NULL; - dbus_message_iter_open_container (iter, DBUS_TYPE_STRUCT, NULL, &iter_struct); + dbus_message_iter_open_container (iter, DBUS_TYPE_STRUCT, NULL, + &iter_struct); dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_STRING, &bus_name); dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_OBJECT_PATH, &path); dbus_message_iter_close_container (iter, &iter_struct); @@ -52,7 +54,9 @@ spi_dbus_append_name_and_path_inner (DBusMessageIter *iter, const char *bus_name extern gchar *atspi_dbus_name; void -spi_dbus_append_name_and_path (DBusMessage *message, DBusMessageIter *iter, AtkObject *obj, gboolean do_register, gboolean unref) +spi_dbus_append_name_and_path (DBusMessage * message, DBusMessageIter * iter, + AtkObject * obj, gboolean do_register, + gboolean unref) { gchar *path; DBusMessageIter iter_struct; @@ -72,7 +76,8 @@ spi_dbus_append_name_and_path (DBusMessage *message, DBusMessageIter *iter, AtkO * Unrefs the AtkObject if unref is true. */ DBusMessage * -spi_dbus_return_object (DBusMessage *message, AtkObject *obj, gboolean do_register, gboolean unref) +spi_dbus_return_object (DBusMessage * message, AtkObject * obj, + gboolean do_register, gboolean unref) { DBusMessage *reply; reply = dbus_message_new_method_return (message); @@ -87,13 +92,16 @@ spi_dbus_return_object (DBusMessage *message, AtkObject *obj, gboolean do_regist } DBusMessage * -spi_dbus_return_hyperlink (DBusMessage *message, AtkHyperlink *link, AtkObject *container, gboolean unref) +spi_dbus_return_hyperlink (DBusMessage * message, AtkHyperlink * link, + AtkObject * container, gboolean unref) { - return spi_dbus_return_sub_object (message, G_OBJECT (link), G_OBJECT (container), unref); + return spi_dbus_return_sub_object (message, G_OBJECT (link), + G_OBJECT (container), unref); } DBusMessage * -spi_dbus_return_sub_object (DBusMessage *message, GObject *sub, GObject *container, gboolean unref) +spi_dbus_return_sub_object (DBusMessage * message, GObject * sub, + GObject * container, gboolean unref) { DBusMessage *reply; gchar *path; @@ -127,7 +135,7 @@ spi_dbus_return_sub_object (DBusMessage *message, GObject *sub, GObject *contain * Unrefs the object if unref is true. */ dbus_bool_t -spi_dbus_return_v_object (DBusMessageIter *iter, AtkObject *obj, int unref) +spi_dbus_return_v_object (DBusMessageIter * iter, AtkObject * obj, int unref) { DBusMessageIter iter_variant; char *path; @@ -140,7 +148,8 @@ spi_dbus_return_v_object (DBusMessageIter *iter, AtkObject *obj, int unref) if (unref) g_object_unref (obj); - dbus_message_iter_open_container (iter, DBUS_TYPE_VARIANT, "(so)", &iter_variant); + dbus_message_iter_open_container (iter, DBUS_TYPE_VARIANT, "(so)", + &iter_variant); spi_dbus_append_name_and_path_inner (&iter_variant, NULL, path); dbus_message_iter_close_container (iter, &iter_variant); return TRUE; @@ -149,7 +158,7 @@ spi_dbus_return_v_object (DBusMessageIter *iter, AtkObject *obj, int unref) /*---------------------------------------------------------------------------*/ void -append_atk_object_interfaces (AtkObject *object, DBusMessageIter *iter) +append_atk_object_interfaces (AtkObject * object, DBusMessageIter * iter) { const gchar *itf; @@ -245,33 +254,33 @@ append_atk_object_interfaces (AtkObject *object, DBusMessageIter *iter) * be registered with D-Bus and have been given a D-Bus object path. */ void -spi_atk_append_accessible(AtkObject *obj, gpointer data) +spi_atk_append_accessible (AtkObject * obj, gpointer data) { DBusMessageIter iter_struct, iter_sub_array; - dbus_uint32_t states [2]; + dbus_uint32_t states[2]; int count; AtkStateSet *set; - DBusMessageIter *iter_array = (DBusMessageIter *)data; + DBusMessageIter *iter_array = (DBusMessageIter *) data; const char *name, *desc; dbus_uint32_t role; set = atk_object_ref_state_set (obj); - { - AtkObject *parent; - gchar *path; - gchar *bus_parent = NULL, *path_parent = NULL; + { + AtkObject *parent; + gchar *path; + gchar *bus_parent = NULL, *path_parent; - /* Marshall object path */ - path = atk_dbus_object_to_path (obj, FALSE); + /* Marshall object path */ + path = atk_dbus_object_to_path (obj, FALSE); - role = spi_accessible_role_from_atk_role (atk_object_get_role (obj)); + role = spi_accessible_role_from_atk_role (atk_object_get_role (obj)); - /* Marshall parent */ - parent = atk_object_get_parent(obj); - if (parent == NULL) - { - /* TODO: Support getting parent of an AtkPlug */ + /* Marshall parent */ + parent = atk_object_get_parent (obj); + if (parent == NULL) + { + /* TODO: Support getting parent of an AtkPlug */ #ifdef __ATK_PLUG_H__ if (ATK_IS_PLUG (obj)) { @@ -287,114 +296,124 @@ spi_atk_append_accessible(AtkObject *obj, gpointer data) } else if (role != Accessibility_ROLE_APPLICATION) #else - if (role != Accessibility_ROLE_APPLICATION) + if (role != Accessibility_ROLE_APPLICATION) #endif - path_parent = g_strdup (SPI_DBUS_PATH_NULL); - else - path_parent = atk_dbus_desktop_object_path (); - } - else - { - path_parent = atk_dbus_object_to_path (parent, FALSE); - if (!path_parent) - { - /* This should only happen if a widget is re-parented to - * an AtkObject that has not been registered and is then - * updated. Ideally objects would be de-registered when - * they are removed from a registered tree object, but - * this would invalidate a huge amount of cache when - * re-parenting. - */ + path_parent = g_strdup (SPI_DBUS_PATH_NULL); + else + path_parent = atk_dbus_desktop_object_path (); + } + else + { + path_parent = atk_dbus_object_to_path (parent, FALSE); + if (!path_parent) + { + /* This should only happen if a widget is re-parented to + * an AtkObject that has not been registered and is then + * updated. Ideally objects would be de-registered when + * they are removed from a registered tree object, but + * this would invalidate a huge amount of cache when + * re-parenting. + */ #if SPI_ATK_DEBUG - g_warning ("AT-SPI: Registered accessible marshalled when parent not registered"); + g_warning + ("AT-SPI: Registered accessible marshalled when parent not registered"); #endif - path_parent = atk_dbus_desktop_object_path (); - } - } - - dbus_message_iter_open_container (iter_array, DBUS_TYPE_STRUCT, NULL, &iter_struct); - dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_OBJECT_PATH, &path); - spi_dbus_append_name_and_path_inner (&iter_struct, bus_parent, path_parent); - g_free(path_parent); - g_free (bus_parent); - - /* Marshall children */ - dbus_message_iter_open_container (&iter_struct, DBUS_TYPE_ARRAY, "(so)", &iter_sub_array); - if (!atk_state_set_contains_state (set, ATK_STATE_MANAGES_DESCENDANTS)) - { - gint childcount, i; - - childcount = atk_object_get_n_accessible_children (obj); - for (i = 0; i < childcount; i++) - { - AtkObject *child; - gchar *child_path; - - child = atk_object_ref_accessible_child (obj, i); - child_path = atk_dbus_object_to_path (child, FALSE); - if (child_path) - { - spi_dbus_append_name_and_path_inner (&iter_sub_array, NULL, child_path); - g_free (child_path); - } - g_object_unref(G_OBJECT(child)); - } - } + path_parent = atk_dbus_desktop_object_path (); + } + } + + dbus_message_iter_open_container (iter_array, DBUS_TYPE_STRUCT, NULL, + &iter_struct); + dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_OBJECT_PATH, + &path); + spi_dbus_append_name_and_path_inner (&iter_struct, bus_parent, + path_parent); + g_free (path_parent); + g_free (bus_parent); + + /* Marshall children */ + dbus_message_iter_open_container (&iter_struct, DBUS_TYPE_ARRAY, "(so)", + &iter_sub_array); + if (!atk_state_set_contains_state (set, ATK_STATE_MANAGES_DESCENDANTS)) + { + gint childcount, i; + + childcount = atk_object_get_n_accessible_children (obj); + for (i = 0; i < childcount; i++) + { + AtkObject *child; + gchar *child_path; + + child = atk_object_ref_accessible_child (obj, i); + child_path = atk_dbus_object_to_path (child, FALSE); + if (child_path) + { + spi_dbus_append_name_and_path_inner (&iter_sub_array, NULL, + child_path); + g_free (child_path); + } + g_object_unref (G_OBJECT (child)); + } + } #ifdef __ATK_PLUG_H__ - if (ATK_IS_SOCKET (obj) && atk_socket_is_occupied (ATK_SOCKET(obj))) - { - AtkSocket *socket = ATK_SOCKET(obj); - gchar *child_name, *child_path; - child_name = g_strdup (socket->embedded_plug_id); - child_path = g_utf8_strchr (child_name + 1, -1, ':'); - if (child_path) - { - *(child_path++) = '\0'; - spi_dbus_append_name_and_path_inner (&iter_sub_array, child_name, child_path); - } - g_free (child_name); - } + if (ATK_IS_SOCKET (obj) && atk_socket_is_occupied (ATK_SOCKET (obj))) + { + AtkSocket *socket = ATK_SOCKET (obj); + gchar *child_name, *child_path; + child_name = g_strdup (socket->embedded_plug_id); + child_path = g_utf8_strchr (child_name + 1, -1, ':'); + if (child_path) + { + *(child_path++) = '\0'; + spi_dbus_append_name_and_path_inner (&iter_sub_array, child_name, + child_path); + } + g_free (child_name); + } #endif - dbus_message_iter_close_container (&iter_struct, &iter_sub_array); - - /* Marshall interfaces */ - dbus_message_iter_open_container (&iter_struct, DBUS_TYPE_ARRAY, "s", &iter_sub_array); - append_atk_object_interfaces (obj, &iter_sub_array); - dbus_message_iter_close_container (&iter_struct, &iter_sub_array); - - /* Marshall name */ - name = atk_object_get_name (obj); - if (!name) - name = ""; - dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_STRING, &name); - - /* Marshall role */ - dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_UINT32, &role); - - /* Marshall description */ - desc = atk_object_get_description (obj); - if (!desc) - desc = ""; - dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_STRING, &desc); - - g_free(path); - - /* Marshall state set */ - spi_atk_state_set_to_dbus_array (set, states); - dbus_message_iter_open_container (&iter_struct, DBUS_TYPE_ARRAY, "u", &iter_sub_array); - for (count = 0; count < 2; count++) - { - dbus_message_iter_append_basic (&iter_sub_array, DBUS_TYPE_UINT32, &states[count]); - } - dbus_message_iter_close_container (&iter_struct, &iter_sub_array); - } + dbus_message_iter_close_container (&iter_struct, &iter_sub_array); + + /* Marshall interfaces */ + dbus_message_iter_open_container (&iter_struct, DBUS_TYPE_ARRAY, "s", + &iter_sub_array); + append_atk_object_interfaces (obj, &iter_sub_array); + dbus_message_iter_close_container (&iter_struct, &iter_sub_array); + + /* Marshall name */ + name = atk_object_get_name (obj); + if (!name) + name = ""; + dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_STRING, &name); + + /* Marshall role */ + dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_UINT32, &role); + + /* Marshall description */ + desc = atk_object_get_description (obj); + if (!desc) + desc = ""; + dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_STRING, &desc); + + g_free (path); + + /* Marshall state set */ + spi_atk_state_set_to_dbus_array (set, states); + dbus_message_iter_open_container (&iter_struct, DBUS_TYPE_ARRAY, "u", + &iter_sub_array); + for (count = 0; count < 2; count++) + { + dbus_message_iter_append_basic (&iter_sub_array, DBUS_TYPE_UINT32, + &states[count]); + } + dbus_message_iter_close_container (&iter_struct, &iter_sub_array); + } dbus_message_iter_close_container (iter_array, &iter_struct); g_object_unref (set); } void -spi_atk_append_attribute_set (DBusMessageIter *iter, AtkAttributeSet *attr) +spi_atk_append_attribute_set (DBusMessageIter * iter, AtkAttributeSet * attr) { DBusMessageIter dictIter; @@ -404,20 +423,23 @@ spi_atk_append_attribute_set (DBusMessageIter *iter, AtkAttributeSet *attr) } void -spi_atk_append_attribute_set_inner (DBusMessageIter *iter, AtkAttributeSet *attr) +spi_atk_append_attribute_set_inner (DBusMessageIter * iter, + AtkAttributeSet * attr) { DBusMessageIter dictEntryIter; while (attr) { AtkAttribute *attribute = (AtkAttribute *) attr->data; - dbus_message_iter_open_container (iter, DBUS_TYPE_DICT_ENTRY, NULL, &dictEntryIter); - dbus_message_iter_append_basic (&dictEntryIter, DBUS_TYPE_STRING, &attribute->name); - dbus_message_iter_append_basic (&dictEntryIter, DBUS_TYPE_STRING, &attribute->value); + dbus_message_iter_open_container (iter, DBUS_TYPE_DICT_ENTRY, NULL, + &dictEntryIter); + dbus_message_iter_append_basic (&dictEntryIter, DBUS_TYPE_STRING, + &attribute->name); + dbus_message_iter_append_basic (&dictEntryIter, DBUS_TYPE_STRING, + &attribute->value); dbus_message_iter_close_container (iter, &dictEntryIter); attr = g_slist_next (attr); } } /*END------------------------------------------------------------------------*/ - diff --git a/atk-adaptor/accessible-marshaller.h b/atk-adaptor/accessible-marshaller.h index 267989d..4d0a131 100644 --- a/atk-adaptor/accessible-marshaller.h +++ b/atk-adaptor/accessible-marshaller.h @@ -28,32 +28,37 @@ #include void -spi_dbus_append_name_and_path_inner (DBusMessageIter *iter, const char *bus_name, const char *path); +spi_dbus_append_name_and_path_inner (DBusMessageIter * iter, + const char *bus_name, const char *path); void -spi_dbus_append_name_and_path (DBusMessage *message, DBusMessageIter *iter, AtkObject *obj, gboolean do_register, gboolean unref); +spi_dbus_append_name_and_path (DBusMessage * message, DBusMessageIter * iter, + AtkObject * obj, gboolean do_register, + gboolean unref); -DBusMessage * -spi_dbus_return_object (DBusMessage *message, AtkObject *obj, gboolean do_register, gboolean unref); +DBusMessage *spi_dbus_return_object (DBusMessage * message, AtkObject * obj, + gboolean do_register, gboolean unref); -DBusMessage * -spi_dbus_return_hyperlink (DBusMessage *message, AtkHyperlink *link, AtkObject *container, gboolean unref); +DBusMessage *spi_dbus_return_hyperlink (DBusMessage * message, + AtkHyperlink * link, + AtkObject * container, + gboolean unref); -DBusMessage * -spi_dbus_return_sub_object (DBusMessage *message, GObject *sub, GObject *container, gboolean unref); +DBusMessage *spi_dbus_return_sub_object (DBusMessage * message, GObject * sub, + GObject * container, gboolean unref); dbus_bool_t -spi_dbus_return_v_object (DBusMessageIter *iter, AtkObject *obj, int unref); +spi_dbus_return_v_object (DBusMessageIter * iter, AtkObject * obj, int unref); -void -spi_atk_append_accessible(AtkObject *obj, gpointer iter); +void spi_atk_append_accessible (AtkObject * obj, gpointer iter); void -spi_atk_append_attribute_set (DBusMessageIter *iter, AtkAttributeSet *attr); +spi_atk_append_attribute_set (DBusMessageIter * iter, AtkAttributeSet * attr); void -spi_atk_append_attribute_set_inner (DBusMessageIter *iter, AtkAttributeSet *attr); +spi_atk_append_attribute_set_inner (DBusMessageIter * iter, + AtkAttributeSet * attr); void -append_atk_object_interfaces (AtkObject *object, DBusMessageIter *iter); +append_atk_object_interfaces (AtkObject * object, DBusMessageIter * iter); #endif /* ACCESSIBLE_MARSHALLER */ diff --git a/atk-adaptor/accessible-register.c b/atk-adaptor/accessible-register.c index d4a1d6c..f0963af 100644 --- a/atk-adaptor/accessible-register.c +++ b/atk-adaptor/accessible-register.c @@ -76,7 +76,7 @@ #define SPI_ATK_OBJECT_REFERENCE_TEMPLATE SPI_ATK_OBJECT_PATH_PREFIX "/%d" -static GHashTable *ref2ptr = NULL; /* Used for converting a D-Bus path (Reference) to the object pointer */ +static GHashTable *ref2ptr = NULL; /* Used for converting a D-Bus path (Reference) to the object pointer */ static GHashTable *objects_with_subrefs = NULL; static GHashTable *leased_refs = NULL; static int leased_refs_count; @@ -87,19 +87,21 @@ static GStaticRecMutex registration_mutex = G_STATIC_REC_MUTEX_INIT; /*---------------------------------------------------------------------------*/ -static GStaticMutex recursion_check_guard = G_STATIC_MUTEX_INIT; -static gboolean recursion_check = FALSE; +static GStaticMutex recursion_check_guard = G_STATIC_MUTEX_INIT; +static gboolean recursion_check = FALSE; static int last_gc_time; -static void deregister_sub_accessible (gpointer key, gpointer obj_data, gpointer iter); +static void deregister_sub_accessible (gpointer key, gpointer obj_data, + gpointer iter); -static void deregister_sub_hyperlink (gpointer key, gpointer obj_data, gpointer iter); +static void deregister_sub_hyperlink (gpointer key, gpointer obj_data, + gpointer iter); static gboolean recursion_check_and_set () { gboolean ret; - g_static_mutex_lock (&recursion_check_guard); + g_static_mutex_lock (&recursion_check_guard); ret = recursion_check; recursion_check = TRUE; g_static_mutex_unlock (&recursion_check_guard); @@ -109,7 +111,7 @@ recursion_check_and_set () static void recursion_check_unset () { - g_static_mutex_lock (&recursion_check_guard); + g_static_mutex_lock (&recursion_check_guard); recursion_check = FALSE; g_static_mutex_unlock (&recursion_check_guard); } @@ -123,7 +125,7 @@ recursion_check_unset () * AtkObject. */ static guint -assign_reference(void) +assign_reference (void) { reference_counter++; /* Reference of 0 not allowed as used as direct key in hash table */ @@ -137,19 +139,19 @@ assign_reference(void) * Returns the reference of the object, or 0 if it is not registered. */ static guint -gobject_to_ref (GObject *gobj) +gobject_to_ref (GObject * gobj) { - return GPOINTER_TO_INT(g_object_get_data (gobj, "dbus-id")); + return GPOINTER_TO_INT (g_object_get_data (gobj, "dbus-id")); } static guint -object_to_ref (AtkObject *accessible) +object_to_ref (AtkObject * accessible) { return gobject_to_ref (G_OBJECT (accessible)); } static guint -hyperlink_to_ref (AtkHyperlink *link) +hyperlink_to_ref (AtkHyperlink * link) { return gobject_to_ref (G_OBJECT (link)); } @@ -160,7 +162,7 @@ hyperlink_to_ref (AtkHyperlink *link) gchar * atk_dbus_ref_to_path (guint ref) { - return g_strdup_printf(SPI_ATK_OBJECT_REFERENCE_TEMPLATE, ref); + return g_strdup_printf (SPI_ATK_OBJECT_REFERENCE_TEMPLATE, ref); } /*---------------------------------------------------------------------------*/ @@ -172,7 +174,7 @@ atk_dbus_ref_to_path (guint ref) * it is no longer exposed over D-Bus. */ static void -deregister_object (gpointer data, GObject *gobj) +deregister_object (gpointer data, GObject * gobj) { guint ref; GHashTable *subrefs_atk; @@ -180,33 +182,35 @@ deregister_object (gpointer data, GObject *gobj) g_return_if_fail (ATK_IS_OBJECT (gobj) || ATK_IS_HYPERLINK (gobj)); subrefs_atk = (GHashTable *) g_object_get_data (gobj, "dbus-subrefs-atk"); - subrefs_hyperlink = (GHashTable *) g_object_get_data (gobj, "dbus-subrefs-hyperlink"); + subrefs_hyperlink = + (GHashTable *) g_object_get_data (gobj, "dbus-subrefs-hyperlink"); if (subrefs_atk) - { - g_hash_table_foreach (subrefs_atk, deregister_sub_accessible, data); - g_hash_table_unref (subrefs_atk); - } - + { + g_hash_table_foreach (subrefs_atk, deregister_sub_accessible, data); + g_hash_table_unref (subrefs_atk); + } + if (subrefs_hyperlink) - { - g_hash_table_foreach (subrefs_hyperlink, deregister_sub_hyperlink, data); - g_hash_table_unref (subrefs_hyperlink); - } - + { + g_hash_table_foreach (subrefs_hyperlink, deregister_sub_hyperlink, + data); + g_hash_table_unref (subrefs_hyperlink); + } + if (subrefs_atk || subrefs_hyperlink) g_hash_table_remove (objects_with_subrefs, gobj); if (ATK_IS_OBJECT (gobj)) - { - ref = object_to_ref (ATK_OBJECT (gobj)); - if (ref != 0) - { - spi_emit_cache_removal (ref, atk_adaptor_app_data->bus); - g_hash_table_remove(ref2ptr, GINT_TO_POINTER(ref)); - } + { + ref = object_to_ref (ATK_OBJECT (gobj)); + if (ref != 0) + { + spi_emit_cache_removal (ref, atk_adaptor_app_data->bus); + g_hash_table_remove (ref2ptr, GINT_TO_POINTER (ref)); + } } - } +} static void deregister_sub_accessible (gpointer key, gpointer obj_data, gpointer iter) @@ -228,82 +232,88 @@ deregister_sub_hyperlink (gpointer key, gpointer obj_data, gpointer iter) ref = gobject_to_ref (ghyperlink); if (ref != 0) { - g_hash_table_remove(ref2ptr, GINT_TO_POINTER(ref)); + g_hash_table_remove (ref2ptr, GINT_TO_POINTER (ref)); } g_object_unref (ghyperlink); } static void -register_gobject (GObject *gobj, GObject *container) +register_gobject (GObject * gobj, GObject * container) { guint ref; - g_return_if_fail (G_IS_OBJECT(gobj)); + g_return_if_fail (G_IS_OBJECT (gobj)); - ref = assign_reference(); + ref = assign_reference (); - g_hash_table_insert (ref2ptr, GINT_TO_POINTER(ref), gobj); - g_object_set_data (G_OBJECT(gobj), "dbus-id", GINT_TO_POINTER(ref)); - g_object_weak_ref(G_OBJECT(gobj), deregister_object, NULL); + g_hash_table_insert (ref2ptr, GINT_TO_POINTER (ref), gobj); + g_object_set_data (G_OBJECT (gobj), "dbus-id", GINT_TO_POINTER (ref)); + g_object_weak_ref (G_OBJECT (gobj), deregister_object, NULL); if (container) - { - GHashTable *subrefs = (GHashTable *) g_object_get_data (G_OBJECT (container), "dbus-subrefs-atk"); - if (!subrefs) { - subrefs = g_hash_table_new(g_direct_hash, g_direct_equal); - g_object_set_data (G_OBJECT (container), "dbus-subrefs-atk", subrefs); + GHashTable *subrefs = + (GHashTable *) g_object_get_data (G_OBJECT (container), + "dbus-subrefs-atk"); + if (!subrefs) + { + subrefs = g_hash_table_new (g_direct_hash, g_direct_equal); + g_object_set_data (G_OBJECT (container), "dbus-subrefs-atk", + subrefs); + } + g_hash_table_insert (subrefs, GINT_TO_POINTER (ref), gobj); + g_hash_table_insert (objects_with_subrefs, gobj, subrefs); } - g_hash_table_insert (subrefs, GINT_TO_POINTER(ref), gobj); - g_hash_table_insert (objects_with_subrefs, gobj, subrefs); - } if (ATK_IS_HYPERLINK (gobj)) g_object_ref (gobj); else if (ATK_IS_OBJECT (gobj)) - { - AtkObject *accessible = ATK_OBJECT (gobj); - AtkStateSet *state = atk_object_ref_state_set (accessible); - if (atk_state_set_contains_state (state, ATK_STATE_TRANSIENT)) { - g_object_ref (gobj); - /* We should only get here as the result of a query other than GetTree */ - spi_emit_cache_update (accessible, atk_adaptor_app_data->bus); + AtkObject *accessible = ATK_OBJECT (gobj); + AtkStateSet *state = atk_object_ref_state_set (accessible); + if (atk_state_set_contains_state (state, ATK_STATE_TRANSIENT)) + { + g_object_ref (gobj); + /* We should only get here as the result of a query other than GetTree */ + spi_emit_cache_update (accessible, atk_adaptor_app_data->bus); + } + g_object_unref (state); } - g_object_unref (state); - } } /* * Called to register an AtkObject with AT-SPI and expose it over D-Bus. */ static void -register_accessible (AtkObject *accessible, AtkObject *container) +register_accessible (AtkObject * accessible, AtkObject * container) { - g_return_if_fail (ATK_IS_OBJECT(accessible)); + g_return_if_fail (ATK_IS_OBJECT (accessible)); register_gobject (G_OBJECT (accessible), G_OBJECT (container)); } static void -register_hyperlink (AtkHyperlink *hyperlink, AtkObject *container) +register_hyperlink (AtkHyperlink * hyperlink, AtkObject * container) { guint ref; g_return_if_fail (ATK_IS_HYPERLINK (hyperlink)); g_return_if_fail (container); - ref = assign_reference(); + ref = assign_reference (); - g_hash_table_insert (ref2ptr, GINT_TO_POINTER(ref), hyperlink); - g_object_set_data (G_OBJECT(hyperlink), "dbus-id", GINT_TO_POINTER(ref)); + g_hash_table_insert (ref2ptr, GINT_TO_POINTER (ref), hyperlink); + g_object_set_data (G_OBJECT (hyperlink), "dbus-id", GINT_TO_POINTER (ref)); g_object_ref (G_OBJECT (hyperlink)); - GHashTable *subrefs = (GHashTable *) g_object_get_data (G_OBJECT (container), "dbus-subrefs-hyperlink"); + GHashTable *subrefs = + (GHashTable *) g_object_get_data (G_OBJECT (container), + "dbus-subrefs-hyperlink"); if (!subrefs) - { - subrefs = g_hash_table_new(g_direct_hash, g_direct_equal); - g_object_set_data (G_OBJECT (container), "dbus-subrefs-hyperlink", GINT_TO_POINTER(ref)); - } - g_hash_table_insert (subrefs, GINT_TO_POINTER(ref), hyperlink); + { + subrefs = g_hash_table_new (g_direct_hash, g_direct_equal); + g_object_set_data (G_OBJECT (container), "dbus-subrefs-hyperlink", + GINT_TO_POINTER (ref)); + } + g_hash_table_insert (subrefs, GINT_TO_POINTER (ref), hyperlink); } /*---------------------------------------------------------------------------*/ @@ -320,17 +330,17 @@ register_hyperlink (AtkHyperlink *hyperlink, AtkObject *container) * TODO Add debug wrapper */ static gboolean -non_owned_accessible (AtkObject *accessible) -{ - if ((G_OBJECT (accessible))->ref_count <= 1) - { - g_warning ("AT-SPI: Child referenced that is not owned by its parent"); - return TRUE; - } - else - { - return FALSE; - } +non_owned_accessible (AtkObject * accessible) +{ + if ((G_OBJECT (accessible))->ref_count <= 1) + { + g_warning ("AT-SPI: Child referenced that is not owned by its parent"); + return TRUE; + } + else + { + return FALSE; + } } #endif /* SPI_ATK_DEBUG */ @@ -340,35 +350,36 @@ non_owned_accessible (AtkObject *accessible) * Currently true if TRANSIENT and not SHOWING */ static gboolean -object_is_moot (AtkObject *accessible) +object_is_moot (AtkObject * accessible) { - AtkStateSet *state; - gboolean result = FALSE; + AtkStateSet *state; + gboolean result = FALSE; - /* This is dangerous, refing the state set - * seems to do wierd things to the tree & cause recursion - * by modifying the tree alot. - */ - state = atk_object_ref_state_set (accessible); - if ( atk_state_set_contains_state (state, ATK_STATE_TRANSIENT) && - !atk_state_set_contains_state (state, ATK_STATE_SHOWING)) - { - result = TRUE; - } - g_object_unref (state); + /* This is dangerous, refing the state set + * seems to do wierd things to the tree & cause recursion + * by modifying the tree alot. + */ + state = atk_object_ref_state_set (accessible); + if (atk_state_set_contains_state (state, ATK_STATE_TRANSIENT) && + !atk_state_set_contains_state (state, ATK_STATE_SHOWING)) + { + result = TRUE; + } + g_object_unref (state); - return result; + return result; } static void -append_children (AtkObject *accessible, GQueue *traversal) +append_children (AtkObject * accessible, GQueue * traversal) { AtkObject *current; guint i; gint count = atk_object_get_n_accessible_children (accessible); - if (count < 0) count = 0; - for (i =0; i < count; i++) + if (count < 0) + count = 0; + for (i = 0; i < count; i++) { current = atk_object_ref_accessible_child (accessible, i); if (current) @@ -391,11 +402,11 @@ append_children (AtkObject *accessible, GQueue *traversal) * or if it has already been registered. */ void -register_subtree (AtkObject *accessible) +register_subtree (AtkObject * accessible) { AtkObject *current; - GQueue *traversal; - GQueue *emit_update; + GQueue *traversal; + GQueue *emit_update; g_return_if_fail (ATK_IS_OBJECT (accessible)); @@ -413,9 +424,9 @@ register_subtree (AtkObject *accessible) { register_accessible (current, NULL); #ifdef SPI_ATK_DEBUG - g_debug ("REG - %s - %d - %s", atk_object_get_name (current), - atk_object_get_role (current), - atk_dbus_object_to_path (current)); + g_debug ("REG - %s - %d - %s", atk_object_get_name (current), + atk_object_get_role (current), + atk_dbus_object_to_path (current)); #endif append_children (current, traversal); } @@ -439,10 +450,10 @@ register_subtree (AtkObject *accessible) * way that client side cache needs to be updated. */ static void -update_accessible (AtkObject *accessible) +update_accessible (AtkObject * accessible) { - guint ref = 0; - g_return_if_fail (ATK_IS_OBJECT(accessible)); + guint ref = 0; + g_return_if_fail (ATK_IS_OBJECT (accessible)); ref = object_to_ref (accessible); if (ref) @@ -454,9 +465,9 @@ update_accessible (AtkObject *accessible) /*---------------------------------------------------------------------------*/ void -atk_dbus_foreach_registered(GHFunc func, gpointer data) +atk_dbus_foreach_registered (GHFunc func, gpointer data) { - g_hash_table_foreach(ref2ptr, func, data); + g_hash_table_foreach (ref2ptr, func, data); } /* @@ -470,25 +481,26 @@ atk_dbus_path_to_gobject (const char *path) 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 */ + path += SPI_ATK_PATH_PREFIX_LENGTH; /* Skip over the prefix */ if (!g_strcmp0 (SPI_ATK_OBJECT_PATH_DESKTOP, path)) - return G_OBJECT (atk_get_root()); + return G_OBJECT (atk_get_root ()); if (path[0] != '/') - return NULL; + return NULL; path++; index = atoi (path); - data = g_hash_table_lookup (ref2ptr, GINT_TO_POINTER(index)); + data = g_hash_table_lookup (ref2ptr, GINT_TO_POINTER (index)); if (data) - { - GObject *gobj = G_OBJECT (data); - g_object_set_data (gobj, "last-ref-time", (gpointer) time (NULL)); - return gobj; - } + { + GObject *gobj = G_OBJECT (data); + g_object_set_data (gobj, "last-ref-time", (gpointer) time (NULL)); + return gobj; + } else return NULL; } @@ -505,7 +517,7 @@ atk_dbus_path_to_object (const char *path) * object that has not already been registered. */ gchar * -atk_dbus_object_attempt_registration (AtkObject *accessible) +atk_dbus_object_attempt_registration (AtkObject * accessible) { guint ref; @@ -520,13 +532,13 @@ atk_dbus_object_attempt_registration (AtkObject *accessible) prev = accessible; current = atk_object_get_parent (accessible); if (current) - cref = object_to_ref (current); + cref = object_to_ref (current); while (current && !cref) { prev = current; current = atk_object_get_parent (current); if (current) - cref = object_to_ref (current); + cref = object_to_ref (current); } /* A registered parent, with non-registered child, has been found */ @@ -544,7 +556,8 @@ atk_dbus_object_attempt_registration (AtkObject *accessible) else { #ifdef SPI_ATK_DEBUG - g_debug ("AT-SPI: Could not register a non-attached accessible object"); + g_debug + ("AT-SPI: Could not register a non-attached accessible object"); #endif return NULL; } @@ -560,52 +573,57 @@ atk_dbus_object_attempt_registration (AtkObject *accessible) * Used to lookup a D-Bus path from the AtkObject. */ static gchar * -atk_dbus_gobject_to_path_internal (GObject *gobj, gboolean do_register, GObject *container) +atk_dbus_gobject_to_path_internal (GObject * gobj, gboolean do_register, + GObject * container) { guint ref; ref = gobject_to_ref (gobj); if (!ref && do_register) - { - register_gobject (gobj, container); - ref = gobject_to_ref (gobj); - } + { + register_gobject (gobj, container); + ref = gobject_to_ref (gobj); + } if (!ref) - return NULL; + return NULL; else - return atk_dbus_ref_to_path (ref); + return atk_dbus_ref_to_path (ref); } gchar * -atk_dbus_object_to_path (AtkObject *accessible, gboolean do_register) +atk_dbus_object_to_path (AtkObject * accessible, gboolean do_register) { - AtkObject *container = (accessible && do_register? atk_object_get_parent (accessible): NULL); - return atk_dbus_gobject_to_path_internal (G_OBJECT (accessible), do_register, G_OBJECT (container)); + AtkObject *container = (accessible + && do_register ? atk_object_get_parent (accessible) + : NULL); + return atk_dbus_gobject_to_path_internal (G_OBJECT (accessible), + do_register, + G_OBJECT (container)); } gchar * -atk_dbus_sub_object_to_path (GObject *gobj, GObject *container) +atk_dbus_sub_object_to_path (GObject * gobj, GObject * container) { return atk_dbus_gobject_to_path_internal (gobj, TRUE, container); } gchar * -atk_dbus_hyperlink_to_path (AtkHyperlink *hyperlink, AtkObject *container) +atk_dbus_hyperlink_to_path (AtkHyperlink * hyperlink, AtkObject * container) { guint ref; ref = gobject_to_ref (G_OBJECT (hyperlink)); if (!ref && container) - { - register_hyperlink (hyperlink, container); - ref = hyperlink_to_ref (hyperlink); - } + { + register_hyperlink (hyperlink, container); + ref = hyperlink_to_ref (hyperlink); + } if (!ref) - return NULL; + return NULL; else - return atk_dbus_ref_to_path (ref); + return atk_dbus_ref_to_path (ref); } gchar * @@ -616,11 +634,10 @@ atk_dbus_desktop_object_path () /*---------------------------------------------------------------------------*/ -typedef gboolean (*TreeUpdateAction) (GSignalInvocationHint *signal_hint, - guint n_param_values, - const GValue *param_values, - gpointer data, - AtkObject *accessible); +typedef gboolean (*TreeUpdateAction) (GSignalInvocationHint * signal_hint, + guint n_param_values, + const GValue * param_values, + gpointer data, AtkObject * accessible); /* * Events are not evaluated for non-registered accessibles. @@ -633,11 +650,10 @@ typedef gboolean (*TreeUpdateAction) (GSignalInvocationHint *signal_hint, */ /* TODO Turn this function into a macro? */ static gboolean -tree_update_wrapper (GSignalInvocationHint *signal_hint, - guint n_param_values, - const GValue *param_values, - gpointer data, - TreeUpdateAction action) +tree_update_wrapper (GSignalInvocationHint * signal_hint, + guint n_param_values, + const GValue * param_values, + gpointer data, TreeUpdateAction action) { AtkObject *accessible; @@ -646,14 +662,14 @@ tree_update_wrapper (GSignalInvocationHint *signal_hint, /* Ensure that only registered accessibles * have their signals processed. */ - accessible = ATK_OBJECT(g_value_get_object (¶m_values[0])); + accessible = ATK_OBJECT (g_value_get_object (¶m_values[0])); g_return_val_if_fail (ATK_IS_OBJECT (accessible), TRUE); if (object_to_ref (accessible)) { #ifdef SPI_ATK_DEBUG if (recursion_check_and_set ()) - g_warning ("AT-SPI: Recursive use of registration module"); + g_warning ("AT-SPI: Recursive use of registration module"); g_debug ("AT-SPI: Tree update listener"); #endif @@ -670,7 +686,7 @@ tree_update_wrapper (GSignalInvocationHint *signal_hint, static gboolean maybe_expire_lease (gpointer key, gpointer obj_data, gpointer iter) { - time_t secs = time (NULL) - (time_t)obj_data; + time_t secs = time (NULL) - (time_t) obj_data; if (secs < 30) return FALSE; @@ -681,7 +697,8 @@ maybe_expire_lease (gpointer key, gpointer obj_data, gpointer iter) static void expire_old_leases_in (gpointer key, gpointer obj_data, gpointer iter) { - g_hash_table_foreach_remove ((GHashTable *)obj_data, maybe_expire_lease, NULL); + g_hash_table_foreach_remove ((GHashTable *) obj_data, maybe_expire_lease, + NULL); } static void @@ -691,144 +708,141 @@ expire_old_leases () } static gboolean -tree_update_state_action (GSignalInvocationHint *signal_hint, - guint n_param_values, - const GValue *param_values, - gpointer data, - AtkObject *accessible) +tree_update_state_action (GSignalInvocationHint * signal_hint, + guint n_param_values, + const GValue * param_values, + gpointer data, AtkObject * accessible) { const gchar *name; gboolean state; if (n_param_values < 3) - { - g_warning ("at-spi: Not enough params in state-changed signal"); - return TRUE; - } + { + g_warning ("at-spi: Not enough params in state-changed signal"); + return TRUE; + } name = g_value_get_string (param_values + 1); state = g_value_get_boolean (param_values + 2); if (!strcmp (name, "visible")) - { - AtkStateSet *set = atk_object_ref_state_set (accessible); - if (atk_state_set_contains_state (set, ATK_STATE_TRANSIENT)) { - if (state == 0) - { - g_hash_table_insert (leased_refs, accessible, (gpointer) time (NULL)); - leased_refs_count++; - /* todo: Set to a high number: 5 for dbg. */ - if (leased_refs_count > 5) - expire_old_leases (); - } - else - { - g_hash_table_remove (leased_refs, accessible); - leased_refs_count--; - } + AtkStateSet *set = atk_object_ref_state_set (accessible); + if (atk_state_set_contains_state (set, ATK_STATE_TRANSIENT)) + { + if (state == 0) + { + g_hash_table_insert (leased_refs, accessible, + (gpointer) time (NULL)); + leased_refs_count++; + /* todo: Set to a high number: 5 for dbg. */ + if (leased_refs_count > 5) + expire_old_leases (); + } + else + { + g_hash_table_remove (leased_refs, accessible); + leased_refs_count--; + } + } + g_object_unref (set); } - g_object_unref (set); - } - update_accessible (accessible); + update_accessible (accessible); return TRUE; } static gboolean -tree_update_state_listener (GSignalInvocationHint *signal_hint, - guint n_param_values, - const GValue *param_values, - gpointer data) +tree_update_state_listener (GSignalInvocationHint * signal_hint, + guint n_param_values, + const GValue * param_values, gpointer data) { - tree_update_wrapper (signal_hint, n_param_values, param_values, data, tree_update_state_action); + tree_update_wrapper (signal_hint, n_param_values, param_values, data, + tree_update_state_action); return TRUE; } static gboolean -tree_update_property_action (GSignalInvocationHint *signal_hint, - guint n_param_values, - const GValue *param_values, - gpointer data, - AtkObject *accessible) -{ - AtkPropertyValues *values; - const gchar *pname = NULL; - - values = (AtkPropertyValues*) g_value_get_pointer (¶m_values[1]); - pname = values[0].property_name; - if (strcmp (pname, "accessible-name") == 0 || - strcmp (pname, "accessible-description") == 0 || - strcmp (pname, "accessible-parent") == 0 || - strcmp (pname, "accessible-role") == 0) - { - update_accessible (accessible); - } - /* Parent value us updated by child-add signal of parent object */ - return TRUE; +tree_update_property_action (GSignalInvocationHint * signal_hint, + guint n_param_values, + const GValue * param_values, + gpointer data, AtkObject * accessible) +{ + AtkPropertyValues *values; + const gchar *pname = NULL; + + values = (AtkPropertyValues *) g_value_get_pointer (¶m_values[1]); + pname = values[0].property_name; + if (strcmp (pname, "accessible-name") == 0 || + strcmp (pname, "accessible-description") == 0 || + strcmp (pname, "accessible-parent") == 0 || + strcmp (pname, "accessible-role") == 0) + { + update_accessible (accessible); + } + /* Parent value us updated by child-add signal of parent object */ + return TRUE; } static gboolean -tree_update_property_listener (GSignalInvocationHint *signal_hint, - guint n_param_values, - const GValue *param_values, - gpointer data) +tree_update_property_listener (GSignalInvocationHint * signal_hint, + guint n_param_values, + const GValue * param_values, gpointer data) { - tree_update_wrapper (signal_hint, n_param_values, param_values, data, tree_update_property_action); + tree_update_wrapper (signal_hint, n_param_values, param_values, data, + tree_update_property_action); return TRUE; } static gboolean -tree_update_children_action (GSignalInvocationHint *signal_hint, - guint n_param_values, - const GValue *param_values, - gpointer data, - AtkObject *accessible) +tree_update_children_action (GSignalInvocationHint * signal_hint, + guint n_param_values, + const GValue * param_values, + gpointer data, AtkObject * accessible) { - const gchar *detail = NULL; - AtkObject *child; + const gchar *detail = NULL; + AtkObject *child; - if (signal_hint->detail) - detail = g_quark_to_string (signal_hint->detail); + if (signal_hint->detail) + detail = g_quark_to_string (signal_hint->detail); - if (!strcmp (detail, "add")) - { - gpointer child; - int index = g_value_get_uint (param_values + 1); - child = g_value_get_pointer (param_values + 2); + if (!strcmp (detail, "add")) + { + gpointer child; + int index = g_value_get_uint (param_values + 1); + child = g_value_get_pointer (param_values + 2); - if (!ATK_IS_OBJECT (child)) - { - child = atk_object_ref_accessible_child (accessible, index); + if (!ATK_IS_OBJECT (child)) + { + child = atk_object_ref_accessible_child (accessible, index); #ifdef SPI_ATK_DEBUG - non_owned_accessible (child); + non_owned_accessible (child); #endif - } - register_subtree (child); - update_accessible (accessible); } - else if (!strcmp (detail, "remove")) - { - update_accessible (accessible); - } - return TRUE; + register_subtree (child); + update_accessible (accessible); + } + else if (!strcmp (detail, "remove")) + { + update_accessible (accessible); + } + return TRUE; } static gboolean -tree_update_children_listener (GSignalInvocationHint *signal_hint, - guint n_param_values, - const GValue *param_values, - gpointer data) +tree_update_children_listener (GSignalInvocationHint * signal_hint, + guint n_param_values, + const GValue * param_values, gpointer data) { - tree_update_wrapper (signal_hint, n_param_values, param_values, data, tree_update_children_action); - return TRUE; + tree_update_wrapper (signal_hint, n_param_values, param_values, data, + tree_update_children_action); + return TRUE; } /*---------------------------------------------------------------------------*/ static void -spi_atk_register_toplevel_added (AtkObject *accessible, - guint index, - AtkObject *child) +spi_atk_register_toplevel_added (AtkObject * accessible, + guint index, AtkObject * child) { g_static_rec_mutex_lock (®istration_mutex); @@ -838,7 +852,7 @@ spi_atk_register_toplevel_added (AtkObject *accessible, { #ifdef SPI_ATK_DEBUG if (recursion_check_and_set ()) - g_warning ("AT-SPI: Recursive use of registration module"); + g_warning ("AT-SPI: Recursive use of registration module"); g_debug ("AT-SPI: Toplevel added listener"); #endif @@ -859,9 +873,8 @@ spi_atk_register_toplevel_added (AtkObject *accessible, } static void -spi_atk_register_toplevel_removed (AtkObject *accessible, - guint index, - AtkObject *child) +spi_atk_register_toplevel_removed (AtkObject * accessible, + guint index, AtkObject * child) { g_static_rec_mutex_lock (®istration_mutex); @@ -871,7 +884,7 @@ spi_atk_register_toplevel_removed (AtkObject *accessible, { #ifdef SPI_ATK_DEBUG if (recursion_check_and_set ()) - g_warning ("AT-SPI: Recursive use of registration module"); + g_warning ("AT-SPI: Recursive use of registration module"); g_debug ("AT-SPI: Toplevel removed listener"); #endif @@ -889,38 +902,39 @@ spi_atk_register_toplevel_removed (AtkObject *accessible, * Initializes all of the required D-Bus interfaces. */ void -atk_dbus_initialize (AtkObject *root) +atk_dbus_initialize (AtkObject * root) { if (!ref2ptr) - ref2ptr = g_hash_table_new(g_direct_hash, g_direct_equal); + ref2ptr = g_hash_table_new (g_direct_hash, g_direct_equal); if (!objects_with_subrefs) - objects_with_subrefs = g_hash_table_new(g_direct_hash, g_direct_equal); + objects_with_subrefs = g_hash_table_new (g_direct_hash, g_direct_equal); if (!leased_refs) - leased_refs = g_hash_table_new(g_direct_hash, g_direct_equal); + leased_refs = g_hash_table_new (g_direct_hash, g_direct_equal); #ifdef SPI_ATK_DEBUG if (g_thread_supported ()) - g_message ("AT-SPI: Threads enabled"); + g_message ("AT-SPI: Threads enabled"); g_debug ("AT-SPI: Initial Atk tree regisration"); #endif register_subtree (root); - atk_add_global_event_listener (tree_update_property_listener, "Gtk:AtkObject:property-change"); - atk_add_global_event_listener (tree_update_children_listener, "Gtk:AtkObject:children-changed"); - atk_add_global_event_listener (tree_update_state_listener, "Gtk:AtkObject:state-change"); + atk_add_global_event_listener (tree_update_property_listener, + "Gtk:AtkObject:property-change"); + atk_add_global_event_listener (tree_update_children_listener, + "Gtk:AtkObject:children-changed"); + atk_add_global_event_listener (tree_update_state_listener, + "Gtk:AtkObject:state-change"); g_signal_connect (root, "children-changed::add", - (GCallback) spi_atk_register_toplevel_added, - NULL); + (GCallback) spi_atk_register_toplevel_added, NULL); g_signal_connect (root, "children-changed::remove", - (GCallback) spi_atk_register_toplevel_removed, - NULL); + (GCallback) spi_atk_register_toplevel_removed, NULL); } /*END------------------------------------------------------------------------*/ diff --git a/atk-adaptor/accessible-register.h b/atk-adaptor/accessible-register.h index f9f6a90..fe1912d 100644 --- a/atk-adaptor/accessible-register.h +++ b/atk-adaptor/accessible-register.h @@ -27,32 +27,25 @@ #include #include -void -atk_dbus_foreach_registered(GHFunc func, gpointer data); +void atk_dbus_foreach_registered (GHFunc func, gpointer data); /*---------------------------------------------------------------------------*/ -GObject * -atk_dbus_path_to_gobject (const char *path); +GObject *atk_dbus_path_to_gobject (const char *path); -AtkObject * -atk_dbus_path_to_object (const char *path); +AtkObject *atk_dbus_path_to_object (const char *path); -gchar * -atk_dbus_object_attempt_registration (AtkObject *accessible); +gchar *atk_dbus_object_attempt_registration (AtkObject * accessible); -gchar * -atk_dbus_object_to_path (AtkObject *accessible, gboolean do_register); +gchar *atk_dbus_object_to_path (AtkObject * accessible, gboolean do_register); -gchar * -atk_dbus_sub_object_to_path (GObject *accessible, GObject *container); +gchar *atk_dbus_sub_object_to_path (GObject * accessible, + GObject * container); -gchar * -atk_dbus_hyperlink_to_path (AtkHyperlink *hyperlink, AtkObject *container); +gchar *atk_dbus_hyperlink_to_path (AtkHyperlink * hyperlink, + AtkObject * container); -gchar * -atk_dbus_desktop_object_path (); +gchar *atk_dbus_desktop_object_path (); -gchar * -atk_dbus_ref_to_path (guint ref); +gchar *atk_dbus_ref_to_path (guint ref); #endif /* ACCESSIBLE_REGISTER */ diff --git a/atk-adaptor/action-adaptor.c b/atk-adaptor/action-adaptor.c index 8f3f565..451e38c 100644 --- a/atk-adaptor/action-adaptor.c +++ b/atk-adaptor/action-adaptor.c @@ -28,7 +28,7 @@ #include "common/spi-dbus.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; @@ -37,7 +37,8 @@ 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; DBusError error; @@ -48,22 +49,25 @@ impl_get_description (DBusConnection *bus, DBusMessage *message, void *user_data dbus_error_init (&error); g_return_val_if_fail (ATK_IS_ACTION (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args (message, &error, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) - { - return droute_invalid_arguments_error (message); - } - desc = atk_action_get_description(action, index); - if (!desc) desc = ""; + if (!dbus_message_get_args + (message, &error, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) + { + return droute_invalid_arguments_error (message); + } + desc = atk_action_get_description (action, index); + if (!desc) + desc = ""; reply = dbus_message_new_method_return (message); if (reply) - { - dbus_message_append_args (reply, DBUS_TYPE_STRING, &desc, DBUS_TYPE_INVALID); - } + { + dbus_message_append_args (reply, DBUS_TYPE_STRING, &desc, + DBUS_TYPE_INVALID); + } return reply; } static DBusMessage * -impl_get_name (DBusConnection *bus, DBusMessage *message, void *user_data) +impl_get_name (DBusConnection * bus, DBusMessage * message, void *user_data) { DBusMessage *reply; DBusError error; @@ -74,22 +78,26 @@ impl_get_name (DBusConnection *bus, DBusMessage *message, void *user_data) dbus_error_init (&error); g_return_val_if_fail (ATK_IS_ACTION (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args (message, &error, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) - { - return droute_invalid_arguments_error (message); - } - name = atk_action_get_name(action, index); - if (!name) name = ""; + if (!dbus_message_get_args + (message, &error, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) + { + return droute_invalid_arguments_error (message); + } + name = atk_action_get_name (action, index); + if (!name) + name = ""; reply = dbus_message_new_method_return (message); if (reply) - { - dbus_message_append_args (reply, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID); - } + { + dbus_message_append_args (reply, DBUS_TYPE_STRING, &name, + DBUS_TYPE_INVALID); + } return reply; } static DBusMessage * -impl_get_keybinding (DBusConnection *bus, DBusMessage *message, void *user_data) +impl_get_keybinding (DBusConnection * bus, DBusMessage * message, + void *user_data) { DBusMessage *reply; DBusError error; @@ -100,21 +108,25 @@ impl_get_keybinding (DBusConnection *bus, DBusMessage *message, void *user_data) dbus_error_init (&error); g_return_val_if_fail (ATK_IS_ACTION (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args (message, &error, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) - { - return droute_invalid_arguments_error (message); - } - kb = atk_action_get_keybinding(action, index); - if (!kb) kb = ""; + if (!dbus_message_get_args + (message, &error, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) + { + return droute_invalid_arguments_error (message); + } + kb = atk_action_get_keybinding (action, index); + if (!kb) + kb = ""; reply = dbus_message_new_method_return (message); if (reply) - { - dbus_message_append_args (reply, DBUS_TYPE_STRING, &kb, DBUS_TYPE_INVALID); - } + { + dbus_message_append_args (reply, DBUS_TYPE_STRING, &kb, + DBUS_TYPE_INVALID); + } return reply; } -static DBusMessage *impl_GetActions(DBusConnection *bus, DBusMessage *message, void *user_data) +static DBusMessage * +impl_GetActions (DBusConnection * bus, DBusMessage * message, void *user_data) { AtkAction *action = (AtkAction *) user_data; DBusMessage *reply; @@ -124,26 +136,33 @@ static DBusMessage *impl_GetActions(DBusConnection *bus, DBusMessage *message, v g_return_val_if_fail (ATK_IS_ACTION (user_data), droute_not_yet_handled_error (message)); - count = atk_action_get_n_actions(action); + count = atk_action_get_n_actions (action); reply = dbus_message_new_method_return (message); - if (!reply) goto oom; + if (!reply) + goto oom; dbus_message_iter_init_append (reply, &iter); if (!dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, "(sss)", &iter_array)) goto oom; for (i = 0; i < count; i++) { - const char *name = atk_action_get_name(action, i); - const char *desc = atk_action_get_description(action, i); - const char *kb = atk_action_get_keybinding(action, i); - if (!name) name = ""; - if (!desc) desc = ""; - if (!kb) kb = ""; - 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, &name); - dbus_message_iter_append_basic(&iter_struct, DBUS_TYPE_STRING, &desc); - dbus_message_iter_append_basic(&iter_struct, DBUS_TYPE_STRING, &kb); - if (!dbus_message_iter_close_container(&iter_array, &iter_struct)) goto oom; + const char *name = atk_action_get_name (action, i); + const char *desc = atk_action_get_description (action, i); + const char *kb = atk_action_get_keybinding (action, i); + if (!name) + name = ""; + if (!desc) + desc = ""; + if (!kb) + kb = ""; + 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, &name); + dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_STRING, &desc); + dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_STRING, &kb); + if (!dbus_message_iter_close_container (&iter_array, &iter_struct)) + goto oom; } if (!dbus_message_iter_close_container (&iter, &iter_array)) goto oom; @@ -153,7 +172,8 @@ oom: return reply; } -static DBusMessage *impl_DoAction(DBusConnection *bus, DBusMessage *message, void *user_data) +static DBusMessage * +impl_DoAction (DBusConnection * bus, DBusMessage * message, void *user_data) { AtkAction *action = (AtkAction *) user_data; DBusError error; @@ -169,36 +189,38 @@ static DBusMessage *impl_DoAction(DBusConnection *bus, DBusMessage *message, voi { return droute_invalid_arguments_error (message); } - rv = atk_action_do_action(action, index); + rv = atk_action_do_action (action, index); reply = dbus_message_new_method_return (message); if (reply) { - dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &rv, DBUS_TYPE_INVALID); + dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &rv, + DBUS_TYPE_INVALID); } return reply; } -DRouteMethod methods[] = -{ - { impl_get_description, "GetDescription" }, - { impl_get_name, "GetName" }, - { impl_get_keybinding, "GetKeyBinding" }, - {impl_GetActions, "GetActions"}, - {impl_DoAction, "DoAction"}, - {NULL, NULL } +DRouteMethod methods[] = { + {impl_get_description, "GetDescription"} + , + {impl_get_name, "GetName"} + , + {impl_get_keybinding, "GetKeyBinding"} + , + {impl_GetActions, "GetActions"} + , + {impl_DoAction, "DoAction"} + , + {NULL, NULL} }; -static DRouteProperty properties[] = -{ - { impl_get_NActions, NULL, "NActions" }, - { NULL, NULL } +static DRouteProperty properties[] = { + {impl_get_NActions, NULL, "NActions"}, + {NULL, NULL} }; void -spi_initialize_action (DRoutePath *path) +spi_initialize_action (DRoutePath * path) { droute_path_add_interface (path, - SPI_DBUS_INTERFACE_ACTION, - methods, - properties); + SPI_DBUS_INTERFACE_ACTION, methods, properties); }; diff --git a/atk-adaptor/adaptors.h b/atk-adaptor/adaptors.h index d871a7b..7f8bdd9 100644 --- a/atk-adaptor/adaptors.h +++ b/atk-adaptor/adaptors.h @@ -29,20 +29,20 @@ Accessibility_Role 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_table (DRoutePath *path); -void spi_initialize_text (DRoutePath *path); -void spi_initialize_value (DRoutePath *path); -void spi_initialize_tree (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_table (DRoutePath * path); +void spi_initialize_text (DRoutePath * path); +void spi_initialize_value (DRoutePath * path); +void spi_initialize_tree (DRoutePath * path); #endif /* ADAPTORS_H */ diff --git a/atk-adaptor/application-adaptor.c b/atk-adaptor/application-adaptor.c index 03385a4..57643f9 100644 --- a/atk-adaptor/application-adaptor.c +++ b/atk-adaptor/application-adaptor.c @@ -28,8 +28,7 @@ #include "common/spi-dbus.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 ()); } @@ -57,14 +56,14 @@ impl_set_Id (DBusMessageIter * iter, void *user_data) static DBusMessage * impl_registerToolkitEventListener (DBusConnection * bus, - DBusMessage * message, void *user_data) + DBusMessage * message, void *user_data) { return NULL; } static DBusMessage * impl_registerObjectEventListener (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { return NULL; } @@ -111,10 +110,9 @@ 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, SPI_DBUS_INTERFACE_APPLICATION, - methods, - properties); + methods, properties); }; diff --git a/atk-adaptor/bridge.c b/atk-adaptor/bridge.c index 08288fd..00ead5c 100644 --- a/atk-adaptor/bridge.c +++ b/atk-adaptor/bridge.c @@ -46,7 +46,7 @@ * Provides the path for the introspection directory. */ #if !defined ATSPI_INTROSPECTION_PATH - #error "No introspection XML directory defined" +#error "No introspection XML directory defined" #endif /*---------------------------------------------------------------------------*/ @@ -64,36 +64,36 @@ static const AtkMisc *atk_misc = NULL; * with the screen number stripped off if present. * */ -static const gchar* +static const gchar * spi_display_name (void) { - static const char *canonical_display_name = NULL; - if (!canonical_display_name) - { - const gchar *display_env = g_getenv ("AT_SPI_DISPLAY"); - if (!display_env) - { - display_env = g_getenv ("DISPLAY"); - if (!display_env || !display_env[0]) - canonical_display_name = ":0"; - else - { - gchar *display_p, *screen_p; - canonical_display_name = g_strdup (display_env); - display_p = strrchr (canonical_display_name, ':'); - screen_p = strrchr (canonical_display_name, '.'); - if (screen_p && display_p && (screen_p > display_p)) - { - *screen_p = '\0'; - } - } - } - else - { - canonical_display_name = display_env; - } - } - return canonical_display_name; + static const char *canonical_display_name = NULL; + if (!canonical_display_name) + { + const gchar *display_env = g_getenv ("AT_SPI_DISPLAY"); + if (!display_env) + { + display_env = g_getenv ("DISPLAY"); + if (!display_env || !display_env[0]) + canonical_display_name = ":0"; + else + { + gchar *display_p, *screen_p; + canonical_display_name = g_strdup (display_env); + display_p = strrchr (canonical_display_name, ':'); + screen_p = strrchr (canonical_display_name, '.'); + if (screen_p && display_p && (screen_p > display_p)) + { + *screen_p = '\0'; + } + } + } + else + { + canonical_display_name = display_env; + } + } + return canonical_display_name; } /*---------------------------------------------------------------------------*/ @@ -108,59 +108,60 @@ spi_display_name (void) static DBusConnection * spi_atk_bridge_get_bus (void) { - Atom AT_SPI_BUS; - Atom actual_type; - Display *bridge_display; - int actual_format; - unsigned char *data = NULL; - unsigned long nitems; - unsigned long leftover; - - DBusConnection *bus = NULL; - DBusError error; - - bridge_display = XOpenDisplay (spi_display_name ()); - if (!bridge_display) - g_error ("AT_SPI: Could not get the display\n"); - - 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); - - dbus_error_init (&error); - - if (data == NULL) - { - g_warning ("AT-SPI: Accessibility bus not found - Using session bus.\n"); - bus = dbus_bus_get (DBUS_BUS_SESSION, &error); - if (!bus) - g_error ("AT-SPI: Couldn't connect to bus: %s\n", error.message); - } - else - { - bus = dbus_connection_open (data, &error); - if (!bus) - { - g_error ("AT-SPI: Couldn't connect to bus: %s\n", error.message); - } - else - { - if (!dbus_bus_register (bus, &error)) - g_error ("AT-SPI: Couldn't register with bus: %s\n"); - } - } - - return bus; + Atom AT_SPI_BUS; + Atom actual_type; + Display *bridge_display; + int actual_format; + unsigned char *data = NULL; + unsigned long nitems; + unsigned long leftover; + + DBusConnection *bus = NULL; + DBusError error; + + bridge_display = XOpenDisplay (spi_display_name ()); + if (!bridge_display) + g_error ("AT_SPI: Could not get the display\n"); + + 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); + + dbus_error_init (&error); + + if (data == NULL) + { + g_warning + ("AT-SPI: Accessibility bus not found - Using session bus.\n"); + bus = dbus_bus_get (DBUS_BUS_SESSION, &error); + if (!bus) + g_error ("AT-SPI: Couldn't connect to bus: %s\n", error.message); + } + else + { + bus = dbus_connection_open (data, &error); + if (!bus) + { + g_error ("AT-SPI: Couldn't connect to bus: %s\n", error.message); + } + else + { + if (!dbus_bus_register (bus, &error)) + g_error ("AT-SPI: Couldn't register with bus: %s\n"); + } + } + + return bus; } /*---------------------------------------------------------------------------*/ static void -register_application (SpiAppData *app) +register_application (SpiAppData * app) { DBusMessage *message; DBusMessageIter iter; @@ -175,22 +176,23 @@ register_application (SpiAppData *app) "RegisterApplication"); dbus_message_set_no_reply (message, TRUE); - uname = dbus_bus_get_unique_name(app->bus); + uname = dbus_bus_get_unique_name (app->bus); if (!uname) - { + { g_error ("AT-SPI: Couldn't get unique name for this connection"); - } + } - dbus_message_iter_init_append(message, &iter); - dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &uname); + dbus_message_iter_init_append (message, &iter); + dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &uname); dbus_connection_send (app->bus, message, NULL); - if (message) dbus_message_unref (message); + if (message) + dbus_message_unref (message); } /*---------------------------------------------------------------------------*/ static void -deregister_application (SpiAppData *app) +deregister_application (SpiAppData * app) { DBusMessage *message; DBusMessageIter iter; @@ -205,12 +207,13 @@ deregister_application (SpiAppData *app) "DeregisterApplication"); dbus_message_set_no_reply (message, TRUE); - uname = dbus_bus_get_unique_name(app->bus); + uname = dbus_bus_get_unique_name (app->bus); - dbus_message_iter_init_append(message, &iter); - dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &uname); + dbus_message_iter_init_append (message, &iter); + dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &uname); dbus_connection_send (app->bus, message, NULL); - if (message) dbus_message_unref (message); + if (message) + dbus_message_unref (message); } /*---------------------------------------------------------------------------*/ @@ -224,10 +227,10 @@ exit_func (void) } spi_atk_tidy_windows (); - spi_atk_deregister_event_listeners(); + spi_atk_deregister_event_listeners (); deregister_application (atk_adaptor_app_data); - g_free(atk_adaptor_app_data); + g_free (atk_adaptor_app_data); atk_adaptor_app_data = NULL; /* Not currently creating an XDisplay */ @@ -244,20 +247,20 @@ 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(atk_adaptor_app_data->bus); + const char *uname = dbus_bus_get_unique_name (atk_adaptor_app_data->bus); gchar *path; GString *str = g_string_new (NULL); - path = atk_dbus_object_to_path (ATK_OBJECT(plug), TRUE); + path = atk_dbus_object_to_path (ATK_OBJECT (plug), TRUE); g_string_printf (str, "%s:%s", uname, path); g_free (path); return g_string_free (str, FALSE); } static void -socket_embed_hook (AtkSocket *socket, gchar *plug_id) +socket_embed_hook (AtkSocket * socket, gchar * plug_id) { AtkObject *accessible = ATK_OBJECT(socket); gchar *plug_name, *plug_path; @@ -289,7 +292,7 @@ static void install_plug_hooks () { gpointer data; - + data = g_type_class_ref (ATK_TYPE_PLUG); plug_class = ATK_PLUG_CLASS (data); data = g_type_class_ref (ATK_TYPE_SOCKET); @@ -302,10 +305,11 @@ install_plug_hooks () 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}, +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} }; @@ -320,7 +324,7 @@ static GOptionEntry atspi_option_entries[] = * */ static int -adaptor_init (gint *argc, gchar **argv[]) +adaptor_init (gint * argc, gchar ** argv[]) { GOptionContext *opt; GError *err = NULL; @@ -341,11 +345,11 @@ adaptor_init (gint *argc, gchar **argv[]) g_return_val_if_fail (root, 0); /* Parse command line options */ - opt = g_option_context_new(NULL); - g_option_context_add_main_entries(opt, atspi_option_entries, NULL); - g_option_context_set_ignore_unknown_options(opt, TRUE); - if (!g_option_context_parse(opt, argc, argv, &err)) - g_warning("AT-SPI Option parsing failed: %s\n", err->message); + opt = g_option_context_new (NULL); + g_option_context_add_main_entries (opt, atspi_option_entries, NULL); + g_option_context_set_ignore_unknown_options (opt, TRUE); + if (!g_option_context_parse (opt, argc, argv, &err)) + g_warning ("AT-SPI Option parsing failed: %s\n", err->message); /* Allocate global data and do ATK initializations */ atk_adaptor_app_data = g_new0 (SpiAppData, 1); @@ -356,49 +360,54 @@ adaptor_init (gint *argc, gchar **argv[]) dbus_error_init (&error); atk_adaptor_app_data->bus = spi_atk_bridge_get_bus (); if (!atk_adaptor_app_data->bus) - { - g_free(atk_adaptor_app_data); - atk_adaptor_app_data = NULL; - return 0; - } - - if (atspi_dbus_name != NULL) - { - if (dbus_bus_request_name(atk_adaptor_app_data->bus, atspi_dbus_name, 0, &error)) { - g_print("AT-SPI Recieved D-Bus name - %s\n", atspi_dbus_name); + g_free (atk_adaptor_app_data); + atk_adaptor_app_data = NULL; + return 0; } - else + + if (atspi_dbus_name != NULL) { - g_print("AT-SPI D-Bus name requested but could not be allocated - %s\n", atspi_dbus_name); + if (dbus_bus_request_name + (atk_adaptor_app_data->bus, atspi_dbus_name, 0, &error)) + { + g_print ("AT-SPI Recieved 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); + } } - } - dbus_connection_setup_with_g_main(atk_adaptor_app_data->bus, g_main_context_default()); + dbus_connection_setup_with_g_main (atk_adaptor_app_data->bus, + g_main_context_default ()); /* Get D-Bus introspection directory */ - introspection_directory = (char *) g_getenv("ATSPI_INTROSPECTION_PATH"); + introspection_directory = (char *) g_getenv ("ATSPI_INTROSPECTION_PATH"); if (introspection_directory == NULL) - introspection_directory = ATSPI_INTROSPECTION_PATH; + introspection_directory = ATSPI_INTROSPECTION_PATH; /* Register droute for routing AT-SPI messages */ - atk_adaptor_app_data->droute = droute_new (atk_adaptor_app_data->bus, introspection_directory); + atk_adaptor_app_data->droute = + droute_new (atk_adaptor_app_data->bus, introspection_directory); treepath = droute_add_one (atk_adaptor_app_data->droute, - "/org/freedesktop/atspi/tree", - NULL); + "/org/freedesktop/atspi/tree", NULL); accpath = droute_add_many (atk_adaptor_app_data->droute, "/org/freedesktop/atspi/accessible", NULL, - (DRouteGetDatumFunction) atk_dbus_path_to_gobject); + (DRouteGetDatumFunction) + atk_dbus_path_to_gobject); /* Register all interfaces with droute and set up application accessible db */ spi_initialize_tree (treepath); spi_initialize_accessible (accpath); spi_initialize_application (accpath); - spi_initialize_action(accpath); + spi_initialize_action (accpath); spi_initialize_collection (accpath); spi_initialize_component (accpath); spi_initialize_document (accpath); @@ -434,13 +443,13 @@ adaptor_init (gint *argc, gchar **argv[]) /*---------------------------------------------------------------------------*/ int -gtk_module_init (gint *argc, gchar **argv[]) +gtk_module_init (gint * argc, gchar ** argv[]) { const gchar *load_bridge = g_getenv ("NO_AT_BRIDGE"); if (!load_bridge || g_ascii_strtod (load_bridge, NULL) == 0) { - return adaptor_init (argc, argv); + return adaptor_init (argc, argv); } return 0; } @@ -456,7 +465,7 @@ gnome_accessibility_module_init (void) if (g_getenv ("AT_SPI_DEBUG")) { - g_print("Atk Accessibility bridge initialized\n"); + g_print ("Atk Accessibility bridge initialized\n"); } } } @@ -467,4 +476,5 @@ gnome_accessibility_module_shutdown (void) spi_atk_deregister_event_listeners (); exit_func (); } + /*END------------------------------------------------------------------------*/ diff --git a/atk-adaptor/bridge.h b/atk-adaptor/bridge.h index 3e41531..44315f1 100644 --- a/atk-adaptor/bridge.h +++ b/atk-adaptor/bridge.h @@ -31,10 +31,10 @@ typedef struct _SpiAppData SpiAppData; struct _SpiAppData { - AtkObject *root; + AtkObject *root; - DBusConnection *bus; - DRouteContext *droute; + DBusConnection *bus; + DRouteContext *droute; }; extern SpiAppData *atk_adaptor_app_data; diff --git a/atk-adaptor/collection-adaptor.c b/atk-adaptor/collection-adaptor.c index 80c90aa..e920545 100644 --- a/atk-adaptor/collection-adaptor.c +++ b/atk-adaptor/collection-adaptor.c @@ -94,10 +94,10 @@ match_states_all_p (AtkObject * child, gint * set) for (i = 0; set[i] != BITARRAY_SEQ_TERM; i++) { if (!atk_state_set_contains_state (chs, set[i])) - { - ret = FALSE; - break; - } + { + ret = FALSE; + break; + } } g_object_unref (chs); @@ -119,10 +119,10 @@ match_states_any_p (AtkObject * child, gint * set) for (i = 0; set[i] != BITARRAY_SEQ_TERM; i++) { if (!atk_state_set_contains_state (chs, set[i])) - { - ret = TRUE; - break; - } + { + ret = TRUE; + break; + } } g_object_unref (chs); @@ -144,10 +144,10 @@ match_states_none_p (AtkObject * child, gint * set) for (i = 0; set[i] != BITARRAY_SEQ_TERM; i++) { if (atk_state_set_contains_state (chs, set[i])) - { - ret = FALSE; - break; - } + { + ret = FALSE; + break; + } } g_object_unref (chs); @@ -162,17 +162,17 @@ match_states_lookup (AtkObject * child, MatchRulePrivate * mrp) { case Accessibility_Collection_MATCH_ALL: if (match_states_all_p (child, mrp->states)) - return TRUE; + return TRUE; break; case Accessibility_Collection_MATCH_ANY: if (match_states_any_p (child, mrp->states)) - return TRUE; + return TRUE; break; case Accessibility_Collection_MATCH_NONE: if (match_states_none_p (child, mrp->states)) - return TRUE; + return TRUE; break; default: @@ -241,17 +241,17 @@ match_roles_lookup (AtkObject * child, MatchRulePrivate * mrp) { case Accessibility_Collection_MATCH_ALL: if (match_roles_all_p (child, mrp->roles)) - return TRUE; + return TRUE; break; case Accessibility_Collection_MATCH_ANY: if (match_roles_any_p (child, mrp->roles)) - return TRUE; + return TRUE; break; case Accessibility_Collection_MATCH_NONE: if (match_roles_none_p (child, mrp->roles)) - return TRUE; + return TRUE; break; default: @@ -272,7 +272,7 @@ match_interfaces_all_p (AtkObject * obj, gchar ** ifaces) for (i = 0; ifaces[i]; i++) if (!child_interface_p (obj, ifaces[i])) { - return FALSE; + return FALSE; } return TRUE; } @@ -289,7 +289,7 @@ match_interfaces_any_p (AtkObject * obj, gchar ** ifaces) for (i = 0; ifaces[i]; i++) if (child_interface_p (obj, ifaces[i])) { - return TRUE; + return TRUE; } return FALSE; } @@ -314,17 +314,17 @@ match_interfaces_lookup (AtkObject * child, MatchRulePrivate * mrp) case Accessibility_Collection_MATCH_ALL: if (match_interfaces_all_p (child, mrp->ifaces)) - return TRUE; + return TRUE; break; case Accessibility_Collection_MATCH_ANY: if (match_interfaces_any_p (child, mrp->ifaces)) - return TRUE; + return TRUE; break; case Accessibility_Collection_MATCH_NONE: if (match_interfaces_none_p (child, mrp->ifaces)) - return TRUE; + return TRUE; break; default: @@ -355,22 +355,22 @@ match_attributes_all_p (AtkObject * child, AtkAttributeSet * attributes) { AtkAttribute *attr = g_slist_nth_data (attributes, i); for (k = 0; k < oa_length; k++) - { - AtkAttribute *oa_attr = g_slist_nth_data (attributes, i); - if (!g_ascii_strcasecmp (oa_attr->name, attr->name) && - !g_ascii_strcasecmp (oa_attr->value, attr->value)) - { - flag = TRUE; - break; - } - else - flag = FALSE; - } + { + AtkAttribute *oa_attr = g_slist_nth_data (attributes, i); + if (!g_ascii_strcasecmp (oa_attr->name, attr->name) && + !g_ascii_strcasecmp (oa_attr->value, attr->value)) + { + flag = TRUE; + break; + } + else + flag = FALSE; + } if (!flag) - { - atk_attribute_set_free (oa); - return FALSE; - } + { + atk_attribute_set_free (oa); + return FALSE; + } } atk_attribute_set_free (oa); return TRUE; @@ -395,15 +395,15 @@ match_attributes_any_p (AtkObject * child, AtkAttributeSet * attributes) { AtkAttribute *attr = g_slist_nth_data (attributes, i); for (k = 0; k < oa_length; k++) - { - AtkAttribute *oa_attr = g_slist_nth_data (attributes, i); - if (!g_ascii_strcasecmp (oa_attr->name, attr->name) && - !g_ascii_strcasecmp (oa_attr->value, attr->value)) - { - atk_attribute_set_free (oa); - return TRUE; - } - } + { + AtkAttribute *oa_attr = g_slist_nth_data (attributes, i); + if (!g_ascii_strcasecmp (oa_attr->name, attr->name) && + !g_ascii_strcasecmp (oa_attr->value, attr->value)) + { + atk_attribute_set_free (oa); + return TRUE; + } + } } atk_attribute_set_free (oa); return FALSE; @@ -428,15 +428,15 @@ match_attributes_none_p (AtkObject * child, AtkAttributeSet * attributes) { AtkAttribute *attr = g_slist_nth_data (attributes, i); for (k = 0; k < oa_length; k++) - { - AtkAttribute *oa_attr = g_slist_nth_data (attributes, i); - if (!g_ascii_strcasecmp (oa_attr->name, attr->name) && - !g_ascii_strcasecmp (oa_attr->value, attr->value)) - { - atk_attribute_set_free (oa); - return FALSE; - } - } + { + AtkAttribute *oa_attr = g_slist_nth_data (attributes, i); + if (!g_ascii_strcasecmp (oa_attr->name, attr->name) && + !g_ascii_strcasecmp (oa_attr->value, attr->value)) + { + atk_attribute_set_free (oa); + return FALSE; + } + } } atk_attribute_set_free (oa); return TRUE; @@ -450,17 +450,17 @@ match_attributes_lookup (AtkObject * child, MatchRulePrivate * mrp) case Accessibility_Collection_MATCH_ALL: if (match_attributes_all_p (child, mrp->attributes)) - return TRUE; + return TRUE; break; case Accessibility_Collection_MATCH_ANY: if (match_attributes_any_p (child, mrp->attributes)) - return TRUE; + return TRUE; break; case Accessibility_Collection_MATCH_NONE: if (match_attributes_none_p (child, mrp->attributes)) - return TRUE; + return TRUE; break; default: @@ -480,9 +480,9 @@ 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) + 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); @@ -494,35 +494,35 @@ sort_order_canonical (MatchRulePrivate * mrp, GList * ls, g_object_unref (child); if (prev && child == pobj) - { - return kount; - } + { + return kount; + } if (flag && match_interfaces_lookup (child, mrp) - && match_states_lookup (child, mrp) - && match_roles_lookup (child, mrp) - && match_attributes_lookup (child, mrp)) - { + && match_states_lookup (child, mrp) + && match_roles_lookup (child, mrp) + && match_attributes_lookup (child, mrp)) + { - ls = g_list_append (ls, child); - kount++; - } + ls = g_list_append (ls, child); + kount++; + } if (!flag) - flag = TRUE; + flag = TRUE; if (recurse && traverse_p (child, traverse)) - kount = sort_order_canonical (mrp, ls, kount, - max, child, 0, TRUE, - pobj, recurse, traverse); + kount = sort_order_canonical (mrp, ls, kount, + max, child, 0, TRUE, + pobj, recurse, traverse); } return kount; } static int sort_order_rev_canonical (MatchRulePrivate * mrp, GList * ls, - gint kount, gint max, - AtkObject * obj, gboolean flag, AtkObject * pobj) + gint kount, gint max, + AtkObject * obj, gboolean flag, AtkObject * pobj) { AtkObject *nextobj; AtkObject *parent; @@ -560,21 +560,21 @@ sort_order_rev_canonical (MatchRulePrivate * mrp, GList * ls, /* Now, drill down the right side to the last descendant */ while (atk_object_get_n_accessible_children (nextobj) > 0) - { - nextobj = atk_object_ref_accessible_child (nextobj, - atk_object_get_n_accessible_children - (nextobj) - 1); - g_object_unref (nextobj); - } + { + nextobj = atk_object_ref_accessible_child (nextobj, + atk_object_get_n_accessible_children + (nextobj) - 1); + g_object_unref (nextobj); + } /* recurse with the last descendant */ kount = sort_order_rev_canonical (mrp, ls, kount, max, - nextobj, TRUE, pobj); + nextobj, TRUE, pobj); } else { /* no more siblings so next node must be the parent */ kount = sort_order_rev_canonical (mrp, ls, kount, max, - parent, TRUE, pobj); + parent, TRUE, pobj); } return kount; @@ -582,20 +582,20 @@ sort_order_rev_canonical (MatchRulePrivate * mrp, GList * ls, static int query_exec (MatchRulePrivate * mrp, Accessibility_Collection_SortOrder sortby, - GList * ls, gint kount, gint max, - AtkObject * obj, glong index, - gboolean flag, - AtkObject * pobj, gboolean recurse, gboolean traverse) + GList * ls, gint kount, gint max, + AtkObject * obj, glong index, + gboolean flag, + AtkObject * pobj, gboolean recurse, gboolean traverse) { switch (sortby) { case Accessibility_Collection_SORT_ORDER_CANONICAL: kount = sort_order_canonical (mrp, ls, 0, max, obj, index, flag, - pobj, recurse, traverse); + pobj, recurse, traverse); break; case Accessibility_Collection_SORT_ORDER_REVERSE_CANONICAL: kount = sort_order_canonical (mrp, ls, 0, max, obj, index, flag, - pobj, recurse, traverse); + pobj, recurse, traverse); break; default: kount = 0; @@ -619,19 +619,19 @@ bitarray_to_seq (int *array, int array_count, int **ret) for (i = 0; i < array_count; i++) { for (j = 0; j < 32; j++) - { - if (array[i] & (1 << j)) - { - if (out_count == out_size - 2) - { - out_size <<= 1; - out = (int *) g_realloc (out, out_size * sizeof (int)); - if (!out) - return FALSE; - } - out[out_count++] = i * 32 + j; - } - } + { + if (array[i] & (1 << j)) + { + if (out_count == out_size - 2) + { + out_size <<= 1; + out = (int *) g_realloc (out, out_size * sizeof (int)); + if (!out) + return FALSE; + } + out[out_count++] = i * 32 + j; + } + } } out[out_count] = BITARRAY_SEQ_TERM; *ret = out; @@ -673,53 +673,53 @@ read_mr (DBusMessageIter * iter, MatchRulePrivate * mrp) dbus_message_iter_get_basic (&mrc, &str); attributes = g_strsplit (str, "\n", -1); for (pp = attributes; *pp; pp++) - { - str = *pp; - attr = g_new (AtkAttribute, 1); - if (attr) - { - int len = strcspn (str, ":"); - attr->name = g_strndup (str, len); - if (str[len] == ':') - { - len++; - if (str[len] == ' ') - len++; - attr->value = g_strdup (str + len); - } - else - attr->value = NULL; - mrp->attributes = g_slist_prepend (mrp->attributes, attr); - } - } + { + str = *pp; + attr = g_new (AtkAttribute, 1); + if (attr) + { + int len = strcspn (str, ":"); + attr->name = g_strndup (str, len); + if (str[len] == ':') + { + len++; + if (str[len] == ' ') + len++; + attr->value = g_strdup (str + len); + } + else + attr->value = NULL; + mrp->attributes = g_slist_prepend (mrp->attributes, attr); + } + } g_strfreev (attributes); } else { dbus_message_iter_recurse (&mrc, &arrayc); while (dbus_message_iter_get_arg_type (&arrayc) != DBUS_TYPE_INVALID) - { - dbus_message_iter_get_basic (&arrayc, &str); - // TODO: remove this print - g_print ("Got attribute: %s\n", str); - attr = g_new (AtkAttribute, 1); - if (attr) - { - int len = strcspn (str, ":"); - attr->name = g_strndup (str, len); - if (str[len] == ':') - { - len++; - if (str[len] == ' ') - len++; - attr->value = g_strdup (str + len); - } - else - attr->value = NULL; - mrp->attributes = g_slist_prepend (mrp->attributes, attr); - } - dbus_message_iter_next (&arrayc); - } + { + dbus_message_iter_get_basic (&arrayc, &str); + // TODO: remove this print + g_print ("Got attribute: %s\n", str); + attr = g_new (AtkAttribute, 1); + if (attr) + { + int len = strcspn (str, ":"); + attr->name = g_strndup (str, len); + if (str[len] == ':') + { + len++; + if (str[len] == ' ') + len++; + attr->value = g_strdup (str + len); + } + else + attr->value = NULL; + mrp->attributes = g_slist_prepend (mrp->attributes, attr); + } + dbus_message_iter_next (&arrayc); + } } dbus_message_iter_next (&mrc); dbus_message_iter_get_basic (&mrc, &matchType); @@ -763,7 +763,7 @@ return_and_free_list (DBusMessage * message, GList * ls) for (item = ls; item; item = g_list_next (item)) { spi_dbus_append_name_and_path (message, &iter_array, - ATK_OBJECT (item->data), TRUE, FALSE); + ATK_OBJECT (item->data), TRUE, FALSE); } if (!dbus_message_iter_close_container (&iter, &iter_array)) goto oom; @@ -786,11 +786,11 @@ free_mrp_data (MatchRulePrivate * mrp) static DBusMessage * GetMatchesFrom (DBusMessage * message, - AtkObject * current_object, - MatchRulePrivate * mrp, - const Accessibility_Collection_SortOrder sortby, - const dbus_bool_t isrestrict, - dbus_int32_t count, const dbus_bool_t traverse) + AtkObject * current_object, + MatchRulePrivate * mrp, + const Accessibility_Collection_SortOrder sortby, + const dbus_bool_t isrestrict, + dbus_int32_t count, const dbus_bool_t traverse) { GList *ls = NULL; AtkObject *parent; @@ -803,11 +803,11 @@ GetMatchesFrom (DBusMessage * message, { parent = atk_object_get_parent (current_object); kount = query_exec (mrp, sortby, ls, 0, count, parent, index, - FALSE, NULL, TRUE, traverse); + FALSE, NULL, TRUE, traverse); } else kount = query_exec (mrp, sortby, ls, 0, count, - current_object, 0, FALSE, NULL, TRUE, traverse); + current_object, 0, FALSE, NULL, TRUE, traverse); ls = g_list_remove (ls, ls->data); @@ -824,15 +824,15 @@ 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) + GList * ls, gint kount, gint max, + AtkObject * obj, + gboolean flag, AtkObject * pobj, dbus_bool_t traverse) { int i = 0; /* First, look through the children recursively. */ kount = sort_order_canonical (mrp, ls, kount, max, obj, 0, TRUE, - NULL, TRUE, TRUE); + NULL, TRUE, TRUE); /* Next, we look through the right subtree */ while ((max == 0 || kount < max) && obj != collection) @@ -840,14 +840,14 @@ inorder (AtkObject * collection, MatchRulePrivate * mrp, AtkObject *parent = atk_object_get_parent (obj); i = atk_object_get_index_in_parent (obj); kount = sort_order_canonical (mrp, ls, kount, max, parent, - i + 1, TRUE, FALSE, TRUE, TRUE); + i + 1, TRUE, FALSE, TRUE, TRUE); obj = parent; } if (kount < max) { kount = sort_order_canonical (mrp, ls, kount, max, - obj, i + 1, TRUE, FALSE, TRUE, TRUE); + obj, i + 1, TRUE, FALSE, TRUE, TRUE); } return kount; @@ -859,11 +859,11 @@ inorder (AtkObject * collection, MatchRulePrivate * mrp, static DBusMessage * GetMatchesInOrder (DBusMessage * message, - AtkObject * current_object, - MatchRulePrivate * mrp, - const Accessibility_Collection_SortOrder sortby, - const dbus_bool_t recurse, - dbus_int32_t count, const dbus_bool_t traverse) + AtkObject * current_object, + MatchRulePrivate * mrp, + const Accessibility_Collection_SortOrder sortby, + const dbus_bool_t recurse, + dbus_int32_t count, const dbus_bool_t traverse) { GList *ls = NULL; AtkObject *obj; @@ -874,7 +874,7 @@ GetMatchesInOrder (DBusMessage * message, obj = atk_dbus_path_to_object (dbus_message_get_path (message)); kount = inorder (obj, mrp, ls, 0, count, - current_object, TRUE, NULL, traverse); + current_object, TRUE, NULL, traverse); ls = g_list_remove (ls, ls->data); @@ -892,10 +892,10 @@ GetMatchesInOrder (DBusMessage * message, static DBusMessage * GetMatchesInBackOrder (DBusMessage * message, - AtkObject * current_object, - MatchRulePrivate * mrp, - const Accessibility_Collection_SortOrder sortby, - dbus_int32_t count) + AtkObject * current_object, + MatchRulePrivate * mrp, + const Accessibility_Collection_SortOrder sortby, + dbus_int32_t count) { GList *ls = NULL; AtkObject *collection; @@ -906,7 +906,7 @@ GetMatchesInBackOrder (DBusMessage * message, collection = atk_dbus_path_to_object (dbus_message_get_path (message)); kount = sort_order_rev_canonical (mrp, ls, 0, count, current_object, - FALSE, collection); + FALSE, collection); ls = g_list_remove (ls, ls->data); @@ -919,12 +919,12 @@ GetMatchesInBackOrder (DBusMessage * message, static DBusMessage * GetMatchesTo (DBusMessage * message, - AtkObject * current_object, - MatchRulePrivate * mrp, - const Accessibility_Collection_SortOrder sortby, - const dbus_bool_t recurse, - const dbus_bool_t isrestrict, - dbus_int32_t count, const dbus_bool_t traverse) + AtkObject * current_object, + MatchRulePrivate * mrp, + const Accessibility_Collection_SortOrder sortby, + const dbus_bool_t recurse, + const dbus_bool_t isrestrict, + dbus_int32_t count, const dbus_bool_t traverse) { GList *ls = NULL; AtkObject *obj; @@ -935,13 +935,13 @@ GetMatchesTo (DBusMessage * message, { obj = atk_object_get_parent (current_object); kount = query_exec (mrp, sortby, ls, 0, count, - obj, 0, TRUE, current_object, TRUE, traverse); + obj, 0, TRUE, current_object, TRUE, traverse); } else { obj = atk_dbus_path_to_object (dbus_message_get_path (message)); kount = query_exec (mrp, sortby, ls, 0, count, - obj, 0, TRUE, current_object, TRUE, traverse); + obj, 0, TRUE, current_object, TRUE, traverse); } @@ -956,7 +956,7 @@ GetMatchesTo (DBusMessage * message, static DBusMessage * impl_GetMatchesFrom (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { char *current_object_path = NULL; AtkObject *current_object; @@ -1002,15 +1002,15 @@ impl_GetMatchesFrom (DBusConnection * bus, DBusMessage * message, { case Accessibility_Collection_TREE_RESTRICT_CHILDREN: return GetMatchesFrom (message, current_object, - &rule, sortby, TRUE, count, traverse); + &rule, sortby, TRUE, count, traverse); break; case Accessibility_Collection_TREE_RESTRICT_SIBLING: return GetMatchesFrom (message, current_object, - &rule, sortby, FALSE, count, traverse); + &rule, sortby, FALSE, count, traverse); break; case Accessibility_Collection_TREE_INORDER: return GetMatchesInOrder (message, current_object, - &rule, sortby, TRUE, count, traverse); + &rule, sortby, TRUE, count, traverse); break; default: return NULL; @@ -1019,7 +1019,7 @@ impl_GetMatchesFrom (DBusConnection * bus, DBusMessage * message, static DBusMessage * impl_GetMatchesTo (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { char *current_object_path = NULL; AtkObject *current_object; @@ -1068,15 +1068,15 @@ impl_GetMatchesTo (DBusConnection * bus, DBusMessage * message, { case Accessibility_Collection_TREE_RESTRICT_CHILDREN: return GetMatchesTo (message, current_object, - &rule, sortby, recurse, TRUE, count, traverse); + &rule, sortby, recurse, TRUE, count, traverse); break; case Accessibility_Collection_TREE_RESTRICT_SIBLING: return GetMatchesTo (message, current_object, - &rule, sortby, recurse, FALSE, count, traverse); + &rule, sortby, recurse, FALSE, count, traverse); break; case Accessibility_Collection_TREE_INORDER: return GetMatchesInBackOrder (message, current_object, - &rule, sortby, count); + &rule, sortby, count); break; default: return NULL; @@ -1115,7 +1115,7 @@ impl_GetMatches (DBusConnection * bus, DBusMessage * message, void *user_data) dbus_message_iter_next (&iter); ls = g_list_prepend (ls, obj); count = query_exec (&rule, sortby, ls, 0, count, - obj, 0, TRUE, NULL, TRUE, traverse); + obj, 0, TRUE, NULL, TRUE, traverse); ls = g_list_remove (ls, ls->data); if (sortby == Accessibility_Collection_SORT_ORDER_REVERSE_CANONICAL) @@ -1135,5 +1135,5 @@ void spi_initialize_collection (DRoutePath * path) { droute_path_add_interface (path, - SPI_DBUS_INTERFACE_COLLECTION, methods, NULL); + SPI_DBUS_INTERFACE_COLLECTION, methods, NULL); }; diff --git a/atk-adaptor/component-adaptor.c b/atk-adaptor/component-adaptor.c index eeb36f9..40f8360 100644 --- a/atk-adaptor/component-adaptor.c +++ b/atk-adaptor/component-adaptor.c @@ -226,7 +226,8 @@ impl_GetMDIZOrder (DBusConnection * bus, DBusMessage * message, reply = dbus_message_new_method_return (message); if (reply) { - dbus_message_append_args (reply, DBUS_TYPE_INT16, &rv, DBUS_TYPE_INVALID); + dbus_message_append_args (reply, DBUS_TYPE_INT16, &rv, + DBUS_TYPE_INVALID); } return reply; } @@ -301,10 +302,8 @@ static DRouteMethod methods[] = { }; void -spi_initialize_component (DRoutePath *path) +spi_initialize_component (DRoutePath * path) { droute_path_add_interface (path, - SPI_DBUS_INTERFACE_COMPONENT, - methods, - NULL); + SPI_DBUS_INTERFACE_COMPONENT, methods, NULL); }; diff --git a/atk-adaptor/document-adaptor.c b/atk-adaptor/document-adaptor.c index 7cf1af7..de83a0d 100644 --- a/atk-adaptor/document-adaptor.c +++ b/atk-adaptor/document-adaptor.c @@ -30,9 +30,7 @@ #include "accessible-marshaller.h" 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; @@ -116,10 +114,8 @@ static DRouteMethod methods[] = { }; void -spi_initialize_document (DRoutePath *path) +spi_initialize_document (DRoutePath * path) { droute_path_add_interface (path, - SPI_DBUS_INTERFACE_DOCUMENT, - methods, - NULL); + SPI_DBUS_INTERFACE_DOCUMENT, methods, NULL); }; diff --git a/atk-adaptor/editabletext-adaptor.c b/atk-adaptor/editabletext-adaptor.c index 76f8ca1..624df14 100644 --- a/atk-adaptor/editabletext-adaptor.c +++ b/atk-adaptor/editabletext-adaptor.c @@ -210,10 +210,8 @@ static DRouteMethod methods[] = { }; void -spi_initialize_editabletext (DRoutePath *path) +spi_initialize_editabletext (DRoutePath * path) { droute_path_add_interface (path, - SPI_DBUS_INTERFACE_EDITABLE_TEXT, - methods, - NULL); + SPI_DBUS_INTERFACE_EDITABLE_TEXT, methods, NULL); }; diff --git a/atk-adaptor/event.c b/atk-adaptor/event.c index e98d4d2..687fc79 100644 --- a/atk-adaptor/event.c +++ b/atk-adaptor/event.c @@ -47,66 +47,71 @@ static gint atk_bridge_focus_tracker_id; /*---------------------------------------------------------------------------*/ static void -set_reply (DBusPendingCall *pending, void *user_data) +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) +send_and_allow_reentry (DBusConnection * bus, DBusMessage * message) { - 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; + if (!dbus_connection_read_write_dispatch (bus, -1)) + return NULL; } - return reply; + return reply; } static gboolean -Accessibility_DeviceEventController_NotifyListenersSync(const Accessibility_DeviceEvent *key_event) +Accessibility_DeviceEventController_NotifyListenersSync (const + Accessibility_DeviceEvent + * key_event) { DBusMessage *message; DBusError error; dbus_bool_t consumed = FALSE; message = - dbus_message_new_method_call(SPI_DBUS_NAME_REGISTRY, - SPI_DBUS_PATH_DEC, - SPI_DBUS_INTERFACE_DEC, - "NotifyListenersSync"); - - dbus_error_init(&error); - if (spi_dbus_marshal_deviceEvent(message, key_event)) - { - DBusMessage *reply = send_and_allow_reentry (atk_adaptor_app_data->bus, message); - if (reply) + dbus_message_new_method_call (SPI_DBUS_NAME_REGISTRY, + SPI_DBUS_PATH_DEC, + SPI_DBUS_INTERFACE_DEC, + "NotifyListenersSync"); + + dbus_error_init (&error); + if (spi_dbus_marshal_deviceEvent (message, key_event)) { - DBusError error; - dbus_error_init(&error); - dbus_message_get_args(reply, &error, DBUS_TYPE_BOOLEAN, &consumed, DBUS_TYPE_INVALID); - dbus_message_unref(reply); + DBusMessage *reply = + send_and_allow_reentry (atk_adaptor_app_data->bus, message); + if (reply) + { + DBusError error; + dbus_error_init (&error); + dbus_message_get_args (reply, &error, DBUS_TYPE_BOOLEAN, &consumed, + DBUS_TYPE_INVALID); + dbus_message_unref (reply); + } } - } - dbus_message_unref(message); + dbus_message_unref (message); return consumed; } static void -spi_init_keystroke_from_atk_key_event (Accessibility_DeviceEvent *keystroke, - AtkKeyEventStruct *event) +spi_init_keystroke_from_atk_key_event (Accessibility_DeviceEvent * keystroke, + AtkKeyEventStruct * event) { - keystroke->id = (dbus_int32_t) event->keyval; - keystroke->hw_code = (dbus_int16_t) event->keycode; + keystroke->id = (dbus_int32_t) event->keyval; + keystroke->hw_code = (dbus_int16_t) event->keycode; keystroke->timestamp = (dbus_uint32_t) event->timestamp; keystroke->modifiers = (dbus_uint16_t) (event->state & 0xFFFF); if (event->string) @@ -137,26 +142,29 @@ spi_init_keystroke_from_atk_key_event (Accessibility_DeviceEvent *keystroke, keystroke->type = 0; break; } -#if 0 - g_print ("key_event type %d; val=%d code=%d modifiers=%x name=%s is_text=%d, time=%lx\n", - (int) keystroke->type, (int) keystroke->id, (int) keystroke->hw_code, - (int) keystroke->modifiers, - keystroke->event_string, (int) keystroke->is_text, (unsigned long) keystroke->timestamp); +#if 0 + g_print + ("key_event type %d; val=%d code=%d modifiers=%x name=%s is_text=%d, time=%lx\n", + (int) keystroke->type, (int) keystroke->id, (int) keystroke->hw_code, + (int) keystroke->modifiers, keystroke->event_string, + (int) keystroke->is_text, (unsigned long) keystroke->timestamp); #endif } static gint -spi_atk_bridge_key_listener (AtkKeyEventStruct *event, gpointer data) +spi_atk_bridge_key_listener (AtkKeyEventStruct * event, gpointer data) { - gboolean result; + gboolean result; Accessibility_DeviceEvent key_event; spi_init_keystroke_from_atk_key_event (&key_event, event); - result = Accessibility_DeviceEventController_NotifyListenersSync (&key_event); + result = + Accessibility_DeviceEventController_NotifyListenersSync (&key_event); - if (key_event.event_string) g_free (key_event.event_string); + if (key_event.event_string) + g_free (key_event.event_string); return result; } @@ -176,31 +184,29 @@ spi_atk_bridge_key_listener (AtkKeyEventStruct *event, gpointer data) */ static gchar * -DBusSignalName (const gchar *s) +DBusSignalName (const gchar * s) { gchar *ret = g_strdup (s); gchar *t; 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; } -static void -emit(AtkObject *accessible, - const char *klass, - const char *major, - const char *minor, - dbus_int32_t detail1, - dbus_int32_t detail2, - const char *type, - const void *val) +static void +emit (AtkObject * accessible, + const char *klass, + const char *major, + const char *minor, + dbus_int32_t detail1, + dbus_int32_t detail2, const char *type, const void *val) { gchar *path; gchar *cname; @@ -216,17 +222,18 @@ emit(AtkObject *accessible, * objects that have not yet been added to the accessible tree. */ if (path == NULL) - { + { #ifdef SPI_ATK_DEBUG g_debug ("AT-SPI: Event recieved from non-registered object"); #endif return; - } + } cname = DBusSignalName (major); - spi_dbus_emit_signal (atk_adaptor_app_data->bus, path, klass, cname, minor, detail1, detail2, type, val); + spi_dbus_emit_signal (atk_adaptor_app_data->bus, path, klass, cname, minor, + detail1, detail2, type, val); g_free (cname); - g_free(path); + g_free (path); } /*---------------------------------------------------------------------------*/ @@ -236,11 +243,9 @@ emit(AtkObject *accessible, * 'any_data' variant of the event. */ static void -emit_rect(AtkObject *accessible, - const char *klass, - const char *major, - const char *minor, - AtkRectangle *rect) +emit_rect (AtkObject * accessible, + const char *klass, + const char *major, const char *minor, AtkRectangle * rect) { DBusMessage *sig; DBusMessageIter iter, variant, sub; @@ -254,11 +259,14 @@ emit_rect(AtkObject *accessible, * objects that have not yet been added to the accessible tree. */ if (path == NULL) - return; + return; - 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 @@ -267,25 +275,26 @@ emit_rect(AtkObject *accessible, */ cname = DBusSignalName (major); - sig = dbus_message_new_signal(path, klass, cname); - g_free(path); - g_free(cname); + sig = dbus_message_new_signal (path, klass, cname); + g_free (path); + g_free (cname); 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_STRING, &minor); dbus_message_iter_append_basic (&iter, DBUS_TYPE_INT32, &dummy); dbus_message_iter_append_basic (&iter, DBUS_TYPE_INT32, &dummy); - dbus_message_iter_open_container (&iter, DBUS_TYPE_VARIANT, "(iiii)", &variant); - 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_close_container (&variant, &sub); + dbus_message_iter_open_container (&iter, DBUS_TYPE_VARIANT, "(iiii)", + &variant); + 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_close_container (&variant, &sub); dbus_message_iter_close_container (&iter, &variant); - dbus_connection_send(atk_adaptor_app_data->bus, sig, NULL); + dbus_connection_send (atk_adaptor_app_data->bus, sig, NULL); dbus_message_unref (sig); } @@ -297,9 +306,10 @@ emit_rect(AtkObject *accessible, * as the AT-SPI event, 'focus:' */ static void -focus_tracker (AtkObject *accessible) +focus_tracker (AtkObject * accessible) { - emit(accessible, ITF_EVENT_FOCUS, "focus", "", 0, 0, DBUS_TYPE_INT32_AS_STRING, 0); + emit (accessible, ITF_EVENT_FOCUS, "focus", "", 0, 0, + DBUS_TYPE_INT32_AS_STRING, 0); } /*---------------------------------------------------------------------------*/ @@ -315,10 +325,9 @@ focus_tracker (AtkObject *accessible) * The property-name is part of the ATK property-change signal. */ static gboolean -property_event_listener (GSignalInvocationHint *signal_hint, - guint n_param_values, - const GValue *param_values, - gpointer data) +property_event_listener (GSignalInvocationHint * signal_hint, + guint n_param_values, + const GValue * param_values, gpointer data) { AtkObject *accessible; AtkPropertyValues *values; @@ -330,64 +339,71 @@ property_event_listener (GSignalInvocationHint *signal_hint, gint i; accessible = g_value_get_object (¶m_values[0]); - values = (AtkPropertyValues*) g_value_get_pointer (¶m_values[1]); + values = (AtkPropertyValues *) g_value_get_pointer (¶m_values[1]); pname = values[0].property_name; if (strcmp (pname, "accessible-name") == 0 || strcmp (pname, "accessible-description") == 0 || strcmp (pname, "accessible-role") == 0 || strcmp (pname, "accessible-parent") == 0) - { + { return TRUE; - } + } /* TODO Could improve this control statement by matching * on only the end of the signal names, */ if (strcmp (pname, "accessible-table-summary") == 0) { - otemp = atk_table_get_summary(ATK_TABLE (accessible)); + otemp = atk_table_get_summary (ATK_TABLE (accessible)); stemp = atk_dbus_object_to_path (otemp, FALSE); if (stemp != NULL) - emit(accessible, ITF_EVENT_OBJECT, PCHANGE, pname, 0, 0, DBUS_TYPE_OBJECT_PATH_AS_STRING, stemp); + emit (accessible, ITF_EVENT_OBJECT, PCHANGE, pname, 0, 0, + DBUS_TYPE_OBJECT_PATH_AS_STRING, stemp); } else if (strcmp (pname, "accessible-table-column-header") == 0) { i = g_value_get_int (&(values->new_value)); - otemp = atk_table_get_column_header(ATK_TABLE (accessible), i); + otemp = atk_table_get_column_header (ATK_TABLE (accessible), i); stemp = atk_dbus_object_to_path (otemp, FALSE); if (stemp != NULL) - emit(accessible, ITF_EVENT_OBJECT, PCHANGE, pname, 0, 0, DBUS_TYPE_OBJECT_PATH_AS_STRING, stemp); + emit (accessible, ITF_EVENT_OBJECT, PCHANGE, pname, 0, 0, + DBUS_TYPE_OBJECT_PATH_AS_STRING, stemp); } else if (strcmp (pname, "accessible-table-row-header") == 0) { i = g_value_get_int (&(values->new_value)); - otemp = atk_table_get_row_header(ATK_TABLE (accessible), i); + otemp = atk_table_get_row_header (ATK_TABLE (accessible), i); stemp = atk_dbus_object_to_path (otemp, FALSE); if (stemp != NULL) - emit(accessible, ITF_EVENT_OBJECT, PCHANGE, pname, 0, 0, DBUS_TYPE_OBJECT_PATH_AS_STRING, stemp); + emit (accessible, ITF_EVENT_OBJECT, PCHANGE, pname, 0, 0, + DBUS_TYPE_OBJECT_PATH_AS_STRING, stemp); } else if (strcmp (pname, "accessible-table-row-description") == 0) { i = g_value_get_int (&(values->new_value)); - stemp = atk_table_get_row_description(ATK_TABLE (accessible), i); - emit(accessible, ITF_EVENT_OBJECT, PCHANGE, pname, 0, 0, DBUS_TYPE_STRING_AS_STRING, stemp); + stemp = atk_table_get_row_description (ATK_TABLE (accessible), i); + emit (accessible, ITF_EVENT_OBJECT, PCHANGE, pname, 0, 0, + DBUS_TYPE_STRING_AS_STRING, stemp); } else if (strcmp (pname, "accessible-table-column-description") == 0) { i = g_value_get_int (&(values->new_value)); - stemp = atk_table_get_column_description(ATK_TABLE (accessible), i); - emit(accessible, ITF_EVENT_OBJECT, PCHANGE, pname, 0, 0, DBUS_TYPE_STRING_AS_STRING, stemp); + stemp = atk_table_get_column_description (ATK_TABLE (accessible), i); + emit (accessible, ITF_EVENT_OBJECT, PCHANGE, pname, 0, 0, + DBUS_TYPE_STRING_AS_STRING, stemp); } else if (strcmp (pname, "accessible-table-caption-object") == 0) { - otemp = atk_table_get_caption(ATK_TABLE(accessible)); - stemp = atk_object_get_name(otemp); - emit(accessible, ITF_EVENT_OBJECT, PCHANGE, pname, 0, 0, DBUS_TYPE_STRING_AS_STRING, stemp); + otemp = atk_table_get_caption (ATK_TABLE (accessible)); + stemp = atk_object_get_name (otemp); + emit (accessible, ITF_EVENT_OBJECT, PCHANGE, pname, 0, 0, + DBUS_TYPE_STRING_AS_STRING, stemp); } else { - emit(accessible, ITF_EVENT_OBJECT, PCHANGE, pname, 0, 0, DBUS_TYPE_INT32_AS_STRING, 0); + emit (accessible, ITF_EVENT_OBJECT, PCHANGE, pname, 0, 0, + DBUS_TYPE_INT32_AS_STRING, 0); } return TRUE; } @@ -402,23 +418,23 @@ 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, - guint n_param_values, - const GValue *param_values, - gpointer data) +state_event_listener (GSignalInvocationHint * signal_hint, + guint n_param_values, + const GValue * param_values, gpointer data) { AtkObject *accessible; gchar *pname; guint detail1; - accessible = ATK_OBJECT(g_value_get_object (¶m_values[0])); + accessible = ATK_OBJECT (g_value_get_object (¶m_values[0])); pname = g_strdup (g_value_get_string (¶m_values[1])); /* TODO - Possibly ignore a change to the 'defunct' state. * This is because without reference counting defunct objects should be removed. */ detail1 = (g_value_get_boolean (¶m_values[2])) ? 1 : 0; - emit(accessible, ITF_EVENT_OBJECT, STATE_CHANGED, pname, detail1, 0, DBUS_TYPE_INT32_AS_STRING, 0); + emit (accessible, ITF_EVENT_OBJECT, STATE_CHANGED, pname, detail1, 0, + DBUS_TYPE_INT32_AS_STRING, 0); g_free (pname); return TRUE; } @@ -437,21 +453,21 @@ state_event_listener (GSignalInvocationHint *signal_hint, * window:deactivate -> window:deactivate */ static gboolean -window_event_listener (GSignalInvocationHint *signal_hint, - guint n_param_values, - const GValue *param_values, - gpointer data) +window_event_listener (GSignalInvocationHint * signal_hint, + guint n_param_values, + const GValue * param_values, gpointer data) { AtkObject *accessible; GSignalQuery signal_query; const gchar *name, *s; - + g_signal_query (signal_hint->signal_id, &signal_query); name = signal_query.signal_name; - accessible = ATK_OBJECT(g_value_get_object(¶m_values[0])); + accessible = ATK_OBJECT (g_value_get_object (¶m_values[0])); s = atk_object_get_name (accessible); - emit(accessible, ITF_EVENT_WINDOW, name, "", 0, 0, DBUS_TYPE_STRING_AS_STRING, s); + emit (accessible, ITF_EVENT_WINDOW, name, "", 0, 0, + DBUS_TYPE_STRING_AS_STRING, s); return TRUE; } @@ -467,10 +483,9 @@ window_event_listener (GSignalInvocationHint *signal_hint, * Gtk:AtkDocument:reload -> document:reload */ 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; @@ -479,9 +494,10 @@ document_event_listener (GSignalInvocationHint *signal_hint, g_signal_query (signal_hint->signal_id, &signal_query); name = signal_query.signal_name; - accessible = ATK_OBJECT(g_value_get_object(¶m_values[0])); + accessible = ATK_OBJECT (g_value_get_object (¶m_values[0])); s = atk_object_get_name (accessible); - emit(accessible, ITF_EVENT_DOCUMENT, name, "", 0, 0, DBUS_TYPE_STRING_AS_STRING, s); + emit (accessible, ITF_EVENT_DOCUMENT, name, "", 0, 0, + DBUS_TYPE_STRING_AS_STRING, s); return TRUE; } @@ -493,10 +509,9 @@ 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; @@ -506,12 +521,12 @@ bounds_event_listener (GSignalInvocationHint *signal_hint, g_signal_query (signal_hint->signal_id, &signal_query); name = signal_query.signal_name; - accessible = ATK_OBJECT(g_value_get_object(¶m_values[0])); + 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); - emit_rect(accessible, ITF_EVENT_OBJECT, name, "", atk_rect); + emit_rect (accessible, ITF_EVENT_OBJECT, name, "", atk_rect); return TRUE; } @@ -523,10 +538,9 @@ bounds_event_listener (GSignalInvocationHint *signal_hint, * */ static gboolean -active_descendant_event_listener (GSignalInvocationHint *signal_hint, - guint n_param_values, - const GValue *param_values, - gpointer data) +active_descendant_event_listener (GSignalInvocationHint * signal_hint, + guint n_param_values, + const GValue * param_values, gpointer data) { AtkObject *accessible; AtkObject *child; @@ -538,8 +552,8 @@ active_descendant_event_listener (GSignalInvocationHint *signal_hint, g_signal_query (signal_hint->signal_id, &signal_query); name = signal_query.signal_name; - accessible = ATK_OBJECT(g_value_get_object(¶m_values[0])); - child = ATK_OBJECT(g_value_get_pointer (¶m_values[1])); + accessible = ATK_OBJECT (g_value_get_object (¶m_values[0])); + child = ATK_OBJECT (g_value_get_pointer (¶m_values[1])); g_return_val_if_fail (ATK_IS_OBJECT (child), TRUE); minor = g_quark_to_string (signal_hint->detail); @@ -551,8 +565,9 @@ active_descendant_event_listener (GSignalInvocationHint *signal_hint, return TRUE; } - emit(accessible, ITF_EVENT_OBJECT, name, "", detail1, 0, DBUS_TYPE_OBJECT_PATH_AS_STRING, s); - g_free(s); + emit (accessible, ITF_EVENT_OBJECT, name, "", detail1, 0, + DBUS_TYPE_OBJECT_PATH_AS_STRING, s); + g_free (s); return TRUE; } @@ -564,10 +579,9 @@ active_descendant_event_listener (GSignalInvocationHint *signal_hint, * */ static gboolean -link_selected_event_listener (GSignalInvocationHint *signal_hint, - guint n_param_values, - const GValue *param_values, - gpointer data) +link_selected_event_listener (GSignalInvocationHint * signal_hint, + guint n_param_values, + const GValue * param_values, gpointer data) { AtkObject *accessible; GSignalQuery signal_query; @@ -577,13 +591,14 @@ link_selected_event_listener (GSignalInvocationHint *signal_hint, g_signal_query (signal_hint->signal_id, &signal_query); name = signal_query.signal_name; - accessible = ATK_OBJECT(g_value_get_object(¶m_values[0])); + accessible = ATK_OBJECT (g_value_get_object (¶m_values[0])); minor = g_quark_to_string (signal_hint->detail); if (G_VALUE_TYPE (¶m_values[1]) == G_TYPE_INT) - detail1 = g_value_get_int (¶m_values[1]); + detail1 = g_value_get_int (¶m_values[1]); - emit(accessible, ITF_EVENT_OBJECT, name, minor, detail1, 0, DBUS_TYPE_INT32_AS_STRING, 0); + emit (accessible, ITF_EVENT_OBJECT, name, minor, detail1, 0, + DBUS_TYPE_INT32_AS_STRING, 0); return TRUE; } @@ -595,10 +610,9 @@ link_selected_event_listener (GSignalInvocationHint *signal_hint, * */ static gboolean -text_changed_event_listener (GSignalInvocationHint *signal_hint, - guint n_param_values, - const GValue *param_values, - gpointer data) +text_changed_event_listener (GSignalInvocationHint * signal_hint, + guint n_param_values, + const GValue * param_values, gpointer data) { AtkObject *accessible; GSignalQuery signal_query; @@ -609,18 +623,20 @@ text_changed_event_listener (GSignalInvocationHint *signal_hint, g_signal_query (signal_hint->signal_id, &signal_query); name = signal_query.signal_name; - accessible = ATK_OBJECT(g_value_get_object(¶m_values[0])); + accessible = ATK_OBJECT (g_value_get_object (¶m_values[0])); minor = g_quark_to_string (signal_hint->detail); if (G_VALUE_TYPE (¶m_values[1]) == G_TYPE_INT) - detail1 = g_value_get_int (¶m_values[1]); + detail1 = g_value_get_int (¶m_values[1]); if (G_VALUE_TYPE (¶m_values[2]) == G_TYPE_INT) - detail2 = g_value_get_int (¶m_values[2]); + detail2 = g_value_get_int (¶m_values[2]); - selected = atk_text_get_text (ATK_TEXT (accessible), detail1, detail1+detail2); + selected = + atk_text_get_text (ATK_TEXT (accessible), detail1, detail1 + detail2); - emit(accessible, ITF_EVENT_OBJECT, name, minor, detail1, detail2, DBUS_TYPE_STRING_AS_STRING, selected); + emit (accessible, ITF_EVENT_OBJECT, name, minor, detail1, detail2, + DBUS_TYPE_STRING_AS_STRING, selected); return TRUE; } @@ -632,10 +648,10 @@ text_changed_event_listener (GSignalInvocationHint *signal_hint, * */ static gboolean -text_selection_changed_event_listener (GSignalInvocationHint *signal_hint, - guint n_param_values, - const GValue *param_values, - gpointer data) +text_selection_changed_event_listener (GSignalInvocationHint * signal_hint, + guint n_param_values, + const GValue * param_values, + gpointer data) { AtkObject *accessible; GSignalQuery signal_query; @@ -645,16 +661,17 @@ text_selection_changed_event_listener (GSignalInvocationHint *signal_hint, g_signal_query (signal_hint->signal_id, &signal_query); name = signal_query.signal_name; - accessible = ATK_OBJECT(g_value_get_object(¶m_values[0])); + accessible = ATK_OBJECT (g_value_get_object (¶m_values[0])); minor = g_quark_to_string (signal_hint->detail); if (G_VALUE_TYPE (¶m_values[1]) == G_TYPE_INT) - detail1 = g_value_get_int (¶m_values[1]); + detail1 = g_value_get_int (¶m_values[1]); if (G_VALUE_TYPE (¶m_values[2]) == G_TYPE_INT) - detail2 = g_value_get_int (¶m_values[2]); + detail2 = g_value_get_int (¶m_values[2]); - emit(accessible, ITF_EVENT_OBJECT, name, minor, detail1, detail2, DBUS_TYPE_STRING_AS_STRING, ""); + emit (accessible, ITF_EVENT_OBJECT, name, minor, detail1, detail2, + DBUS_TYPE_STRING_AS_STRING, ""); return TRUE; } @@ -671,10 +688,9 @@ text_selection_changed_event_listener (GSignalInvocationHint *signal_hint, * any_data is NULL. */ static gboolean -generic_event_listener (GSignalInvocationHint *signal_hint, - guint n_param_values, - const GValue *param_values, - gpointer data) +generic_event_listener (GSignalInvocationHint * signal_hint, + guint n_param_values, + const GValue * param_values, gpointer data) { AtkObject *accessible; GSignalQuery signal_query; @@ -684,15 +700,16 @@ generic_event_listener (GSignalInvocationHint *signal_hint, g_signal_query (signal_hint->signal_id, &signal_query); name = signal_query.signal_name; - accessible = ATK_OBJECT(g_value_get_object(¶m_values[0])); + accessible = ATK_OBJECT (g_value_get_object (¶m_values[0])); if (n_param_values > 1 && G_VALUE_TYPE (¶m_values[1]) == G_TYPE_INT) - detail1 = g_value_get_int (¶m_values[1]); + detail1 = g_value_get_int (¶m_values[1]); if (n_param_values > 2 && G_VALUE_TYPE (¶m_values[2]) == G_TYPE_INT) - detail2 = g_value_get_int (¶m_values[2]); + detail2 = g_value_get_int (¶m_values[2]); - emit(accessible, ITF_EVENT_OBJECT, name, "", detail1, detail2, DBUS_TYPE_INT32_AS_STRING, 0); + emit (accessible, ITF_EVENT_OBJECT, name, "", detail1, detail2, + DBUS_TYPE_INT32_AS_STRING, 0); return TRUE; } @@ -724,7 +741,7 @@ spi_atk_register_event_listeners (void) * Kludge to make sure the Atk interface types are registered, otherwise * the AtkText signal handlers below won't get registered */ - GObject *ao = g_object_new (ATK_TYPE_OBJECT, NULL); + GObject *ao = g_object_new (ATK_TYPE_OBJECT, NULL); AtkObject *bo = atk_no_op_object_new (ao); g_object_unref (G_OBJECT (bo)); @@ -735,36 +752,50 @@ spi_atk_register_event_listeners (void) atk_bridge_focus_tracker_id = atk_add_focus_tracker (focus_tracker); - add_signal_listener (property_event_listener, "Gtk:AtkObject:property-change"); - add_signal_listener (window_event_listener, "window:create"); - add_signal_listener (window_event_listener, "window:destroy"); - add_signal_listener (window_event_listener, "window:minimize"); - add_signal_listener (window_event_listener, "window:maximize"); - add_signal_listener (window_event_listener, "window:restore"); - add_signal_listener (window_event_listener, "window:activate"); - add_signal_listener (window_event_listener, "window:deactivate"); - add_signal_listener (document_event_listener, "Gtk:AtkDocument:load-complete"); - add_signal_listener (document_event_listener, "Gtk:AtkDocument:reload"); - add_signal_listener (document_event_listener, "Gtk:AtkDocument:load-stopped"); + add_signal_listener (property_event_listener, + "Gtk:AtkObject:property-change"); + add_signal_listener (window_event_listener, "window:create"); + add_signal_listener (window_event_listener, "window:destroy"); + add_signal_listener (window_event_listener, "window:minimize"); + add_signal_listener (window_event_listener, "window:maximize"); + add_signal_listener (window_event_listener, "window:restore"); + add_signal_listener (window_event_listener, "window:activate"); + add_signal_listener (window_event_listener, "window:deactivate"); + add_signal_listener (document_event_listener, + "Gtk:AtkDocument:load-complete"); + add_signal_listener (document_event_listener, "Gtk:AtkDocument:reload"); + add_signal_listener (document_event_listener, + "Gtk:AtkDocument:load-stopped"); /* TODO Fake this event on the client side */ - add_signal_listener (state_event_listener, "Gtk:AtkObject:state-change"); + add_signal_listener (state_event_listener, "Gtk:AtkObject:state-change"); /* TODO */ - add_signal_listener (active_descendant_event_listener, "Gtk:AtkObject:active-descendant-changed"); - add_signal_listener (bounds_event_listener, "Gtk:AtkComponent:bounds-changed"); - add_signal_listener (text_selection_changed_event_listener, "Gtk:AtkText:text-selection-changed"); - add_signal_listener (text_changed_event_listener, "Gtk:AtkText:text-changed"); - add_signal_listener (link_selected_event_listener, "Gtk:AtkHypertext:link-selected"); - add_signal_listener (generic_event_listener, "Gtk:AtkObject:visible-data-changed"); - add_signal_listener (generic_event_listener, "Gtk:AtkSelection:selection-changed"); - add_signal_listener (generic_event_listener, "Gtk:AtkText:text-attributes-changed"); - add_signal_listener (generic_event_listener, "Gtk:AtkText:text-caret-moved"); - add_signal_listener (generic_event_listener, "Gtk:AtkTable:row-inserted"); - add_signal_listener (generic_event_listener, "Gtk:AtkTable:row-reordered"); - add_signal_listener (generic_event_listener, "Gtk:AtkTable:row-deleted"); - add_signal_listener (generic_event_listener, "Gtk:AtkTable:column-inserted"); - add_signal_listener (generic_event_listener, "Gtk:AtkTable:column-reordered"); - add_signal_listener (generic_event_listener, "Gtk:AtkTable:column-deleted"); - add_signal_listener (generic_event_listener, "Gtk:AtkTable:model-changed"); + add_signal_listener (active_descendant_event_listener, + "Gtk:AtkObject:active-descendant-changed"); + add_signal_listener (bounds_event_listener, + "Gtk:AtkComponent:bounds-changed"); + add_signal_listener (text_selection_changed_event_listener, + "Gtk:AtkText:text-selection-changed"); + add_signal_listener (text_changed_event_listener, + "Gtk:AtkText:text-changed"); + add_signal_listener (link_selected_event_listener, + "Gtk:AtkHypertext:link-selected"); + add_signal_listener (generic_event_listener, + "Gtk:AtkObject:visible-data-changed"); + add_signal_listener (generic_event_listener, + "Gtk:AtkSelection:selection-changed"); + add_signal_listener (generic_event_listener, + "Gtk:AtkText:text-attributes-changed"); + add_signal_listener (generic_event_listener, + "Gtk:AtkText:text-caret-moved"); + add_signal_listener (generic_event_listener, "Gtk:AtkTable:row-inserted"); + add_signal_listener (generic_event_listener, "Gtk:AtkTable:row-reordered"); + add_signal_listener (generic_event_listener, "Gtk:AtkTable:row-deleted"); + add_signal_listener (generic_event_listener, + "Gtk:AtkTable:column-inserted"); + add_signal_listener (generic_event_listener, + "Gtk:AtkTable:column-reordered"); + add_signal_listener (generic_event_listener, "Gtk:AtkTable:column-deleted"); + add_signal_listener (generic_event_listener, "Gtk:AtkTable:model-changed"); /* * May add the following listeners to implement preemptive key listening for GTK+ @@ -772,7 +803,8 @@ spi_atk_register_event_listeners (void) * atk_add_global_event_listener (spi_atk_bridge_widgetkey_listener, "Gtk:GtkWidget:key-press-event"); * 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_bridge_key_event_listener_id = + atk_add_key_event_listener (spi_atk_bridge_key_listener, NULL); } /*---------------------------------------------------------------------------*/ @@ -788,15 +820,15 @@ 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_remove_focus_tracker (atk_bridge_focus_tracker_id); + for (i = 0; ids && i < ids->len; i++) { - atk_remove_global_event_listener (g_array_index (ids, guint, i)); + atk_remove_global_event_listener (g_array_index (ids, guint, i)); } - + if (atk_bridge_key_event_listener_id) - atk_remove_key_event_listener (atk_bridge_key_event_listener_id); + atk_remove_key_event_listener (atk_bridge_key_event_listener_id); } /*---------------------------------------------------------------------------*/ @@ -822,18 +854,20 @@ spi_atk_tidy_windows (void) AtkObject *child; AtkStateSet *stateset; const gchar *name; - + child = atk_object_ref_accessible_child (root, i); stateset = atk_object_ref_state_set (child); - + name = atk_object_get_name (child); if (atk_state_set_contains_state (stateset, ATK_STATE_ACTIVE)) { - emit(child, ITF_EVENT_WINDOW, "deactivate", NULL, 0, 0, DBUS_TYPE_STRING_AS_STRING, name); + emit (child, ITF_EVENT_WINDOW, "deactivate", NULL, 0, 0, + DBUS_TYPE_STRING_AS_STRING, name); } g_object_unref (stateset); - emit(child, ITF_EVENT_WINDOW, "destroy", NULL, 0, 0, DBUS_TYPE_STRING_AS_STRING, name); + emit (child, ITF_EVENT_WINDOW, "destroy", NULL, 0, 0, + DBUS_TYPE_STRING_AS_STRING, name); g_object_unref (child); } } diff --git a/atk-adaptor/event.h b/atk-adaptor/event.h index ecd3fd9..338478d 100644 --- a/atk-adaptor/event.h +++ b/atk-adaptor/event.h @@ -27,8 +27,8 @@ #include -void spi_atk_register_event_listeners (void); +void spi_atk_register_event_listeners (void); void spi_atk_deregister_event_listeners (void); -void spi_atk_tidy_windows (void); +void spi_atk_tidy_windows (void); #endif /* EVENT_H */ diff --git a/atk-adaptor/hyperlink-adaptor.c b/atk-adaptor/hyperlink-adaptor.c index 8e0acb0..75521ed 100644 --- a/atk-adaptor/hyperlink-adaptor.c +++ b/atk-adaptor/hyperlink-adaptor.c @@ -48,8 +48,7 @@ impl_get_NAnchors (DBusMessageIter * iter, void *user_data) 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 (user_data), FALSE); @@ -81,7 +80,8 @@ impl_GetObject (DBusConnection * bus, DBusMessage * message, void *user_data) return droute_invalid_arguments_error (message); } atk_object = atk_hyperlink_get_object (link, i); - return spi_dbus_return_sub_object (message, G_OBJECT (atk_object), G_OBJECT (link), FALSE); + return spi_dbus_return_sub_object (message, G_OBJECT (atk_object), + G_OBJECT (link), FALSE); } static DBusMessage * @@ -150,10 +150,9 @@ static DRouteProperty properties[] = { }; void -spi_initialize_hyperlink (DRoutePath *path) +spi_initialize_hyperlink (DRoutePath * path) { droute_path_add_interface (path, SPI_DBUS_INTERFACE_HYPERLINK, - methods, - properties); + methods, properties); }; diff --git a/atk-adaptor/hypertext-adaptor.c b/atk-adaptor/hypertext-adaptor.c index c5ee329..082dde3 100644 --- a/atk-adaptor/hypertext-adaptor.c +++ b/atk-adaptor/hypertext-adaptor.c @@ -64,7 +64,8 @@ impl_GetLink (DBusConnection * bus, DBusMessage * message, void *user_data) return droute_invalid_arguments_error (message); } link = atk_hypertext_get_link (hypertext, linkIndex); - return spi_dbus_return_hyperlink (message, link, ATK_OBJECT(hypertext), TRUE); + return spi_dbus_return_hyperlink (message, link, ATK_OBJECT (hypertext), + TRUE); } static DBusMessage * @@ -103,10 +104,8 @@ static DRouteMethod methods[] = { }; void -spi_initialize_hypertext (DRoutePath *path) +spi_initialize_hypertext (DRoutePath * path) { droute_path_add_interface (path, - SPI_DBUS_INTERFACE_HYPERTEXT, - methods, - NULL); + SPI_DBUS_INTERFACE_HYPERTEXT, methods, NULL); }; diff --git a/atk-adaptor/image-adaptor.c b/atk-adaptor/image-adaptor.c index e1b801a..1ed7b24 100644 --- a/atk-adaptor/image-adaptor.c +++ b/atk-adaptor/image-adaptor.c @@ -28,8 +28,7 @@ #include "common/spi-dbus.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); @@ -38,8 +37,7 @@ impl_get_ImageDescription (DBusMessageIter * iter, } 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); @@ -136,10 +134,8 @@ static DRouteProperty properties[] = { }; void -spi_initialize_image (DRoutePath *path) +spi_initialize_image (DRoutePath * path) { droute_path_add_interface (path, - SPI_DBUS_INTERFACE_IMAGE, - methods, - properties); + SPI_DBUS_INTERFACE_IMAGE, methods, properties); }; diff --git a/atk-adaptor/relation-adaptor.c b/atk-adaptor/relation-adaptor.c index eaa7d8b..7b0e32f 100644 --- a/atk-adaptor/relation-adaptor.c +++ b/atk-adaptor/relation-adaptor.c @@ -33,7 +33,7 @@ #include "common/spi-dbus.h" static gboolean -spi_init_relation_type_table (Accessibility_RelationType *types) +spi_init_relation_type_table (Accessibility_RelationType * types) { gint i; @@ -53,8 +53,10 @@ spi_init_relation_type_table (Accessibility_RelationType *types) types[ATK_RELATION_EMBEDS] = Accessibility_RELATION_EMBEDS; types[ATK_RELATION_EMBEDDED_BY] = Accessibility_RELATION_EMBEDDED_BY; types[ATK_RELATION_POPUP_FOR] = Accessibility_RELATION_POPUP_FOR; - types[ATK_RELATION_PARENT_WINDOW_OF] = Accessibility_RELATION_PARENT_WINDOW_OF; - types[ATK_RELATION_DESCRIPTION_FOR] = Accessibility_RELATION_DESCRIPTION_FOR; + types[ATK_RELATION_PARENT_WINDOW_OF] = + Accessibility_RELATION_PARENT_WINDOW_OF; + types[ATK_RELATION_DESCRIPTION_FOR] = + Accessibility_RELATION_DESCRIPTION_FOR; types[ATK_RELATION_DESCRIBED_BY] = Accessibility_RELATION_DESCRIBED_BY; return TRUE; @@ -66,11 +68,12 @@ static Accessibility_RelationType spi_relation_type_from_atk_relation_type (AtkRelationType type) { static gboolean is_initialized = FALSE; - static Accessibility_RelationType spi_relation_type_table [ATK_RELATION_LAST_DEFINED]; + static Accessibility_RelationType + spi_relation_type_table[ATK_RELATION_LAST_DEFINED]; Accessibility_RelationType spi_type; if (!is_initialized) - is_initialized = spi_init_relation_type_table (spi_relation_type_table); + is_initialized = spi_init_relation_type_table (spi_relation_type_table); if (type > ATK_RELATION_NULL && type < ATK_RELATION_LAST_DEFINED) spi_type = spi_relation_type_table[type]; @@ -84,17 +87,16 @@ spi_relation_type_from_atk_relation_type (AtkRelationType type) static AtkRelation * get_relation_from_servant (PortableServer_Servant servant) { - SpiBase *base = SPI_BASE (bonobo_object_from_servant(servant)); + SpiBase *base = SPI_BASE (bonobo_object_from_servant (servant)); g_return_val_if_fail (base, NULL); - return ATK_RELATION(base->gobj); + return ATK_RELATION (base->gobj); } static Accessibility_RelationType -impl_getRelationType (PortableServer_Servant servant, - CORBA_Environment * ev) +impl_getRelationType (PortableServer_Servant servant, CORBA_Environment * ev) { AtkRelation *relation = get_relation_from_servant (servant); AtkRelationType type; @@ -106,10 +108,9 @@ impl_getRelationType (PortableServer_Servant servant, static CORBA_short -impl_getNTargets (PortableServer_Servant servant, - CORBA_Environment * ev) +impl_getNTargets (PortableServer_Servant servant, CORBA_Environment * ev) { - AtkRelation *relation = get_relation_from_servant(servant); + AtkRelation *relation = get_relation_from_servant (servant); g_return_val_if_fail (relation != NULL, 0); return relation->target ? relation->target->len : 0; @@ -118,16 +119,13 @@ impl_getNTargets (PortableServer_Servant servant, static CORBA_Object impl_getTarget (PortableServer_Servant servant, - const CORBA_short index, - CORBA_Environment * ev) + const CORBA_short index, CORBA_Environment * ev) { AtkObject *atk_object; AtkRelation *relation = get_relation_from_servant (servant); g_return_val_if_fail (relation, NULL); - if (!relation->target || - index < 0 || - index >= relation->target->len) + if (!relation->target || index < 0 || index >= relation->target->len) return CORBA_OBJECT_NIL; atk_object = g_ptr_array_index (relation->target, index); @@ -139,7 +137,7 @@ impl_getTarget (PortableServer_Servant servant, SpiRelation * -spi_relation_new (AtkRelation *obj) +spi_relation_new (AtkRelation * obj) { SpiRelation *new_relation = g_object_new (SPI_RELATION_TYPE, NULL); spi_base_construct (SPI_BASE (new_relation), G_OBJECT (obj)); @@ -148,23 +146,21 @@ spi_relation_new (AtkRelation *obj) static void -spi_relation_class_init (SpiRelationClass *klass) +spi_relation_class_init (SpiRelationClass * klass) { POA_Accessibility_Relation__epv *epv = &klass->epv; - epv->getRelationType = impl_getRelationType; - epv->getNTargets = impl_getNTargets; - epv->getTarget = impl_getTarget; + epv->getRelationType = impl_getRelationType; + epv->getNTargets = impl_getNTargets; + epv->getTarget = impl_getTarget; } static void -spi_relation_init (SpiRelation *relation) +spi_relation_init (SpiRelation * relation) { } BONOBO_TYPE_FUNC_FULL (SpiRelation, - Accessibility_Relation, - SPI_TYPE_BASE, - spi_relation) + Accessibility_Relation, SPI_TYPE_BASE, spi_relation) diff --git a/atk-adaptor/selection-adaptor.c b/atk-adaptor/selection-adaptor.c index 7735488..4516b52 100644 --- a/atk-adaptor/selection-adaptor.c +++ b/atk-adaptor/selection-adaptor.c @@ -29,8 +29,7 @@ #include "accessible-marshaller.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); @@ -252,10 +251,9 @@ static DRouteProperty properties[] = { }; void -spi_initialize_selection (DRoutePath *path) +spi_initialize_selection (DRoutePath * path) { droute_path_add_interface (path, SPI_DBUS_INTERFACE_SELECTION, - methods, - properties); + methods, properties); }; diff --git a/atk-adaptor/streamablecontent-adaptor.c b/atk-adaptor/streamablecontent-adaptor.c index cf15bbd..8192e1a 100644 --- a/atk-adaptor/streamablecontent-adaptor.c +++ b/atk-adaptor/streamablecontent-adaptor.c @@ -44,20 +44,22 @@ static GObjectClass *spi_streamable_parent_class; typedef struct _SpiContentStream SpiContentStream; typedef struct _SpiContentStreamClass SpiContentStreamClass; -struct _SpiContentStream { +struct _SpiContentStream +{ BonoboObject parent; GIOChannel *gio; }; -struct _SpiContentStreamClass { +struct _SpiContentStreamClass +{ BonoboObjectClass parent_class; POA_Accessibility_ContentStream__epv epv; }; -GType spi_content_stream_get_type (void); +GType spi_content_stream_get_type (void); -static SpiContentStream* -spi_content_stream_new (GIOChannel *gio) +static SpiContentStream * +spi_content_stream_new (GIOChannel * gio) { SpiContentStream *new_stream = g_object_new (SPI_CONTENT_STREAM_TYPE, NULL); new_stream->gio = gio; @@ -65,103 +67,115 @@ 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)) + if (SPI_IS_CONTENT_STREAM (o)) { - SpiContentStream *stream = SPI_CONTENT_STREAM (o); - if (stream->gio) g_io_channel_unref (stream->gio); + SpiContentStream *stream = SPI_CONTENT_STREAM (o); + if (stream->gio) + g_io_channel_unref (stream->gio); } } static CORBA_long impl_content_stream_seek (PortableServer_Servant servant, - const CORBA_long offset, - const Accessibility_ContentStream_SeekType whence, - CORBA_Environment *ev) + const CORBA_long offset, + const Accessibility_ContentStream_SeekType whence, + CORBA_Environment * ev) { - SpiContentStream *stream = SPI_CONTENT_STREAM (bonobo_object_from_servant(servant)); + SpiContentStream *stream = + SPI_CONTENT_STREAM (bonobo_object_from_servant (servant)); if (stream && stream->gio) - { + { GError *err; GSeekType seektype = G_SEEK_SET; - switch (whence) { - case Accessibility_ContentStream_SEEK_CURRENT: - seektype = G_SEEK_CUR; - break; - case Accessibility_ContentStream_SEEK_END: - seektype = G_SEEK_END; - break; - } - if (g_io_channel_seek_position (stream->gio, (gint64) offset, - seektype, &err) == G_IO_STATUS_NORMAL) - return offset; + switch (whence) + { + case Accessibility_ContentStream_SEEK_CURRENT: + seektype = G_SEEK_CUR; + break; + case Accessibility_ContentStream_SEEK_END: + seektype = G_SEEK_END; + break; + } + if (g_io_channel_seek_position (stream->gio, (gint64) offset, + seektype, &err) == G_IO_STATUS_NORMAL) + return offset; else - return -1; - } + return -1; + } else - return -1; + return -1; } static CORBA_long impl_content_stream_read (PortableServer_Servant servant, - const CORBA_long count, - Accessibility_ContentStream_iobuf** buffer, - CORBA_Environment *ev) + const CORBA_long count, + Accessibility_ContentStream_iobuf ** buffer, + CORBA_Environment * ev) { - SpiContentStream *stream = SPI_CONTENT_STREAM (bonobo_object_from_servant(servant)); + SpiContentStream *stream = + SPI_CONTENT_STREAM (bonobo_object_from_servant (servant)); CORBA_long realcount = 0; if (stream && stream->gio) - { + { gchar *gbuf = NULL; GIOStatus status; GError *err = NULL; - - /* read the giochannel and determine the actual bytes read...*/ - if (count != -1) { - gbuf = g_malloc (count+1); - status = g_io_channel_read_chars (stream->gio, gbuf, count, &realcount, &err); - } + + /* read the giochannel and determine the actual bytes read... */ + if (count != -1) + { + gbuf = g_malloc (count + 1); + status = + g_io_channel_read_chars (stream->gio, gbuf, count, &realcount, + &err); + } else - status = g_io_channel_read_to_end (stream->gio, &gbuf, &realcount, &err); + status = + g_io_channel_read_to_end (stream->gio, &gbuf, &realcount, &err); if (status == G_IO_STATUS_NORMAL || status == G_IO_STATUS_EOF) - { - *buffer = Bonobo_Stream_iobuf__alloc (); - CORBA_sequence_set_release (*buffer, TRUE); + { + *buffer = Bonobo_Stream_iobuf__alloc (); + CORBA_sequence_set_release (*buffer, TRUE); + + (*buffer)->_buffer = + CORBA_sequence_CORBA_octet_allocbuf (realcount); + (*buffer)->_length = realcount; - (*buffer)->_buffer = CORBA_sequence_CORBA_octet_allocbuf (realcount); - (*buffer)->_length = realcount; - - g_memmove ((*buffer)->_buffer, gbuf, realcount); - } + g_memmove ((*buffer)->_buffer, gbuf, realcount); + } g_free (gbuf); - } + } return realcount; } static void -impl_content_stream_close (PortableServer_Servant servant, - CORBA_Environment *ev) +impl_content_stream_close (PortableServer_Servant servant, + CORBA_Environment * ev) { - GIOStatus status; - GError *err; - SpiContentStream *stream = SPI_CONTENT_STREAM (bonobo_object_from_servant(servant)); - if (stream && stream->gio) { - status = g_io_channel_shutdown (stream->gio, TRUE, &err); - g_io_channel_unref (stream->gio); + GIOStatus status; + GError *err; + SpiContentStream *stream = + SPI_CONTENT_STREAM (bonobo_object_from_servant (servant)); + if (stream && stream->gio) + { + status = g_io_channel_shutdown (stream->gio, TRUE, &err); + g_io_channel_unref (stream->gio); } - if (err) g_free (err); + if (err) + g_free (err); } 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; + GObjectClass *object_class = (GObjectClass *) klass; epv->seek = impl_content_stream_seek; epv->read = impl_content_stream_read; @@ -172,31 +186,30 @@ spi_content_stream_class_init (SpiContentStreamClass *klass) 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) + Accessibility_ContentStream, + 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); - g_return_val_if_fail (ATK_IS_STREAMABLE_CONTENT(object->gobj), NULL); + g_return_val_if_fail (ATK_IS_STREAMABLE_CONTENT (object->gobj), NULL); return ATK_STREAMABLE_CONTENT (object->gobj); } /* * CORBA Accessibility::StreamableContent::getContentTypes method implementation */ -static Accessibility_StringSeq* -impl_accessibility_streamable_get_content_types (PortableServer_Servant servant, - CORBA_Environment *ev) +static Accessibility_StringSeq * +impl_accessibility_streamable_get_content_types (PortableServer_Servant + servant, + CORBA_Environment * ev) { Accessibility_StringSeq *typelist = Accessibility_StringSeq__alloc (); AtkStreamableContent *streamable = get_streamable_from_servant (servant); @@ -209,14 +222,16 @@ impl_accessibility_streamable_get_content_types (PortableServer_Servant servant, n_types = atk_streamable_content_get_n_mime_types (streamable); if (n_types) - { + { typelist->_length = typelist->_maximum = n_types; typelist->_buffer = Accessibility_StringSeq_allocbuf (n_types); - for (i = 0; i < n_types; ++i) { - const gchar *mimetype = atk_streamable_content_get_mime_type (streamable, i); - typelist->_buffer[i] = CORBA_string_dup (mimetype ? mimetype : ""); - } - } + for (i = 0; i < n_types; ++i) + { + const gchar *mimetype = + atk_streamable_content_get_mime_type (streamable, i); + typelist->_buffer[i] = CORBA_string_dup (mimetype ? mimetype : ""); + } + } return typelist; } @@ -225,8 +240,8 @@ impl_accessibility_streamable_get_content_types (PortableServer_Servant 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); @@ -236,10 +251,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; } @@ -248,8 +263,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); @@ -259,7 +274,7 @@ impl_accessibility_streamable_get_stream (PortableServer_Servant servant, gio = atk_streamable_content_get_stream (streamable, content_type); - stream = spi_content_stream_new (gio); + stream = spi_content_stream_new (gio); return bonobo_object_dup_ref (BONOBO_OBJREF (stream), ev); } @@ -269,8 +284,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); @@ -283,34 +298,33 @@ 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); + POA_Accessibility_StreamableContent__epv *epv = &klass->epv; + spi_streamable_parent_class = g_type_class_peek_parent (klass); - epv->getContentTypes = impl_accessibility_streamable_get_content_types; - epv->getContent = impl_accessibility_streamable_get_content; - epv->getStream = impl_accessibility_streamable_get_stream; - epv->GetURI = impl_accessibility_streamable_get_uri; + epv->getContentTypes = impl_accessibility_streamable_get_content_types; + epv->getContent = impl_accessibility_streamable_get_content; + epv->getStream = impl_accessibility_streamable_get_stream; + epv->GetURI = impl_accessibility_streamable_get_uri; } 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); + SpiStreamable *retval = g_object_new (SPI_STREAMABLE_TYPE, NULL); - spi_base_construct (SPI_BASE (retval), G_OBJECT(o)); + spi_base_construct (SPI_BASE (retval), G_OBJECT (o)); - return retval; + return retval; } BONOBO_TYPE_FUNC_FULL (SpiStreamable, - Accessibility_StreamableContent, - PARENT_TYPE, - spi_streamable) + Accessibility_StreamableContent, + PARENT_TYPE, spi_streamable) diff --git a/atk-adaptor/table-adaptor.c b/atk-adaptor/table-adaptor.c index a49ea66..212004a 100644 --- a/atk-adaptor/table-adaptor.c +++ b/atk-adaptor/table-adaptor.c @@ -63,8 +63,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; @@ -77,8 +76,7 @@ impl_get_NSelectedRows (DBusMessageIter * iter, } 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; @@ -686,10 +684,8 @@ static DRouteProperty properties[] = { }; void -spi_initialize_table (DRoutePath *path) +spi_initialize_table (DRoutePath * path) { droute_path_add_interface (path, - SPI_DBUS_INTERFACE_TABLE, - methods, - properties); + SPI_DBUS_INTERFACE_TABLE, methods, properties); }; diff --git a/atk-adaptor/text-adaptor.c b/atk-adaptor/text-adaptor.c index 4fd42ab..a15f9c7 100644 --- a/atk-adaptor/text-adaptor.c +++ b/atk-adaptor/text-adaptor.c @@ -32,8 +32,7 @@ #include "accessible-marshaller.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); @@ -41,8 +40,7 @@ impl_get_CharacterCount (DBusMessageIter * iter, } 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); @@ -140,8 +138,9 @@ impl_GetTextBeforeOffset (DBusConnection * bus, DBusMessage * message, reply = dbus_message_new_method_return (message); if (reply) { - dbus_message_append_args (reply, DBUS_TYPE_STRING, &txt, DBUS_TYPE_INT32, - &startOffset, DBUS_TYPE_INT32, &endOffset, + dbus_message_append_args (reply, DBUS_TYPE_STRING, &txt, + DBUS_TYPE_INT32, &startOffset, + DBUS_TYPE_INT32, &endOffset, DBUS_TYPE_INVALID); } g_free (txt); @@ -179,8 +178,9 @@ impl_GetTextAtOffset (DBusConnection * bus, DBusMessage * message, reply = dbus_message_new_method_return (message); if (reply) { - dbus_message_append_args (reply, DBUS_TYPE_STRING, &txt, DBUS_TYPE_INT32, - &startOffset, DBUS_TYPE_INT32, &endOffset, + dbus_message_append_args (reply, DBUS_TYPE_STRING, &txt, + DBUS_TYPE_INT32, &startOffset, + DBUS_TYPE_INT32, &endOffset, DBUS_TYPE_INVALID); } g_free (txt); @@ -219,8 +219,9 @@ impl_GetTextAfterOffset (DBusConnection * bus, DBusMessage * message, reply = dbus_message_new_method_return (message); if (reply) { - dbus_message_append_args (reply, DBUS_TYPE_STRING, &txt, DBUS_TYPE_INT32, - &startOffset, DBUS_TYPE_INT32, &endOffset, + dbus_message_append_args (reply, DBUS_TYPE_STRING, &txt, + DBUS_TYPE_INT32, &startOffset, + DBUS_TYPE_INT32, &endOffset, DBUS_TYPE_INVALID); } g_free (txt); @@ -229,7 +230,7 @@ impl_GetTextAfterOffset (DBusConnection * bus, DBusMessage * message, static DBusMessage * impl_GetCharacterAtOffset (DBusConnection * bus, DBusMessage * message, - void *user_data) + void *user_data) { AtkText *text = (AtkText *) user_data; dbus_int32_t offset; @@ -249,7 +250,8 @@ impl_GetCharacterAtOffset (DBusConnection * bus, DBusMessage * message, reply = dbus_message_new_method_return (message); if (reply) { - dbus_message_append_args (reply, DBUS_TYPE_INT32, &ch, DBUS_TYPE_INVALID); + dbus_message_append_args (reply, DBUS_TYPE_INT32, &ch, + DBUS_TYPE_INVALID); } return reply; } @@ -305,7 +307,8 @@ impl_GetAttributeValue (DBusConnection * bus, DBusMessage * message, { dbus_message_append_args (reply, DBUS_TYPE_STRING, &rv, DBUS_TYPE_INT32, &startOffset, DBUS_TYPE_INT32, &endOffset, - DBUS_TYPE_BOOLEAN, &defined, DBUS_TYPE_INVALID); + DBUS_TYPE_BOOLEAN, &defined, + DBUS_TYPE_INVALID); } atk_attribute_set_free (set); return reply; @@ -369,7 +372,8 @@ impl_GetAttributes (DBusConnection * bus, DBusMessage * message, dbus_message_iter_init_append (reply, &iter); spi_atk_append_attribute_set (&iter, set); dbus_message_append_args (reply, DBUS_TYPE_INT32, &startOffset, - DBUS_TYPE_INT32, &endOffset, DBUS_TYPE_INVALID); + DBUS_TYPE_INT32, &endOffset, + DBUS_TYPE_INVALID); } atk_attribute_set_free (set); return reply; @@ -416,8 +420,8 @@ impl_GetCharacterExtents (DBusConnection * bus, DBusMessage * message, droute_not_yet_handled_error (message)); dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &offset, DBUS_TYPE_UINT32, &coordType, - DBUS_TYPE_INVALID)) + (message, &error, DBUS_TYPE_INT32, &offset, DBUS_TYPE_UINT32, + &coordType, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -754,7 +758,8 @@ impl_GetAttributeRun (DBusConnection * bus, DBusMessage * message, return NULL; dbus_message_iter_init_append (reply, &iter); - dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, "{ss}", &iterArray); + dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, "{ss}", + &iterArray); spi_atk_append_attribute_set_inner (&iterArray, attributes); if (includeDefaults) { @@ -833,10 +838,8 @@ static DRouteProperty properties[] = { }; void -spi_initialize_text (DRoutePath *path) +spi_initialize_text (DRoutePath * path) { droute_path_add_interface (path, - SPI_DBUS_INTERFACE_TEXT, - methods, - properties); + SPI_DBUS_INTERFACE_TEXT, methods, properties); }; diff --git a/atk-adaptor/tree-adaptor.c b/atk-adaptor/tree-adaptor.c index 3935b26..89a065f 100644 --- a/atk-adaptor/tree-adaptor.c +++ b/atk-adaptor/tree-adaptor.c @@ -41,62 +41,64 @@ append_accessible_hf (gpointer key, gpointer obj_data, gpointer data) { /* Make sure it isn't a hyperlink */ if (ATK_IS_OBJECT (obj_data)) - spi_atk_append_accessible (ATK_OBJECT(obj_data), data); + spi_atk_append_accessible (ATK_OBJECT (obj_data), data); } /*---------------------------------------------------------------------------*/ void -spi_emit_cache_removal (guint ref, DBusConnection *bus) +spi_emit_cache_removal (guint ref, DBusConnection * bus) { DBusMessage *message; if ((message = dbus_message_new_signal ("/org/freedesktop/atspi/tree", SPI_DBUS_INTERFACE_TREE, - "RemoveAccessible"))) { - DBusMessageIter iter; - gchar *path; + "RemoveAccessible"))) + { + DBusMessageIter iter; + gchar *path; - dbus_message_iter_init_append (message, &iter); + dbus_message_iter_init_append (message, &iter); - path = atk_dbus_ref_to_path (ref); - dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &path); + path = atk_dbus_ref_to_path (ref); + dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &path); - dbus_connection_send(bus, message, NULL); + dbus_connection_send (bus, message, NULL); - dbus_message_unref (message); - } + dbus_message_unref (message); + } } void -spi_emit_cache_update (AtkObject *accessible, DBusConnection *bus) +spi_emit_cache_update (AtkObject * accessible, DBusConnection * bus) { DBusMessage *message; if ((message = dbus_message_new_signal ("/org/freedesktop/atspi/tree", SPI_DBUS_INTERFACE_TREE, - "UpdateAccessible"))) { - DBusMessageIter iter; + "UpdateAccessible"))) + { + DBusMessageIter iter; - dbus_message_iter_init_append (message, &iter); - spi_atk_append_accessible (accessible, &iter); + dbus_message_iter_init_append (message, &iter); + spi_atk_append_accessible (accessible, &iter); - dbus_connection_send(bus, message, NULL); + dbus_connection_send (bus, message, NULL); - dbus_message_unref (message); - } + dbus_message_unref (message); + } } /*---------------------------------------------------------------------------*/ static DBusMessage * -impl_GetRoot (DBusConnection *bus, DBusMessage *message, void *user_data) +impl_GetRoot (DBusConnection * bus, DBusMessage * message, void *user_data) { - AtkObject *root = atk_get_root(); + AtkObject *root = atk_get_root (); char *path; DBusMessage *reply; - gchar *errmsg; + gchar *errmsg; if (!root) { @@ -112,7 +114,8 @@ impl_GetRoot (DBusConnection *bus, DBusMessage *message, void *user_data) "No root accessible available"); } reply = dbus_message_new_method_return (message); - dbus_message_append_args (reply, DBUS_TYPE_OBJECT_PATH, &path, DBUS_TYPE_INVALID); + dbus_message_append_args (reply, DBUS_TYPE_OBJECT_PATH, &path, + DBUS_TYPE_INVALID); g_free (path); return reply; } @@ -120,7 +123,7 @@ impl_GetRoot (DBusConnection *bus, DBusMessage *message, void *user_data) /*---------------------------------------------------------------------------*/ static DBusMessage * -impl_GetTree (DBusConnection *bus, DBusMessage *message, void *user_data) +impl_GetTree (DBusConnection * bus, DBusMessage * message, void *user_data) { DBusMessage *reply; DBusMessageIter iter, iter_array; @@ -128,9 +131,10 @@ impl_GetTree (DBusConnection *bus, DBusMessage *message, void *user_data) reply = dbus_message_new_method_return (message); dbus_message_iter_init_append (reply, &iter); - dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "(o(so)a(so)assusau)", &iter_array); - atk_dbus_foreach_registered(append_accessible_hf, &iter_array); - dbus_message_iter_close_container(&iter, &iter_array); + dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, + "(o(so)a(so)assusau)", &iter_array); + atk_dbus_foreach_registered (append_accessible_hf, &iter_array); + dbus_message_iter_close_container (&iter, &iter_array); return reply; } @@ -143,12 +147,9 @@ static DRouteMethod methods[] = { }; void -spi_initialize_tree (DRoutePath *path) +spi_initialize_tree (DRoutePath * path) { - droute_path_add_interface (path, - SPI_DBUS_INTERFACE_TREE, - methods, - NULL); + droute_path_add_interface (path, SPI_DBUS_INTERFACE_TREE, methods, NULL); }; /*END------------------------------------------------------------------------*/ diff --git a/atk-adaptor/tree-adaptor.h b/atk-adaptor/tree-adaptor.h index b0c99df..2406448 100644 --- a/atk-adaptor/tree-adaptor.h +++ b/atk-adaptor/tree-adaptor.h @@ -28,10 +28,8 @@ #include #include -void -spi_emit_cache_update (AtkObject *accessible, DBusConnection *bus); +void spi_emit_cache_update (AtkObject * accessible, DBusConnection * bus); -void -spi_emit_cache_removal (guint ref, DBusConnection *bus); +void spi_emit_cache_removal (guint ref, DBusConnection * bus); #endif /* TREE_ADAPTOR_H */ diff --git a/atk-adaptor/value-adaptor.c b/atk-adaptor/value-adaptor.c index 2fd0ace..833543c 100644 --- a/atk-adaptor/value-adaptor.c +++ b/atk-adaptor/value-adaptor.c @@ -30,12 +30,11 @@ #include "common/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}; - GValue dest = {0}; + GValue src = { 0 }; + GValue dest = { 0 }; gdouble dub; g_return_val_if_fail (ATK_IS_VALUE (user_data), FALSE); @@ -55,12 +54,11 @@ impl_get_MinimumValue (DBusMessageIter * iter, } 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}; - GValue dest = {0}; + GValue src = { 0 }; + GValue dest = { 0 }; gdouble dub; g_return_val_if_fail (ATK_IS_VALUE (user_data), FALSE); @@ -80,12 +78,11 @@ impl_get_MaximumValue (DBusMessageIter * iter, } 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}; - GValue dest = {0}; + GValue src = { 0 }; + GValue dest = { 0 }; gdouble dub; g_return_val_if_fail (ATK_IS_VALUE (user_data), FALSE); @@ -105,12 +102,11 @@ impl_get_MinimumIncrement (DBusMessageIter * iter, } 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}; - GValue dest = {0}; + GValue src = { 0 }; + GValue dest = { 0 }; gdouble dub; g_return_val_if_fail (ATK_IS_VALUE (user_data), FALSE); @@ -130,12 +126,11 @@ impl_get_CurrentValue (DBusMessageIter * iter, } 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}; - GValue dest = {0}; + GValue src = { 0 }; + GValue dest = { 0 }; gdouble dub; DBusMessageIter iter_variant; @@ -143,10 +138,10 @@ impl_set_currentValue (DBusMessageIter * iter, dbus_message_iter_recurse (iter, &iter_variant); if (dbus_message_iter_get_arg_type (&iter_variant) != DBUS_TYPE_DOUBLE) - { - g_warning ("TODO: Support setting value from a non-double"); - return FALSE; - } + { + g_warning ("TODO: Support setting value from a non-double"); + return FALSE; + } dbus_message_iter_get_basic (&iter_variant, &dub); g_value_init (&src, G_TYPE_DOUBLE); g_value_set_double (&src, dub); @@ -173,10 +168,8 @@ static DRouteProperty properties[] = { }; void -spi_initialize_value (DRoutePath *path) +spi_initialize_value (DRoutePath * path) { droute_path_add_interface (path, - SPI_DBUS_INTERFACE_VALUE, - NULL, - properties); + SPI_DBUS_INTERFACE_VALUE, NULL, properties); }; -- 2.7.4