From 7925709c9a29363d38c97a30af85830d1be0d4bf Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 5 Aug 2014 10:40:46 +0200 Subject: udev-builtin-keyboard: Allow numeric key codes Like with the old udev rules, allow hwdb entries to specify numeric key codes. Based on a patch from Mircea Miron. https://launchpad.net/bugs/1247584 --- src/udev/udev-builtin-keyboard.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/udev/udev-builtin-keyboard.c b/src/udev/udev-builtin-keyboard.c index 9b66bfd0ac..d6b7dbbac0 100644 --- a/src/udev/udev-builtin-keyboard.c +++ b/src/udev/udev-builtin-keyboard.c @@ -78,7 +78,7 @@ static int builtin_keyboard(struct udev_device *dev, int argc, char *argv[], boo udev_list_entry_foreach(entry, udev_device_get_properties_list_entry(dev)) { const char *key; - unsigned int scancode; + unsigned int scancode, keycode_num; char *endptr; const char *keycode; const struct key *k; @@ -110,13 +110,19 @@ static int builtin_keyboard(struct udev_device *dev, int argc, char *argv[], boo /* translate identifier to key code */ k = keyboard_lookup_key(keycode, strlen(keycode)); - if (!k) { - log_error("Error, unknown key identifier '%s'", keycode); - continue; + if (k) { + keycode_num = k->id; + } else { + /* check if it's a numeric code already */ + keycode_num = strtoul(keycode, &endptr, 0); + if (endptr[0] !='\0') { + log_error("Error, unknown key identifier '%s'", keycode); + continue; + } } map[map_count].scan = scancode; - map[map_count].key = k->id; + map[map_count].key = keycode_num; if (map_count < ELEMENTSOF(map)-1) map_count++; } -- cgit v1.2.3-54-g00ecf