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

Implement -novtswitch option handling for FreeBSD.

This commit is contained in:
Gleb Popov 2023-10-05 18:56:47 +03:00 committed by Alan Coopersmith
parent d63d23bde8
commit f3e347241e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/xfree86/os-support/bsd/bsd_init.c
View File

@ -303,7 +303,7 @@ xf86OpenConsole()
else { else {
/* serverGeneration != 1 */ /* serverGeneration != 1 */
#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT) #if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)
if (!xf86Info.ShareVTs && if (!xf86Info.ShareVTs && xf86Info.autoVTSwitch &&
(xf86Info.consType == SYSCONS || xf86Info.consType == PCVT)) { (xf86Info.consType == SYSCONS || xf86Info.consType == PCVT)) {
if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, xf86Info.vtno) != 0) { if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, xf86Info.vtno) != 0) {
xf86Msg(X_WARNING, "xf86OpenConsole: VT_ACTIVATE failed\n"); xf86Msg(X_WARNING, "xf86OpenConsole: VT_ACTIVATE failed\n");
@ -604,7 +604,7 @@ xf86CloseConsole()
strerror(errno)); strerror(errno));
} }
#endif #endif
if (initialVT != -1) if (xf86Info.autoVTSwitch && initialVT != -1)
ioctl(xf86Info.consoleFd, VT_ACTIVATE, initialVT); ioctl(xf86Info.consoleFd, VT_ACTIVATE, initialVT);
break; break;
#endif /* SYSCONS_SUPPORT || PCVT_SUPPORT */ #endif /* SYSCONS_SUPPORT || PCVT_SUPPORT */