diff options
| author | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2005-02-23 13:16:19 +0000 |
|---|---|---|
| committer | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2005-02-23 13:16:19 +0000 |
| commit | 16ed31d6742ec763d348848ca41bf9c16948cc07 (patch) | |
| tree | ab362973265637fb4f247d430212bc7180cbcb9f | |
| parent | 8e2017cc91e6ff3105b3b2762d19c7c9beb4c139 (diff) | |
merge XORG-6_8_2 to CYGWINCYGWIN-6_8_2-MERGE
| -rw-r--r-- | hw/xfree86/os-support/linux/lnx_io.c | 4 | ||||
| -rw-r--r-- | hw/xfree86/os-support/linux/lnx_kbd.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/hw/xfree86/os-support/linux/lnx_io.c b/hw/xfree86/os-support/linux/lnx_io.c index dda1ff8ef..1eebc757a 100644 --- a/hw/xfree86/os-support/linux/lnx_io.c +++ b/hw/xfree86/os-support/linux/lnx_io.c @@ -114,6 +114,8 @@ KDKBDREP_ioctl_ok(int rate, int delay) { #endif /* KDKBDREP */ } +#undef rate + static int KIOCSRATE_ioctl_ok(int rate, int delay) { #ifdef KIOCSRATE @@ -141,8 +143,6 @@ KIOCSRATE_ioctl_ok(int rate, int delay) { #endif /* KIOCSRATE */ } -#undef rate - void xf86SetKbdRepeat(char rad) { #ifdef __sparc__ 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: |