diff options
author | David Herrmann <dh.herrmann@gmail.com> | 2013-09-17 17:40:02 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2013-09-17 13:49:24 -0500 |
commit | bf7825ae69f53a7e80a740547919833e49ed1df4 (patch) | |
tree | 2f7555bd768a78b782a138c4eeb80b076a194de6 /src/login/logind-seat.c | |
parent | 9209d5121dfb3049cbf280139c4cc40c2038edcc (diff) |
logind: extract has_vts() from can_multi_session()
We currently use seat_can_multi_session() to test for two things:
* whether the seat can handle session-switching
* whether the seat has VTs
As both are currently logically equivalent, we didn't care. However, we
want to allow session-switching on seats without VTs, so split this helper
into:
* seat_can_multi_session(): whether session-switching is supported
* seat_has_vts(): whether the seat has VTs
Note that only one seat on a system can have VTs. There is only one set of
them. We automatically assign them to seat0 as usual.
With this patch in place, we can easily add new session-switching/tracking
methods without breaking any VT code as it is now protected by has_vts(),
no longer by can_multi_session().
Diffstat (limited to 'src/login/logind-seat.c')
-rw-r--r-- | src/login/logind-seat.c | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/src/login/logind-seat.c b/src/login/logind-seat.c index c5350fbf53..3dc529b2b9 100644 --- a/src/login/logind-seat.c +++ b/src/login/logind-seat.c @@ -201,7 +201,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++) { @@ -277,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); @@ -301,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); @@ -412,18 +412,20 @@ int seat_attach_session(Seat *s, Session *session) { seat_send_changed(s, "Sessions\0"); - /* 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. */ - - 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 the first session. */ + if (!seat_has_vts(s) && !s->active) seat_set_active(s, session); return 0; } +bool seat_has_vts(Seat *s) { + assert(s); + + return seat_is_seat0(s) && s->manager->console_active_fd >= 0; +} + bool seat_is_seat0(Seat *s) { assert(s); @@ -433,19 +435,13 @@ bool seat_is_seat0(Seat *s) { bool seat_can_multi_session(Seat *s) { assert(s); - if (!seat_is_seat0(s)) - return false; - - /* If we can't watch which VT is in the foreground, we don't - * support VT switching */ - - return s->manager->console_active_fd >= 0; + return seat_has_vts(s); } bool seat_can_tty(Seat *s) { assert(s); - return seat_is_seat0(s) && s->manager->console_active_fd >= 0; + return seat_has_vts(s); } bool seat_has_master_device(Seat *s) { |