fdo-mirrors/libevdev
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libevdev/libevdev.git synced 2025-12-24 11:10:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolve the names "SW_MAX" and friends

Browse source 
Some of the *_MAX names are duplicates and have a real define. These were not
resolved until now.

Fixes https://gitlab.freedesktop.org/libevdev/libevdev/issues/3

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
This commit is contained in:
Peter Hutterer 2018-06-18 14:18:07 +10:00
parent 812fc7096d
commit d9cfd143d0
2 changed files with 30 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
libevdev/make-event-names.py
View file

@ -9,7 +9,8 @@ import re
import sys
class Bits(object):
pass
def __init__(self):
self.max_codes = {}
prefixes = [
"EV_",
@ -113,6 +114,12 @@ def print_lookup(bits, prefix):
if prefix == "btn":
names = names + btn_additional;
# We need to manually add the _MAX codes because some are
# duplicates
maxname = "%s_MAX" % (prefix.upper())
if maxname in duplicates:
names.append((bits.max_codes[maxname], maxname))
for val, name in sorted(names, key=lambda e: e[1]):
print(" { .name = \"%s\", .value = %s }," % (name, name))
@ -161,9 +168,6 @@ def parse_define(bits, line):
name = m.group(1)
if name in duplicates:
return
try:
value = int(m.group(2), 0)
except ValueError:
@ -173,6 +177,12 @@ def parse_define(bits, line):
if not name.startswith(prefix):
continue
if name.endswith("_MAX"):
bits.max_codes[name] = value
if name in duplicates:
return
attrname = prefix[:-1].lower()
if not hasattr(bits, attrname):

16
test/test-event-codes.c
View file

@ -99,6 +99,21 @@ START_TEST(test_code_names_invalid)
}
END_TEST
START_TEST(test_code_names_max)
{
ck_assert_int_eq(libevdev_event_code_from_name(EV_SYN, "SYN_MAX"), SYN_MAX);
ck_assert_int_eq(libevdev_event_code_from_name(EV_KEY, "KEY_MAX"), KEY_MAX);
ck_assert_int_eq(libevdev_event_code_from_name(EV_REL, "REL_MAX"), REL_MAX);
ck_assert_int_eq(libevdev_event_code_from_name(EV_ABS, "ABS_MAX"), ABS_MAX);
ck_assert_int_eq(libevdev_event_code_from_name(EV_MSC, "MSC_MAX"), MSC_MAX);
ck_assert_int_eq(libevdev_event_code_from_name(EV_SW, "SW_MAX"), SW_MAX);
ck_assert_int_eq(libevdev_event_code_from_name(EV_LED, "LED_MAX"), LED_MAX);
ck_assert_int_eq(libevdev_event_code_from_name(EV_SND, "SND_MAX"), SND_MAX);
ck_assert_int_eq(libevdev_event_code_from_name(EV_REP, "REP_MAX"), REP_MAX);
ck_assert_int_eq(libevdev_event_code_from_name(EV_FF, "FF_MAX"), FF_MAX);
}
END_TEST
START_TEST(test_properties)
{
struct prop {
@ -143,6 +158,7 @@ TEST_SUITE(event_code_suite)
tc = tcase_create("code tests");
tcase_add_test(tc, test_code_names);
tcase_add_test(tc, test_code_names_invalid);
tcase_add_test(tc, test_code_names_max);
suite_add_tcase(s, tc);
tc = tcase_create("property tests");