* Boston, MA 02111-1307, USA.
*/
-#ifdef AT_SPI_DEBUG
#include <stdlib.h>
-#endif
-
#include <config.h>
#include <string.h>
-#include <gdk/gdkx.h>
#include <glib/gmain.h>
+
+#include <spi-common/spi-dbus.h>
+#include <droute/droute.h>
+
#include "registry.h"
+#include "deviceeventcontroller.h"
-#define spi_get_display() GDK_DISPLAY()
+#if !defined ATSPI_INTROSPECTION_PATH
+ #error "No introspection XML directory defined"
+#endif
-static void registry_set_ior (SpiRegistry *registry);
+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}
+};
int
main (int argc, char **argv)
{
- int ret;
- char *obj_id;
- const char *display_name;
- char *cp, *dp;
SpiRegistry *registry;
- DBusError error;
+ SpiDEController *dec;
+ DRouteContext *droute;
+ gchar *introspection_directory;
+
GMainLoop *mainloop;
+ DBusConnection *bus;
+
+ GOptionContext *opt;
+
+ GError *err = NULL;
+ DBusError error;
+ int ret;
g_type_init();
- obj_id = "OAFIID:Accessibility_Registry:1.0";
+ /* 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);
- registry = spi_registry_new ();
+ if (dbus_name == NULL)
+ dbus_name = SPI_DBUS_NAME_REGISTRY;
- display_name = g_getenv ("AT_SPI_DISPLAY");
- if (!display_name)
+ dbus_error_init (&error);
+ bus = dbus_bus_get(DBUS_BUS_SESSION, &error);
+ if (!bus)
{
- display_name = g_getenv ("DISPLAY");
- cp = strrchr (display_name, '.');
- dp = strrchr (display_name, ':');
- if (cp && dp && (cp > dp)) *cp = '\0';
+ g_warning("Couldn't connect to dbus: %s\n", error.message);
}
- dbus_error_init (&error);
mainloop = g_main_loop_new (NULL, FALSE);
- ret= dbus_bus_request_name(registry->droute.bus, SPI_DBUS_NAME_REGISTRY, 0, &error);
+ dbus_connection_setup_with_g_main(bus, g_main_context_default());
- if (!ret)
+ ret = dbus_bus_request_name(bus, dbus_name, DBUS_NAME_FLAG_DO_NOT_QUEUE, &error);
+ if (ret == DBUS_REQUEST_NAME_REPLY_EXISTS)
{
-#ifdef AT_SPI_DEBUG
- fprintf (stderr, "SpiRegistry Message: SpiRegistry daemon was already running.\n");
-#endif
+ g_error("Could not obtain D-Bus name - %s\n", dbus_name);
}
else
{
-#ifdef AT_SPI_DEBUG
- fprintf (stderr, "SpiRegistry Message: SpiRegistry daemon is running.\n");
-#endif
- registry_set_ior (registry);
- g_main_loop_run (mainloop);
+ g_print ("SpiRegistry daemon is running with well-known name - %s\n", dbus_name);
}
- return 0;
-}
+ /* Get D-Bus introspection directory */
+ introspection_directory = (char *) g_getenv("ATSPI_INTROSPECTION_PATH");
+ if (introspection_directory == NULL)
+ introspection_directory = ATSPI_INTROSPECTION_PATH;
-static void
-registry_set_ior (SpiRegistry *registry){
- Atom AT_SPI_IOR = XInternAtom (spi_get_display (), "AT_SPI_IOR", FALSE);
- char *iorstring = NULL;
+ /* Set up D-Route for use by the dec */
+ droute = droute_new (bus, introspection_directory);
- iorstring = SPI_DBUS_NAME_REGISTRY;
+ registry = spi_registry_new (bus, droute);
+ dec = spi_registry_dec_new (registry, bus, droute);
- XChangeProperty (spi_get_display(),
- XDefaultRootWindow (spi_get_display ()),
- AT_SPI_IOR, (Atom) 31, 8,
- PropModeReplace,
- (unsigned char *) iorstring,
- iorstring ? strlen (iorstring) : 0);
+ g_main_loop_run (mainloop);
+ return 0;
}