fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-05-05 05:18:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

//bugs.freedesktop.org/show_bug.cgi?id=2252) attachment #1791

Browse source 
(https://bugs.freedesktop.org/attachment.cgi?id=1791): Fix option
    dontVTSwitch under *BSD, when XKB is disabled. Patch by Matthieu Herrb
    <matthieu.herrb@laas.fr>. Approved in the 2005-01-31 Xorg
    release-wranglers phone call.
This commit is contained in:
Roland Mainz 2005-02-01 03:32:38 +00:00
parent fb9fb8ead9
commit 0917efa006
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_kbd.c
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: