* AT-SPI - Assistive Technology Service Provider Interface
* (Gnome Accessibility Project; http://developer.gnome.org/projects/gap)
*
- * Copyright 2001 Sun Microsystems Inc.
+ * Copyright 2001, 2002 Sun Microsystems Inc.,
+ * Copyright 2001, 2002 Ximian, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* Boston, MA 02111-1307, USA.
*/
-#ifdef AT_SPI_DEBUG
#include <stdlib.h>
-#endif
-
-#include <libbonobo.h>
+#include <config.h>
+#include <string.h>
#include <glib/gmain.h>
+
+#include <spi-common/spi-dbus.h>
+#include <droute/droute.h>
+
#include "registry.h"
+#include "deviceeventcontroller.h"
+
+static gchar *dbus_name = NULL;
+
+static GOptionEntry optentries[] =
+{
+ {"dbus-name", 0, 0, G_OPTION_ARG_STRING, &dbus_name, "Well-known name to register with D-Bus", NULL},
+ {NULL}
+};
+
+static DBusObjectPathVTable droute_vtable =
+{
+ NULL,
+ &droute_message,
+ NULL, NULL, NULL, NULL
+};
int
-main (int argc,
- char **argv)
+main (int argc, char **argv)
{
- SpiRegistry *registry;
- GSource *keyevent_source;
- char *obj_id;
-
- if (!bonobo_init (&argc, argv))
- {
- g_error ("Could not initialize oaf / Bonobo");
- }
-
- obj_id = "OAFIID:Accessibility_Registry:proto0.1";
-
- registry = spi_registry_new ();
-
- bonobo_activation_active_server_register (
- obj_id,
- bonobo_object_corba_objref (bonobo_object (registry)));
-
-#ifdef AT_SPI_DEBUG
- fprintf (stderr, "SpiRegistry Message: SpiRegistry daemon is running.\n");
-#endif
-
- gdk_init(&argc, &argv);
- g_timeout_add_full (G_PRIORITY_HIGH_IDLE, 200, registry->kbd_event_hook, registry, NULL);
-/* keyevent_source =
- g_source_new (registry->kbd_event_hook, sizeof (GSourceFunc));
- g_source_attach (keyevent_source, g_main_context_default());*/
- bonobo_main ();
-
- return 0;
-}
+ SpiRegistry *registry;
+ SpiDEController *dec;
+ DRouteData droute;
+
+ GMainLoop *mainloop;
+ DBusConnection *bus;
+
+ GOptionContext *opt;
+ GError *err = NULL;
+ DBusError error;
+ int ret;
+ g_type_init();
+ /* We depend on GDK as well as XLib for device event processing */
+ gdk_init(&argc, &argv);
+
+ /*Parse command options*/
+ opt = g_option_context_new(NULL);
+ g_option_context_add_main_entries(opt, optentries, NULL);
+
+ if (!g_option_context_parse(opt, &argc, &argv, &err))
+ g_error("Option parsing failed: %s\n", err->message);
+
+ if (dbus_name == NULL)
+ dbus_name = SPI_DBUS_NAME_REGISTRY;
+
+ dbus_error_init (&error);
+ bus = dbus_bus_get(DBUS_BUS_SESSION, &error);
+ droute.bus = bus;
+ if (!bus)
+ {
+ g_warning("Couldn't connect to dbus: %s\n", error.message);
+ }
+
+ mainloop = g_main_loop_new (NULL, FALSE);
+ dbus_connection_setup_with_g_main(bus, g_main_context_default());
+
+ ret = dbus_bus_request_name(bus, dbus_name, DBUS_NAME_FLAG_DO_NOT_QUEUE, &error);
+ if (ret == DBUS_REQUEST_NAME_REPLY_EXISTS)
+ {
+ g_error("Could not obtain D-Bus name - %s\n", dbus_name);
+ }
+ else
+ {
+ g_print ("SpiRegistry daemon is running with well-known name - %s\n", dbus_name);
+ }
+
+ /* Set up D-Route for use by the dec */
+ if (!dbus_connection_register_object_path (droute.bus,
+ "/org/freedesktop/atspi/registry/deviceeventcontroller",
+ &droute_vtable,
+ &droute))
+ {
+ g_error("AT-SPI Registry daemon: Couldn't register droute.\n");
+ return 0;
+ }
+
+ registry = spi_registry_new (bus);
+ dec = spi_registry_dec_new (registry, &droute);
+ droute.user_data = dec;
+
+ g_main_loop_run (mainloop);
+ return 0;
+}