From dc31ce3ddb136bb5add2e51a5b25a79a2705bdeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Schmidt?= Date: Mon, 20 Jan 1997 08:05:15 +0000 Subject: [PATCH] Fix the bug that caused CTRL & ALT keys to be hanging sometimes after an X seesion. Really stupid error of me, and I've been looking at this code SO many times. Thanks to Kazutaka YOKOTA for seeing this.. Submitted by: Kazutaka YOKOTA --- sys/dev/syscons/syscons.c | 2 +- sys/i386/isa/syscons.c | 2 +- sys/isa/syscons.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c index 50e2e41bf27..8d693d62254 100644 --- a/sys/dev/syscons/syscons.c +++ b/sys/dev/syscons/syscons.c @@ -1196,7 +1196,7 @@ scioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p) return 0; case K_XLATE: /* switch to XLT ascii mode */ - if (scp == cur_console && scp->status == KBD_RAW_MODE) + if (scp == cur_console && scp->status & KBD_RAW_MODE) shfts = ctls = alts = agrs = metas = 0; scp->status &= ~KBD_RAW_MODE; return 0; diff --git a/sys/i386/isa/syscons.c b/sys/i386/isa/syscons.c index 50e2e41bf27..8d693d62254 100644 --- a/sys/i386/isa/syscons.c +++ b/sys/i386/isa/syscons.c @@ -1196,7 +1196,7 @@ scioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p) return 0; case K_XLATE: /* switch to XLT ascii mode */ - if (scp == cur_console && scp->status == KBD_RAW_MODE) + if (scp == cur_console && scp->status & KBD_RAW_MODE) shfts = ctls = alts = agrs = metas = 0; scp->status &= ~KBD_RAW_MODE; return 0; diff --git a/sys/isa/syscons.c b/sys/isa/syscons.c index 50e2e41bf27..8d693d62254 100644 --- a/sys/isa/syscons.c +++ b/sys/isa/syscons.c @@ -1196,7 +1196,7 @@ scioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p) return 0; case K_XLATE: /* switch to XLT ascii mode */ - if (scp == cur_console && scp->status == KBD_RAW_MODE) + if (scp == cur_console && scp->status & KBD_RAW_MODE) shfts = ctls = alts = agrs = metas = 0; scp->status &= ~KBD_RAW_MODE; return 0;