programs/Xserver/hw/xfree86/os-support/bsd/bsd_kbd.c Fix option

dontVTSwitch under *BSD, when XKB is disabled. Bugzilla #2252.
This commit is contained in:
Matthieu Herrb 2005-01-30 20:12:07 +00:00
parent 327922f006
commit 206072c475

View File

@ -295,7 +295,7 @@ Bool SpecialKey(InputInfoPtr pInfo, int key, Bool down, int modifiers)
if ((ModifierSet(ControlMask | AltMask)) ||
(ModifierSet(ControlMask | AltLangMask))) {
if (VTSwitchEnabled && !xf86Info.vtSysreq) {
if (VTSwitchEnabled && !xf86Info.vtSysreq && !xf86Info.dontVTSwitch) {
switch (key) {
case KEY_F1:
case KEY_F2:
@ -321,7 +321,7 @@ Bool SpecialKey(InputInfoPtr pInfo, int key, Bool down, int modifiers)
}
}
#ifdef USE_VT_SYSREQ
if (VTSwitchEnabled && xf86Info.vtSysreq) {
if (VTSwitchEnabled && xf86Info.vtSysreq && !xf86Info.dontVTSwitch) {
switch (key) {
case KEY_F1:
case KEY_F2: