diff options
| author | Roland Mainz <roland.mainz@nrubsig.org> | 2005-02-01 03:32:38 +0000 |
|---|---|---|
| committer | Roland Mainz <roland.mainz@nrubsig.org> | 2005-02-01 03:32:38 +0000 |
| commit | 0917efa0062956513b018651d6592227df9513ff (patch) | |
| tree | 37bf8595a3385c422be8cbda6af5d315fdca5cf7 | |
| parent | fb9fb8ead9aa58ce9559b8645849227f364e664c (diff) | |
//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
<matthieu.herrb@laas.fr>. Approved in the 2005-01-31 Xorg
release-wranglers phone call.
| -rw-r--r-- | hw/xfree86/os-support/bsd/bsd_kbd.c | 4 |
1 files 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: |