SPI_DBUS_INTERFACE_ACCESSIBLE,
SPI_DBUS_INTERFACE_ACTION,
SPI_DBUS_INTERFACE_APPLICATION,
+ SPI_DBUS_INTERFACE_COLLECTION,
SPI_DBUS_INTERFACE_COMPONENT,
SPI_DBUS_INTERFACE_DOCUMENT,
SPI_DBUS_INTERFACE_EDITABLE_TEXT,
SPI_DBUS_INTERFACE_HYPERLINK,
SPI_DBUS_INTERFACE_HYPERTEXT,
SPI_DBUS_INTERFACE_IMAGE,
- "org.freedesktop.atspi.LoginHelper",
+ "org.a11y.atspi.LoginHelper",
SPI_DBUS_INTERFACE_SELECTION,
- "org.freedesktop.atspi.Selector",
+ "org.a11y.atspi.Selector",
SPI_DBUS_INTERFACE_TABLE,
SPI_DBUS_INTERFACE_TEXT,
SPI_DBUS_INTERFACE_VALUE,
{
g_free (accessible->v.path);
}
+ if (accessible->states)
+ spi_state_set_cache_unref (accessible->states);
+ g_free (accessible->description);
+ g_free (accessible->name);
g_free(accessible);
}
}
int id;
guint *id_val;
- if (sscanf (path, "/org/freedesktop/atspi/accessible/%d", &id) != 1)
+ if (sscanf (path, "/org/a11y/atspi/accessible/%d", &id) != 1)
{
return NULL;
}
if (!app_hash)
{
app_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify)g_hash_table_unref);
- if (!app_hash) return;
+ if (!app_hash) return NULL;
}
app = g_hash_table_lookup (app_hash, bus_name);
if (app) return app;
if (!bus_name_dup) return NULL;
// TODO: change below to something that will send state-change:defunct notification if necessary */
app = g_new (CSpiApplication, 1);
- if (!app) return NULL;
+ if (!app)
+ {
+ g_free (bus_name_dup);
+ return NULL;
+ }
app->bus_name = bus_name_dup;
if (APP_IS_REGISTRY (app))
{
char *name;
dbus_uint32_t role;
char *description;
+ GArray *state_bitflags;
} CACHE_ADDITION;
+static void
+handle_addition (CSpiApplication*app, CACHE_ADDITION *ca)
+{
+ gint i;
+ GList *new_list;
+
+ Accessible *a = ref_accessible (app, ca->path);
+ /* Note: children don't hold refs for their parents or vice versa */
+ a->parent = ref_accessible (app, ca->parent);
+ if (a->parent) cspi_object_unref (a->parent);
+ if (a->children)
+ {
+ g_list_free (a->children);
+ a->children = NULL;
+ }
+ for (i = 0; i < ca->children->len; i++)
+ {
+ const char *child_path = g_array_index (ca->children, const char *, i);
+ Accessible *child = ref_accessible (app, child_path);
+ new_list = g_list_append (a->children, child);
+ if (new_list) a->children = new_list;
+ cspi_object_unref (child);
+ }
+ a->interfaces = 0;
+ for (i = 0; i < ca->interfaces->len; i++)
+ {
+ const char *iface = g_array_index (ca->interfaces, const char *, i);
+ if (!strcmp (iface, "org.freedesktop.DBus.Introspectable")) continue;
+ gint n = get_iface_num (iface);
+ if (n == -1)
+ {
+ g_warning ("Unknown interface %s", iface);
+ }
+ else a->interfaces |= (1 << n);
+ g_free (iface);
+ }
+ if (a->name) g_free (a->name);
+ a->name = ca->name;
+ a->role = ca->role;
+ if (a->description) g_free (a->description);
+ a->description = ca->description;
+ a->states = spi_state_set_cache_new (ca->state_bitflags);
+ g_array_free (ca->interfaces, TRUE);
+ g_array_free (ca->children, TRUE);
+ /* spi_state_set_cache_new frees state_bitflags */
+ /* This is a bit of a hack since ref_accessible sets ref_count to 2
+ * for a new object, one of the refs being for the cache */
+ cspi_object_unref (a);
+}
+
/* Update the cache with added/modified objects and free the array */
static void
handle_additions (CSpiApplication*app, GArray *additions)
{
- gint i, j;
- GList *l, *new_list;
+ gint i;
if (!additions)
{
for (i = 0; i < additions->len; i++)
{
CACHE_ADDITION *ca = &g_array_index (additions, CACHE_ADDITION, i);
- Accessible *a = ref_accessible (app, ca->path);
- /* Note: children don't hold refs for their parents or vice versa */
- a->parent = ref_accessible (app, ca->parent);
- if (a->parent) cspi_object_unref (a->parent);
- if (a->children)
- {
- g_list_free (a->children);
- a->children = NULL;
- }
- for (j = 0; j < ca->children->len; j++)
- {
- const char *child_path = g_array_index (ca->children, const char *, j);
- Accessible *child = ref_accessible (app, child_path);
- new_list = g_list_append (a->children, child);
- if (new_list) a->children = new_list;
- cspi_object_unref (child);
- }
- a->interfaces = 0;
- for (j = 0; j < ca->interfaces->len; j++)
- {
- const char *iface = g_array_index (ca->interfaces, const char *, j);
- if (!strcmp (iface, "org.freedesktop.DBus.Introspectable")) continue;
- gint n = get_iface_num (iface);
- if (n == -1)
- {
- g_warning ("Unknown interface %s", iface);
- }
- else a->interfaces |= (1 << n);
- g_free (iface);
- }
- if (a->name) g_free (a->name);
- a->name = ca->name;
- a->role = ca->role;
- if (a->description) g_free (a->description);
- a->description = ca->description;
- g_array_free (ca->interfaces, TRUE);
- g_array_free (ca->children, TRUE);
- /* This is a bit of a hack since ref_accessible sets ref_count to 2
- * for a new object, one of the refs being for the cache */
- cspi_object_unref (a);
+ handle_addition (app, ca);
}
- g_array_free (additions, TRUE);
}
-static void
-handle_removals (CSpiApplication *app, GArray *removals)
+static DBusHandlerResult
+cspi_dbus_handle_remove_accessible (DBusConnection *bus, DBusMessage *message, void *user_data)
{
- gint j;
+ const char *sender = dbus_message_get_sender (message);
+ CSpiApplication *app = cspi_get_application (sender);
+ const char *path;
+ Accessible *a;
- if (!removals) return;
- for (j = 0; j < removals->len; j++)
+ if (!dbus_message_get_args (message, NULL, DBUS_TYPE_STRING, &path, DBUS_TYPE_INVALID))
{
- const char *path = g_array_index (removals, const char *, j);
- Accessible *a = ref_accessible (app, path);
- if (a->parent && g_list_find (a->parent->children, a))
- {
- a->parent->children = g_list_remove (a->parent->children, a);
- /* Note: children don't hold refs for their parents or vice versa */
- }
- g_hash_table_remove (app->hash, &a->v.id);
- cspi_object_unref_internal (a, TRUE); /* unref our own ref */
+ g_warning ("Received RemoveAccessible with invalid arguments");
+ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+ }
+ a = ref_accessible (app, path);
+ if (a->parent && g_list_find (a->parent->children, a))
+ {
+ a->parent->children = g_list_remove (a->parent->children, a);
+ // TODO: Send children-changed:remove event
+ /* Note: children don't hold refs for their parents or vice versa */
}
- g_array_free (removals, TRUE);
+ g_hash_table_remove (app->hash, &a->v.id);
+ cspi_object_unref_internal (a, TRUE); /* unref our own ref */
+ return DBUS_HANDLER_RESULT_HANDLED;
}
static gboolean
char *root_path;
dbus_error_init (&error);
- if (dbind_connection_method_call (bus, bus_name, "/org/freedesktop/atspi/tree", spi_interface_tree, "getRoot", &error, "=>o", &root_path))
+ if (dbind_method_call_reentrant (bus, bus_name, "/org/a11y/atspi/tree", spi_interface_tree, "getRoot", &error, "=>o", &root_path))
{
Accessible *obj = cspi_ref_accessible (bus_name, root_path);
if (obj)
return TRUE;
}
+static Accessible *desktop;
+
static Accessible *
-ref_accessible_desktop (CSpiApplication *app, const char *path)
+ref_accessible_desktop (CSpiApplication *app)
{
- char *path_dup;
DBusError error;
GArray *apps = NULL;
GArray *additions;
gint i;
- Accessible *a = g_hash_table_lookup (app->hash, path);
- if (a)
+ if (desktop)
{
- cspi_object_ref (a);
- return a;
+ cspi_object_ref (desktop);
+ return desktop;
}
- path_dup = g_strdup (path);
- if (!path_dup) return NULL;
- a = g_new0 (Accessible, 1);
- if (!a)
+ desktop = g_new0 (Accessible, 1);
+ if (!desktop)
{
- g_free (path_dup);
return NULL;
}
- g_hash_table_insert (app->hash, path_dup, a);
- a->app = app;
- a->v.path = path_dup;
- a->ref_count = 2; /* one for the caller, one for the hash */
- cspi_dbus_get_property (a, SPI_DBUS_INTERFACE_ACCESSIBLE, "name", NULL, "s", &a->name);
+ g_hash_table_insert (app->hash, "", desktop);
+ desktop->app = app;
+ desktop->ref_count = 2; /* one for the caller, one for the hash */
+ desktop->name = g_strdup ("");
dbus_error_init (&error);
- if (!dbind_connection_method_call (bus, spi_bus_registry, a->v.path, spi_interface_desktop, "getChildren", &error, "=>as", &apps))
+ if (!dbind_method_call_reentrant (bus, spi_bus_registry, spi_path_registry, spi_interface_registry, "getApplications", &error, "=>as", &apps))
{
- g_error ("Couldn't get desktop children: %s", error.message);
+ g_error ("Couldn't get application list: %s", error.message);
}
for (i = 0; i < apps->len; i++)
{
CSpiApplication *app = cspi_get_application (app_name);
additions = NULL;
dbus_error_init (&error);
- dbind_connection_method_call (bus, app_name, "/org/freedesktop/atspi/tree", spi_interface_tree, "getTree", &error, "=>a(ooaoassus)", &additions);
+ dbind_method_call_reentrant (bus, app_name, "/org/a11y/atspi/tree", spi_interface_tree, "getTree", &error, "=>a(ooaoassusau)", &additions);
if (error.message)
{
g_warning ("getTree (%s): %s", app_name, error.message);
}
handle_additions (app, additions);
- add_app_to_desktop (a, app_name);
+ add_app_to_desktop (desktop, app_name);
}
g_array_free (apps, TRUE);
- return a;
+ return desktop;
}
Accessible *
if (!a) return NULL;
if ( APP_IS_REGISTRY(a))
{
- return ref_accessible_desktop (a, path);
+ return ref_accessible_desktop (a);
}
return ref_accessible (a, path);
}
return ref_accessible (obj->app, path);
}
-typedef struct
-{
- GArray *additions;
- GArray *removals;
-} CacheSignalData;
-
-static const char *cacheSignalType = "a(ooaoassus)ao";
+static const char *cacheSignalType = "(ooaoassusau)";
static DBusHandlerResult
-cspi_dbus_handle_update_tree (DBusConnection *bus, DBusMessage *message, void *user_data)
+cspi_dbus_handle_update_accessible (DBusConnection *bus, DBusMessage *message, void *user_data)
{
DBusMessageIter iter;
- CacheSignalData cd;
- void *p = &cd;
+ CACHE_ADDITION ca;
+ void *p = &ca;
const char *sender = dbus_message_get_sender (message);
CSpiApplication *app = cspi_get_application (sender);
const char *type = cacheSignalType;
if (!app)
{
- g_warning ("UpdateTree from unknown app. Should we add it?", sender);
- return;
+ g_warning ("UpdateAccessible from unknown app. Should we add it?", sender);
+ return DBUS_HANDLER_RESULT_HANDLED;
}
dbus_message_iter_init (message, &iter);
// TODO: Check signature
dbind_any_demarshal (&iter, &type, &p); /* additions */
- dbind_any_demarshal (&iter, &type, &p); /* removals */
- handle_additions (app, cd.additions);
- handle_removals (app, cd.removals);
+ handle_addition (app, &ca);
+ return DBUS_HANDLER_RESULT_HANDLED;
}
static DBusHandlerResult
-cspi_dbus_handle_add_application (DBusConnection *bus, DBusMessage *message, void *user_data)
+cspi_dbus_handle_register_application (DBusConnection *bus, DBusMessage *message, void *user_data)
{
DBusError error;
dbus_uint32_t v;
char *bus_name;
dbus_error_init (&error);
- if (!dbus_message_get_args (message, NULL, DBUS_TYPE_UINT32, &v, DBUS_TYPE_STRING, &bus_name, DBUS_TYPE_INVALID))
- {
- g_warning ("Error processing %s: %s\n", dbus_message_get_member(message), error.message);
- dbus_error_free (&error);
- return DBUS_HANDLER_RESULT_HANDLED;
- }
- a = cspi_ref_accessible (spi_bus_registry, dbus_message_get_path(message));
- if (add_app_to_desktop (a, bus_name))
+ a = cspi_ref_accessible (spi_bus_registry, spi_path_registry);
+ if (add_app_to_desktop (a, dbus_message_get_sender (message)))
{
send_children_changed (a, g_list_last (a->children)->data, TRUE);
}
}
static DBusHandlerResult
-cspi_dbus_handle_remove_application (DBusConnection *bus, DBusMessage *message, void *user_data)
+cspi_dbus_handle_deregister_application (DBusConnection *bus, DBusMessage *message, void *user_data)
{
- DBusError error;
- dbus_uint32_t v;
Accessible *a;
+ DBusError error;
char *bus_name;
-
+
dbus_error_init (&error);
- if (!dbus_message_get_args (message, NULL, DBUS_TYPE_UINT32, &v, DBUS_TYPE_STRING, &bus_name, DBUS_TYPE_INVALID))
+ if (!dbus_message_get_args (message, &error, DBUS_TYPE_STRING, &bus_name, DBUS_TYPE_INVALID))
{
g_warning ("Error processing %s: %s\n", dbus_message_get_member(message), error.message);
dbus_error_free (&error);
return DBUS_HANDLER_RESULT_HANDLED;
}
- a = cspi_ref_accessible (spi_bus_registry, dbus_message_get_path(message));
+
+ a = cspi_ref_accessible (spi_bus_registry, spi_path_registry);
remove_app_from_desktop (a, bus_name);
cspi_object_unref (a);
return DBUS_HANDLER_RESULT_HANDLED;
char *bus_name;
if (type == DBUS_MESSAGE_TYPE_SIGNAL &&
- !strcmp (interface, SPI_DBUS_INTERFACE_ACCESSIBLE))
+ !strncmp (interface, "org.a11y.atspi.Event.", 28))
{
return cspi_dbus_handle_event (bus, message, data);
}
{
return cspi_dbus_handle_deviceEvent (bus, message, data);
}
- if (dbus_message_is_signal (message, spi_interface_tree, "updateTree"))
+ if (dbus_message_is_signal (message, spi_interface_tree, "updateAccessible"))
{
- return cspi_dbus_handle_update_tree (bus, message, data);
+ return cspi_dbus_handle_update_accessible (bus, message, data);
}
- if (dbus_message_is_signal (message, spi_interface_registry, "applicationAdd"))
+ if (dbus_message_is_signal (message, spi_interface_tree, "removeAccessible"))
{
- return cspi_dbus_handle_add_application (bus, message, data);
+ return cspi_dbus_handle_remove_accessible (bus, message, data);
}
- if (dbus_message_is_signal (message, spi_interface_registry, "applicationRemove"))
+ if (dbus_message_is_method_call (message, spi_interface_registry, "registerApplication"))
{
- return cspi_dbus_handle_remove_application (bus, message, data);
+ return cspi_dbus_handle_register_application (bus, message, data);
+ }
+ if (dbus_message_is_method_call (message, spi_interface_registry, "deregisterApplication"))
+ {
+ return cspi_dbus_handle_deregister_application (bus, message, data);
}
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
}
+static const char *signal_interfaces[] =
+{
+ "org.a11y.atspi.Event.Object",
+ "org.a11y.atspi.Event.Window",
+ "org.a11y.atspi.Event.Mouse",
+ "org.a11y.atspi.Event.Terminal",
+ "org.a11y.atspi.Event.Document",
+ "org.a11y.atspi.Event.Focus",
+ NULL
+};
+
/**
* SPI_init:
*
{
DBusError error;
char *match;
+ int i;
if (SPI_inited)
{
dbus_bus_register (bus, &error);
dbus_connection_setup_with_g_main(bus, g_main_context_default());
dbus_connection_add_filter (bus, cspi_dbus_filter, NULL, NULL);
- match = g_strdup_printf ("type='signal',interface='%s',member='updateTree'", spi_interface_tree);
+ match = g_strdup_printf ("type='signal',interface='%s',member='updateAccessible'", spi_interface_tree);
dbus_error_init (&error);
dbus_bus_add_match (bus, match, &error);
g_free (match);
- match = g_strdup_printf ("type='signal',sender='%s'", spi_bus_registry);
+ match = g_strdup_printf ("type='signal',interface='%s',member='removeAccessible'", spi_interface_tree);
+ dbus_error_init (&error);
dbus_bus_add_match (bus, match, &error);
g_free (match);
+ match = g_strdup_printf ("type='method_call',interface='%s'", spi_interface_registry);
+ dbus_bus_add_match (bus, match, &error);
+ g_free (match);
+ for (i = 0; signal_interfaces[i]; i++)
+ {
+ match = g_strdup_printf ("type='signal',interface='%s'", signal_interfaces[i]);
+ dbus_bus_add_match (bus, match, &error);
+ g_free (match);
+ }
return 0;
}
{
if (APP_IS_REGISTRY (obj->app))
{
- return g_strdup_printf (SPI_DBUS_PATH_DESKTOP);
+ return g_strdup_printf (SPI_DBUS_PATH_REGISTRY);
}
- return g_strdup_printf ("/org/freedesktop/atspi/accessible/%d", obj->v.id);
+ return g_strdup_printf ("/org/a11y/atspi/accessible/%d", obj->v.id);
}
dbus_bool_t
if (!error) error = &err;
dbus_error_init (error);
va_start (args, type);
- retval = dbind_connection_method_call_va (SPI_bus(), obj->app->bus_name, path, interface, method, error, type, args);
+ retval = dbind_method_call_reentrant_va (SPI_bus(), obj->app->bus_name, path, interface, method, error, type, args);
va_end (args);
g_free (path);
if (dbus_error_is_set (error))
projects / platform / core / uifw / at-spi2-atk.git / blobdiff