diff options
| author | Andrew Turner <andrew.turner4@arm.com> | 2023-08-30 10:28:39 +0100 |
|---|---|---|
| committer | Aleksandr Nogikh <nogikh@google.com> | 2023-08-31 12:18:08 +0000 |
| commit | c5f8e6dcca94312ac64ef4fa377989889ed64123 (patch) | |
| tree | bedd49dd9b6b5e9b1fccef05dd5a48ef65d8bcdf /sys | |
| parent | 355a2f360eff47e2e713b5a563bbe840160efccf (diff) | |
sys/freebsd: update the *_DEADKEYMAP definitions
GIO_DEADKEYMAP and PIO_DEADKEYMAP have been updated uo support Unicode
characters. Update the structure definitions and add the compat ioctls.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/freebsd/dev_kbd.txt | 12 | ||||
| -rw-r--r-- | sys/freebsd/dev_kbd.txt.const | 6 |
2 files changed, 16 insertions, 2 deletions
diff --git a/sys/freebsd/dev_kbd.txt b/sys/freebsd/dev_kbd.txt index 9cf6834de..c2147311f 100644 --- a/sys/freebsd/dev_kbd.txt +++ b/sys/freebsd/dev_kbd.txt @@ -41,6 +41,8 @@ ioctl$OGIO_KEYMAP(fd fd_kbd, cmd const[OGIO_KEYMAP], arg ptr[out, okeymap]) ioctl$OPIO_KEYMAP(fd fd_kbd, cmd const[OPIO_KEYMAP], arg ptr[in, okeymap]) ioctl$GIO_DEADKEYMAP(fd fd_kbd, cmd const[GIO_DEADKEYMAP], arg ptr[out, accentmap]) ioctl$PIO_DEADKEYMAP(fd fd_kbd, cmd const[PIO_DEADKEYMAP], arg ptr[in, accentmap]) +ioctl$OGIO_DEADKEYMAP(fd fd_kbd, cmd const[OGIO_DEADKEYMAP], arg ptr[out, oaccentmap]) +ioctl$OPIO_DEADKEYMAP(fd fd_kbd, cmd const[OPIO_DEADKEYMAP], arg ptr[in, oaccentmap]) ioctl$GIO_KEYMAPENT(fd fd_kbd, cmd const[GIO_KEYMAPENT], arg ptr[inout, keyarg]) ioctl$PIO_KEYMAPENT(fd fd_kbd, cmd const[PIO_KEYMAPENT], arg ptr[in, keyarg]) @@ -80,6 +82,16 @@ accentmap { } acc_t { + accchar int32 + map array[int32, 104] +} + +oaccentmap { + n_accs int16 + acc array[oacc_t, NUM_DEADKEYS] +} + +oacc_t { accchar int8 map array[int8, 104] } diff --git a/sys/freebsd/dev_kbd.txt.const b/sys/freebsd/dev_kbd.txt.const index b3442d394..a51f7798c 100644 --- a/sys/freebsd/dev_kbd.txt.const +++ b/sys/freebsd/dev_kbd.txt.const @@ -29,7 +29,7 @@ F_ACC = 137 F_FN = 27 F_SCR = 11 GETFKEY = 3222563584 -GIO_DEADKEYMAP = 1177185032 +GIO_DEADKEYMAP = 536898312 GIO_KEYMAP = 536898310 GIO_KEYMAPENT = 3223874314 GIO_SCRNMAP = 1090546434 @@ -72,11 +72,13 @@ NOP = 0 NUM_DEADKEYS = 15 NUM_KEYS = 256 NUM_STATES = 8 +OGIO_DEADKEYMAP = 1177185032 OGIO_KEYMAP = 1241672454 +OPIO_DEADKEYMAP = 2250926857 OPIO_KEYMAP = 2315414279 PASTE = 163 PDWN = 162 -PIO_DEADKEYMAP = 2250926857 +PIO_DEADKEYMAP = 536898313 PIO_KEYMAP = 536898311 PIO_KEYMAPENT = 2150132491 PIO_SCRNMAP = 2164288259 |