d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make the keyboard layer Unicode aware.

Browse Source 
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/...
This commit is contained in:
ed 2009-09-19 17:56:26 +00:00
parent 064ad1c10a
commit 48c86dac05
4 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sys/dev/kbd/kbd.c
View File

@ -837,13 +837,14 @@ static int fkey_change_ok(fkeytab_t *, fkeyarg_t *, struct thread *);
int
genkbd_commonioctl(keyboard_t *kbd, u_long cmd, caddr_t arg)
{
#ifndef KBD_DISABLE_KEYMAP_LOAD
keymap_t *mapp;
#endif
keyarg_t *keyp;
fkeyarg_t *fkeyp;
int s;
int i;
#ifndef KBD_DISABLE_KEYMAP_LOAD
int error;
#endif
s = spltty();
switch (cmd) {
@ -869,18 +870,29 @@ genkbd_commonioctl(keyboard_t *kbd, u_long cmd, caddr_t arg)
break;
case GIO_KEYMAP: /* get keyboard translation table */
bcopy(kbd->kb_keymap, arg, sizeof(*kbd->kb_keymap));
break;
error = copyout(kbd->kb_keymap, *(void **)arg,
sizeof(keymap_t));
splx(s);
return (error);
case PIO_KEYMAP: /* set keyboard translation table */
#ifndef KBD_DISABLE_KEYMAP_LOAD
error = keymap_change_ok(kbd->kb_keymap, (keymap_t *)arg,
curthread);
mapp = malloc(sizeof *mapp, M_TEMP, M_NOWAIT);
error = copyin(*(void **)arg, mapp, sizeof *mapp);
if (error != 0) {
splx(s);
free(mapp, M_TEMP);
return (error);
}
error = keymap_change_ok(kbd->kb_keymap, mapp, curthread);
if (error != 0) {
splx(s);
free(mapp, M_TEMP);
return (error);
}
bzero(kbd->kb_accentmap, sizeof(*kbd->kb_accentmap));
bcopy(arg, kbd->kb_keymap, sizeof(*kbd->kb_keymap));
bcopy(mapp, kbd->kb_keymap, sizeof(*kbd->kb_keymap));
free(mapp, M_TEMP);
break;
#else
splx(s);

7
sys/sys/kbio.h
View File

@ -106,7 +106,7 @@ typedef struct keyboard_repeat keyboard_repeat_t;
#define _KEYMAP_DECLARED
struct keyent_t {
u_char map[NUM_STATES];
u_int map[NUM_STATES];
u_char spcl;
u_char flgs;
#define FLAG_LOCK_O 0
@ -220,8 +220,9 @@ typedef struct fkeyarg fkeyarg_t;
#define GIO_SCRNMAP _IOR('k', 2, scrmap_t)
#define PIO_SCRNMAP _IOW('k', 3, scrmap_t)
#endif
#define GIO_KEYMAP _IOR('k', 6, keymap_t)
#define PIO_KEYMAP _IOW('k', 7, keymap_t)
/* XXX: Should have keymap_t as an argument, but that's too big for ioctl()! */
#define GIO_KEYMAP _IO('k', 6)
#define PIO_KEYMAP _IO('k', 7)
#define GIO_DEADKEYMAP _IOR('k', 8, accentmap_t)
#define PIO_DEADKEYMAP _IOW('k', 9, accentmap_t)
#define GIO_KEYMAPENT _IOWR('k', 10, keyarg_t)

2
usr.sbin/kbdcontrol/kbdcontrol.c
View File

@ -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:

8
usr.sbin/kbdcontrol/kbdmap.5
View File

@ -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,