clearlinux/systemd-stable
2
0
Fork 0
mirror of https://github.com/clearlinux/systemd-stable.git synced 2026-09-04 20:51:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

udev-builtin-keyboard: Allow numeric key codes

Browse Source 
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
(cherry picked from commit 7925709c9a)

Conflicts:
	src/udev/udev-builtin-keyboard.c
This commit is contained in:
Martin Pitt
2014-10-26 18:23:41 -04:00
committed by Zbigniew Jędrzejewski-Szmek
parent 41a050837d
commit e39b227b68
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/udev/udev-builtin-keyboard.c
+11 -5
View File
@@ -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'\n", 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++;
}