#include "seat-unity.h"
#include "configuration.h"
#include "unity-system-compositor.h"
-#include "x-server-local.h"
-#include "mir-server.h"
+#include "x-server-xmir.h"
#include "vt.h"
#include "plymouth.h"
/* System compositor */
UnitySystemCompositor *compositor;
- /* Next Mir ID to use for a Mir sessions, X server and greeters */
- gint next_session_id;
+ /* X server being used for XDMCP */
+ XServerXmir *xdmcp_x_server;
+
+ /* Next Mir ID to use for a Xmir servers */
gint next_x_server_id;
- gint next_greeter_id;
/* The currently visible session */
Session *active_session;
G_DEFINE_TYPE (SeatUnity, seat_unity, SEAT_TYPE);
-static gboolean
-seat_unity_get_start_local_sessions (Seat *seat)
-{
- return !seat_get_string_property (seat, "xdmcp-manager");
-}
+static XServerXmir *create_x_server (Seat *seat);
static void
seat_unity_setup (Seat *seat)
}
static void
-compositor_ready_cb (UnitySystemCompositor *compositor, SeatUnity *seat)
+check_stopped (SeatUnity *seat)
{
- l_debug (seat, "Compositor ready");
- SEAT_CLASS (seat_unity_parent_class)->start (SEAT (seat));
+ if (!seat->priv->compositor && !seat->priv->xdmcp_x_server)
+ SEAT_CLASS (seat_unity_parent_class)->stop (SEAT (seat));
}
static void
-compositor_stopped_cb (UnitySystemCompositor *compositor, SeatUnity *seat)
+xdmcp_x_server_stopped_cb (DisplayServer *display_server, Seat *seat)
{
- g_object_unref (seat->priv->compositor);
- seat->priv->compositor = NULL;
+ l_debug (seat, "XDMCP X server stopped");
- if (seat_get_is_stopping (SEAT (seat)))
+ g_signal_handlers_disconnect_matched (SEAT_UNITY (seat)->priv->xdmcp_x_server, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, seat);
+ SEAT_UNITY (seat)->priv->xdmcp_x_server = NULL;
+
+ g_object_unref (display_server);
+
+ if (seat_get_is_stopping (seat))
+ check_stopped (SEAT_UNITY (seat));
+ else
+ seat_stop (seat);
+}
+
+static void
+compositor_ready_cb (UnitySystemCompositor *compositor, SeatUnity *seat)
+{
+ const gchar *xdmcp_manager = NULL;
+
+ l_debug (seat, "Compositor ready");
+
+ /* If running as an XDMCP client then just start an X server */
+ xdmcp_manager = seat_get_string_property (SEAT (seat), "xdmcp-manager");
+ if (xdmcp_manager)
{
- SEAT_CLASS (seat_unity_parent_class)->stop (SEAT (seat));
- return;
+ const gchar *key_name = NULL;
+ gint port = 0;
+
+ seat->priv->xdmcp_x_server = create_x_server (SEAT (seat));
+ x_server_local_set_xdmcp_server (X_SERVER_LOCAL (seat->priv->xdmcp_x_server), xdmcp_manager);
+ port = seat_get_integer_property (SEAT (seat), "xdmcp-port");
+ if (port > 0)
+ x_server_local_set_xdmcp_port (X_SERVER_LOCAL (seat->priv->xdmcp_x_server), port);
+ key_name = seat_get_string_property (SEAT (seat), "xdmcp-key");
+ if (key_name)
+ {
+ gchar *path;
+ GKeyFile *keys;
+ gboolean result;
+ GError *error = NULL;
+
+ path = g_build_filename (config_get_directory (config_get_instance ()), "keys.conf", NULL);
+
+ keys = g_key_file_new ();
+ result = g_key_file_load_from_file (keys, path, G_KEY_FILE_NONE, &error);
+ if (error)
+ l_debug (seat, "Error getting key %s", error->message);
+ g_clear_error (&error);
+
+ if (result)
+ {
+ gchar *key = NULL;
+
+ if (g_key_file_has_key (keys, "keyring", key_name, NULL))
+ key = g_key_file_get_string (keys, "keyring", key_name, NULL);
+ else
+ l_debug (seat, "Key %s not defined", key_name);
+
+ if (key)
+ x_server_local_set_xdmcp_key (X_SERVER_LOCAL (seat->priv->xdmcp_x_server), key);
+ g_free (key);
+ }
+
+ g_free (path);
+ g_key_file_free (keys);
+ }
+
+ g_signal_connect (seat->priv->xdmcp_x_server, DISPLAY_SERVER_SIGNAL_STOPPED, G_CALLBACK (xdmcp_x_server_stopped_cb), seat);
+ if (!display_server_start (DISPLAY_SERVER (seat->priv->xdmcp_x_server)))
+ seat_stop (SEAT (seat));
}
- l_debug (seat, "Stopping Unity seat, compositor terminated");
+ SEAT_CLASS (seat_unity_parent_class)->start (SEAT (seat));
+}
- seat_stop (SEAT (seat));
+static void
+compositor_stopped_cb (UnitySystemCompositor *compositor, SeatUnity *seat)
+{
+ l_debug (seat, "Compositor stopped");
+
+ g_clear_object (&seat->priv->compositor);
+
+ if (seat_get_is_stopping (SEAT (seat)))
+ check_stopped (seat);
+ else
+ seat_stop (SEAT (seat));
}
static gboolean
return FALSE;
}
- timeout = seat_get_integer_property (seat, "unity-compositor-timeout");
+ timeout = seat_get_integer_property (SEAT (seat), "unity-compositor-timeout");
if (timeout <= 0)
timeout = 60;
SEAT_UNITY (seat)->priv->compositor = unity_system_compositor_new ();
- g_signal_connect (SEAT_UNITY (seat)->priv->compositor, "ready", G_CALLBACK (compositor_ready_cb), seat);
- g_signal_connect (SEAT_UNITY (seat)->priv->compositor, "stopped", G_CALLBACK (compositor_stopped_cb), seat);
- unity_system_compositor_set_command (SEAT_UNITY (seat)->priv->compositor, seat_get_string_property (seat, "unity-compositor-command"));
+ g_signal_connect (SEAT_UNITY (seat)->priv->compositor, DISPLAY_SERVER_SIGNAL_READY, G_CALLBACK (compositor_ready_cb), seat);
+ g_signal_connect (SEAT_UNITY (seat)->priv->compositor, DISPLAY_SERVER_SIGNAL_STOPPED, G_CALLBACK (compositor_stopped_cb), seat);
+ unity_system_compositor_set_command (SEAT_UNITY (seat)->priv->compositor, seat_get_string_property (SEAT (seat), "unity-compositor-command"));
unity_system_compositor_set_vt (SEAT_UNITY (seat)->priv->compositor, vt);
unity_system_compositor_set_timeout (SEAT_UNITY (seat)->priv->compositor, timeout);
return display_server_start (DISPLAY_SERVER (SEAT_UNITY (seat)->priv->compositor));
}
-static DisplayServer *
+static XServerXmir *
create_x_server (Seat *seat)
{
- XServerLocal *x_server;
- const gchar *command = NULL, *layout = NULL, *config_file = NULL, *xdmcp_manager = NULL, *key_name = NULL;
+ XServerXmir *x_server;
+ gchar *number;
+ XAuthority *cookie;
+ const gchar *command = NULL, *layout = NULL, *config_file = NULL;
gboolean allow_tcp;
- gint port = 0;
gchar *id;
l_debug (seat, "Starting X server on Unity compositor");
- x_server = x_server_local_new ();
+ x_server = x_server_xmir_new (SEAT_UNITY (seat)->priv->compositor);
- command = seat_get_string_property (seat, "xserver-command");
- if (command)
- x_server_local_set_command (x_server, command);
+ command = seat_get_string_property (seat, "xmir-command");
+ x_server_local_set_command (X_SERVER_LOCAL (x_server), command);
id = g_strdup_printf ("x-%d", SEAT_UNITY (seat)->priv->next_x_server_id);
SEAT_UNITY (seat)->priv->next_x_server_id++;
- x_server_local_set_mir_id (x_server, id);
- x_server_local_set_mir_socket (x_server, unity_system_compositor_get_socket (SEAT_UNITY (seat)->priv->compositor));
+ x_server_xmir_set_mir_id (x_server, id);
+ x_server_xmir_set_mir_socket (x_server, unity_system_compositor_get_socket (SEAT_UNITY (seat)->priv->compositor));
g_free (id);
+ number = g_strdup_printf ("%d", x_server_get_display_number (X_SERVER (x_server)));
+ cookie = x_authority_new_local_cookie (number);
+ x_server_set_authority (X_SERVER (x_server), cookie);
+ g_free (number);
+ g_object_unref (cookie);
+
layout = seat_get_string_property (seat, "xserver-layout");
if (layout)
- x_server_local_set_layout (x_server, layout);
-
- x_server_local_set_xdg_seat (x_server, seat_get_name (seat));
+ x_server_local_set_layout (X_SERVER_LOCAL (x_server), layout);
+
+ x_server_local_set_xdg_seat (X_SERVER_LOCAL (x_server), seat_get_name (seat));
config_file = seat_get_string_property (seat, "xserver-config");
if (config_file)
- x_server_local_set_config (x_server, config_file);
+ x_server_local_set_config (X_SERVER_LOCAL (x_server), config_file);
allow_tcp = seat_get_boolean_property (seat, "xserver-allow-tcp");
- x_server_local_set_allow_tcp (x_server, allow_tcp);
-
- xdmcp_manager = seat_get_string_property (seat, "xdmcp-manager");
- if (xdmcp_manager)
- x_server_local_set_xdmcp_server (x_server, xdmcp_manager);
-
- port = seat_get_integer_property (seat, "xdmcp-port");
- if (port > 0)
- x_server_local_set_xdmcp_port (x_server, port);
-
- key_name = seat_get_string_property (seat, "xdmcp-key");
- if (key_name)
- {
- gchar *dir, *path;
- GKeyFile *keys;
- gboolean result;
- GError *error = NULL;
-
- dir = config_get_string (config_get_instance (), "LightDM", "config-directory");
- path = g_build_filename (dir, "keys.conf", NULL);
- g_free (dir);
-
- keys = g_key_file_new ();
- result = g_key_file_load_from_file (keys, path, G_KEY_FILE_NONE, &error);
- if (error)
- l_debug (seat, "Error getting key %s", error->message);
- g_clear_error (&error);
-
- if (result)
- {
- gchar *key = NULL;
-
- if (g_key_file_has_key (keys, "keyring", key_name, NULL))
- key = g_key_file_get_string (keys, "keyring", key_name, NULL);
- else
- l_debug (seat, "Key %s not defined", key_name);
+ x_server_local_set_allow_tcp (X_SERVER_LOCAL (x_server), allow_tcp);
- if (key)
- x_server_local_set_xdmcp_key (x_server, key);
- g_free (key);
- }
-
- g_free (path);
- g_key_file_free (keys);
- }
-
- return DISPLAY_SERVER (x_server);
+ return x_server;
}
static DisplayServer *
-create_mir_server (Seat *seat)
+seat_unity_create_display_server (Seat *seat, Session *session)
{
- MirServer *mir_server;
-
- mir_server = mir_server_new ();
- mir_server_set_parent_socket (mir_server, unity_system_compositor_get_socket (SEAT_UNITY (seat)->priv->compositor));
+ const gchar *session_type;
- return DISPLAY_SERVER (mir_server);
-}
-
-static DisplayServer *
-seat_unity_create_display_server (Seat *seat, const gchar *session_type)
-{
+ session_type = session_get_session_type (session);
if (strcmp (session_type, "x") == 0)
- return create_x_server (seat);
+ return DISPLAY_SERVER (create_x_server (seat));
else if (strcmp (session_type, "mir") == 0)
- return create_mir_server (seat);
+ return g_object_ref (SEAT_UNITY (seat)->priv->compositor);
else
{
l_warning (seat, "Can't create unsupported display server '%s'", session_type);
}
}
-static Greeter *
+static gboolean
+seat_unity_display_server_is_used (Seat *seat, DisplayServer *display_server)
+{
+ if (display_server == DISPLAY_SERVER (SEAT_UNITY (seat)->priv->compositor))
+ return TRUE;
+
+ return SEAT_CLASS (seat_unity_parent_class)->display_server_is_used (seat, display_server);
+}
+
+static GreeterSession *
seat_unity_create_greeter_session (Seat *seat)
{
- Greeter *greeter_session;
- gchar *id;
+ GreeterSession *greeter_session;
gint vt;
greeter_session = SEAT_CLASS (seat_unity_parent_class)->create_greeter_session (seat);
session_set_env (SESSION (greeter_session), "XDG_SEAT", seat_get_name (seat));
- id = g_strdup_printf ("greeter-%d", SEAT_UNITY (seat)->priv->next_greeter_id);
- SEAT_UNITY (seat)->priv->next_greeter_id++;
- session_set_env (SESSION (greeter_session), "MIR_SERVER_NAME", id);
- g_free (id);
-
vt = display_server_get_vt (DISPLAY_SERVER (SEAT_UNITY (seat)->priv->compositor));
if (vt >= 0)
{
seat_unity_create_session (Seat *seat)
{
Session *session;
- gchar *id;
gint vt;
session = SEAT_CLASS (seat_unity_parent_class)->create_session (seat);
session_set_env (session, "XDG_SEAT", seat_get_name (seat));
- id = g_strdup_printf ("session-%d", SEAT_UNITY (seat)->priv->next_session_id);
- SEAT_UNITY (seat)->priv->next_session_id++;
- session_set_env (session, "MIR_SERVER_NAME", id);
- g_free (id);
-
vt = display_server_get_vt (DISPLAY_SERVER (SEAT_UNITY (seat)->priv->compositor));
if (vt >= 0)
{
return session;
}
-static void
-seat_unity_set_active_session (Seat *seat, Session *session)
+static const gchar *
+get_mir_id (Session *session)
{
DisplayServer *display_server;
- if (session == SEAT_UNITY (seat)->priv->active_session)
- return;
- SEAT_UNITY (seat)->priv->active_session = g_object_ref (session);
+ if (!session)
+ return NULL;
- display_server = session_get_display_server (session);
- if (SEAT_UNITY (seat)->priv->active_display_server != display_server)
- {
- const gchar *id = NULL;
+ display_server = session_get_display_server (session);
+ if (IS_UNITY_SYSTEM_COMPOSITOR (display_server))
+ return session_get_env (session, "MIR_SERVER_NAME");
+ if (IS_X_SERVER_XMIR (display_server))
+ return x_server_xmir_get_mir_id (X_SERVER_XMIR (display_server));
- SEAT_UNITY (seat)->priv->active_display_server = g_object_ref (display_server);
+ return NULL;
+}
- if (IS_X_SERVER_LOCAL (display_server))
- id = x_server_local_get_mir_id (X_SERVER_LOCAL (display_server));
- else
- id = session_get_env (session, "MIR_SERVER_NAME");
+static void
+seat_unity_set_active_session (Seat *s, Session *session)
+{
+ SeatUnity *seat = SEAT_UNITY (s);
+ const gchar *old_id, *new_id;
- if (id)
- {
- l_debug (seat, "Switching to Mir session %s", id);
- unity_system_compositor_set_active_session (SEAT_UNITY (seat)->priv->compositor, id);
- }
- else
- l_warning (seat, "Failed to work out session ID");
- }
+ old_id = get_mir_id (seat->priv->active_session);
+ new_id = get_mir_id (session);
- SEAT_CLASS (seat_unity_parent_class)->set_active_session (seat, session);
+ g_clear_object (&seat->priv->active_session);
+ seat->priv->active_session = g_object_ref (session);
+
+ if (g_strcmp0 (old_id, new_id) != 0)
+ unity_system_compositor_set_active_session (seat->priv->compositor, new_id);
+
+ SEAT_CLASS (seat_unity_parent_class)->set_active_session (s, session);
}
static Session *
display_server = session_get_display_server (session);
if (IS_X_SERVER_LOCAL (display_server))
- id = x_server_local_get_mir_id (X_SERVER_LOCAL (display_server));
+ id = x_server_xmir_get_mir_id (X_SERVER_XMIR (display_server));
else
id = session_get_env (session, "MIR_SERVER_NAME");
static void
seat_unity_run_script (Seat *seat, DisplayServer *display_server, Process *script)
{
- const gchar *path;
- XServerLocal *x_server;
+ if (IS_X_SERVER_XMIR (display_server))
+ {
+ XServerXmir *x_server;
+ const gchar *path;
- x_server = X_SERVER_LOCAL (display_server);
- path = x_server_local_get_authority_file_path (x_server);
- process_set_env (script, "DISPLAY", x_server_get_address (X_SERVER (x_server)));
- process_set_env (script, "XAUTHORITY", path);
+ x_server = X_SERVER_XMIR (display_server);
+ path = x_server_local_get_authority_file_path (X_SERVER_LOCAL (x_server));
+ process_set_env (script, "DISPLAY", x_server_get_address (X_SERVER (x_server)));
+ process_set_env (script, "XAUTHORITY", path);
+ }
SEAT_CLASS (seat_unity_parent_class)->run_script (seat, display_server, script);
}
{
/* Stop the compositor first */
if (SEAT_UNITY (seat)->priv->compositor)
- {
display_server_stop (DISPLAY_SERVER (SEAT_UNITY (seat)->priv->compositor));
- return;
- }
- SEAT_CLASS (seat_unity_parent_class)->stop (seat);
+ /* Stop the XDMCP X server first */
+ if (SEAT_UNITY (seat)->priv->xdmcp_x_server)
+ display_server_stop (DISPLAY_SERVER (SEAT_UNITY (seat)->priv->xdmcp_x_server));
+
+ check_stopped (SEAT_UNITY (seat));
}
static void
{
SeatUnity *seat = SEAT_UNITY (object);
- if (seat->priv->compositor)
- g_object_unref (seat->priv->compositor);
- if (seat->priv->active_session)
- g_object_unref (seat->priv->active_session);
- if (seat->priv->active_display_server)
- g_object_unref (seat->priv->active_display_server);
+ g_clear_object (&seat->priv->compositor);
+ if (seat->priv->xdmcp_x_server)
+ {
+ g_signal_handlers_disconnect_matched (seat->priv->xdmcp_x_server, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, seat);
+ g_object_unref (seat->priv->xdmcp_x_server);
+ }
+ g_clear_object (&seat->priv->active_session);
+ g_clear_object (&seat->priv->active_display_server);
G_OBJECT_CLASS (seat_unity_parent_class)->finalize (object);
}
SeatClass *seat_class = SEAT_CLASS (klass);
object_class->finalize = seat_unity_finalize;
- seat_class->get_start_local_sessions = seat_unity_get_start_local_sessions;
seat_class->setup = seat_unity_setup;
seat_class->start = seat_unity_start;
seat_class->create_display_server = seat_unity_create_display_server;
+ seat_class->display_server_is_used = seat_unity_display_server_is_used;
seat_class->create_greeter_session = seat_unity_create_greeter_session;
seat_class->create_session = seat_unity_create_session;
seat_class->set_active_session = seat_unity_set_active_session;
projects / sojka / lightdm.git / blobdiff