From 0917efa0062956513b018651d6592227df9513ff Mon Sep 17 00:00:00 2001 From: Roland Mainz Date: Tue, 1 Feb 2005 03:32:38 +0000 Subject: //bugs.freedesktop.org/show_bug.cgi?id=2252) attachment #1791 (https://bugs.freedesktop.org/attachment.cgi?id=1791): Fix option dontVTSwitch under *BSD, when XKB is disabled. Patch by Matthieu Herrb . Approved in the 2005-01-31 Xorg release-wranglers phone call. --- hw/xfree86/os-support/bsd/bsd_kbd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/xfree86/os-support/bsd/bsd_kbd.c b/hw/xfree86/os-support/bsd/bsd_kbd.c index 67f0b800d..190e6378b 100644 --- a/hw/xfree86/os-support/bsd/bsd_kbd.c +++ b/hw/xfree86/os-support/bsd/bsd_kbd.c @@ -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: -- cgit v1.2.3