#undef SPI_LISTENER_DEBUG
#undef SPI_DEBUG
+#undef SPI_QUEUE_DEBUG
#include <config.h>
#ifdef SPI_DEBUG
# include <stdio.h>
#endif
-#include <bonobo/bonobo-exception.h>
-#include "../libspi/spi-private.h"
+#include <spi-common/spi-dbus.h>
+
#include "registry.h"
+#include "dbus/dbus-glib-lowlevel.h"
/* Our parent GObject type */
-#define PARENT_TYPE SPI_LISTENER_TYPE
-
-/* A pointer to our parent object class */
-static SpiListenerClass *spi_registry_parent_class;
+#define PARENT_TYPE G_OBJECT_TYPE
-extern int _dbg = 0;
+int _dbg = 0;
typedef enum {
ETYPE_FOCUS,
GQuark detail; /* from string segment[3] (not concatenated) */
} EventTypeStruct;
-typedef struct {
- Accessibility_EventListener listener;
- GQuark event_type_quark;
- EventTypeCategory event_type_cat;
-} SpiListenerStruct;
+G_DEFINE_TYPE(SpiRegistry, spi_registry, G_TYPE_OBJECT)
static void
-spi_registry_set_debug (char *debug_flag_string)
+spi_registry_set_debug (const char *debug_flag_string)
{
if (debug_flag_string)
- _dbg = g_ascii_digit_value(debug_flag_string);
+ _dbg = (int) g_ascii_strtod (debug_flag_string, NULL);
}
-SpiListenerStruct *
-spi_listener_struct_new (Accessibility_EventListener listener, CORBA_Environment *ev)
+static void emit(SpiRegistry *registry, const char *name, int first_type, ...)
{
- SpiListenerStruct *retval = g_malloc (sizeof (SpiListenerStruct));
- retval->listener = bonobo_object_dup_ref (listener, ev);
- return retval;
-}
-
+ va_list arg;
-void
-spi_listener_struct_free (SpiListenerStruct *ls, CORBA_Environment *ev)
-{
- bonobo_object_release_unref (ls->listener, ev);
- g_free (ls);
+ va_start(arg, first_type);
+ spi_dbus_emit_valist(registry->droute.bus, SPI_DBUS_PATH_REGISTRY, SPI_DBUS_INTERFACE_REGISTRY, name, first_type, arg);
+ va_end(arg);
}
static void
desktop_add_application (SpiDesktop *desktop,
guint index, gpointer data)
{
- BonoboObject *registry = BONOBO_OBJECT (data);
- Accessibility_Event e;
- CORBA_Environment ev;
- Accessibility_Accessible a;
+ SpiRegistry *registry = SPI_REGISTRY (data);
+ const char *name = g_list_nth_data(desktop->applications, index);
- 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_Accessible_unref (a, &ev);
- Accessibility_Registry_notifyEvent (BONOBO_OBJREF (registry),
- &e, &ev);
- Accessibility_Desktop_unref (e.source, &ev);
- CORBA_exception_free (&ev);
+ emit(registry, "ApplicationAdd", DBUS_TYPE_UINT32, &index, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID);
}
desktop_remove_application (SpiDesktop *desktop,
guint index, gpointer data)
{
- BonoboObject *registry = BONOBO_OBJECT (data);
- Accessibility_Event e;
- Accessibility_Accessible a;
- CORBA_Environment ev;
+ SpiRegistry *registry = SPI_REGISTRY (data);
+ const char *name = g_list_nth_data(desktop->applications, index);
- 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);
+ emit(registry, "ApplicationRemove", DBUS_TYPE_UINT32, &index, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID);
}
spi_registry_object_finalize (GObject *object)
{
DBG (1, g_warning ("spi_registry_object_finalize called\n"));
+ g_object_unref (SPI_REGISTRY (object)->de_controller);
- /* TODO: unref deviceeventcontroller, which disconnects key listener */
G_OBJECT_CLASS (spi_registry_parent_class)->finalize (object);
}
-static long
-_get_unique_id (void)
-{
- static long id = 0;
-
- return ++id;
-}
-
/**
* registerApplication:
* @application: a reference to the requesting @Application
* 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 DBusMessage *
+impl_accessibility_registry_register_application (DBusConnection *bus, DBusMessage *message, void *user_data)
{
- SpiRegistry *registry = SPI_REGISTRY (bonobo_object_from_servant (servant));
+ SpiRegistry *registry = SPI_REGISTRY (user_data);
+ const char *application = dbus_message_get_sender (message);
#ifdef SPI_DEBUG
- fprintf (stderr, "registering app %p\n", application);
+ fprintf (stderr, "registering app %s\n", application);
#endif
spi_desktop_add_application (registry->desktop, application);
- 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
*/
-}
-
-#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;
-}
-#endif
-
-static void
-register_with_toolkits (SpiRegistry *spi_registry_bonobo_object, EventTypeStruct *etype, CORBA_Environment *ev)
-{
- 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 */
-
- n_desktops = Accessibility_Registry_getDesktopCount (registry, ev);
-
- for (i=0; i<n_desktops; ++i)
- {
- desktop = Accessibility_Registry_getDesktop (registry, i, ev);
- n_apps = Accessibility_Desktop__get_childCount (desktop, ev);
- for (j=0; j<n_apps; ++j)
- {
- app = (Accessibility_Application) Accessibility_Desktop_getChildAtIndex (desktop,
- j,
- ev);
- Accessibility_Application_registerToolkitEventListener (app,
- registry,
- CORBA_string_dup (etype->event_name),
- ev);
- }
- }
-}
-
-#ifdef USE_A_HASH_IN_FUTURE
-
-static gint
-compare_listener_quarks (gconstpointer p1, gconstpointer p2)
-{
- return (((SpiListenerStruct *)p2)->event_type_quark !=
- ((SpiListenerStruct *)p1)->event_type_quark);
-}
-
-static gint
-compare_listener_corbaref (gconstpointer p1, gconstpointer p2)
-{
- return compare_corba_objects (((SpiListenerStruct *)p2)->listener,
- ((SpiListenerStruct *)p1)->listener);
-}
-#endif
-
-static void
-parse_event_type (EventTypeStruct *etype, const char *event_name)
-{
- gchar **split_string;
- gchar *s;
-
- split_string = g_strsplit (event_name, ":", 4);
- etype->event_name = event_name;
-
- 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))
- {
- etype->type_cat = ETYPE_KEYBOARD;
- }
- else
- {
- etype->type_cat = ETYPE_TOOLKIT;
- }
-
- if (split_string[1])
- {
- etype->major = g_quark_from_string (split_string[1]);
- if (split_string[2])
- {
- 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 ("");
- }
- }
- else
- {
- etype->minor = etype->major;
- etype->detail = g_quark_from_static_string (""); //etype->major;
- }
- }
- else
- {
- etype->major = g_quark_from_static_string ("");
- etype->minor = etype->major;
- etype->detail = etype->major;
- }
-
- g_strfreev (split_string);
+ return dbus_message_new_method_return (message);
}
/**
* 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)
+static DBusMessage *
+impl_accessibility_registry_deregister_application (DBusConnection *bus, DBusMessage *message, void *user_data)
{
- SpiRegistry *registry = SPI_REGISTRY (bonobo_object_from_servant (servant));
+ SpiRegistry *registry = SPI_REGISTRY (user_data);
+ const char *application = dbus_message_get_sender (message);
spi_desktop_remove_application (registry->desktop, application);
#ifdef SPI_DEBUG
- fprintf (stderr, "de-registered app %p\n", application);
-#endif
-}
-
-static GList **
-get_listener_list (SpiRegistry *registry,
- EventTypeCategory cat)
-{
- GList **ret;
-
- switch (cat)
- {
- case ETYPE_OBJECT:
- case ETYPE_PROPERTY:
- case ETYPE_FOCUS:
- ret = ®istry->object_listeners;
- break;
- case ETYPE_WINDOW:
- ret = ®istry->window_listeners;
- break;
- case ETYPE_MOUSE:
- case ETYPE_TOOLKIT:
- ret = ®istry->toolkit_listeners;
- break;
- case ETYPE_KEYBOARD:
- default:
- ret = NULL;
- break;
- }
- return ret;
-}
-
-/*
- * CORBA Accessibility::Registry::registerGlobalEventListener method implementation
- */
-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);
+ fprintf (stderr, "de-registered app %s\n", application);
#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);
-
- if (list)
- {
- *list = g_list_prepend (*list, ls);
-
- if (etype.type_cat == ETYPE_TOOLKIT)
- {
- register_with_toolkits (registry, &etype, ev);
- }
- }
- else
- {
- spi_listener_struct_free (ls, ev);
- }
+ return dbus_message_new_method_return (message);
}
-static SpiReEntrantContinue
-remove_listener_cb (GList * const *list, gpointer user_data)
-{
- SpiListenerStruct *ls = (SpiListenerStruct *) (*list)->data;
- CORBA_Environment ev;
- Accessibility_EventListener listener = user_data;
-
- CORBA_exception_init (&ev);
-
- if (CORBA_Object_is_equivalent (ls->listener, listener, &ev))
- {
- spi_re_entrant_list_delete_link (list);
- spi_listener_struct_free (ls, &ev);
- }
-
- CORBA_exception_free (&ev);
-
- return SPI_RE_ENTRANT_CONTINUE;
-}
-
-/*
- * 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)
-{
- int i;
- GList **lists[3];
- SpiRegistry *registry = SPI_REGISTRY (bonobo_object_from_servant (servant));
-
- lists[0] = ®istry->object_listeners;
- lists[1] = ®istry->window_listeners;
- lists[2] = ®istry->toolkit_listeners;
-
- for (i = 0; i < sizeof (lists) / sizeof (lists[0]); i++)
- {
- spi_re_entrant_list_foreach (lists [i], remove_listener_cb, listener);
- }
-}
-
-
-/*
- * 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)
-{
- SpiRegistry *registry;
- EventTypeStruct etype;
-
- registry = SPI_REGISTRY (bonobo_object_from_servant (servant));
-
- parse_event_type (&etype, (char *) event_name);
-
- spi_re_entrant_list_foreach (get_listener_list (registry, etype.type_cat),
- remove_listener_cb, listener);
-}
-
-
/**
* getDesktopCount:
* return values: a short integer indicating the current number of
* Get the current number of desktops.
*
**/
-static short
-impl_accessibility_registry_get_desktop_count (PortableServer_Servant servant,
- CORBA_Environment * ev)
+static DBusMessage *
+impl_accessibility_registry_get_desktop_count (DBusConnection *bus, DBusMessage *message, void *user_data)
{
+ dbus_int16_t n_desktops = 1;
+ DBusMessage *reply;
+
/* TODO: implement support for multiple virtual desktops */
- CORBA_short n_desktops;
- n_desktops = (CORBA_short) 1;
- return n_desktops;
+ reply = dbus_message_new_method_return (message);
+ if (reply)
+ {
+ dbus_message_append_args (reply, DBUS_TYPE_INT16, &n_desktops, DBUS_TYPE_INVALID);
+ }
+ return reply;
}
-
/**
* getDesktop:
* @n: the index of 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)
+static DBusMessage *
+impl_accessibility_registry_get_desktop (DBusConnection *bus, DBusMessage *message, void *user_data)
{
- SpiRegistry *registry = SPI_REGISTRY (bonobo_object_from_servant (servant));
+ DBusError error;
+ dbus_int16_t n;
+ const char *path;
+ DBusMessage *reply;
/* TODO: implement support for multiple virtual desktops */
- if (n == 0)
- {
- return (Accessibility_Desktop)
- bonobo_object_dup_ref (BONOBO_OBJREF (registry->desktop), ev);
- }
- else
- {
- return (Accessibility_Desktop) CORBA_OBJECT_NIL;
- }
+ dbus_error_init (&error);
+ if (!dbus_message_get_args (message, &error, DBUS_TYPE_INT16, &n, DBUS_TYPE_INVALID))
+ {
+ return spi_dbus_general_error (message);
+ }
+ path = (n == 0? SPI_DBUS_PATH_DESKTOP: "/");
+ reply = dbus_message_new_method_return (message);
+ if (reply)
+ {
+ dbus_message_append_args (reply, DBUS_TYPE_STRING, &path, DBUS_TYPE_INVALID);
+ }
+ return reply;
}
* Get a list of accessible desktops.
*
**/
-static Accessibility_DesktopSeq *
-impl_accessibility_registry_get_desktop_list (PortableServer_Servant servant,
- CORBA_Environment * ev)
+static DBusMessage *
+impl_accessibility_registry_get_desktop_list (DBusConnection *bus, DBusMessage *message, void *user_data)
{
- SpiRegistry *registry = SPI_REGISTRY (bonobo_object_from_servant (servant));
- Accessibility_DesktopSeq *desktops;
-
- 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);
-
- return desktops;
+ DBusMessage *reply;
+ DBusMessageIter iter, iter_array;
+ const char *path = SPI_DBUS_PATH_DESKTOP;
+
+ reply = dbus_message_new_method_return (message);
+ if (!reply) return NULL;
+ dbus_message_iter_init_append(reply, &iter);
+ if (!dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, "o", &iter_array)) goto oom;
+ dbus_message_iter_append_basic(&iter_array, DBUS_TYPE_STRING, &path);
+ if (!dbus_message_iter_close_container (&iter, &iter_array)) goto oom;
+ return reply;
+oom:
+ // TODO: handle out-of-memory
+ return reply;
}
-static Accessibility_DeviceEventController
-impl_accessibility_registry_get_device_event_controller (PortableServer_Servant servant,
- CORBA_Environment *ev)
-{
- SpiRegistry *registry = SPI_REGISTRY (bonobo_object_from_servant (servant));
-
- if (!registry->de_controller)
- {
- registry->de_controller = spi_device_event_controller_new (registry);
- }
-
- return bonobo_object_dup_ref (BONOBO_OBJREF (registry->de_controller), ev);
-}
-
-typedef struct {
- CORBA_Environment *ev;
- Bonobo_Unknown source;
- EventTypeStruct etype;
- Accessibility_Event e_out;
-} NotifyContext;
-
-static SpiReEntrantContinue
-notify_listeners_cb (GList * const *list, gpointer user_data)
+static DBusMessage *
+impl_accessibility_registry_get_device_event_controller (DBusConnection *bus, DBusMessage *message, void *user_data)
{
- SpiListenerStruct *ls;
- NotifyContext *ctx = user_data;
-#ifdef SPI_DEBUG
- CORBA_string s;
-#endif
-
- ls = (*list)->data;
-
-#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
- 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);
-#endif
-
- ctx->e_out.source = CORBA_Object_duplicate (ctx->source, ctx->ev);
- if (BONOBO_EX (ctx->ev))
- {
- return SPI_RE_ENTRANT_CONTINUE;
- }
-
- 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)));
- if (ctx->ev->_major == CORBA_SYSTEM_EXCEPTION)
- CORBA_exception_init (ctx->ev);
- /* clear system exception on notify, it means listener is dead but
- * that's no concern of the event source :-) */
- }
- }
- else /* dup re-entered */
- {
- CORBA_Object_release (ctx->e_out.source, ctx->ev);
- }
- }
-
- return SPI_RE_ENTRANT_CONTINUE;
+ DBusMessage *reply;
+ const char *path = SPI_DBUS_PATH_DEC;
+
+ reply = dbus_message_new_method_return (message);
+ if (reply)
+ {
+ dbus_message_append_args (reply, DBUS_TYPE_STRING, &path, DBUS_TYPE_INVALID);
+ }
+ return reply;
}
-static void
-impl_registry_notify_event (PortableServer_Servant servant,
- const Accessibility_Event *e,
- CORBA_Environment *ev)
-{
- SpiRegistry *registry;
- GList **list;
- NotifyContext ctx;
-
- registry = SPI_REGISTRY (bonobo_object_from_servant (servant));
-
- parse_event_type (&ctx.etype, e->type);
-
- list = get_listener_list (registry, ctx.etype.type_cat);
-
- if (list && *list)
- {
- ctx.ev = ev;
- ctx.e_out = *e;
- CORBA_any__copy (&ctx.e_out.any_data, &e->any_data);
- ctx.source = e->source;
- spi_re_entrant_list_foreach (list, notify_listeners_cb, &ctx);
- }
-}
static void
spi_registry_class_init (SpiRegistryClass *klass)
{
GObjectClass * object_class = (GObjectClass *) klass;
- POA_Accessibility_Registry__epv *epv = &klass->epv;
- spi_registry_parent_class = g_type_class_ref (SPI_LISTENER_TYPE);
+ spi_registry_parent_class = g_type_class_ref (G_TYPE_OBJECT);
object_class->finalize = spi_registry_object_finalize;
-
- klass->parent_class.epv.notifyEvent = impl_registry_notify_event;
-
- 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;
}
+static DBusObjectPathVTable droute_vtable =
+{
+ NULL,
+ &droute_message,
+ NULL, NULL, NULL, NULL
+};
+
static void
spi_registry_init (SpiRegistry *registry)
{
+ DBusError error;
+
spi_registry_set_debug (g_getenv ("AT_SPI_DEBUG"));
- registry->object_listeners = NULL;
- registry->window_listeners = NULL;
- registry->toolkit_listeners = NULL;
+ /*
+ * 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->exit_notify_timeout = 200;
+ registry->queue_handler_id = 0;
+
+ dbus_error_init (&error);
+ registry->droute.bus = dbus_bus_get(DBUS_BUS_SESSION, &error);
+ if (!registry->droute.bus)
+ {
+ g_warning("Couldn't connect to dbus: %s\n", error.message);
+ return;
+ }
+ spi_registry_initialize_registry_interface (®istry->droute);
+ spi_registry_initialize_desktop_interface (®istry->droute);
+ spi_registry_initialize_dec_interface (®istry->droute);
+ // todo: initialize accessible and component interfaces, for desktop?
+ if (!dbus_connection_try_register_fallback (registry->droute.bus, "/org/freedesktop/atspi", &droute_vtable, ®istry->droute, &error))
+ {
+ g_warning("Couldn't register droute.\n");
+ }
+ dbus_connection_setup_with_g_main(registry->droute.bus, g_main_context_default());
+
+ // TODO: decide whether focus_object is still relevant
registry->desktop = spi_desktop_new ();
/* Register callback notification for application addition and removal */
g_signal_connect (G_OBJECT (registry->desktop),
registry->de_controller = spi_device_event_controller_new (registry);
}
-BONOBO_TYPE_FUNC_FULL (SpiRegistry,
- Accessibility_Registry,
- PARENT_TYPE,
- spi_registry);
-
SpiRegistry *
spi_registry_new (void)
{
SpiRegistry *retval = g_object_new (SPI_REGISTRY_TYPE, NULL);
- bonobo_object_set_immortal (BONOBO_OBJECT (retval), TRUE);
return retval;
}
+
+static DRouteMethod methods[] =
+{
+ { impl_accessibility_registry_register_application , "registerApplication" },
+ { impl_accessibility_registry_deregister_application, "deregisterApplication" },
+ { impl_accessibility_registry_get_desktop_count, "getDesktopCount" },
+ { impl_accessibility_registry_get_desktop, "getDesktop" },
+ { impl_accessibility_registry_get_desktop_list, "getDesktopList" },
+ { impl_accessibility_registry_get_device_event_controller, "getDeviceEventController" },
+ { NULL, NULL }
+};
+
+void
+spi_registry_initialize_registry_interface (DRouteData * data)
+{
+ droute_add_interface (data, "org.freedesktop.atspi.Registry", methods,
+ NULL, NULL, NULL);
+};
projects / platform / core / uifw / at-spi2-atk.git / blobdiff