* AT-SPI - Assistive Technology Service Provider Interface
* (Gnome Accessibility Project; http://developer.gnome.org/projects/gap)
*
+ * Copyright 2008, 2010 Codethink Ltd.
* Copyright 2001, 2002 Sun Microsystems Inc.,
* Copyright 2001, 2002 Ximian, Inc.
*
* Boston, MA 02111-1307, USA.
*/
-/* registry.c: the main accessibility service registry implementation */
-
-#undef SPI_LISTENER_DEBUG
-#undef SPI_DEBUG
-#undef SPI_QUEUE_DEBUG
-
#include <config.h>
-#ifdef SPI_DEBUG
-# include <stdio.h>
-#endif
+#include <string.h>
+#include <ctype.h>
-#include <bonobo/bonobo-exception.h>
-#include "../libspi/spi-private.h"
+#include "paths.h"
#include "registry.h"
+#include "introspection.h"
-/* Our parent GObject type */
-#define PARENT_TYPE SPI_LISTENER_TYPE
-
-/* A pointer to our parent object class */
-static SpiListenerClass *spi_registry_parent_class;
-
-static GQuark _deactivate_quark = 0;
-static GQuark _activate_quark = 0;
-static GQuark _state_quark = 0;
-static GQuark _state_changed_focused_quark = 0;
-
-int _dbg = 0;
-
-typedef enum {
- ETYPE_FOCUS,
- ETYPE_OBJECT,
- ETYPE_PROPERTY,
- ETYPE_WINDOW,
- ETYPE_TOOLKIT,
- ETYPE_KEYBOARD,
- ETYPE_MOUSE,
- ETYPE_LAST_DEFINED
-} EventTypeCategory;
-
-typedef struct {
- const char *event_name;
- EventTypeCategory type_cat;
- GQuark major; /* from string segment[1] */
- GQuark minor; /* from string segment[1]+segment[2] */
- GQuark detail; /* from string segment[3] (not concatenated) */
-} EventTypeStruct;
-
-typedef struct {
- Accessibility_EventListener listener;
- GQuark event_type_quark;
- EventTypeCategory event_type_cat;
-} SpiListenerStruct;
+typedef struct event_data event_data;
+struct event_data
+{
+ gchar *bus_name;
+ gchar **data;
+ GSList *properties;
+};
+
+static void
+children_added_listener (DBusConnection * bus,
+ gint index,
+ const gchar * name,
+ const gchar * path);
static void
-spi_registry_set_debug (const char *debug_flag_string)
+children_removed_listener (DBusConnection * bus,
+ gint index,
+ const gchar * name,
+ const gchar * path);
+
+/*---------------------------------------------------------------------------*/
+
+typedef struct _SpiReference
{
- if (debug_flag_string)
- _dbg = (int) g_ascii_strtod (debug_flag_string, NULL);
-}
+ gchar *name;
+ gchar *path;
+} SpiReference;
-SpiListenerStruct *
-spi_listener_struct_new (Accessibility_EventListener listener, CORBA_Environment *ev)
+static SpiReference *
+spi_reference_new (const gchar *name, const gchar *path)
{
- SpiListenerStruct *retval = g_malloc (sizeof (SpiListenerStruct));
- retval->listener = bonobo_object_dup_ref (listener, ev);
- return retval;
-}
+ SpiReference *ref;
+ ref = g_new0 (SpiReference, 1);
+ ref->name = g_strdup (name);
+ ref->path = g_strdup (path);
-void
-spi_listener_struct_free (SpiListenerStruct *ls, CORBA_Environment *ev)
-{
- bonobo_object_release_unref (ls->listener, ev);
- g_free (ls);
+ return ref;
}
static void
-desktop_add_application (SpiDesktop *desktop,
- guint index, gpointer data)
+spi_reference_free (SpiReference *ref)
{
- BonoboObject *registry = BONOBO_OBJECT (data);
- Accessibility_Event e;
- CORBA_Environment ev;
- Accessibility_Accessible a;
-
- CORBA_exception_init (&ev);
- e.type = "object:children-changed:add";
- e.source = BONOBO_OBJREF (desktop);
- e.detail1 = index;
- e.detail2 = 0;
- a = Accessibility_Accessible_getChildAtIndex (BONOBO_OBJREF (desktop),
- index, &ev);
- /* FIXME
- spi_init_any_object (&e.any_data, a);
- */
- spi_init_any_nil (&e.any_data);
- Accessibility_Registry_notifyEvent (BONOBO_OBJREF (registry),
- &e, &ev);
- bonobo_object_release_unref (a, &ev);
- CORBA_exception_free (&ev);
+ g_free (ref->name);
+ g_free (ref->path);
+ g_free (ref);
}
+/*---------------------------------------------------------------------------*/
+G_DEFINE_TYPE(SpiRegistry, spi_registry, G_TYPE_OBJECT)
static void
-desktop_remove_application (SpiDesktop *desktop,
- guint index, gpointer data)
+spi_registry_class_init (SpiRegistryClass *klass)
{
- BonoboObject *registry = BONOBO_OBJECT (data);
- Accessibility_Event e;
- Accessibility_Accessible a;
- CORBA_Environment ev;
-
- CORBA_exception_init (&ev);
-
- e.type = "object:children-changed:remove";
- e.source = BONOBO_OBJREF (desktop);
- e.detail1 = index;
- e.detail2 = 0;
- a = Accessibility_Accessible_getChildAtIndex (BONOBO_OBJREF (desktop),
- index, &ev);
- /* FIXME
- spi_init_any_object (&e.any_data, a);
- */
- spi_init_any_nil (&e.any_data);
- Accessibility_Accessible_unref (a, &ev);
- Accessibility_Registry_notifyEvent (BONOBO_OBJREF (registry),
- &e, &ev);
- Accessibility_Desktop_unref (e.source, &ev);
- CORBA_exception_free (&ev);
+ spi_registry_parent_class = g_type_class_ref (G_TYPE_OBJECT);
}
-
static void
-spi_registry_object_finalize (GObject *object)
+spi_registry_init (SpiRegistry *registry)
{
- DBG (1, g_warning ("spi_registry_object_finalize called\n"));
- g_object_unref (SPI_REGISTRY (object)->de_controller);
-
- G_OBJECT_CLASS (spi_registry_parent_class)->finalize (object);
+ registry->apps = g_ptr_array_new_with_free_func ((GDestroyNotify) spi_reference_free);
}
-static long
-_get_unique_id (void)
+/*---------------------------------------------------------------------------*/
+
+static dbus_bool_t
+return_v_string (DBusMessageIter * iter, const gchar * str)
{
- static long id = 0;
+ DBusMessageIter variant;
- return ++id;
+ if (!dbus_message_iter_open_container (iter, DBUS_TYPE_VARIANT, "s",
+ &variant))
+ return FALSE;
+ dbus_message_iter_append_basic (&variant, DBUS_TYPE_STRING, &str);
+ dbus_message_iter_close_container (iter, &variant);
+ return TRUE;
}
-/**
- * registerApplication:
- * @application: a reference to the requesting @Application
- * return values: void
- *
- * Register a new application with the accessibility broker.
- *
- **/
-static void
-impl_accessibility_registry_register_application (PortableServer_Servant servant,
- const Accessibility_Application application,
- CORBA_Environment * ev)
+static dbus_bool_t
+append_reference (DBusMessageIter * iter, const char * name, const char * path)
{
- SpiRegistry *registry = SPI_REGISTRY (bonobo_object_from_servant (servant));
-
-#ifdef SPI_DEBUG
- fprintf (stderr, "registering app %p\n", application);
-#endif
- spi_desktop_add_application (registry->desktop, application);
+ DBusMessageIter iter_struct;
- Accessibility_Application__set_id (application, _get_unique_id (), ev);
-
- /*
- * TODO: change the implementation below to a WM-aware one;
- * e.g. don't add all apps to the SpiDesktop
- */
+ if (!dbus_message_iter_open_container (iter, DBUS_TYPE_STRUCT, NULL,
+ &iter_struct))
+ return FALSE;
+ dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_STRING, &name);
+ dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_OBJECT_PATH, &path);
+ dbus_message_iter_close_container (iter, &iter_struct);
+ return TRUE;
}
-#ifdef USE_A_HASH_IN_FUTURE
-static gint
-compare_corba_objects (gconstpointer p1, gconstpointer p2)
-{
- CORBA_Environment ev;
- gint retval;
+/*---------------------------------------------------------------------------*/
-#ifdef SPI_DEBUG
- fprintf (stderr, "comparing %p to %p\n",
- p1, p2);
-#endif
-
- retval = !CORBA_Object_is_equivalent ((CORBA_Object) p1, (CORBA_Object) p2, &ev);
- return retval;
+static gboolean
+compare_reference (SpiReference *one, SpiReference *two)
+{
+ if (g_strcmp0 (one->name, two->name) == 0 &&
+ g_strcmp0 (one->path, two->path) == 0)
+ return TRUE;
+ else
+ return FALSE;
}
-#endif
-static void
-register_with_toolkits (SpiRegistry *spi_registry_bonobo_object, EventTypeStruct *etype, CORBA_Environment *ev)
+static gboolean
+find_index_of_reference (GPtrArray *arr, const gchar *name, const gchar * path, guint *index)
{
- gint n_desktops;
- gint n_apps;
- gint i, j;
- Accessibility_Desktop desktop;
- Accessibility_Application app;
- Accessibility_Registry registry;
- registry = BONOBO_OBJREF (spi_registry_bonobo_object);
-
- /* for each app in each desktop, call ...Application_registerToolkitEventListener */
+ SpiReference *ref;
+ gboolean found = FALSE;
+ guint i = 0;
- n_desktops = Accessibility_Registry_getDesktopCount (registry, ev);
+ ref = spi_reference_new (name, path);
- for (i=0; i<n_desktops; ++i)
+ for (i = 0; i < arr->len; i++)
{
- desktop = Accessibility_Registry_getDesktop (registry, i, ev);
- n_apps = Accessibility_Desktop__get_childCount (desktop, ev);
- for (j=0; j<n_apps; ++j)
+ if (compare_reference (ref, g_ptr_array_index (arr, i)));
{
- app = (Accessibility_Application) Accessibility_Desktop_getChildAtIndex (desktop,
- j,
- ev);
- Accessibility_Application_registerToolkitEventListener (app,
- registry,
- CORBA_string_dup (etype->event_name),
- ev);
+ found = TRUE;
+ break;
}
}
-}
-#ifdef USE_A_HASH_IN_FUTURE
+ spi_reference_free (ref);
-static gint
-compare_listener_quarks (gconstpointer p1, gconstpointer p2)
+ *index = i;
+ return found;
+}
+
+static void
+add_application (SpiRegistry *reg, DBusConnection *bus, const gchar *name, const gchar *path)
{
- return (((SpiListenerStruct *)p2)->event_type_quark !=
- ((SpiListenerStruct *)p1)->event_type_quark);
+ g_ptr_array_add (reg->apps, spi_reference_new (name, path));
+ children_added_listener (bus, reg->apps->len - 1, name, path);
}
-static gint
-compare_listener_corbaref (gconstpointer p1, gconstpointer p2)
+static void
+set_id (SpiRegistry *reg, DBusConnection *bus, const gchar *name, const gchar *path)
{
- return compare_corba_objects (((SpiListenerStruct *)p2)->listener,
- ((SpiListenerStruct *)p1)->listener);
+ DBusMessage *message;
+ DBusMessageIter iter, iter_variant;
+ const char *iface_application = "org.a11y.atspi.Application";
+ const char *id = "Id";
+
+ message = dbus_message_new_method_call (name, path,
+ DBUS_INTERFACE_PROPERTIES, "Set");
+ if (!message)
+ return;
+ dbus_message_iter_init_append (message, &iter);
+ dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &iface_application);
+ dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &id);
+ dbus_message_iter_open_container (&iter, DBUS_TYPE_VARIANT, "i", &iter_variant);
+ dbus_message_iter_append_basic (&iter_variant, DBUS_TYPE_INT32, ®->id);
+ /* TODO: This will cause problems if we cycle through 2^31 ids */
+ reg->id++;
+ dbus_message_iter_close_container (&iter, &iter_variant);
+ dbus_connection_send (bus, message, NULL);
+ dbus_message_unref (message);
}
-#endif
static void
-parse_event_type (EventTypeStruct *etype, const char *event_name)
+remove_application (SpiRegistry *reg, DBusConnection *bus, guint index)
{
- gchar **split_string;
- gchar *s;
+ SpiReference *ref = g_ptr_array_index (reg->apps, index);
- split_string = g_strsplit (event_name, ":", 4);
- etype->event_name = event_name;
+ spi_remove_device_listeners (reg->dec, ref->name);
+ children_removed_listener (bus, index, ref->name, ref->path);
+ g_ptr_array_remove_index (reg->apps, index);
+}
- if (!g_ascii_strncasecmp (event_name, "focus:", 6))
- {
- etype->type_cat = ETYPE_FOCUS;
- }
- else if (!g_ascii_strncasecmp (event_name, "mouse:", 6))
- {
- etype->type_cat = ETYPE_MOUSE;
- }
- else if (!g_ascii_strncasecmp (event_name, "object:", 7))
- {
- etype->type_cat = ETYPE_OBJECT;
- }
- else if (!g_ascii_strncasecmp (event_name, "window:", 7))
- {
- etype->type_cat = ETYPE_WINDOW;
- }
- else if (!g_ascii_strncasecmp (event_name, "keyboard:", 9))
+static gboolean
+event_is_subtype (gchar **needle, gchar **haystack)
+{
+ while (*haystack && **haystack)
{
- etype->type_cat = ETYPE_KEYBOARD;
+ if (g_strcmp0 (*needle, *haystack))
+ return FALSE;
+ needle++;
+ haystack++;
}
- else
+ return TRUE;
+}
+
+static gboolean
+needs_mouse_poll (char **event)
+{
+ if (g_strcmp0 (event [0], "Mouse") != 0)
+ return FALSE;
+ if (!event [1] || !event [1][0])
+ return TRUE;
+ return (g_strcmp0 (event [1], "Abs") == 0);
+}
+
+static void
+remove_events (SpiRegistry *registry, const char *bus_name, const char *event)
+{
+ gchar **remove_data;
+ GList *list;
+ gboolean mouse_found = FALSE;
+ DBusMessage *signal;
+
+ remove_data = g_strsplit (event, ":", 3);
+ if (!remove_data)
{
- etype->type_cat = ETYPE_TOOLKIT;
+ return;
}
- if (split_string[1])
+ for (list = registry->events; list;)
{
- etype->major = g_quark_from_string (split_string[1]);
- if (split_string[2])
+ event_data *evdata = list->data;
+ list = list->next;
+ if (!g_strcmp0 (evdata->bus_name, bus_name) &&
+ event_is_subtype (evdata->data, remove_data))
{
- etype->minor = g_quark_from_string (s = g_strconcat (split_string[1], split_string[2], NULL));
- g_free (s);
- if (split_string[3])
- {
- etype->detail = g_quark_from_string (split_string[3]);
- }
- else
- {
- etype->detail = g_quark_from_static_string ("");
- }
+ g_strfreev (evdata->data);
+ g_free (evdata->bus_name);
+ g_slist_free_full (evdata->properties, g_free);
+ g_free (evdata);
+ registry->events = g_list_remove (registry->events, evdata);
}
else
{
- etype->minor = etype->major;
- etype->detail = g_quark_from_static_string (""); /*etype->major;*/
+ if (needs_mouse_poll (evdata->data))
+ mouse_found = TRUE;
}
}
- else
- {
- etype->major = g_quark_from_static_string ("");
- etype->minor = etype->major;
- etype->detail = etype->major;
- }
- g_strfreev (split_string);
-}
-
-/**
- * deregisterApplication:
- * @application: a reference to the @Application
- * to be deregistered.
- * return values: void
- *
- * De-register an application previously registered with the broker.
- *
- **/
-static void
-impl_accessibility_registry_deregister_application (PortableServer_Servant servant,
- const Accessibility_Application application,
- CORBA_Environment * ev)
-{
- SpiRegistry *registry = SPI_REGISTRY (bonobo_object_from_servant (servant));
+ if (!mouse_found)
+ spi_device_event_controller_stop_poll_mouse ();
- spi_desktop_remove_application (registry->desktop, application);
+ g_strfreev (remove_data);
-#ifdef SPI_DEBUG
- fprintf (stderr, "de-registered app %p\n", application);
-#endif
+ signal = dbus_message_new_signal (SPI_DBUS_PATH_REGISTRY,
+ SPI_DBUS_INTERFACE_REGISTRY,
+ "EventListenerDeregistered");
+ dbus_message_append_args (signal, DBUS_TYPE_STRING, &bus_name,
+ DBUS_TYPE_STRING, &event, DBUS_TYPE_INVALID);
+ dbus_connection_send (registry->bus, signal, NULL);
+ dbus_message_unref (signal);
}
-static GList **
-get_listener_list (SpiRegistry *registry,
- EventTypeCategory cat)
+static void
+handle_disconnection (DBusConnection *bus, DBusMessage *message, void *user_data)
{
- GList **ret;
-
- switch (cat)
+ char *name, *old, *new;
+ SpiRegistry *reg = SPI_REGISTRY (user_data);
+
+ if (dbus_message_get_args (message, NULL,
+ DBUS_TYPE_STRING, &name,
+ DBUS_TYPE_STRING, &old,
+ DBUS_TYPE_STRING, &new,
+ DBUS_TYPE_INVALID))
{
- case ETYPE_OBJECT:
- case ETYPE_PROPERTY:
- case ETYPE_FOCUS:
- case ETYPE_KEYBOARD:
- ret = ®istry->object_listeners;
- break;
- case ETYPE_WINDOW:
- ret = ®istry->window_listeners;
- break;
- case ETYPE_MOUSE:
- case ETYPE_TOOLKIT:
- ret = ®istry->toolkit_listeners;
- break;
- default:
- ret = NULL;
- break;
+ if (*old != '\0' && *new == '\0')
+ {
+ /* Remove all children with the application name the same as the disconnected application. */
+ guint i;
+ for (i = 0; i < reg->apps->len; i++)
+ {
+ SpiReference *ref = g_ptr_array_index (reg->apps, i);
+ if (!g_strcmp0 (old, ref->name))
+ {
+ remove_application (reg, bus, i);
+ i--;
+ }
+ }
+
+ remove_events (reg, old, "");
+ }
}
- return ret;
}
/*
- * CORBA Accessibility::Registry::registerGlobalEventListener method implementation
+ * Converts names of the form "active-descendant-changed" to
+ *" ActiveDescendantChanged"
*/
-static void
-impl_accessibility_registry_register_global_event_listener (
- PortableServer_Servant servant,
- Accessibility_EventListener listener,
- const CORBA_char *event_name,
- CORBA_Environment *ev)
-{
- SpiRegistry *registry = SPI_REGISTRY (bonobo_object_from_servant (servant));
- SpiListenerStruct *ls = spi_listener_struct_new (listener, ev);
- EventTypeStruct etype;
- GList **list;
-
-#ifdef SPI_LISTENER_DEBUG
- fprintf (stderr, "registering for events of type %s\n", event_name);
-#endif
-
- /* parse, check major event type and add listener accordingly */
- parse_event_type (&etype, event_name);
- ls->event_type_quark = etype.minor;
- ls->event_type_cat = etype.type_cat;
-
- list = get_listener_list (registry, etype.type_cat);
+static gchar *
+ensure_proper_format (const char *name)
+{
+ gchar *ret = (gchar *) g_malloc (strlen (name) * 2 + 2);
+ gchar *p = ret;
+ gboolean need_upper = TRUE;
- if (list)
+ if (!ret)
+ return NULL;
+ while (*name)
{
- *list = g_list_prepend (*list, ls);
-
- if (etype.type_cat == ETYPE_TOOLKIT)
+ if (need_upper)
+ {
+ *p++ = toupper (*name);
+ need_upper = FALSE;
+ }
+ else if (*name == '-')
+ need_upper = TRUE;
+ else if (*name == ':')
{
- register_with_toolkits (registry, &etype, ev);
- }
+ need_upper = TRUE;
+ *p++ = *name;
+ }
+ else
+ *p++ = *name;
+ name++;
}
+ *p = '\0';
+ return ret;
+}
+
+static DBusHandlerResult
+signal_filter (DBusConnection *bus, DBusMessage *message, void *user_data)
+{
+ guint res = DBUS_HANDLER_RESULT_HANDLED;
+ const gint type = dbus_message_get_type (message);
+ const char *iface = dbus_message_get_interface (message);
+ const char *member = dbus_message_get_member (message);
+
+ if (type != DBUS_MESSAGE_TYPE_SIGNAL)
+ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+
+ if (!g_strcmp0(iface, DBUS_INTERFACE_DBUS) &&
+ !g_strcmp0(member, "NameOwnerChanged"))
+ handle_disconnection (bus, message, user_data);
else
- {
- spi_listener_struct_free (ls, ev);
- }
+ res = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+
+ return res;
}
-typedef struct {
- gboolean remove_all;
- Accessibility_EventListener listener;
- EventTypeStruct etype;
-} RemoveListenerClosure;
+/* org.at_spi.Socket interface */
+/*---------------------------------------------------------------------------*/
-static SpiReEntrantContinue
-remove_listener_cb (GList * const *list, gpointer user_data)
+static DBusMessage*
+impl_Embed (DBusConnection *bus, DBusMessage *message, void *user_data)
{
- SpiListenerStruct *ls = (SpiListenerStruct *) (*list)->data;
- CORBA_Environment ev;
- RemoveListenerClosure *cl = user_data;
+ SpiRegistry *reg = SPI_REGISTRY (user_data);
+ DBusMessageIter iter, iter_struct;
+ const gchar *app_name, *obj_path;
+
+ DBusMessage *reply = NULL;
+ DBusMessageIter reply_iter;
+
+ dbus_message_iter_init (message, &iter);
+ dbus_message_iter_recurse (&iter, &iter_struct);
+ if (!(dbus_message_iter_get_arg_type (&iter_struct) == DBUS_TYPE_STRING))
+ goto error;
+ dbus_message_iter_get_basic (&iter_struct, &app_name);
+ if (!app_name)
+ app_name = dbus_message_get_sender (message);
+ if (!dbus_message_iter_next (&iter_struct))
+ goto error;
+ if (!(dbus_message_iter_get_arg_type (&iter_struct) == DBUS_TYPE_OBJECT_PATH))
+ goto error;
+ dbus_message_iter_get_basic (&iter_struct, &obj_path);
+
+ add_application(reg, bus, app_name, obj_path);
+
+ set_id (reg, bus, app_name, obj_path);
+
+ reply = dbus_message_new_method_return (message);
+ dbus_message_iter_init_append (reply, &reply_iter);
+ append_reference (&reply_iter,
+ dbus_bus_get_unique_name (bus),
+ SPI_DBUS_PATH_ROOT);
+
+ return reply;
+error:
+ return dbus_message_new_error (message, DBUS_ERROR_FAILED, "Invalid arguments");
+}
- CORBA_exception_init (&ev);
+static DBusMessage*
+impl_Unembed (DBusConnection *bus, DBusMessage *message, void *user_data)
+{
+ SpiRegistry *reg = SPI_REGISTRY (user_data);
+ DBusMessageIter iter, iter_struct;
+ gchar *app_name, *obj_path;
+ guint index;
+
+ dbus_message_iter_init (message, &iter);
+ dbus_message_iter_recurse (&iter, &iter_struct);
+ if (!(dbus_message_iter_get_arg_type (&iter_struct) == DBUS_TYPE_STRING))
+ goto error;
+ dbus_message_iter_get_basic (&iter_struct, &app_name);
+ if (!dbus_message_iter_next (&iter_struct))
+ goto error;
+ if (!(dbus_message_iter_get_arg_type (&iter_struct) == DBUS_TYPE_OBJECT_PATH))
+ goto error;
+ dbus_message_iter_get_basic (&iter_struct, &obj_path);
+
+ if (find_index_of_reference (reg->apps, app_name, obj_path, &index))
+ remove_application(reg, bus, index);
+
+ return NULL;
+error:
+ return dbus_message_new_error (message, DBUS_ERROR_FAILED, "Invalid arguments");
+}
- if (cl->remove_all || (((cl->etype.minor == ls->event_type_quark) ||
- (cl->etype.major == ls->event_type_quark)) &&
- cl->etype.type_cat == ls->event_type_cat ) )
- {
- if (CORBA_Object_is_equivalent (ls->listener, cl->listener, &ev))
- {
- spi_re_entrant_list_delete_link (list);
- spi_listener_struct_free (ls, &ev);
- }
- }
+/* org.at_spi.Component interface */
+/*---------------------------------------------------------------------------*/
- CORBA_exception_free (&ev);
+static DBusMessage *
+impl_Contains (DBusConnection * bus, DBusMessage * message, void *user_data)
+{
+ dbus_bool_t retval = FALSE;
+ DBusMessage *reply;
- return SPI_RE_ENTRANT_CONTINUE;
+ reply = dbus_message_new_method_return (message);
+ dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &retval,
+ DBUS_TYPE_INVALID);
+ return reply;
}
-/*
- * CORBA Accessibility::Registry::deregisterGlobalEventListenerAll method implementation
- */
-static void
-impl_accessibility_registry_deregister_global_event_listener_all (
- PortableServer_Servant servant,
- Accessibility_EventListener listener,
- CORBA_Environment *ev)
+static DBusMessage *
+impl_GetAccessibleAtPoint (DBusConnection * bus, DBusMessage * message,
+ void *user_data)
{
- int i;
- GList **lists[3];
- SpiRegistry *registry = SPI_REGISTRY (bonobo_object_from_servant (servant));
- RemoveListenerClosure cl = { 0, };
+ DBusMessage *reply = NULL;
+ DBusMessageIter iter;
- lists[0] = ®istry->object_listeners;
- lists[1] = ®istry->window_listeners;
- lists[2] = ®istry->toolkit_listeners;
+ reply = dbus_message_new_method_return (message);
+ dbus_message_iter_init_append (reply, &iter);
+ append_reference (&iter,
+ dbus_bus_get_unique_name (bus),
+ SPI_DBUS_PATH_NULL);
- cl.remove_all = TRUE;
- cl.listener = listener;
+ return reply;
+}
- for (i = 0; i < sizeof (lists) / sizeof (lists[0]); i++)
- {
- spi_re_entrant_list_foreach (lists [i], remove_listener_cb, &cl);
- }
+static DBusMessage *
+impl_GetExtents (DBusConnection * bus, DBusMessage * message, void *user_data)
+{
+ dbus_int32_t x = 0, y = 0, width = 1024, height = 768;
+ DBusMessage *reply;
+ DBusMessageIter iter, iter_struct;
+
+ reply = dbus_message_new_method_return (message);
+ dbus_message_iter_init_append (reply, &iter);
+ dbus_message_iter_open_container (&iter, DBUS_TYPE_STRUCT, NULL,
+ &iter_struct);
+ dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_INT32, &x);
+ dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_INT32, &y);
+ dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_INT32, &width);
+ dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_INT32, &height);
+ dbus_message_iter_close_container (&iter, &iter_struct);
+ return reply;
}
+static DBusMessage *
+impl_GetPosition (DBusConnection * bus, DBusMessage * message,
+ void *user_data)
+{
+ DBusMessage *reply;
+ dbus_int32_t x = 0, y = 0;
-/*
- * CORBA Accessibility::Registry::deregisterGlobalEventListener method implementation
- */
-static void
-impl_accessibility_registry_deregister_global_event_listener (
- PortableServer_Servant servant,
- Accessibility_EventListener listener,
- const CORBA_char *event_name,
- CORBA_Environment *ev)
+ reply = dbus_message_new_method_return (message);
+ dbus_message_append_args (reply, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32,
+ &y, DBUS_TYPE_INVALID);
+ return reply;
+}
+
+static DBusMessage *
+impl_GetSize (DBusConnection * bus, DBusMessage * message, void *user_data)
{
- SpiRegistry *registry;
- RemoveListenerClosure cl = { 0, };
+ /* TODO - Get the screen size */
+ DBusMessage *reply;
+ dbus_int32_t width = 1024, height = 768;
+
+ reply = dbus_message_new_method_return (message);
+ dbus_message_append_args (reply, DBUS_TYPE_INT32, &width,
+ DBUS_TYPE_INT32, &height, DBUS_TYPE_INVALID);
+ return reply;
+}
- registry = SPI_REGISTRY (bonobo_object_from_servant (servant));
+#define LAYER_WIDGET 3;
- cl.remove_all = FALSE;
- parse_event_type (&cl.etype, (char *) event_name);
- cl.listener = listener;
+static DBusMessage *
+impl_GetLayer (DBusConnection * bus, DBusMessage * message, void *user_data)
+{
+ DBusMessage *reply;
+ dbus_uint32_t rv = LAYER_WIDGET;
- spi_re_entrant_list_foreach (get_listener_list (registry, cl.etype.type_cat),
- remove_listener_cb, &cl);
+ reply = dbus_message_new_method_return (message);
+ dbus_message_append_args (reply, DBUS_TYPE_UINT32, &rv,
+ DBUS_TYPE_INVALID);
+ return reply;
}
+static DBusMessage *
+impl_GetMDIZOrder (DBusConnection * bus, DBusMessage * message,
+ void *user_data)
+{
+ DBusMessage *reply;
+ dbus_int16_t rv = 0;
-/**
- * getDesktopCount:
- * return values: a short integer indicating the current number of
- * @Desktops.
- *
- * Get the current number of desktops.
- *
- **/
-static short
-impl_accessibility_registry_get_desktop_count (PortableServer_Servant servant,
- CORBA_Environment * ev)
+ reply = dbus_message_new_method_return (message);
+ dbus_message_append_args (reply, DBUS_TYPE_INT16, &rv,
+ DBUS_TYPE_INVALID);
+ return reply;
+}
+
+static DBusMessage *
+impl_GrabFocus (DBusConnection * bus, DBusMessage * message, void *user_data)
{
- /* TODO: implement support for multiple virtual desktops */
- CORBA_short n_desktops;
- n_desktops = (CORBA_short) 1;
- return n_desktops;
+ DBusMessage *reply;
+ dbus_bool_t retval = FALSE;
+
+ reply = dbus_message_new_method_return (message);
+ dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &retval,
+ DBUS_TYPE_INVALID);
+ return reply;
}
+static DBusMessage *
+impl_GetAlpha (DBusConnection * bus, DBusMessage * message, void *user_data)
+{
+ double rv = 1.0;
+ DBusMessage *reply;
-/**
- * getDesktop:
- * @n: the index of the requested @Desktop.
- * return values: a reference to the requested @Desktop.
- *
- * Get the nth accessible desktop.
- *
- **/
-static Accessibility_Desktop
-impl_accessibility_registry_get_desktop (PortableServer_Servant servant,
- const CORBA_short n,
- CORBA_Environment * ev)
+ reply = dbus_message_new_method_return (message);
+ dbus_message_append_args (reply, DBUS_TYPE_DOUBLE, &rv,
+ DBUS_TYPE_INVALID);
+ return reply;
+}
+
+/* org.at_spi.Accessible interface */
+/*---------------------------------------------------------------------------*/
+
+static dbus_bool_t
+impl_get_Name (DBusMessageIter * iter, void *user_data)
{
- SpiRegistry *registry = SPI_REGISTRY (bonobo_object_from_servant (servant));
+ const gchar *name = "main";
+ return return_v_string (iter, name);
+}
- /* TODO: implement support for multiple virtual desktops */
- if (n == 0)
+static dbus_bool_t
+impl_get_Description (DBusMessageIter * iter, void *user_data)
+{
+ const gchar *description = "";
+ return return_v_string (iter, description);
+}
+
+static dbus_bool_t
+impl_get_Parent (DBusMessageIter * iter, void *user_data)
+{
+ const gchar *name = "";
+ DBusMessageIter iter_variant;
+
+ dbus_message_iter_open_container (iter, DBUS_TYPE_VARIANT, "(so)",
+ &iter_variant);
+ append_reference (&iter_variant,
+ name,
+ SPI_DBUS_PATH_NULL);
+ dbus_message_iter_close_container (iter, &iter_variant);
+ return TRUE;
+}
+
+static dbus_bool_t
+impl_get_ChildCount (DBusMessageIter * iter, void *user_data)
+{
+ SpiRegistry *reg = SPI_REGISTRY (user_data);
+ dbus_int32_t rv = reg->apps->len;
+ dbus_bool_t result;
+ DBusMessageIter iter_variant;
+
+ if (!dbus_message_iter_open_container (iter, DBUS_TYPE_VARIANT, "i",
+ &iter_variant))
+ return FALSE;
+ result = dbus_message_iter_append_basic (&iter_variant, DBUS_TYPE_INT32, &rv);
+ dbus_message_iter_close_container (iter, &iter_variant);
+ return result;
+}
+
+static dbus_bool_t
+impl_get_ToolkitName (DBusMessageIter * iter, void *user_data)
+{
+ return return_v_string (iter, "at-spi-registry");
+}
+
+static dbus_bool_t
+impl_get_ToolkitVersion (DBusMessageIter * iter, void *user_data)
+{
+ return return_v_string (iter, "2.0");
+}
+
+static DBusMessage *
+impl_GetChildAtIndex (DBusConnection * bus,
+ DBusMessage * message, void *user_data)
+{
+ SpiRegistry *reg = SPI_REGISTRY (user_data);
+ DBusMessage *reply;
+ DBusMessageIter iter;
+ DBusError error;
+ SpiReference *ref;
+ dbus_int32_t i;
+
+ dbus_error_init (&error);
+ if (!dbus_message_get_args
+ (message, &error, DBUS_TYPE_INT32, &i, DBUS_TYPE_INVALID))
{
- return (Accessibility_Desktop)
- bonobo_object_dup_ref (BONOBO_OBJREF (registry->desktop), ev);
+ return dbus_message_new_error (message, DBUS_ERROR_FAILED, "Invalid arguments");
}
+
+ reply = dbus_message_new_method_return (message);
+ dbus_message_iter_init_append (reply, &iter);
+
+ if (i < 0 || i >= reg->apps->len)
+ append_reference (&iter, SPI_DBUS_NAME_REGISTRY, SPI_DBUS_PATH_NULL);
else
{
- return (Accessibility_Desktop) CORBA_OBJECT_NIL;
+ ref = g_ptr_array_index (reg->apps, i);
+ append_reference (&iter, ref->name, ref->path);
}
+
+ return reply;
}
+static DBusMessage *
+impl_GetChildren (DBusConnection * bus,
+ DBusMessage * message, void *user_data)
+{
+ DBusMessage *reply = NULL;
+ DBusMessageIter iter, iter_array;
+ SpiRegistry *reg = SPI_REGISTRY (user_data);
+ int i;
+
+ reply = dbus_message_new_method_return (message);
-/**
- * getDesktopList:
- * return values: a sequence containing references to
- * the @Desktops.
- *
- * Get a list of accessible desktops.
- *
- **/
-static Accessibility_DesktopSeq *
-impl_accessibility_registry_get_desktop_list (PortableServer_Servant servant,
- CORBA_Environment * ev)
+ dbus_message_iter_init_append (reply, &iter);
+ dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "(so)", &iter_array);
+ for (i=0; i < reg->apps->len; i++)
+ {
+ SpiReference *current = g_ptr_array_index (reg->apps, i);
+ append_reference (&iter_array, current->name, current->path);
+ }
+ dbus_message_iter_close_container(&iter, &iter_array);
+ return reply;
+}
+
+static DBusMessage *
+impl_GetIndexInParent (DBusConnection * bus,
+ DBusMessage * message, void *user_data)
+{
+ DBusMessage *reply;
+ dbus_uint32_t rv = 0;
+
+ reply = dbus_message_new_method_return (message);
+ dbus_message_append_args (reply, DBUS_TYPE_INT32, &rv, DBUS_TYPE_INVALID);
+ return reply;
+}
+
+static DBusMessage *
+impl_GetRelationSet (DBusConnection * bus,
+ DBusMessage * message, void *user_data)
{
- SpiRegistry *registry = SPI_REGISTRY (bonobo_object_from_servant (servant));
- Accessibility_DesktopSeq *desktops;
+ DBusMessage *reply;
+ DBusMessageIter iter, iter_array;
- desktops = Accessibility_DesktopSeq__alloc ();
- desktops->_length = desktops->_maximum = 1;
- desktops->_buffer = Accessibility_DesktopSeq_allocbuf (desktops->_length);
- desktops->_buffer [0] = bonobo_object_dup_ref (BONOBO_OBJREF (registry->desktop), ev);
+ reply = dbus_message_new_method_return (message);
+ dbus_message_iter_init_append (reply, &iter);
+ dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, "(ua(so))", &iter_array);
+ dbus_message_iter_close_container (&iter, &iter_array);
- return desktops;
+ return reply;
}
+static DBusMessage *
+impl_GetRole (DBusConnection * bus, DBusMessage * message, void * user_data)
+{
+ DBusMessage *reply;
+ dbus_uint32_t rv = 14; /* TODO: Get DESKTOP_FRAME from somewhere */
+
+ reply = dbus_message_new_method_return (message);
+ dbus_message_append_args (reply, DBUS_TYPE_UINT32, &rv, DBUS_TYPE_INVALID);
+ return reply;
+}
-static Accessibility_DeviceEventController
-impl_accessibility_registry_get_device_event_controller (PortableServer_Servant servant,
- CORBA_Environment *ev)
+static DBusMessage *
+impl_GetRoleName (DBusConnection * bus,
+ DBusMessage * message, void *user_data)
{
- SpiRegistry *registry = SPI_REGISTRY (bonobo_object_from_servant (servant));
+ DBusMessage *reply;
+ const char *role_name = "desktop frame";
- if (!registry->de_controller)
+ reply = dbus_message_new_method_return (message);
+ dbus_message_append_args (reply, DBUS_TYPE_STRING, &role_name,
+ DBUS_TYPE_INVALID);
+ return reply;
+}
+
+static DBusMessage *
+impl_GetLocalizedRoleName (DBusConnection * bus,
+ DBusMessage * message, void *user_data)
+{
+ /* TODO - Localize this */
+ DBusMessage *reply;
+ const char *role_name = "desktop frame";
+
+ reply = dbus_message_new_method_return (message);
+ dbus_message_append_args (reply, DBUS_TYPE_STRING, &role_name,
+ DBUS_TYPE_INVALID);
+ return reply;
+}
+
+static DBusMessage *
+impl_GetState (DBusConnection * bus, DBusMessage * message, void *user_data)
+{
+ DBusMessage *reply = NULL;
+ DBusMessageIter iter, iter_array;
+
+ dbus_uint32_t states[2] = {0, 0};
+ guint count;
+
+ reply = dbus_message_new_method_return (message);
+ dbus_message_iter_init_append (reply, &iter);
+
+ dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, "u", &iter_array);
+ for (count = 0; count < 2; count++)
{
- registry->de_controller = spi_device_event_controller_new (registry);
+ 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)
+{
+ DBusMessage *reply = NULL;
+ DBusMessageIter iter, array;
- return bonobo_object_dup_ref (BONOBO_OBJREF (registry->de_controller), ev);
+ reply = dbus_message_new_method_return (message);
+ dbus_message_iter_init_append (reply, &iter);
+ dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, "{ss}", &array);
+ dbus_message_iter_close_container (&iter, &array);
+
+ return reply;
}
-typedef struct {
- CORBA_Environment *ev;
- Bonobo_Unknown source;
- EventTypeStruct etype;
- Accessibility_Event e_out;
-} NotifyContext;
+static DBusMessage *
+impl_GetApplication (DBusConnection * bus,
+ DBusMessage * message, void *user_data)
+{
+ DBusMessage *reply = NULL;
+ DBusMessageIter iter;
+
+ reply = dbus_message_new_method_return (message);
+ dbus_message_iter_init_append (reply, &iter);
+ append_reference (&iter,
+ dbus_bus_get_unique_name (bus),
+ SPI_DBUS_PATH_NULL);
-static SpiReEntrantContinue
-notify_listeners_cb (GList * const *list, gpointer user_data)
+ return reply;
+}
+
+static DBusMessage *
+impl_GetInterfaces (DBusConnection * bus,
+ DBusMessage * message, void *user_data)
{
- SpiListenerStruct *ls;
- NotifyContext *ctx = user_data;
+ DBusMessage *reply;
+ DBusMessageIter iter, iter_array;
- ls = (*list)->data;
+ const char *acc = SPI_DBUS_INTERFACE_ACCESSIBLE;
+ const char *com = SPI_DBUS_INTERFACE_COMPONENT;
-#ifdef SPI_LISTENER_DEBUG
- fprintf (stderr, "event quarks: %lx %lx %lx\n", ls->event_type_quark, ctx->etype.major, ctx->etype.minor);
- fprintf (stderr, "event name: %s\n", ctx->etype.event_name);
-#endif
- if ((ls->event_type_quark == ctx->etype.major) ||
- (ls->event_type_quark == ctx->etype.minor))
- {
-#ifdef SPI_DEBUG
- CORBA_string s;
- fprintf (stderr, "notifying listener %d\n", 0);
-/* g_list_index (list, l->data)); */
- s = Accessibility_Accessible__get_name (ctx->source, ctx->ev);
- fprintf (stderr, "event source name %s\n", s);
- CORBA_free (s);
- if (BONOBO_EX (ctx->ev))
- {
- CORBA_exception_free (ctx->ev);
- return SPI_RE_ENTRANT_CONTINUE;
- }
-#endif
-
- ctx->e_out.source = ctx->source;
-
- if ((*list) && (*list)->data == ls)
- {
- Accessibility_EventListener_notifyEvent (
- (Accessibility_EventListener) ls->listener, &ctx->e_out, ctx->ev);
- if (ctx->ev->_major != CORBA_NO_EXCEPTION)
- {
- DBG (1, g_warning ("Accessibility app error: exception during "
- "event notification: %s\n",
- CORBA_exception_id (ctx->ev)));
- CORBA_exception_free (ctx->ev);
- /* FIXME: check that this item is removed from the list
- * on system exception by a 'broken' listener */
- }
- }
- }
+ reply = dbus_message_new_method_return (message);
+
+ dbus_message_iter_init_append (reply, &iter);
+ dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, "s",
+ &iter_array);
+ dbus_message_iter_append_basic (&iter_array, DBUS_TYPE_STRING, &acc);
+ dbus_message_iter_append_basic (&iter_array, DBUS_TYPE_STRING, &com);
+ dbus_message_iter_close_container (&iter, &iter_array);
- return SPI_RE_ENTRANT_CONTINUE;
+ return reply;
}
-static void
-registry_emit_event (SpiRegistry *registry, NotifyContext *ctx)
+static DBusMessage *
+impl_GetItems (DBusConnection * bus, DBusMessage * message, void *user_data)
{
- GList **list = get_listener_list (registry, ctx->etype.type_cat);
+ DBusMessage *reply;
+ DBusMessageIter iter, iter_array;
- if (list && *list)
- {
-
- spi_re_entrant_list_foreach (list, notify_listeners_cb, ctx);
- }
+ reply = dbus_message_new_method_return (message);
+
+ dbus_message_iter_init_append (reply, &iter);
+ dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY,
+ "((so)(so)(so)a(so)assusau)", &iter_array);
+ dbus_message_iter_close_container (&iter, &iter_array);
+ return reply;
}
-static NotifyContext*
-registry_clone_notify_context (NotifyContext *ctx)
+/* I would rather these two be signals, but I'm not sure that dbus-python
+ * supports emitting signals except for a service, so implementing as both
+ * a method call and signal for now.
+ */
+static DBusMessage *
+impl_register_event (DBusConnection *bus, DBusMessage *message, void *user_data)
{
- NotifyContext *new_ctx = g_new0 (NotifyContext, 1);
+ SpiRegistry *registry = SPI_REGISTRY (user_data);
+ const char *orig_name;
+ gchar *name;
+ event_data *evdata;
+ gchar **data;
+ DBusMessage *signal;
+ const char *sender = dbus_message_get_sender (message);
+ DBusMessageIter iter, iter_array;
+ const char *signature = dbus_message_get_signature (message);
+
+ if (strcmp (signature, "sas") != 0 &&
+ strcmp (signature, "s") != 0)
+ {
+ g_warning ("got RegisterEvent with invalid signature '%s'", signature);
+ return NULL;
+ }
- new_ctx->ev = NULL;
- new_ctx->source = bonobo_object_dup_ref (ctx->source, NULL);
- new_ctx->etype.event_name = CORBA_string_dup (ctx->etype.event_name);
- new_ctx->etype.type_cat = ctx->etype.type_cat;
- new_ctx->etype.major = ctx->etype.major;
- new_ctx->etype.minor = ctx->etype.minor;
- new_ctx->etype.detail = ctx->etype.detail;
- new_ctx->e_out.type = CORBA_string_dup (ctx->e_out.type);
- new_ctx->e_out.source = ctx->e_out.source;
- new_ctx->e_out.detail1 = ctx->e_out.detail1;
- new_ctx->e_out.detail2 = ctx->e_out.detail2;
- CORBA_any__copy (&(new_ctx->e_out.any_data), &(ctx->e_out.any_data));
- return new_ctx;
-}
+ dbus_message_iter_init (message, &iter);
+ dbus_message_iter_get_basic (&iter, &orig_name);
+ dbus_message_iter_next (&iter);
+ name = ensure_proper_format (orig_name);
-static void
-registry_flush_event_queue (SpiRegistry *registry,
- gboolean discard,
- CORBA_Environment *ev)
-{
- NotifyContext *q_ctx;
- while (!g_queue_is_empty (registry->deferred_event_queue)) {
- q_ctx = g_queue_pop_tail (registry->deferred_event_queue);
-#ifdef SPI_QUEUE_DEBUG
- fprintf (stderr, "%s! %s [n=%d] %p\n", (discard ? "discard" : "pop"),
- q_ctx->etype.event_name,
- (int) registry->deferred_event_queue->length, q_ctx);
-#endif
- if (!discard) {
- q_ctx->ev = ev;
- registry_emit_event (registry, q_ctx);
+ evdata = g_new0 (event_data, 1);
+ data = g_strsplit (name, ":", 3);
+ evdata->bus_name = g_strdup (sender);
+ evdata->data = data;
+
+ if (dbus_message_iter_get_arg_type (&iter) == DBUS_TYPE_ARRAY)
+ {
+ dbus_message_iter_recurse (&iter, &iter_array);
+ while (dbus_message_iter_get_arg_type (&iter_array) != DBUS_TYPE_INVALID)
+ {
+ const char *property;
+ dbus_message_iter_get_basic (&iter_array, &property);
+ evdata->properties = g_slist_append (evdata->properties,
+ g_strdup (property));
+ dbus_message_iter_next (&iter_array);
}
- if (discard &&
- (q_ctx->etype.type_cat == ETYPE_OBJECT) &&
- (q_ctx->etype.major == _state_quark) &&
- (q_ctx->etype.minor == _state_changed_focused_quark)) {
- registry->focus_object = q_ctx->source;
-#ifdef SPI_QUEUE_DEBUG
- fprintf (stderr, "discard!: set focus_object %p\n", registry->focus_object);
-#endif
+ }
+ registry->events = g_list_append (registry->events, evdata);
+
+ if (needs_mouse_poll (evdata->data))
+ {
+ spi_device_event_controller_start_poll_mouse (registry);
}
- else {
- bonobo_object_release_unref (q_ctx->source, NULL);
+
+ signal = dbus_message_new_signal (SPI_DBUS_PATH_REGISTRY,
+ SPI_DBUS_INTERFACE_REGISTRY,
+ "EventListenerRegistered");
+ if (signal)
+ {
+ GSList *ls = evdata->properties;
+ dbus_message_iter_init_append (signal, &iter);
+ dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &sender);
+ dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &name);
+ dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, "s", &iter_array);
+ while (ls)
+ {
+ dbus_message_iter_append_basic (&iter_array, DBUS_TYPE_STRING, &ls->data);
+ ls = g_slist_next (ls);
}
- CORBA_free ((void *)q_ctx->etype.event_name);
- CORBA_free ((void *)q_ctx->e_out.type);
- g_free (q_ctx);
+ dbus_message_iter_close_container (&iter, &iter_array);
+ dbus_connection_send (bus, signal, NULL);
+ dbus_message_unref (signal);
}
- registry->is_queueing = FALSE;
+
+ g_free (name);
+ return dbus_message_new_method_return (message);
}
-static gboolean
-registry_timeout_flush_queue (gpointer data)
+static DBusMessage *
+impl_deregister_event (DBusConnection *bus, DBusMessage *message, void *user_data)
{
- SpiRegistry *registry = data;
- CORBA_Environment ev;
-#ifdef SPI_QUEUE_DEBUG
- fprintf (stderr, "timeout! flushing queue...\n");
-#endif
- CORBA_exception_init (&ev);
- registry->queue_handler_id = 0;
- registry_flush_event_queue (registry, FALSE, &ev);
- return FALSE;
+ SpiRegistry *registry = SPI_REGISTRY (user_data);
+ const char *orig_name;
+ gchar *name;
+ const char *sender = dbus_message_get_sender (message);
+
+ if (!dbus_message_get_args (message, NULL, DBUS_TYPE_STRING, &orig_name,
+ DBUS_TYPE_INVALID))
+ return NULL;
+ name = ensure_proper_format (orig_name);
+
+ remove_events (registry, sender, name);
+
+ g_free (name);
+ return dbus_message_new_method_return (message);
}
-static gboolean
-registry_discard_on_event (SpiRegistry *registry, NotifyContext *ctx)
-{
- gboolean retval = FALSE;
- NotifyContext *q_ctx = g_queue_peek_tail (registry->deferred_event_queue);
- if ((q_ctx != NULL) &&
- (ctx->etype.type_cat == ETYPE_WINDOW) &&
- (ctx->etype.major == _activate_quark)) {
- if (CORBA_Object_is_equivalent (ctx->source, q_ctx->source, NULL)) {
- retval = TRUE;
+static DBusMessage *
+impl_get_registered_events (DBusConnection *bus, DBusMessage *message, void *user_data)
+{
+ SpiRegistry *registry = SPI_REGISTRY (user_data);
+ event_data *evdata;
+ DBusMessage *reply;
+ DBusMessageIter iter, iter_struct, iter_array;
+ GList *list;
+
+ reply = dbus_message_new_method_return (message);
+ if (!reply)
+ return NULL;
+
+ dbus_message_iter_init_append (reply, &iter);
+ dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, "(ss)", &iter_array);
+ for (list = registry->events; list; list = list->next)
+ {
+ gchar *str;
+ evdata = list->data;
+ str = g_strconcat (evdata->data [0],
+ ":", (evdata->data [1]? evdata->data [1]: ""),
+ ":", (evdata->data [1] && evdata->data [2]? evdata->data [2]: ""), NULL);
+ dbus_message_iter_open_container (&iter_array, DBUS_TYPE_STRUCT, NULL, &iter_struct);
+ dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_STRING, &evdata->bus_name);
+ dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_STRING, &str);
+ dbus_message_iter_close_container (&iter_array, &iter_struct);
+ g_free (str);
}
- }
- return retval;
+ dbus_message_iter_close_container (&iter, &iter_array);
+ return reply;
}
-static gboolean
-registry_reset_on_event (SpiRegistry *registry, NotifyContext *ctx)
+/*---------------------------------------------------------------------------*/
+
+static void
+emit_Available (DBusConnection * bus)
{
- return (ctx->etype.type_cat == ETYPE_WINDOW) ? TRUE : FALSE;
+ DBusMessage *sig;
+ DBusMessageIter iter;
+
+ sig = dbus_message_new_signal(SPI_DBUS_PATH_ROOT, SPI_DBUS_INTERFACE_SOCKET, "Available");
+
+ dbus_message_iter_init_append(sig, &iter);
+ append_reference (&iter, SPI_DBUS_NAME_REGISTRY, SPI_DBUS_PATH_ROOT);
+
+ dbus_connection_send(bus, sig, NULL);
+ dbus_message_unref(sig);
}
-#ifdef SPI_QUEUE_DEBUG
-#include <sys/time.h>
-#endif
+/*---------------------------------------------------------------------------*/
+
+static const char *introspection_header =
+"<?xml version=\"1.0\"?>\n";
+
+static const char *introspection_node_element =
+"<node name=\"%s\">\n";
+
+static const char *introspection_footer =
+"</node>";
+
+static DBusMessage *
+impl_Introspect_root (DBusConnection * bus,
+ DBusMessage * message, void *user_data)
+{
+ GString *output;
+ gchar *final;
+
+ const gchar *pathstr = SPI_DBUS_PATH_ROOT;
+
+ DBusMessage *reply;
+
+ output = g_string_new(introspection_header);
+
+ g_string_append_printf(output, introspection_node_element, pathstr);
+
+ g_string_append (output, spi_org_a11y_atspi_Accessible);
+ g_string_append (output, spi_org_a11y_atspi_Component);
+
+ g_string_append(output, introspection_footer);
+ final = g_string_free(output, FALSE);
+
+ reply = dbus_message_new_method_return (message);
+ dbus_message_append_args(reply, DBUS_TYPE_STRING, &final, DBUS_TYPE_INVALID);
+
+ g_free(final);
+ return reply;
+}
+
+static DBusMessage *
+impl_Introspect_registry (DBusConnection * bus,
+ DBusMessage * message, void *user_data)
+{
+ GString *output;
+ gchar *final;
+
+ const gchar *pathstr = SPI_DBUS_PATH_REGISTRY;
+
+ DBusMessage *reply;
+
+ output = g_string_new(introspection_header);
+
+ g_string_append_printf(output, introspection_node_element, pathstr);
+
+ g_string_append (output, spi_org_a11y_atspi_Registry);
+
+ g_string_append(output, introspection_footer);
+ final = g_string_free(output, FALSE);
+
+ reply = dbus_message_new_method_return (message);
+ dbus_message_append_args(reply, DBUS_TYPE_STRING, &final, DBUS_TYPE_INVALID);
+
+ g_free(final);
+ return reply;
+}
+
+/*---------------------------------------------------------------------------*/
+
+/*
+ * Emits an AT-SPI event.
+ * AT-SPI events names are split into three parts:
+ * class:major:minor
+ * This is mapped onto D-Bus events as:
+ * D-Bus Interface:Signal Name:Detail argument
+ *
+ * Marshals a basic type into the 'any_data' attribute of
+ * the AT-SPI event.
+ */
+static void
+emit_event (DBusConnection *bus,
+ const char *klass,
+ const char *major,
+ const char *minor,
+ dbus_int32_t detail1,
+ dbus_int32_t detail2,
+ const char *name,
+ const char *path)
+{
+ DBusMessage *sig;
+ DBusMessageIter iter, iter_variant;
+
+ sig = dbus_message_new_signal(SPI_DBUS_PATH_ROOT, klass, major);
+
+ dbus_message_iter_init_append(sig, &iter);
+
+ dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &minor);
+ dbus_message_iter_append_basic(&iter, DBUS_TYPE_INT32, &detail1);
+ dbus_message_iter_append_basic(&iter, DBUS_TYPE_INT32, &detail2);
+
+ dbus_message_iter_open_container (&iter, DBUS_TYPE_VARIANT, "(so)",
+ &iter_variant);
+ append_reference (&iter_variant, name, path);
+ dbus_message_iter_close_container (&iter, &iter_variant);
+
+ append_reference (&iter,
+ dbus_bus_get_unique_name (bus),
+ SPI_DBUS_PATH_ROOT);
+
+ dbus_connection_send(bus, sig, NULL);
+ dbus_message_unref(sig);
+}
+
+/*---------------------------------------------------------------------------*/
+
+/*
+ * Children changed signal converter and forwarder.
+ *
+ * Klass (Interface) org.a11y.atspi.Event.Object
+ * Major is the signal name.
+ * Minor is 'add' or 'remove'
+ * detail1 is the index.
+ * detail2 is 0.
+ * any_data is the child reference.
+ */
static void
-registry_start_queue (SpiRegistry *registry)
+children_added_listener (DBusConnection * bus,
+ gint index,
+ const gchar * name,
+ const gchar * path)
{
-#ifdef SPI_QUEUE_DEBUG
- struct timeval tp;
- gettimeofday (&tp, NULL);
- fprintf (stderr, "start queueing at %i.%.6i\n", tp.tv_sec, tp.tv_usec);
-#endif
- if (registry->queue_handler_id != 0)
- g_source_remove (registry->queue_handler_id);
-
- if (registry->focus_object)
- {
-#ifdef SPI_QUEUE_DEBUG
- fprintf (stderr, "registry_start_queue: release focus_object %p\n", registry->focus_object);
-#endif
- bonobo_object_release_unref (registry->focus_object, NULL);
- registry->focus_object = NULL;
- }
- registry->queue_handler_id = g_timeout_add_full (G_PRIORITY_HIGH_IDLE,
- registry->exit_notify_timeout,
- registry_timeout_flush_queue, registry,
- NULL);
- registry->is_queueing = TRUE;
+ emit_event (bus, SPI_DBUS_INTERFACE_EVENT_OBJECT, "ChildrenChanged", "add", index, 0,
+ name, path);
}
-static gboolean
-registry_discard_event (SpiRegistry *registry, NotifyContext *ctx)
+static void
+children_removed_listener (DBusConnection * bus,
+ gint index,
+ const gchar * name,
+ const gchar * path)
{
- gboolean ret = FALSE;
+ emit_event (bus, SPI_DBUS_INTERFACE_EVENT_OBJECT, "ChildrenChanged", "remove", index, 0,
+ name, path);
+}
- if (ctx->etype.type_cat == ETYPE_FOCUS)
+/*---------------------------------------------------------------------------*/
+
+static DBusHandlerResult
+handle_method_root (DBusConnection *bus, DBusMessage *message, void *user_data)
+{
+ DBusHandlerResult result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+
+ const gchar *iface = dbus_message_get_interface (message);
+ const gchar *member = dbus_message_get_member (message);
+ const gint type = dbus_message_get_type (message);
+
+ DBusMessage *reply = NULL;
+
+ /* Check for basic reasons not to handle */
+ if (type != DBUS_MESSAGE_TYPE_METHOD_CALL ||
+ member == NULL ||
+ iface == NULL)
+ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+
+ if (!strcmp (iface, "org.freedesktop.DBus.Properties"))
{
- if (registry->focus_object)
+ if (!strcmp (member, "Get"))
{
- if (CORBA_Object_is_equivalent (registry->focus_object, ctx->source, NULL))
+ const gchar *prop_iface;
+ const gchar *prop_member;
+ DBusError error;
+
+ dbus_error_init (&error);
+ if (dbus_message_get_args (message,
+ &error,
+ DBUS_TYPE_STRING,
+ &prop_iface,
+ DBUS_TYPE_STRING,
+ &prop_member,
+ DBUS_TYPE_INVALID))
{
- ret = TRUE;
+ DBusMessageIter iter;
+
+ reply = dbus_message_new_method_return (message);
+ dbus_message_iter_init_append (reply, &iter);
+
+
+ if (!strcmp (prop_iface, SPI_DBUS_INTERFACE_ACCESSIBLE))
+ {
+ if (!strcmp (prop_member, "Name"))
+ impl_get_Name (&iter, user_data);
+ else if (!strcmp (prop_member, "Description"))
+ impl_get_Description (&iter, user_data);
+ else if (!strcmp (prop_member, "Parent"))
+ impl_get_Parent (&iter, user_data);
+ else if (!strcmp (prop_member, "ChildCount"))
+ impl_get_ChildCount (&iter, user_data);
+ else
+ {
+ dbus_message_unref (reply);
+ reply = dbus_message_new_error (message, DBUS_ERROR_FAILED, "Property unavailable");
+ }
+ }
+ else if (!strcmp (prop_iface, SPI_DBUS_INTERFACE_APPLICATION))
+ {
+ if (!strcmp (prop_member, "ToolkitName"))
+ impl_get_ToolkitName (&iter, user_data);
+ else if (!strcmp (prop_member, "ToolkitVersion"))
+ impl_get_ToolkitVersion (&iter, user_data);
+ else
+ {
+ dbus_message_unref (reply);
+ reply = dbus_message_new_error (message, DBUS_ERROR_FAILED, "Property unavailable");
+ }
+ }
+ else
+ {
+ dbus_message_unref (reply);
+ reply = dbus_message_new_error (message, DBUS_ERROR_FAILED, "Property unavailable");
+ }
}
-#ifdef SPI_QUEUE_DEBUG
- fprintf (stderr, "registry_discard_event: release focus_object %p\n", registry->focus_object);
-#endif
- bonobo_object_release_unref (registry->focus_object, NULL);
- registry->focus_object = NULL;
+ else
+ {
+ reply = dbus_message_new_error (message, DBUS_ERROR_FAILED, error.message);
+ }
+ result = DBUS_HANDLER_RESULT_HANDLED;
+ }
+ else if (!strcmp (member, "GetAll"))
+ {
+ result = DBUS_HANDLER_RESULT_HANDLED;
}
}
- return ret;
-}
-static gboolean
-registry_defer_on_event (SpiRegistry *registry, NotifyContext *ctx)
-{
- gboolean defer = FALSE;
- if ((ctx->etype.type_cat == ETYPE_WINDOW) &&
- (ctx->etype.major == _deactivate_quark)) {
- defer = TRUE;
- registry_start_queue (registry);
- }
- /* defer all object:state-change events after a window:deactivate */
- else if ((ctx->etype.type_cat == ETYPE_FOCUS) ||
- ((ctx->etype.type_cat == ETYPE_OBJECT) &&
- (ctx->etype.major == _state_quark))) {
- defer = TRUE;
- }
- return defer;
-}
+ if (!strcmp (iface, SPI_DBUS_INTERFACE_ACCESSIBLE))
+ {
+ result = DBUS_HANDLER_RESULT_HANDLED;
+ if (!strcmp (member, "GetChildAtIndex"))
+ reply = impl_GetChildAtIndex (bus, message, user_data);
+ else if (!strcmp (member, "GetChildren"))
+ reply = impl_GetChildren (bus, message, user_data);
+ else if (!strcmp (member, "GetIndexInParent"))
+ reply = impl_GetIndexInParent (bus, message, user_data);
+ else if (!strcmp (member, "GetRelationSet"))
+ reply = impl_GetRelationSet (bus, message, user_data);
+ else if (!strcmp (member, "GetRole"))
+ reply = impl_GetRole (bus, message, user_data);
+ else if (!strcmp (member, "GetRoleName"))
+ reply = impl_GetRoleName (bus, message, user_data);
+ else if (!strcmp (member, "GetLocalizedRoleName"))
+ reply = impl_GetLocalizedRoleName (bus, message, user_data);
+ else if (!strcmp (member, "GetState"))
+ reply = impl_GetState (bus, message, user_data);
+ else if (!strcmp (member, "GetAttributes"))
+ reply = impl_GetAttributes (bus, message, user_data);
+ else if (!strcmp (member, "GetApplication"))
+ reply = impl_GetApplication (bus, message, user_data);
+ else if (!strcmp (member, "GetInterfaces"))
+ reply = impl_GetInterfaces (bus, message, user_data);
+ else
+ result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+ }
-static gboolean
-registry_queue_event (SpiRegistry *registry, NotifyContext *ctx)
-{
- NotifyContext *q_ctx = registry_clone_notify_context (ctx);
-#ifdef SPI_QUEUE_DEBUG
- if (q_ctx->etype.type_cat != ETYPE_MOUSE)
- fprintf (stderr, "push! %s %p\n", q_ctx->etype.event_name, q_ctx);
-#endif
- if (registry->is_queueing)
+ if (!strcmp (iface, SPI_DBUS_INTERFACE_COMPONENT))
+ {
+ result = DBUS_HANDLER_RESULT_HANDLED;
+ if (!strcmp (member, "Contains"))
+ reply = impl_Contains (bus, message, user_data);
+ else if (!strcmp (member, "GetAccessibleAtPoint"))
+ reply = impl_GetAccessibleAtPoint (bus, message, user_data);
+ else if (!strcmp (member, "GetExtents"))
+ reply = impl_GetExtents (bus, message, user_data);
+ else if (!strcmp (member, "GetPosition"))
+ reply = impl_GetPosition (bus, message, user_data);
+ else if (!strcmp (member, "GetSize"))
+ reply = impl_GetSize (bus, message, user_data);
+ else if (!strcmp (member, "GetLayer"))
+ reply = impl_GetLayer (bus, message, user_data);
+ else if (!strcmp (member, "GetMDIZOrder"))
+ reply = impl_GetMDIZOrder (bus, message, user_data);
+ else if (!strcmp (member, "GrabFocus"))
+ reply = impl_GrabFocus (bus, message, user_data);
+ else if (!strcmp (member, "GetAlpha"))
+ reply = impl_GetAlpha (bus, message, user_data);
+ else
+ result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+ }
+
+ if (!strcmp (iface, SPI_DBUS_INTERFACE_SOCKET))
+ {
+ result = DBUS_HANDLER_RESULT_HANDLED;
+ if (!strcmp (member, "Embed"))
+ reply = impl_Embed (bus, message, user_data);
+ else if (!strcmp (member, "Unembed"))
+ reply = impl_Unembed (bus, message, user_data);
+ else
+ result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+ }
+
+ if (!strcmp (iface, "org.freedesktop.DBus.Introspectable"))
{
- g_queue_push_head (registry->deferred_event_queue, q_ctx);
+ result = DBUS_HANDLER_RESULT_HANDLED;
+ if (!strcmp (member, "Introspect"))
+ reply = impl_Introspect_root (bus, message, user_data);
+ else
+ result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+ }
+
+ if (result == DBUS_HANDLER_RESULT_HANDLED)
+ {
+ if (!reply)
+ {
+ reply = dbus_message_new_method_return (message);
+ }
- return FALSE;
+ dbus_connection_send (bus, reply, NULL);
+ dbus_message_unref (reply);
}
+#if 0
else
{
- bonobo_object_release_unref (q_ctx->source, NULL);
- CORBA_free ((void *)q_ctx->etype.event_name);
- CORBA_free ((void *)q_ctx->e_out.type);
- g_free (q_ctx);
- return TRUE;
+ g_print ("Registry | Unhandled message : %s|%s\n", iface, member);
}
+#endif
+
+ return result;
}
-/**
- * Dispose of event in one of several ways:
- * 1) discard;
- * 2) initiate queuing and push onto queue (below)
- * 3) push on existing queue to either pop on timeout or on subsequent event
- * 4) pass-through immediately
- * 5) pass-through, discarding queued events
- * 6) emit queued events and then pass through
- **/
-static gboolean
-registry_filter_event (SpiRegistry *registry, NotifyContext *ctx,
- CORBA_Environment *ev)
+static DBusHandlerResult
+handle_method_cache (DBusConnection *bus, DBusMessage *message, void *user_data)
{
- g_assert (ctx != NULL);
+ DBusHandlerResult result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
- if (registry_discard_event (registry, ctx))
- return FALSE;
+ const gchar *iface = dbus_message_get_interface (message);
+ const gchar *member = dbus_message_get_member (message);
+ const gint type = dbus_message_get_type (message);
- if (registry_defer_on_event (registry, ctx)) { /* #2, #3 */
- if (registry->is_queueing) {
- return registry_queue_event (registry, ctx);
- }
- else { /* #4a */
- return TRUE;
+ DBusMessage *reply = NULL;
+
+ /* Check for basic reasons not to handle */
+ if (type != DBUS_MESSAGE_TYPE_METHOD_CALL ||
+ member == NULL ||
+ iface == NULL)
+ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+
+ if (!strcmp (iface, SPI_DBUS_INTERFACE_CACHE))
+ {
+ result = DBUS_HANDLER_RESULT_HANDLED;
+ if (!strcmp (member, "GetItems"))
+ reply = impl_GetItems (bus, message, user_data);
+ else
+ result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
}
- }
- else if (registry_reset_on_event (registry, ctx)) { /* #5, #6 */
- gboolean discard = registry_discard_on_event (registry, ctx);
-#ifdef SPI_QUEUE_DEBUG
- fprintf (stderr, "event %s caused reset, discard=%d\n",
- ctx->etype.event_name, (int) discard);
- {
- struct timeval tp;
- gettimeofday (&tp, NULL);
- fprintf (stderr, "event at %i.%.6i\n", tp.tv_sec, tp.tv_usec);
- }
-#endif
- registry_flush_event_queue (registry, discard, ev);
- return (discard ? FALSE : TRUE);
- }
- else { /* #4b */
- return TRUE;
- }
-}
-static void
-impl_registry_notify_event (PortableServer_Servant servant,
- const Accessibility_Event *e,
- CORBA_Environment *ev)
-{
- SpiRegistry *registry;
- NotifyContext ctx;
- static int level = 0;
-
- level++;
- registry = SPI_REGISTRY (bonobo_object_from_servant (servant));
-
- parse_event_type (&ctx.etype, e->type);
-
- ctx.ev = ev;
- ctx.e_out = *e;
- ctx.source = e->source;
-
-#ifdef SPI_QUEUE_DEBUG
- if (ctx.etype.type_cat != ETYPE_MOUSE)
- fprintf (stderr, "filter! %s level: %d\n", ctx.etype.event_name, level);
-#endif
- if (registry_filter_event (registry, &ctx, ev)) {
-#ifdef SPI_QUEUE_DEBUG
- if (ctx.etype.type_cat != ETYPE_MOUSE)
- fprintf (stderr, "emit! %s level: %d\n", ctx.etype.event_name, level);
-#endif
- registry_emit_event (registry, &ctx);
- }
- level--;
+ if (result == DBUS_HANDLER_RESULT_HANDLED)
+ {
+ if (!reply)
+ {
+ reply = dbus_message_new_method_return (message);
+ }
+
+ dbus_connection_send (bus, reply, NULL);
+ dbus_message_unref (reply);
+ }
+ return result;
}
-static void
-spi_registry_class_init (SpiRegistryClass *klass)
+static DBusHandlerResult
+handle_method_registry (DBusConnection *bus, DBusMessage *message, void *user_data)
{
- GObjectClass * object_class = (GObjectClass *) klass;
- POA_Accessibility_Registry__epv *epv = &klass->epv;
+ DBusHandlerResult result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
- spi_registry_parent_class = g_type_class_ref (SPI_LISTENER_TYPE);
-
- object_class->finalize = spi_registry_object_finalize;
+ const gchar *iface = dbus_message_get_interface (message);
+ const gchar *member = dbus_message_get_member (message);
+ const gint type = dbus_message_get_type (message);
+
+ DBusMessage *reply = NULL;
- klass->parent_class.epv.notifyEvent = impl_registry_notify_event;
+ /* Check for basic reasons not to handle */
+ if (type != DBUS_MESSAGE_TYPE_METHOD_CALL ||
+ member == NULL ||
+ iface == NULL)
+ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+
+ if (!strcmp (iface, SPI_DBUS_INTERFACE_REGISTRY))
+ {
+ result = DBUS_HANDLER_RESULT_HANDLED;
+ if (!strcmp(member, "RegisterEvent"))
+ reply = impl_register_event (bus, message, user_data);
+ else if (!strcmp(member, "DeregisterEvent"))
+ reply = impl_deregister_event (bus, message, user_data);
+ else if (!strcmp(member, "GetRegisteredEvents"))
+ reply = impl_get_registered_events (bus, message, user_data);
+ else
+ result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+ }
+
+ if (!strcmp (iface, "org.freedesktop.DBus.Introspectable"))
+ {
+ result = DBUS_HANDLER_RESULT_HANDLED;
+ if (!strcmp (member, "Introspect"))
+ reply = impl_Introspect_registry (bus, message, user_data);
+ else
+ result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+ }
+
+ if (result == DBUS_HANDLER_RESULT_HANDLED)
+ {
+ if (!reply)
+ {
+ reply = dbus_message_new_method_return (message);
+ }
+
+ dbus_connection_send (bus, reply, NULL);
+ dbus_message_unref (reply);
+ }
+#if 0
+ else
+ {
+ g_print ("Registry | Unhandled message : %s|%s\n", iface, member);
+ }
+#endif
- epv->registerApplication = impl_accessibility_registry_register_application;
- epv->deregisterApplication = impl_accessibility_registry_deregister_application;
- epv->registerGlobalEventListener = impl_accessibility_registry_register_global_event_listener;
- epv->deregisterGlobalEventListener = impl_accessibility_registry_deregister_global_event_listener;
- epv->deregisterGlobalEventListenerAll = impl_accessibility_registry_deregister_global_event_listener_all;
- epv->getDeviceEventController = impl_accessibility_registry_get_device_event_controller;
- epv->getDesktopCount = impl_accessibility_registry_get_desktop_count;
- epv->getDesktop = impl_accessibility_registry_get_desktop;
- epv->getDesktopList = impl_accessibility_registry_get_desktop_list;
- _deactivate_quark = g_quark_from_static_string ("deactivate");
- _activate_quark = g_quark_from_static_string ("activate");
- _state_quark = g_quark_from_static_string ("state-changed");
- _state_changed_focused_quark = g_quark_from_static_string ("state-changedfocused");
+ return result;
}
-static void
-spi_registry_init (SpiRegistry *registry)
+/*---------------------------------------------------------------------------*/
+
+static DBusObjectPathVTable root_vtable =
{
- spi_registry_set_debug (g_getenv ("AT_SPI_DEBUG"));
- /*
- * TODO: FIXME, this module makes the foolish assumptions that
- * registryd uses the same display as the apps, and that the
- * DISPLAY environment variable is set.
- */
- gdk_init (NULL, NULL);
-
- registry->object_listeners = NULL;
- registry->window_listeners = NULL;
- registry->toolkit_listeners = NULL;
- registry->deferred_event_queue = g_queue_new ();
- registry->exit_notify_timeout = 200;
- registry->queue_handler_id = 0;
- /*
- * The focus_object is set when a state-change:focused event is discarded
- * after a window:deactivate event is received because a window:activate
- * event has been received for the same window within the timeout period.
- * The focus object is used to suppress a focus event for that object.
- * It is released when a window:deactivate event is received.
- */
- registry->focus_object = NULL;
- registry->desktop = spi_desktop_new ();
- /* Register callback notification for application addition and removal */
- g_signal_connect (G_OBJECT (registry->desktop),
- "application_added",
- G_CALLBACK (desktop_add_application),
- registry);
-
- g_signal_connect (G_OBJECT (registry->desktop),
- "application_removed",
- G_CALLBACK (desktop_remove_application),
- registry);
-
- registry->de_controller = spi_device_event_controller_new (registry);
-}
-
-BONOBO_TYPE_FUNC_FULL (SpiRegistry,
- Accessibility_Registry,
- PARENT_TYPE,
- spi_registry)
+ NULL,
+ &handle_method_root,
+ NULL, NULL, NULL, NULL
+};
+
+static DBusObjectPathVTable registry_vtable =
+{
+ NULL,
+ &handle_method_registry,
+ NULL, NULL, NULL, NULL
+};
+
+static DBusObjectPathVTable cache_vtable =
+{
+ NULL,
+ &handle_method_cache,
+ NULL, NULL, NULL, NULL
+};
+
+static gchar *app_sig_match_name_owner =
+ "type='signal', interface='org.freedesktop.DBus', member='NameOwnerChanged'";
SpiRegistry *
-spi_registry_new (void)
+spi_registry_new (DBusConnection *bus)
{
- SpiRegistry *retval = g_object_new (SPI_REGISTRY_TYPE, NULL);
- bonobo_object_set_immortal (BONOBO_OBJECT (retval), TRUE);
- return retval;
+ SpiRegistry *reg = g_object_new (SPI_REGISTRY_TYPE, NULL);
+
+ reg->bus = bus;
+
+ dbus_bus_add_match (bus, app_sig_match_name_owner, NULL);
+ dbus_connection_add_filter (bus, signal_filter, reg, NULL);
+
+ dbus_connection_register_object_path (bus, SPI_DBUS_PATH_ROOT, &root_vtable, reg);
+
+ dbus_connection_register_object_path (bus, SPI_DBUS_PATH_CACHE, &cache_vtable, reg);
+
+ dbus_connection_register_object_path (bus, SPI_DBUS_PATH_REGISTRY, ®istry_vtable, reg);
+
+ emit_Available (bus);
+
+ reg->events = NULL;
+
+ return reg;
}
+
+/*END------------------------------------------------------------------------*/
projects / platform / upstream / at-spi2-core.git / blobdiff