mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

weston-launch: make sure weston-launch activates the VT

Browse Source 
Currently weston-launch does not activate the VT when opening the
terminal directly (e.g. using --tty=/dev/tty7). Weston takes full
control over the terminal by switching it to graphical mode etc.
However, the old VT stays active as can be seen when looking at
sysfs:
  # cat /sys/class/tty/tty0/active
  tty1

Always switch to the new VT to make sure the correct VT is active.
This aligns with how TTY setup is implemented in launcher-direct.c.

Signed-off-by: Stefan Agner <stefan@agner.ch>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
Stefan Agner
2019-11-14 23:29:09 +01:00
committed by Pekka Paalanen
parent cb24a7d1eb
commit c6f818a016
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libweston/weston-launch.c
+14
View File
@@ -605,6 +605,20 @@ setup_tty(struct weston_launch *wl, const char *tty)
wl->ttynr = minor(buf.st_rdev); wl->ttynr = minor(buf.st_rdev);
} }
if (ioctl(wl->tty, VT_ACTIVATE, wl->ttynr) < 0) {
fprintf(stderr,
"weston: failed to activate VT: %s\n",
strerror(errno));
return -1;
}
if (ioctl(wl->tty, VT_WAITACTIVE, wl->ttynr) < 0) {
fprintf(stderr,
"weston: failed to wait for VT to be active: %s\n",
strerror(errno));
return -1;
}
if (ioctl(wl->tty, KDGKBMODE, &wl->kb_mode)) { if (ioctl(wl->tty, KDGKBMODE, &wl->kb_mode)) {
fprintf(stderr, fprintf(stderr,
"weston: failed to get current keyboard mode: %s\n", "weston: failed to get current keyboard mode: %s\n",