Xkb fixed layout #4778

Merged
merged 2 commits into from Dec 1, 2016

Conversation

2 participants
@whot
Contributor

whot commented Dec 1, 2016

This PR adds new properties to the keyboard hwdb: XKB_FIXED_LAYOUT and XKB_FIXED_VARIANT. It marks devices that look like keyboards but aren't ones that should otherwise have the layout modified. Examples are the Yubikeys which will send wrong passphrases when it's not in the US layout.

hwdb: fix comment referring to rules file
60-keyboard.rules was renamed to 60-evdev.rules in 51c0c28

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
@martinpitt

This comment has been minimized.

Show comment
Hide comment
@martinpitt

martinpitt Dec 1, 2016

Contributor

This fails the recently enabled parse_hwdb test:

Cannot parse ../hwdb/60-keyboard.hwdb: Expected stringEnd (at char 54609), (line:1255, col:1)

test with other recent PRs succeed, so it looks like parse_hwdb needs to be updated? Presumably these two properties need to be added to the props list?

Contributor

martinpitt commented Dec 1, 2016

This fails the recently enabled parse_hwdb test:

Cannot parse ../hwdb/60-keyboard.hwdb: Expected stringEnd (at char 54609), (line:1255, col:1)

test with other recent PRs succeed, so it looks like parse_hwdb needs to be updated? Presumably these two properties need to be added to the props list?

hwdb: add XKB_FIXED_LAYOUT/VARIANT to the keyboard hwdb
Yubikeys and other pseudo keyboards require that they are in the US layout,
otherwise the data they send is invalid. Add two new keys to signal this to
processes that handles (XKB) layouts.
@whot

This comment has been minimized.

Show comment
Hide comment
@whot

whot Dec 1, 2016

Contributor

sorry about that, I was sure I had run make check on this... fixed now with the proper parser additions, new head is 086c001

Contributor

whot commented Dec 1, 2016

sorry about that, I was sure I had run make check on this... fixed now with the proper parser additions, new head is 086c001

@martinpitt

Nice, thank you! It's actually quite a nice coincidence that not even a day after we enable this test it actually was (sort of) useful :-)

LGTM, fine to merge if CI gives thumbs up.

@martinpitt martinpitt merged commit b06662e into systemd:master Dec 1, 2016

4 of 5 checks passed

xenial-amd64 autopkgtest finished (failure)
Details
default Build finished.
Details
semaphoreci The build passed on Semaphore.
Details
xenial-i386 autopkgtest finished (success)
Details
xenial-s390x autopkgtest finished (success)
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment