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

seat: Use current VT for switch and ack

Browse source
This commit is contained in:
Kenny Levinsen 2020-09-22 00:59:48 +02:00
parent 521d95349f
commit ba4c422659
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
seatd/seat.c
View file

@ -87,8 +87,8 @@ static void vt_close(struct seat *seat) {
seat->cur_ttyfd = -1; seat->cur_ttyfd = -1;
} }
static int vt_switch(int vt) { static int vt_switch(struct seat *seat, int vt) {
int ttyfd = terminal_open(0); int ttyfd = terminal_open(seat->cur_vt);
if (ttyfd == -1) { if (ttyfd == -1) {
log_errorf("could not open terminal: %s", strerror(errno)); log_errorf("could not open terminal: %s", strerror(errno));
return -1; return -1;
@ -99,8 +99,8 @@ static int vt_switch(int vt) {
return 0; return 0;
} }
static int vt_ack(void) { static int vt_ack(struct seat *seat) {
int tty0fd = terminal_open(0); int tty0fd = terminal_open(seat->cur_vt);
if (tty0fd == -1) { if (tty0fd == -1) {
log_errorf("unable to open tty0: %s", strerror(errno)); log_errorf("unable to open tty0: %s", strerror(errno));
return -1; return -1;
@ -575,7 +575,7 @@ int seat_set_next_session(struct client *client, int session) {
if (seat->vt_bound) { if (seat->vt_bound) {
log_infof("switching to VT %d from %d", session, seat->cur_vt); log_infof("switching to VT %d from %d", session, seat->cur_vt);
if (vt_switch(session) == -1) { if (vt_switch(seat, session) == -1) {
log_error("could not switch VT"); log_error("could not switch VT");
return -1; return -1;
} }
@ -625,13 +625,14 @@ int seat_prepare_vt_switch(struct seat *seat) {
log_debug("VT switch request on non VT-bound seat, ignoring"); log_debug("VT switch request on non VT-bound seat, ignoring");
return -1; return -1;
} }
seat_update_vt(seat);
log_debug("acking VT switch"); log_debug("acking VT switch");
if (seat->active_client != NULL) { if (seat->active_client != NULL) {
seat_disable_client(seat->active_client); seat_disable_client(seat->active_client);
} }
vt_ack(); vt_ack(seat);
seat->cur_vt = -1; seat->cur_vt = -1;
return 0; return 0;
} }