#include <linux/vt.h>
#include <string.h>
-#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"
return NULL;
}
- s->id = path_get_file_name(s->state_file);
+ s->id = basename(s->state_file);
s->manager = m;
if (hashmap_put(m->seats, s->id, s) < 0) {
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);
}
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);
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));
return 0;
}
-static int vt_allocate(int vtnr) {
- int fd, r;
- char *p;
+static int vt_allocate(unsigned int vtnr) {
+ _cleanup_free_ char *p = NULL;
+ _cleanup_close_ int fd = -1;
assert(vtnr >= 1);
- if (asprintf(&p, "/dev/tty%i", vtnr) < 0)
+ if (asprintf(&p, "/dev/tty%u", vtnr) < 0)
return -ENOMEM;
fd = open_terminal(p, O_RDWR|O_NOCTTY|O_CLOEXEC);
- free(p);
-
- r = fd < 0 ? -errno : 0;
-
- if (fd >= 0)
- close_nointr_nofail(fd);
+ if (fd < 0)
+ return -errno;
- return r;
+ return 0;
}
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++) {
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);
return 0;
}
-int seat_active_vt_changed(Seat *s, int vtnr) {
+int seat_active_vt_changed(Seat *s, unsigned int vtnr) {
Session *i, *new_active = NULL;
int r;
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);
+ log_debug("VT changed to %u", vtnr);
LIST_FOREACH(sessions_by_seat, i, s->sessions)
if (i->vtnr == vtnr) {
int seat_read_active_vt(Seat *s) {
char t[64];
ssize_t k;
- int r, vtnr;
+ unsigned int vtnr;
+ int r;
assert(s);
- if (!seat_can_multi_session(s))
+ if (!seat_has_vts(s))
return 0;
lseek(s->manager->console_active_fd, SEEK_SET, 0);
return -EIO;
}
- r = safe_atoi(t+3, &vtnr);
+ r = safe_atou(t+3, &vtnr);
if (r < 0) {
log_error("Failed to parse VT number %s", t+3);
return r;
}
- if (vtnr <= 0) {
+ if (!vtnr) {
log_error("VT number invalid: %s", t+3);
return -EIO;
}
assert(session);
assert(!session->seat);
- session->seat = s;
- LIST_PREPEND(Session, sessions_by_seat, s->sessions, session);
+ if (!seat_has_vts(s) != !session->vtnr)
+ return -EINVAL;
- seat_send_changed(s, "Sessions\0");
+ session->seat = s;
+ 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;
}
+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 seat_is_seat0(s) && s->manager->console_active_fd >= 0;
+}
+
bool seat_is_seat0(Seat *s) {
assert(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) {
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_seat0(s))
- return 1;
+ return true;
return seat_has_master_device(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;
}