summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu.herrb@laas.fr>2004-11-11 16:09:58 +0000
committerMatthieu Herrb <matthieu.herrb@laas.fr>2004-11-11 16:09:58 +0000
commite5040e24f03a2fe770139e6f37acef3da48aa0f9 (patch)
tree3d4ef3143b7ffda1a07e9660df2f8b29f4b1742e
parente380fd548ed5452d08184723145dd992ad72288c (diff)
oops commited wrong version previously
-rw-r--r--hw/xfree86/os-support/bsd/bsd_KbdMap.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/hw/xfree86/os-support/bsd/bsd_KbdMap.c b/hw/xfree86/os-support/bsd/bsd_KbdMap.c
index 75c067d33..542eb2630 100644
--- a/hw/xfree86/os-support/bsd/bsd_KbdMap.c
+++ b/hw/xfree86/os-support/bsd/bsd_KbdMap.c
@@ -1044,10 +1044,11 @@ KbdGetMapping (InputInfoPtr pInfo, KeySymsPtr pKeySyms, CARD8 *pModMap)
case PCCONS:
case PCVT:
pKbd->RemapScanCode = ATScancode;
+ break;
#endif
#ifdef WSCONS_SUPPORT
case WSCONS:
- if (pKbd->isConsole) {
+ if (!pKbd->isConsole) {
switch (pKbd->wsKbdType) {
case WSKBD_TYPE_PC_XT:
case WSKBD_TYPE_PC_AT:
@@ -1072,7 +1073,9 @@ KbdGetMapping (InputInfoPtr pInfo, KeySymsPtr pKeySyms, CARD8 *pModMap)
default:
ErrorF("Unknown wskbd type %d\n", pKbd->wsKbdType);
}
- }
+ } else {
+ pKbd->RemapScanCode = ATScancode;
+ }
break;
#endif
}