#include <droute/droute.h>
#include <gmodule.h>
-#include <glib/gi18n.h>
#include <atspi/atspi.h>
#include "bridge.h"
/*---------------------------------------------------------------------------*/
-SpiBridge *spi_global_app_data = NULL;
+static DBusHandlerResult
+signal_filter (DBusConnection *bus, DBusMessage *message, void *user_data);
-/*static Display *bridge_display = NULL;*/
+SpiBridge *spi_global_app_data = NULL;
/*---------------------------------------------------------------------------*/
static GSList *clients = NULL;
static void
-get_registered_event_listeners (SpiBridge *app)
+tally_event_reply ()
{
- DBusMessage *message, *reply;
- DBusMessageIter iter, iter_array, iter_struct;
+ static int replies_received = 0;
- message = dbus_message_new_method_call (SPI_DBUS_NAME_REGISTRY,
- ATSPI_DBUS_PATH_REGISTRY,
- ATSPI_DBUS_INTERFACE_REGISTRY,
- "GetRegisteredEvents");
- if (!message)
- return;
+ replies_received++;
+ if (replies_received == 3)
+ {
+ if (!clients)
+ spi_atk_deregister_event_listeners ();
+ spi_global_app_data->events_initialized = TRUE;
+ }
+}
+
+static void
+get_events_reply (DBusPendingCall *pending, void *user_data)
+{
+ DBusMessage *reply = dbus_pending_call_steal_reply (pending);
+ DBusMessageIter iter, iter_array, iter_struct;
- reply = dbus_connection_send_with_reply_and_block (app->bus, message, 5000, NULL);
- dbus_message_unref (message);
if (!reply)
- {
- spi_global_app_data->events_initialized = TRUE;
- return;
- }
+ goto done;
+
if (strcmp (dbus_message_get_signature (reply), "a(ss)") != 0)
{
g_warning ("atk-bridge: GetRegisteredEvents returned message with unknown signature");
- dbus_message_unref (reply);
- spi_global_app_data->events_initialized = TRUE;
- return;
+ goto done;
}
+
dbus_message_iter_init (reply, &iter);
dbus_message_iter_recurse (&iter, &iter_array);
while (dbus_message_iter_get_arg_type (&iter_array) != DBUS_TYPE_INVALID)
add_event (bus_name, event);
dbus_message_iter_next (&iter_array);
}
- dbus_message_unref (reply);
- if (!clients)
- spi_atk_deregister_event_listeners ();
- spi_global_app_data->events_initialized = TRUE;
+done:
+ if (reply)
+ dbus_message_unref (reply);
+ if (pending)
+ dbus_pending_call_unref (pending);
+
+ tally_event_reply ();
+}
+
+static void
+get_device_events_reply (DBusPendingCall *pending, void *user_data)
+{
+ DBusMessage *reply = dbus_pending_call_steal_reply (pending);
+ DBusMessageIter iter, iter_array, iter_struct;
+
+ if (!reply)
+ goto done;
+
+ if (strncmp (dbus_message_get_signature (reply), "a(s", 3) != 0)
+ {
+ g_warning ("atk-bridge: get_device_events_reply: unknown signature");
+ goto done;
+ }
+
+ dbus_message_iter_init (reply, &iter);
+ dbus_message_iter_recurse (&iter, &iter_array);
+ while (dbus_message_iter_get_arg_type (&iter_array) != DBUS_TYPE_INVALID)
+ {
+ char *bus_name;
+ dbus_message_iter_recurse (&iter_array, &iter_struct);
+ dbus_message_iter_get_basic (&iter_struct, &bus_name);
+ spi_atk_add_client (bus_name);
+ dbus_message_iter_next (&iter_array);
+ }
+
+done:
+ if (reply)
+ dbus_message_unref (reply);
+ if (pending)
+ dbus_pending_call_unref (pending);
+
+ tally_event_reply ();
+}
+
+static void
+get_registered_event_listeners (SpiBridge *app)
+{
+ DBusMessage *message;
+ DBusPendingCall *pending = NULL;
+
+ message = dbus_message_new_method_call (SPI_DBUS_NAME_REGISTRY,
+ ATSPI_DBUS_PATH_REGISTRY,
+ ATSPI_DBUS_INTERFACE_REGISTRY,
+ "GetRegisteredEvents");
+ if (!message)
+ return;
+
+ dbus_connection_send_with_reply (app->bus, message, &pending, -1);
+ dbus_message_unref (message);
+ if (!pending)
+ {
+ spi_global_app_data->events_initialized = TRUE;
+ return;
+ }
+ dbus_pending_call_set_notify (pending, get_events_reply, NULL, NULL);
+
+ message = dbus_message_new_method_call (SPI_DBUS_NAME_REGISTRY,
+ ATSPI_DBUS_PATH_DEC,
+ ATSPI_DBUS_INTERFACE_DEC,
+ "GetKeystrokeListeners");
+ if (!message)
+ return;
+ pending = NULL;
+ dbus_connection_send_with_reply (app->bus, message, &pending, -1);
+ dbus_message_unref (message);
+ if (!pending)
+ {
+ spi_global_app_data->events_initialized = TRUE;
+ return;
+ }
+ dbus_pending_call_set_notify (pending, get_device_events_reply, NULL, NULL);
+
+ message = dbus_message_new_method_call (SPI_DBUS_NAME_REGISTRY,
+ ATSPI_DBUS_PATH_DEC,
+ ATSPI_DBUS_INTERFACE_DEC,
+ "GetDeviceEventListeners");
+ if (!message)
+ return;
+ pending = NULL;
+ dbus_connection_send_with_reply (app->bus, message, &pending, -1);
+ dbus_message_unref (message);
+ if (!pending)
+ {
+ spi_global_app_data->events_initialized = TRUE;
+ return;
+ }
+ dbus_pending_call_set_notify (pending, get_device_events_reply, NULL, NULL);
}
static void
/*---------------------------------------------------------------------------*/
-static void
-exit_func (void)
-{
- if (!spi_global_app_data)
- {
- return;
- }
-
- spi_atk_tidy_windows ();
- spi_atk_deregister_event_listeners ();
- deregister_application (spi_global_app_data);
-
- g_free (spi_global_app_data);
- spi_global_app_data = NULL;
-
- /* Not currently creating an XDisplay */
-#if 0
- if (bridge_display)
- XCloseDisplay (bridge_display);
-#endif
-}
-
/*---------------------------------------------------------------------------*/
static AtkPlugClass *plug_class;
DBusMessageIter iter, iter_array;
AtkStateSet *set;
+ set = atk_state_set_new ();
+
if (!socket->embedded_plug_id)
- return NULL;
+ return set;
child_name = g_strdup (socket->embedded_plug_id);
if (!child_name)
- return NULL;
+ return set;
child_path = g_utf8_strchr (child_name + 1, -1, ':');
if (!child_path)
{
g_free (child_name);
- return NULL;
+ return set;
}
*(child_path++) = '\0';
message = dbus_message_new_method_call (child_name, child_path, ATSPI_DBUS_INTERFACE_ACCESSIBLE, "GetState");
reply = dbus_connection_send_with_reply_and_block (spi_global_app_data->bus, message, 1, NULL);
dbus_message_unref (message);
if (reply == NULL)
- return NULL;
+ return set;
if (strcmp (dbus_message_get_signature (reply), "au") != 0)
{
dbus_message_unref (reply);
- return NULL;
+ return set;
}
- set = atk_state_set_new ();
- if (!set)
- return NULL;
+
dbus_message_iter_init (reply, &iter);
dbus_message_iter_recurse (&iter, &iter_array);
do
}
static dbus_bool_t
-user_check (DBusConnection *bus, unsigned long uid)
+user_check (DBusConnection *bus, unsigned long uid, void *data)
{
if (uid == getuid () || uid == geteuid ())
return TRUE;
droute_intercept_dbus (con);
droute_context_register (spi_global_app_data->droute, con);
- new_list = g_list_append (spi_global_app_data->direct_connections, con);
- if (new_list)
- spi_global_app_data->direct_connections = new_list;
+ spi_global_app_data->direct_connections = g_list_append (spi_global_app_data->direct_connections, con);
}
static int
server = dbus_server_listen(spi_global_app_data->app_bus_addr, &err);
if (server == NULL)
{
- g_warning (_("atk-bridge: Couldn't listen on dbus server: %s"), err.message);
+ g_warning ("atk-bridge: Couldn't listen on dbus server: %s", err.message);
dbus_error_init (&err);
spi_global_app_data->app_bus_addr [0] = '\0';
g_main_context_unref (spi_global_app_data->main_context);
remove_events (sender, name);
}
+static void
+handle_device_listener_registered (DBusConnection *bus, DBusMessage *message,
+ void *user_data)
+{
+ char *sender;
+ DBusMessageIter iter, iter_struct;
+
+ if (strncmp (dbus_message_get_signature (message), "(s", 2) != 0)
+ {
+ g_warning ("atk-bridge: handle_device_listener_register: unknown signature");
+ return;
+ }
+
+ dbus_message_iter_init (message, &iter);
+ dbus_message_iter_recurse (&iter, &iter_struct);
+ dbus_message_iter_get_basic (&iter_struct, &sender);
+ spi_atk_add_client (sender);
+}
+
static DBusHandlerResult
signal_filter (DBusConnection *bus, DBusMessage *message, void *user_data)
{
else
result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
}
+ else if (!strcmp (interface, ATSPI_DBUS_INTERFACE_DEVICE_EVENT_LISTENER))
+ {
+ result = DBUS_HANDLER_RESULT_HANDLED;
+ if (!strcmp (member, "KeystrokeListenerRegistered"))
+ handle_device_listener_registered (bus, message, user_data);
+ else if (!strcmp (member, "DeviceListenerRegistered"))
+ handle_device_listener_registered (bus, message, user_data);
+ else
+ result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+ }
if (!g_strcmp0(interface, DBUS_INTERFACE_DBUS) &&
!g_strcmp0(member, "NameOwnerChanged"))
* - Application registration with the AT-SPI registry.
*
*/
-static int
+int
adaptor_init (gint * argc, gchar ** argv[])
{
GOptionContext *opt;
/* Set up filter and match rules to catch signals */
dbus_bus_add_match (spi_global_app_data->bus, "type='signal', interface='org.a11y.atspi.Registry', sender='org.a11y.atspi.Registry'", NULL);
+ dbus_bus_add_match (spi_global_app_data->bus, "type='signal', interface='org.a11y.atspi.DeviceEventListener', sender='org.a11y.atspi.Registry'", NULL);
dbus_connection_add_filter (spi_global_app_data->bus, signal_filter, NULL,
NULL);
return 0;
}
+void
+adaptor_cleanup (void)
+{
+ GList *l;
+ GSList *ls;
+
+ if (!spi_global_app_data)
+ return;
+
+ spi_atk_tidy_windows ();
+ spi_atk_deregister_event_listeners ();
+
+ deregister_application (spi_global_app_data);
+
+ if (spi_global_app_data->bus)
+ {
+ dbus_connection_remove_filter (spi_global_app_data->bus, signal_filter, NULL);
+ droute_context_unregister (spi_global_app_data->droute, spi_global_app_data->bus);
+ dbus_connection_unref (spi_global_app_data->bus);
+ }
+
+ for (l = spi_global_app_data->direct_connections; l; l = l->next)
+ {
+ DBusConnection *connection;
+
+ connection = l->data;
+
+ droute_context_unregister (spi_global_app_data->droute, connection);
+ droute_unintercept_dbus (connection);
+ dbus_connection_unref (connection);
+ }
+ g_list_free (spi_global_app_data->direct_connections);
+
+ for (ls = clients; ls; ls = ls->next)
+ g_free (l->data);
+ g_slist_free (clients);
+ clients = NULL;
+
+ g_object_unref (spi_global_cache);
+ g_object_unref (spi_global_leasing);
+ g_object_unref (spi_global_register);
+
+ if (spi_global_app_data->main_context)
+ g_main_context_unref (spi_global_app_data->main_context);
+
+ droute_free (spi_global_app_data->droute);
+
+ g_free (spi_global_app_data);
+ spi_global_app_data = NULL;
+}
+
/*---------------------------------------------------------------------------*/
int
void
gnome_accessibility_module_shutdown (void)
{
- spi_atk_deregister_event_listeners ();
- exit_func ();
+ adaptor_cleanup ();
}
+/*---------------------------------------------------------------------------*/
+
static gchar *name_match_tmpl =
"type='signal', interface='org.freedesktop.DBus', member='NameOwnerChanged', arg0='%s'";
spi_atk_remove_client (const char *bus_name)
{
GSList *l;
+ GSList *next_node;
- for (l = clients; l; l = l->next)
+ l = clients;
+ while (l)
{
+ next_node = l->next;
+
if (!g_strcmp0 (l->data, bus_name))
{
gchar *match = g_strdup_printf (name_match_tmpl, l->data);
dbus_bus_remove_match (spi_global_app_data->bus, match, NULL);
g_free (match);
g_free (l->data);
- clients = g_slist_remove_link (clients, l);
+ clients = g_slist_delete_link (clients, l);
if (!clients)
spi_atk_deregister_event_listeners ();
}
+
+ l = next_node;
}
}
projects / platform / core / uifw / at-spi2-atk.git / blobdiff