X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=bus%2Fat-spi-bus-launcher.c;h=261353f9a2431eb56eaf97a0b2f467005c4f8bbf;hb=15140f5a10127ef50c73230b395991efb9ab3219;hp=290ccbde4d4f42c054be93969e0bf59ef773fe5e;hpb=166209e13b1eae0b6b239c868ae532702032831f;p=platform%2Fupstream%2Fat-spi2-core.git diff --git a/bus/at-spi-bus-launcher.c b/bus/at-spi-bus-launcher.c index 290ccbd..261353f 100644 --- a/bus/at-spi-bus-launcher.c +++ b/bus/at-spi-bus-launcher.c @@ -30,8 +30,10 @@ #include #include +#ifdef HAVE_X11 #include #include +#endif typedef enum { A11Y_BUS_STATE_IDLE = 0, @@ -44,8 +46,12 @@ typedef struct { GMainLoop *loop; gboolean launch_immediately; gboolean a11y_enabled; + gboolean screen_reader_enabled; GDBusConnection *session_bus; - GSettings *desktop_schema; + GSettings *a11y_schema; + GSettings *interface_schema; + + GDBusProxy *client_proxy; A11yBusState state; /* -1 == error, 0 == pending, > 0 == running */ @@ -66,11 +72,150 @@ static const gchar introspection_xml[] = " " "" "" + "" "" ""; static GDBusNodeInfo *introspection_data = NULL; static void +respond_to_end_session (GDBusProxy *proxy) +{ + GVariant *parameters; + + parameters = g_variant_new ("(bs)", TRUE, ""); + + g_dbus_proxy_call (proxy, + "EndSessionResponse", parameters, + G_DBUS_CALL_FLAGS_NONE, + -1, NULL, NULL, NULL); +} + +static void +g_signal_cb (GDBusProxy *proxy, + gchar *sender_name, + gchar *signal_name, + GVariant *parameters, + gpointer user_data) +{ + A11yBusLauncher *app = user_data; + + if (g_strcmp0 (signal_name, "QueryEndSession") == 0) + respond_to_end_session (proxy); + else if (g_strcmp0 (signal_name, "EndSession") == 0) + respond_to_end_session (proxy); + else if (g_strcmp0 (signal_name, "Stop") == 0) + g_main_loop_quit (app->loop); +} + +static void +client_proxy_ready_cb (GObject *source_object, + GAsyncResult *res, + gpointer user_data) +{ + A11yBusLauncher *app = user_data; + GError *error = NULL; + + app->client_proxy = g_dbus_proxy_new_for_bus_finish (res, &error); + + if (error != NULL) + { + g_warning ("Failed to get a client proxy: %s", error->message); + g_error_free (error); + + return; + } + + g_signal_connect (app->client_proxy, "g-signal", + G_CALLBACK (g_signal_cb), app); +} + +static void +register_client (A11yBusLauncher *app) +{ + GDBusProxyFlags flags; + GDBusProxy *sm_proxy; + GError *error; + const gchar *app_id; + const gchar *autostart_id; + gchar *client_startup_id; + GVariant *parameters; + GVariant *variant; + gchar *object_path; + + flags = G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES | + G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS; + + error = NULL; + sm_proxy = g_dbus_proxy_new_sync (app->session_bus, flags, NULL, + "org.gnome.SessionManager", + "/org/gnome/SessionManager", + "org.gnome.SessionManager", + NULL, &error); + + if (error != NULL) + { + g_warning ("Failed to get session manager proxy: %s", error->message); + g_error_free (error); + + return; + } + + app_id = "at-spi-bus-launcher"; + autostart_id = g_getenv ("DESKTOP_AUTOSTART_ID"); + + if (autostart_id != NULL) + { + client_startup_id = g_strdup (autostart_id); + g_unsetenv ("DESKTOP_AUTOSTART_ID"); + } + else + { + client_startup_id = g_strdup (""); + } + + parameters = g_variant_new ("(ss)", app_id, client_startup_id); + g_free (client_startup_id); + + error = NULL; + variant = g_dbus_proxy_call_sync (sm_proxy, + "RegisterClient", parameters, + G_DBUS_CALL_FLAGS_NONE, + -1, NULL, &error); + + g_object_unref (sm_proxy); + + if (error != NULL) + { + g_warning ("Failed to register client: %s", error->message); + g_error_free (error); + + return; + } + + g_variant_get (variant, "(o)", &object_path); + g_variant_unref (variant); + + flags = G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES; + g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION, flags, NULL, + "org.gnome.SessionManager", object_path, + "org.gnome.SessionManager.ClientPrivate", + NULL, client_proxy_ready_cb, app); + + g_free (object_path); +} + +static void +name_appeared_handler (GDBusConnection *connection, + const gchar *name, + const gchar *name_owner, + gpointer user_data) +{ + A11yBusLauncher *app = user_data; + + register_client (app); +} + +static void setup_bus_child (gpointer data) { A11yBusLauncher *app = data; @@ -138,11 +283,17 @@ ensure_a11y_bus (A11yBusLauncher *app) char *argv[] = { DBUS_DAEMON, NULL, "--nofork", "--print-address", "3", NULL }; char addr_buf[2048]; GError *error = NULL; + const char *config_path = NULL; if (app->a11y_bus_pid != 0) return FALSE; - - argv[1] = g_strdup_printf ("--config-file=%s/at-spi2/accessibility.conf", SYSCONFDIR); + + if (g_file_test (SYSCONFDIR"/at-spi2/accessibility.conf", G_FILE_TEST_EXISTS)) + config_path = "--config-file="SYSCONFDIR"/at-spi2/accessibility.conf"; + else + config_path = "--config-file="DATADIR"/defaults/at-spi2/accessibility.conf"; + + argv[1] = config_path; if (pipe (app->pipefd) < 0) g_error ("Failed to create pipe: %s", strerror (errno)); @@ -184,6 +335,7 @@ ensure_a11y_bus (A11yBusLauncher *app) app->a11y_bus_address = g_strchomp (g_strdup (addr_buf)); g_debug ("a11y bus address: %s", app->a11y_bus_address); +#ifdef HAVE_X11 { Display *display = XOpenDisplay (NULL); if (display) @@ -198,6 +350,7 @@ ensure_a11y_bus (A11yBusLauncher *app) XCloseDisplay (display); } } +#endif return TRUE; @@ -246,9 +399,9 @@ handle_get_property (GDBusConnection *connection, A11yBusLauncher *app = user_data; if (g_strcmp0 (property_name, "IsEnabled") == 0) - { - return g_variant_new ("b", app->a11y_enabled); - } + return g_variant_new ("b", app->a11y_enabled); + else if (g_strcmp0 (property_name, "ScreenReaderEnabled") == 0) + return g_variant_new ("b", app->screen_reader_enabled); else return NULL; } @@ -257,29 +410,77 @@ static void handle_a11y_enabled_change (A11yBusLauncher *app, gboolean enabled, gboolean notify_gsettings) { - GVariantBuilder *builder; - GVariantBuilder *invalidated_builder; + GVariantBuilder builder; + GVariantBuilder invalidated_builder; if (enabled == app->a11y_enabled) return; app->a11y_enabled = enabled; - if (notify_gsettings && app->desktop_schema) - g_settings_set_boolean (app->desktop_schema, "toolkit-accessibility", - enabled); + if (notify_gsettings && app->interface_schema) + { + g_settings_set_boolean (app->interface_schema, "toolkit-accessibility", + enabled); + g_settings_sync (); + } + + g_variant_builder_init (&builder, G_VARIANT_TYPE_ARRAY); + g_variant_builder_init (&invalidated_builder, G_VARIANT_TYPE ("as")); + g_variant_builder_add (&builder, "{sv}", "IsEnabled", + g_variant_new_boolean (enabled)); + + g_dbus_connection_emit_signal (app->session_bus, NULL, "/org/a11y/bus", + "org.freedesktop.DBus.Properties", + "PropertiesChanged", + g_variant_new ("(sa{sv}as)", "org.a11y.Status", + &builder, + &invalidated_builder), + NULL); + + g_variant_builder_clear (&builder); + g_variant_builder_clear (&invalidated_builder); +} + +static void +handle_screen_reader_enabled_change (A11yBusLauncher *app, gboolean enabled, + gboolean notify_gsettings) +{ + GVariantBuilder builder; + GVariantBuilder invalidated_builder; + + if (enabled == app->screen_reader_enabled) + return; + + /* If the screen reader is being enabled, we should enable accessibility + * if it isn't enabled already */ + if (enabled) + handle_a11y_enabled_change (app, enabled, notify_gsettings); + + app->screen_reader_enabled = enabled; + + if (notify_gsettings && app->a11y_schema) + { + g_settings_set_boolean (app->a11y_schema, "screen-reader-enabled", + enabled); + g_settings_sync (); + } - builder = g_variant_builder_new (G_VARIANT_TYPE_ARRAY); - invalidated_builder = g_variant_builder_new (G_VARIANT_TYPE ("as")); - g_variant_builder_add (builder, "{sv}", "IsEnabled", + g_variant_builder_init (&builder, G_VARIANT_TYPE_ARRAY); + g_variant_builder_init (&invalidated_builder, G_VARIANT_TYPE ("as")); + g_variant_builder_add (&builder, "{sv}", "ScreenReaderEnabled", g_variant_new_boolean (enabled)); g_dbus_connection_emit_signal (app->session_bus, NULL, "/org/a11y/bus", - "org.freedesktop.DBus", "PropertiesChanged", + "org.freedesktop.DBus.Properties", + "PropertiesChanged", g_variant_new ("(sa{sv}as)", "org.a11y.Status", - builder, - invalidated_builder), + &builder, + &invalidated_builder), NULL); + + g_variant_builder_clear (&builder); + g_variant_builder_clear (&invalidated_builder); } static gboolean @@ -293,21 +494,28 @@ handle_set_property (GDBusConnection *connection, gpointer user_data) { A11yBusLauncher *app = user_data; + const gchar *type = g_variant_get_type_string (value); + gboolean enabled; + + if (g_strcmp0 (type, "b") != 0) + { + g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS, + "org.a11y.Status.%s expects a boolean but got %s", property_name, type); + return FALSE; + } + + enabled = g_variant_get_boolean (value); if (g_strcmp0 (property_name, "IsEnabled") == 0) { - const gchar *type = g_variant_get_type_string (value); - gboolean enabled; - if (g_strcmp0 (type, "b") != 0) - { - g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS, - "org.a11y.Status.IsEnabled expects a boolean but got %s", type); - return FALSE; - } - enabled = g_variant_get_boolean (value); handle_a11y_enabled_change (app, enabled, TRUE); return TRUE; } + else if (g_strcmp0 (property_name, "ScreenReaderEnabled") == 0) + { + handle_screen_reader_enabled_change (app, enabled, TRUE); + return TRUE; + } else { g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS, @@ -365,15 +573,18 @@ on_bus_acquired (GDBusConnection *connection, NULL, &error); if (registration_id == 0) - g_error ("%s", error->message); + { + g_error ("%s", error->message); + g_clear_error (&error); + } g_dbus_connection_register_object (connection, - "/org/a11y/bus", - introspection_data->interfaces[1], - &status_vtable, - _global_app, - NULL, - &error); + "/org/a11y/bus", + introspection_data->interfaces[1], + &status_vtable, + _global_app, + NULL, + NULL); } static void @@ -394,8 +605,11 @@ on_name_acquired (GDBusConnection *connection, const gchar *name, gpointer user_data) { - A11yBusLauncher *app = user_data; - (void) app; + g_bus_watch_name (G_BUS_TYPE_SESSION, + "org.gnome.SessionManager", + G_BUS_NAME_WATCHER_FLAGS_NONE, + name_appeared_handler, NULL, + user_data, NULL); } static int sigterm_pipefd[2]; @@ -437,6 +651,7 @@ init_sigterm_handling (A11yBusLauncher *app) static gboolean already_running () { +#ifdef HAVE_X11 Atom AT_SPI_BUS; Atom actual_type; Display *bridge_display; @@ -461,12 +676,8 @@ already_running () if (data) { GDBusConnection *bus; - GError *error = NULL; - const gchar *old_session = g_getenv ("DBUS_SESSION_BUS_ADDRESS"); - /* TODO: Is there a better way to connect? This is really hacky */ - g_setenv ("DBUS_SESSION_BUS_ADDRESS", data, TRUE); - bus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error); - g_setenv ("DBUS_SESSION_BUS_ADDRESS", old_session, TRUE); + bus = g_dbus_connection_new_for_address_sync ((const gchar *)data, 0, + NULL, NULL, NULL); if (bus != NULL) { result = TRUE; @@ -476,10 +687,13 @@ already_running () XCloseDisplay (bridge_display); return result; +#else + return FALSE; +#endif } static GSettings * -get_desktop_schema () +get_schema (const gchar *name) { const char * const *schemas = NULL; gint i; @@ -487,7 +701,7 @@ get_desktop_schema () schemas = g_settings_list_schemas (); for (i = 0; schemas[i]; i++) { - if (!strcmp (schemas[i], "org.gnome.desktop.interface")) + if (!strcmp (schemas[i], name)) return g_settings_new (schemas[i]); } @@ -500,10 +714,10 @@ gsettings_key_changed (GSettings *gsettings, const gchar *key, void *user_data) gboolean new_val = g_settings_get_boolean (gsettings, key); A11yBusLauncher *app = user_data; - if (strcmp (key, "toolkit-accessibility") != 0) - return; - - handle_a11y_enabled_change (_global_app, new_val, FALSE); + if (!strcmp (key, "toolkit-accessibility")) + handle_a11y_enabled_change (_global_app, new_val, FALSE); + else if (!strcmp (key, "screen-reader-enabled")) + handle_screen_reader_enabled_change (_global_app, new_val, FALSE); } int @@ -515,10 +729,9 @@ main (int argc, GDBusConnection *session_bus; int name_owner_id; gboolean a11y_set = FALSE; + gboolean screen_reader_set = FALSE; gint i; - g_type_init (); - if (already_running ()) return 0; @@ -529,26 +742,42 @@ main (int argc, { if (!strcmp (argv[i], "--launch-immediately")) _global_app->launch_immediately = TRUE; - else if (sscanf (argv[i], "--a11y=%d", &_global_app->a11y_enabled) == 2) + else if (sscanf (argv[i], "--a11y=%d", &_global_app->a11y_enabled) == 1) a11y_set = TRUE; + else if (sscanf (argv[i], "--screen-reader=%d", + &_global_app->screen_reader_enabled) == 1) + screen_reader_set = TRUE; else - g_error ("usage: %s [--launch-immediately] [--a11y=0|1]", argv[0]); + g_error ("usage: %s [--launch-immediately] [--a11y=0|1] [--screen-reader=0|1]", argv[0]); } - _global_app->desktop_schema = get_desktop_schema (); + _global_app->interface_schema = get_schema ("org.gnome.desktop.interface"); + _global_app->a11y_schema = get_schema ("org.gnome.desktop.a11y.applications"); if (!a11y_set) { - _global_app->a11y_enabled = _global_app->desktop_schema - ? g_settings_get_boolean (_global_app->desktop_schema, "toolkit-accessibility") + _global_app->a11y_enabled = _global_app->interface_schema + ? g_settings_get_boolean (_global_app->interface_schema, "toolkit-accessibility") : _global_app->launch_immediately; } - if (_global_app->desktop_schema) - g_signal_connect (_global_app->desktop_schema, + if (!screen_reader_set) + { + _global_app->screen_reader_enabled = _global_app->a11y_schema + ? g_settings_get_boolean (_global_app->a11y_schema, "screen-reader-enabled") + : FALSE; + } + + if (_global_app->interface_schema) + g_signal_connect (_global_app->interface_schema, "changed::toolkit-accessibility", G_CALLBACK (gsettings_key_changed), _global_app); + if (_global_app->a11y_schema) + g_signal_connect (_global_app->a11y_schema, + "changed::screen-reader-enabled", + G_CALLBACK (gsettings_key_changed), _global_app); + init_sigterm_handling (_global_app); introspection_data = g_dbus_node_info_new_for_xml (introspection_xml, NULL); @@ -572,6 +801,7 @@ main (int argc, * GDM is launching a login on an X server it was using before, * we don't want early login processes to pick up the stale address. */ +#ifdef HAVE_X11 { Display *display = XOpenDisplay (NULL); if (display) @@ -585,6 +815,7 @@ main (int argc, XCloseDisplay (display); } } +#endif if (_global_app->a11y_launch_error_message) {