diff options
| author | Deron Johnson <deron.johnson@sun.com> | 2005-02-18 17:53:12 +0000 |
|---|---|---|
| committer | Deron Johnson <deron.johnson@sun.com> | 2005-02-18 17:53:12 +0000 |
| commit | a8f39eff71788e1755ef1f15bec19c0b66e4e92e (patch) | |
| tree | a5c98d87b9d7b70c4c579495036ad09dd76839ac | |
| parent | d1887f48869203ea61c58b7c4e8749cac17f82ef (diff) | |
More 682 mere
| -rw-r--r-- | hw/xfree86/os-support/linux/lnx_kbd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/xfree86/os-support/linux/lnx_kbd.c b/hw/xfree86/os-support/linux/lnx_kbd.c index 68f3af38b..dd6df5cb5 100644 --- a/hw/xfree86/os-support/linux/lnx_kbd.c +++ b/hw/xfree86/os-support/linux/lnx_kbd.c @@ -142,6 +142,8 @@ KDKBDREP_ioctl_ok(int rate, int delay) { #endif /* KDKBDREP */ } +#undef rate + static int KIOCSRATE_ioctl_ok(int rate, int delay) { #ifdef KIOCSRATE @@ -169,8 +171,6 @@ KIOCSRATE_ioctl_ok(int rate, int delay) { #endif /* KIOCSRATE */ } -#undef rate - static void SetKbdRepeat(InputInfoPtr pInfo, char rad) { @@ -356,7 +356,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: @@ -382,7 +382,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: |