X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flogin%2Flogind-seat.c;h=ca0e8d7fcfdd0fc2ee2d24938c2845bf5c7596a9;hp=937315ebf1ab17c4fa8a9b0ab61003c784451ed4;hb=3fdb2494c1e24c0a020f5b54022d2c751fd26f50;hpb=877d54e9b09e093c2102f519a84e2a52637ae035 diff --git a/src/login/logind-seat.c b/src/login/logind-seat.c index 937315ebf..ca0e8d7fc 100644 --- a/src/login/logind-seat.c +++ b/src/login/logind-seat.c @@ -27,8 +27,8 @@ #include #include -#include "systemd/sd-id128.h" -#include "systemd/sd-messages.h" +#include "sd-id128.h" +#include "sd-messages.h" #include "logind-seat.h" #include "logind-acl.h" #include "util.h" @@ -67,7 +67,7 @@ void seat_free(Seat *s) { assert(s); if (s->in_gc_queue) - LIST_REMOVE(Seat, gc_queue, s->manager->seat_gc_queue, s); + LIST_REMOVE(gc_queue, s->manager->seat_gc_queue, s); while (s->sessions) session_free(s->sessions); @@ -84,9 +84,9 @@ void seat_free(Seat *s) { } int seat_save(Seat *s) { + _cleanup_free_ char *temp_path = NULL; + _cleanup_fclose_ FILE *f = NULL; int r; - FILE *f; - char *temp_path; assert(s); @@ -105,11 +105,11 @@ int seat_save(Seat *s) { fprintf(f, "# This is private data. Do not parse.\n" - "IS_VTCONSOLE=%i\n" + "IS_SEAT0=%i\n" "CAN_MULTI_SESSION=%i\n" "CAN_TTY=%i\n" "CAN_GRAPHICAL=%i\n", - seat_is_vtconsole(s), + seat_is_seat0(s), seat_can_multi_session(s), seat_can_tty(s), seat_can_graphical(s)); @@ -151,9 +151,6 @@ int seat_save(Seat *s) { unlink(temp_path); } - fclose(f); - free(temp_path); - finish: if (r < 0) log_error("Failed to save seat data for %s: %s", s->id, strerror(-r)); @@ -170,8 +167,8 @@ int seat_load(Seat *s) { } static int vt_allocate(int vtnr) { - int fd, r; - char *p; + _cleanup_free_ char *p = NULL; + _cleanup_close_ int fd = -1; assert(vtnr >= 1); @@ -179,14 +176,10 @@ static int vt_allocate(int vtnr) { return -ENOMEM; fd = open_terminal(p, O_RDWR|O_NOCTTY|O_CLOEXEC); - free(p); - - r = fd < 0 ? -errno : 0; + if (fd < 0) + return -errno; - if (fd >= 0) - close_nointr_nofail(fd); - - return r; + return 0; } int seat_preallocate_vts(Seat *s) { @@ -201,7 +194,7 @@ int seat_preallocate_vts(Seat *s) { if (s->manager->n_autovts <= 0) return 0; - if (!seat_can_multi_session(s)) + if (!seat_has_vts(s)) return 0; for (i = 1; i <= s->manager->n_autovts; i++) { @@ -246,13 +239,20 @@ int seat_set_active(Seat *s, Session *session) { old_active = s->active; s->active = session; + if (old_active) { + session_device_pause_all(old_active); + session_send_changed(old_active, "Active", NULL); + } + seat_apply_acls(s, old_active); - if (session && session->started) - session_send_changed(session, "Active\0"); + if (session && session->started) { + session_send_changed(session, "Active", NULL); + session_device_resume_all(session); + } if (!session || session->started) - seat_send_changed(s, "ActiveSession\0"); + seat_send_changed(s, "ActiveSession", NULL); seat_save(s); @@ -263,7 +263,8 @@ int seat_set_active(Seat *s, Session *session) { if (old_active) { session_save(old_active); - user_save(old_active->user); + if (!session || session->user != old_active->user) + user_save(old_active->user); } return 0; @@ -276,7 +277,7 @@ int seat_active_vt_changed(Seat *s, int vtnr) { assert(s); assert(vtnr >= 1); - if (!seat_can_multi_session(s)) + if (!seat_has_vts(s)) return -EINVAL; log_debug("VT changed to %i", vtnr); @@ -300,7 +301,7 @@ int seat_read_active_vt(Seat *s) { assert(s); - if (!seat_can_multi_session(s)) + if (!seat_has_vts(s)) return 0; lseek(s->manager->console_active_fd, SEEK_SET, 0); @@ -340,7 +341,7 @@ int seat_start(Seat *s) { return 0; log_struct(LOG_INFO, - "MESSAGE_ID=" SD_ID128_FORMAT_STR, SD_ID128_FORMAT_VAL(SD_MESSAGE_SEAT_START), + MESSAGE_ID(SD_MESSAGE_SEAT_START), "SEAT_ID=%s", s->id, "MESSAGE=New seat %s.", s->id, NULL); @@ -368,7 +369,7 @@ int seat_stop(Seat *s) { if (s->started) log_struct(LOG_INFO, - "MESSAGE_ID=" SD_ID128_FORMAT_STR, SD_ID128_FORMAT_VAL(SD_MESSAGE_SEAT_STOP), + MESSAGE_ID(SD_MESSAGE_SEAT_STOP), "SEAT_ID=%s", s->id, "MESSAGE=Removed seat %s.", s->id, NULL); @@ -407,50 +408,68 @@ int seat_attach_session(Seat *s, Session *session) { assert(!session->seat); session->seat = s; - LIST_PREPEND(Session, sessions_by_seat, s->sessions, session); - - seat_send_changed(s, "Sessions\0"); + LIST_PREPEND(sessions_by_seat, s->sessions, session); - /* Note that even if a seat is not multi-session capable it - * still might have multiple sessions on it since old, dead - * sessions might continue to be tracked until all their - * processes are gone. The most recently added session - * (i.e. the first in s->sessions) is the one that matters. */ + seat_send_changed(s, "Sessions", NULL); - if (!seat_can_multi_session(s)) + /* On seats with VTs, the VT logic defines which session is active. On + * seats without VTs, we automatically activate new sessions. */ + if (!seat_has_vts(s)) seat_set_active(s, session); return 0; } -bool seat_is_vtconsole(Seat *s) { +void seat_complete_switch(Seat *s) { + Session *session; + + assert(s); + + /* if no session-switch is pending or if it got canceled, do nothing */ + if (!s->pending_switch) + return; + + session = s->pending_switch; + s->pending_switch = NULL; + + seat_set_active(s, session); +} + +bool seat_has_vts(Seat *s) { assert(s); - return s->manager->vtconsole == s; + return seat_is_seat0(s) && s->manager->console_active_fd >= 0; } -bool seat_can_multi_session(Seat *s) { +bool seat_is_seat0(Seat *s) { assert(s); - if (!seat_is_vtconsole(s)) - return false; + return s->manager->seat0 == s; +} - /* If we can't watch which VT is in the foreground, we don't - * support VT switching */ +bool seat_can_multi_session(Seat *s) { + assert(s); - return s->manager->console_active_fd >= 0; + return seat_has_vts(s); } bool seat_can_tty(Seat *s) { assert(s); - return seat_is_vtconsole(s); + return seat_has_vts(s); +} + +bool seat_has_master_device(Seat *s) { + assert(s); + + /* device list is ordered by "master" flag */ + return !!s->devices && s->devices->master; } bool seat_can_graphical(Seat *s) { assert(s); - return !!s->devices; + return seat_has_master_device(s); } int seat_get_idle_hint(Seat *s, dual_timestamp *t) { @@ -470,7 +489,7 @@ int seat_get_idle_hint(Seat *s, dual_timestamp *t) { if (!ih) { if (!idle_hint) { - if (k.monotonic < ts.monotonic) + if (k.monotonic > ts.monotonic) ts = k; } else { idle_hint = false; @@ -489,16 +508,16 @@ int seat_get_idle_hint(Seat *s, dual_timestamp *t) { return idle_hint; } -int seat_check_gc(Seat *s, bool drop_not_started) { +bool seat_check_gc(Seat *s, bool drop_not_started) { assert(s); if (drop_not_started && !s->started) - return 0; + return false; - if (seat_is_vtconsole(s)) - return 1; + if (seat_is_seat0(s)) + return true; - return !!s->devices; + return seat_has_master_device(s); } void seat_add_to_gc_queue(Seat *s) { @@ -507,7 +526,7 @@ void seat_add_to_gc_queue(Seat *s) { if (s->in_gc_queue) return; - LIST_PREPEND(Seat, gc_queue, s->manager->seat_gc_queue, s); + LIST_PREPEND(gc_queue, s->manager->seat_gc_queue, s); s->in_gc_queue = true; }