mirror of
https://github.com/sheumann/hush.git
synced 2024-12-30 05:29:47 +00:00
setkeycodes: fix handling of 0exx scancodes
function old new delta setkeycodes_main 143 130 -13 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
parent
dc1fd2e52a
commit
2e068e725c
@ -21,7 +21,7 @@ enum {
|
|||||||
int setkeycodes_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
int setkeycodes_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
||||||
int setkeycodes_main(int argc, char **argv)
|
int setkeycodes_main(int argc, char **argv)
|
||||||
{
|
{
|
||||||
int fd, sc;
|
int fd;
|
||||||
struct kbkeycode a;
|
struct kbkeycode a;
|
||||||
|
|
||||||
if (!(argc & 1) /* if even */ || argc < 2) {
|
if (!(argc & 1) /* if even */ || argc < 2) {
|
||||||
@ -30,17 +30,17 @@ int setkeycodes_main(int argc, char **argv)
|
|||||||
|
|
||||||
fd = get_console_fd_or_die();
|
fd = get_console_fd_or_die();
|
||||||
|
|
||||||
while (argc > 2) {
|
while (argv[1]) {
|
||||||
a.keycode = xatou_range(argv[2], 0, 127);
|
int sc = xstrtoul_range(argv[1], 16, 0, 0xe07f);
|
||||||
a.scancode = sc = xstrtoul_range(argv[1], 16, 0, 255);
|
if (sc >= 0xe000) {
|
||||||
if (a.scancode > 127) {
|
sc -= 0xe000;
|
||||||
a.scancode -= 0xe000;
|
sc += 0x0080;
|
||||||
a.scancode += 128;
|
|
||||||
}
|
}
|
||||||
|
a.scancode = sc;
|
||||||
|
a.keycode = xatou_range(argv[2], 0, 255);
|
||||||
ioctl_or_perror_and_die(fd, KDSETKEYCODE, &a,
|
ioctl_or_perror_and_die(fd, KDSETKEYCODE, &a,
|
||||||
"can't set SCANCODE %x to KEYCODE %d",
|
"can't set SCANCODE %x to KEYCODE %d",
|
||||||
sc, a.keycode);
|
sc, a.keycode);
|
||||||
argc -= 2;
|
|
||||||
argv += 2;
|
argv += 2;
|
||||||
}
|
}
|
||||||
return EXIT_SUCCESS;
|
return EXIT_SUCCESS;
|
||||||
|
Loading…
Reference in New Issue
Block a user