frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfree86: Only switch to original VT if it is active. 

If the X server is terminated while its VT is not active, it should
not change the current VT.

v2: Query current state in xf86CloseConsole using VT_GETSTATE instead of
    keeping track in xf86VTEnter/xf86VTLeave/etc.
This commit is contained in:
Michal Srb 2018-10-16 09:32:13 +02:00 committed by Adam Jackson
parent 7c25439f0d
commit ff91c696ff
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hw/xfree86/os-support/linux/lnx_init.c
View File

@ -299,6 +299,7 @@ void
xf86CloseConsole(void) xf86CloseConsole(void)
{ {
struct vt_mode VT; struct vt_mode VT;
struct vt_stat vts;
int ret; int ret;
if (xf86Info.ShareVTs) { if (xf86Info.ShareVTs) {
@ -336,10 +337,19 @@ xf86CloseConsole(void)
if (xf86Info.autoVTSwitch) { if (xf86Info.autoVTSwitch) {
/* /*
* Perform a switch back to the active VT when we were started * Perform a switch back to the active VT when we were started if our
*/ * vt is active now.
*/
if (activeVT >= 0) { if (activeVT >= 0) {
switch_to(activeVT, "xf86CloseConsole"); SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_GETSTATE, &vts));
if (ret < 0) {
xf86Msg(X_WARNING, "xf86OpenConsole: VT_GETSTATE failed: %s\n",
strerror(errno));
} else {
if (vts.v_active == xf86Info.vtno) {
switch_to(activeVT, "xf86CloseConsole");
}
}
activeVT = -1; activeVT = -1;
} }
} }