summaryrefslogtreecommitdiffstats
path: root/usr.sbin/kbdcontrol
diff options
context:
space:
mode:
authored <ed@FreeBSD.org>2009-09-19 17:56:26 +0000
committered <ed@FreeBSD.org>2009-09-19 17:56:26 +0000
commit48c86dac0525a55eff2b75b5ba8dc573d1014cfe (patch)
tree1c093255582b069eabdbf07475eaefadbeaa94dd /usr.sbin/kbdcontrol
parent064ad1c10a013fdee8dfa0bfcedcec6231604546 (diff)
downloadFreeBSD-src-48c86dac0525a55eff2b75b5ba8dc573d1014cfe.zip
FreeBSD-src-48c86dac0525a55eff2b75b5ba8dc573d1014cfe.tar.gz
Make the keyboard layer Unicode aware.
Just take keyent_t to use an u_int to store the Unicode codepoints. Unfortunately the keymap is now too big to be loaded using an ioctl argument, so change the ioctl to pick a pointer. This change breaks kbdcontrol ABI. It doesn't break X11, because X11 doesn't do anything with syscons keymaps. It just switches the device out of K_XLATE. Obtained from: //depot/user/ed/newcons/...
Diffstat (limited to 'usr.sbin/kbdcontrol')
-rw-r--r--usr.sbin/kbdcontrol/kbdcontrol.c2
-rw-r--r--usr.sbin/kbdcontrol/kbdmap.58
2 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/kbdcontrol/kbdcontrol.c b/usr.sbin/kbdcontrol/kbdcontrol.c
index bbeb758..5d20b16 100644
--- a/usr.sbin/kbdcontrol/kbdcontrol.c
+++ b/usr.sbin/kbdcontrol/kbdcontrol.c
@@ -256,7 +256,7 @@ get_entry(void)
case TLET:
return (unsigned char)letter;
case TNUM:
- if (number < 0 || number > 255)
+ if (number < 0x000000 || number > 0x10FFFF)
return -1;
return number;
default:
diff --git a/usr.sbin/kbdcontrol/kbdmap.5 b/usr.sbin/kbdcontrol/kbdmap.5
index 2b94b35..4c4cd86 100644
--- a/usr.sbin/kbdcontrol/kbdmap.5
+++ b/usr.sbin/kbdcontrol/kbdmap.5
@@ -84,7 +84,7 @@ The symbol the key should produce,
in single quotes.
.It Ar decnum
The
-.Tn ASCII
+.Tn Unicode
value to produce
as a decimal number
(see
@@ -92,7 +92,7 @@ as a decimal number
For example, 32 for space.
.It 0x Ns Ar hexnum
The
-.Tn ASCII
+.Tn Unicode
value to produce
as a hexadecimal number.
For example, 0x20 for space.
@@ -274,7 +274,7 @@ This is followed
by the symbol for the accent,
given in single quotes or
as a decimal or hexadecimal
-.Tn ASCII
+.Tn Unicode
value.
This symbol will be produced
if the accent key is pressed and
@@ -290,7 +290,7 @@ Both symbols in a pair can be given
in either single quotes or
as decimal or
hexadecimal
-.Tn ASCII
+.Tn Unicode
values.
.Pp
For example,
OpenPOWER on IntegriCloud