X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=registryd%2Fregistry-main.c;h=d8b5dc58793439eb905e3f30034a4f4d048d0223;hb=b6f20b2db69e9b0d89f061546590a705b5f72ab2;hp=a5dc5babefe93dc369b99bdbd7c26052f889c822;hpb=1591741a68e87b54d8fd56615f85d80778f8a5dd;p=platform%2Fupstream%2Fat-spi2-core.git diff --git a/registryd/registry-main.c b/registryd/registry-main.c index a5dc5ba..d8b5dc5 100644 --- a/registryd/registry-main.c +++ b/registryd/registry-main.c @@ -25,88 +25,244 @@ #include #include #include +#include +#include +#include -#include +#include #include "paths.h" #include "registry.h" #include "deviceeventcontroller.h" +#include "atspi/atspi.h" -#if !defined ATSPI_INTROSPECTION_PATH - #error "No introspection XML directory defined" -#endif - +static GMainLoop *mainloop; static gchar *dbus_name = NULL; +static gboolean use_gnome_session = FALSE; static GOptionEntry optentries[] = { {"dbus-name", 0, 0, G_OPTION_ARG_STRING, &dbus_name, "Well-known name to register with D-Bus", NULL}, + {"use-gnome-session", 0, 0, G_OPTION_ARG_NONE, &use_gnome_session, "Should register with gnome session manager", NULL}, {NULL} }; +static GDBusProxy *sm_proxy = NULL; +static char *client_id = NULL; +static GDBusProxy *client_proxy = NULL; + +#define SM_DBUS_NAME "org.gnome.SessionManager" +#define SM_DBUS_PATH "/org/gnome/SessionManager" +#define SM_DBUS_INTERFACE "org.gnome.SessionManager" + +#define SM_CLIENT_DBUS_INTERFACE "org.gnome.SessionManager.ClientPrivate" + +static gboolean register_client (void); + +static void +on_session_signal (GDBusProxy *proxy, + gchar *sender_name, + gchar *signal_name, + GVariant *parameters, + gpointer user_data) +{ + if (g_strcmp0 (signal_name, "SessionOver") == 0) { + g_main_loop_quit (mainloop); + } else if (g_strcmp0 (signal_name, "SessionRunning") == 0) { + if (!register_client ()) + g_warning ("Unable to register client with session manager"); + } +} + +static gboolean +session_manager_connect (void) +{ + GVariant *res; + gboolean is_running; + + sm_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION, 0, NULL, + SM_DBUS_NAME, + SM_DBUS_PATH, + SM_DBUS_INTERFACE, NULL, NULL); + + res = g_dbus_proxy_call_sync (sm_proxy, + "IsSessionRunning", NULL, + 0, 1000, NULL, NULL); + + if (res) { + g_variant_get (res, "(b)", &is_running); + g_variant_unref (res); + if (is_running) { + if (!register_client ()) + g_warning ("Unable to register client with session manager"); + } + } + + g_signal_connect (G_OBJECT (sm_proxy), "g-signal", + G_CALLBACK (on_session_signal), NULL); + + return (sm_proxy != NULL); +} + +static gboolean +end_session_response (gboolean is_okay, const gchar *reason) +{ + GVariant *ret; + GError *error = NULL; + + if (!reason) + reason = ""; + + ret = g_dbus_proxy_call_sync (client_proxy, "EndSessionResponse", + g_variant_new ("(bs)", is_okay, reason), + 0, 1000, NULL, &error); + + if (!ret) { + g_warning ("Failed to send session response %s", error->message); + g_error_free (error); + return FALSE; + } + else + g_variant_unref (ret); + + return TRUE; +} + +static void +client_proxy_signal_cb (GDBusProxy *proxy, + gchar *sender_name, + gchar *signal_name, + GVariant *parameters, + gpointer user_data) +{ + if (g_strcmp0 (signal_name, "QueryEndSession") == 0) { + g_debug ("Got QueryEndSession signal"); + end_session_response (TRUE, NULL); + } else if (g_strcmp0 (signal_name, "EndSession") == 0) { + g_debug ("Got EndSession signal"); + end_session_response (TRUE, NULL); + g_main_loop_quit (mainloop); + } else if (g_strcmp0 (signal_name, "Stop") == 0) { + g_debug ("Got Stop signal"); + g_main_loop_quit (mainloop); + } +} + +static gboolean +register_client (void) +{ + GError *error; + GVariant *res; + const char *startup_id; + const char *app_id; + + if (client_proxy) + return TRUE; + + startup_id = g_getenv ("DESKTOP_AUTOSTART_ID"); + if (!startup_id) + startup_id = ""; + app_id = "at-spi-registryd.desktop"; + + error = NULL; + res = g_dbus_proxy_call_sync (sm_proxy, + "RegisterClient", + g_variant_new ("(ss)", app_id, + startup_id), + 0, 1000, NULL, &error); + if (! res) { + const char *message = (error && error->message ? error->message + : "no error"); + g_warning ("Failed to register client: %s", message); + if (error) + g_error_free (error); + return FALSE; + } + g_variant_get (res, "(o)", &client_id); + g_variant_unref (res); + + client_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION, 0, NULL, + SM_DBUS_NAME, + client_id, + SM_CLIENT_DBUS_INTERFACE, + NULL, NULL); + + g_signal_connect (client_proxy, "g-signal", + G_CALLBACK (client_proxy_signal_cb), NULL); + + g_unsetenv ("DESKTOP_AUTOSTART_ID"); + + return TRUE; +} + +/*---------------------------------------------------------------------------*/ + + +/*---------------------------------------------------------------------------*/ + +typedef GObject *(*gconf_client_get_default_t) (); +typedef gboolean (*gconf_client_get_bool_t)(GObject *, const char *, void *); + int main (int argc, char **argv) { SpiRegistry *registry; SpiDEController *dec; - DRouteContext *droute; - gchar *introspection_directory; - GMainLoop *mainloop; - DBusConnection *bus; + DBusConnection *bus = NULL; 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); + g_clear_error (&err); + } if (dbus_name == NULL) dbus_name = SPI_DBUS_NAME_REGISTRY; - dbus_error_init (&error); - bus = dbus_bus_get(DBUS_BUS_SESSION, &error); + bus = atspi_get_a11y_bus (); if (!bus) { - g_warning("Couldn't connect to dbus: %s\n", error.message); + return 0; } mainloop = g_main_loop_new (NULL, FALSE); - dbus_connection_setup_with_g_main(bus, g_main_context_default()); + atspi_dbus_connection_setup_with_g_main(bus, NULL); - ret = dbus_bus_request_name(bus, dbus_name, DBUS_NAME_FLAG_DO_NOT_QUEUE, &error); + ret = dbus_bus_request_name(bus, dbus_name, DBUS_NAME_FLAG_DO_NOT_QUEUE, NULL); if (ret == DBUS_REQUEST_NAME_REPLY_EXISTS) { - g_error("Could not obtain D-Bus name - %s\n", dbus_name); + exit (0); /* most likely already running */ } else { g_print ("SpiRegistry daemon is running with well-known name - %s\n", dbus_name); } - /* Get D-Bus introspection directory */ - introspection_directory = (char *) g_getenv("ATSPI_INTROSPECTION_PATH"); - if (introspection_directory == NULL) - introspection_directory = ATSPI_INTROSPECTION_PATH; - - /* Set up D-Route for use by the dec */ - droute = droute_new (bus, introspection_directory); + registry = spi_registry_new (bus); + dec = spi_registry_dec_new (registry, bus); - registry = spi_registry_new (bus, droute); - dec = spi_registry_dec_new (registry, bus, droute); + if (use_gnome_session) + { + if (!session_manager_connect ()) + g_warning ("Unable to connect to session manager"); + } g_main_loop_run (mainloop); + + dbus_connection_close (bus); + dbus_connection_unref (bus); + g_object_unref (dec); + g_object_unref (registry); + return 0; }