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:
parent
327922f006
commit
206072c475
|
@ -295,7 +295,7 @@ Bool SpecialKey(InputInfoPtr pInfo, int key, Bool down, int modifiers)
|
||||||
|
|
||||||
if ((ModifierSet(ControlMask | AltMask)) ||
|
if ((ModifierSet(ControlMask | AltMask)) ||
|
||||||
(ModifierSet(ControlMask | AltLangMask))) {
|
(ModifierSet(ControlMask | AltLangMask))) {
|
||||||
if (VTSwitchEnabled && !xf86Info.vtSysreq) {
|
if (VTSwitchEnabled && !xf86Info.vtSysreq && !xf86Info.dontVTSwitch) {
|
||||||
switch (key) {
|
switch (key) {
|
||||||
case KEY_F1:
|
case KEY_F1:
|
||||||
case KEY_F2:
|
case KEY_F2:
|
||||||
|
@ -321,7 +321,7 @@ Bool SpecialKey(InputInfoPtr pInfo, int key, Bool down, int modifiers)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#ifdef USE_VT_SYSREQ
|
#ifdef USE_VT_SYSREQ
|
||||||
if (VTSwitchEnabled && xf86Info.vtSysreq) {
|
if (VTSwitchEnabled && xf86Info.vtSysreq && !xf86Info.dontVTSwitch) {
|
||||||
switch (key) {
|
switch (key) {
|
||||||
case KEY_F1:
|
case KEY_F1:
|
||||||
case KEY_F2:
|
case KEY_F2:
|
||||||
|
|
Loading…
Reference in New Issue