mherrb/seatd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

seat: Only close VT if no new session was found

Browse source
This commit is contained in:
Kenny Levinsen 2020-09-22 01:33:45 +02:00
parent be45c480ec
commit ca6478716d
1 changed files with 23 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

28
seatd/seat.c
View file

@ -61,7 +61,10 @@ static void seat_update_vt(struct seat *seat) {
static int vt_open(struct seat *seat, int vt) { static int vt_open(struct seat *seat, int vt) {
assert(vt != -1); assert(vt != -1);
assert(seat->cur_ttyfd == -1); if (seat->cur_ttyfd != -1) {
terminal_set_process_switching(seat->cur_ttyfd, true);
close(seat->cur_ttyfd);
}
seat->cur_ttyfd = terminal_open(vt); seat->cur_ttyfd = terminal_open(vt);
if (seat->cur_ttyfd == -1) { if (seat->cur_ttyfd == -1) {
log_errorf("could not open terminal for vt %d: %s", vt, strerror(errno)); log_errorf("could not open terminal for vt %d: %s", vt, strerror(errno));
@ -432,7 +435,7 @@ int seat_open_client(struct seat *seat, struct client *client) {
} }
if (seat->vt_bound && vt_open(seat, client->session) == -1) { if (seat->vt_bound && vt_open(seat, client->session) == -1) {
return -1; goto error;
} }
for (struct linked_list *elem = client->devices.next; elem != &client->devices; for (struct linked_list *elem = client->devices.next; elem != &client->devices;
@ -446,11 +449,17 @@ int seat_open_client(struct seat *seat, struct client *client) {
seat->active_client = client; seat->active_client = client;
if (client_send_enable_seat(client) == -1) { if (client_send_enable_seat(client) == -1) {
log_error("could not send enable signal"); log_error("could not send enable signal");
return -1; goto error;
} }
log_info("client successfully enabled"); log_info("client successfully enabled");
return 0; return 0;
error:
if (seat->vt_bound) {
vt_close(seat);
}
return -1;
} }
int seat_close_client(struct client *client) { int seat_close_client(struct client *client) {
@ -476,11 +485,10 @@ int seat_close_client(struct client *client) {
seat->active_client = NULL; seat->active_client = NULL;
log_debug("closed client"); log_debug("closed client");
if (seat->vt_bound) { seat_activate(seat);
if (seat->vt_bound && seat->active_client == NULL) {
vt_close(seat); vt_close(seat);
} }
seat_activate(seat);
return 0; return 0;
} }
@ -538,14 +546,16 @@ int seat_ack_disable_client(struct client *client) {
client->pending_disable = false; client->pending_disable = false;
log_debug("disabled client"); log_debug("disabled client");
if (seat->active_client == client) { if (seat->active_client != client) {
if (seat->vt_bound) { return 0;
vt_close(seat);
} }
seat->active_client = NULL; seat->active_client = NULL;
seat_activate(seat); seat_activate(seat);
if (seat->vt_bound && seat->active_client == NULL) {
vt_close(seat);
} }
return 0; return 0;
} }