|
c8efb704
|
2023-05-12T22:00:32
|
|
ci: bump runs-on versions
Mostly to bump to macos one which will hopefully fix CI issues there.
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
5a5ab3e8
|
2023-05-06T17:14:04
|
|
utils: fix printf format warnings on mingw
See:
https://github.com/mesonbuild/wrapdb/pull/819
https://github.com/Exiv2/exiv2/blob/c86ae6acf597304db37246434ebc393d732c22c2/src/image_int.hpp#L15
https://sourceforge.net/p/mingw-w64/wiki2/gnu%20printf/
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
e020174a
|
2023-05-05T10:52:07
|
|
build: show a summary
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
80be81e5
|
2023-05-05T10:16:30
|
|
build: require bison >= 2.3a
At least 2.3 (released 2006) which is the version shipped with macos
doesn't work. Reading the changelog I think 2.3a *should* work, so
require that.
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
45ba936b
|
2023-05-05T10:57:32
|
|
ci/windows: use the vs backend instead of ninja backend
So we have some coverage of that.
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
60d38b0c
|
2023-05-05T10:11:00
|
|
build: bump required meson to 0.52.0
Support for version checks in `find_program()`.
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
b06aedb8
|
2023-05-02T14:15:55
|
|
scanner: allow for a zero terminated string as keymap
As the documentation for xkb_keymap_new_from_buffer() states, the "input string
does not have to be zero-terminated". The actual implementation however failed
with "unrecognized token/syntax error" when it encountered a null byte.
Fix this by allowing a null byte at the last position of the buffer. Anything
else is likely a client error anyway.
Fixes #307
|
|
|
98b33142
|
2023-05-04T20:35:39
|
|
README: use meson compile/test over ninja
This is backend-agnostic and the recommended way to invoke compilation.
This requires meson 0.55 (July 2020) and we only require 0.51 but at this point
I'm expecting most users who require the README instructions will have a
recent-enough meson anyway.
|
|
536cf427
|
2023-05-04T07:14:54
|
|
.editorconfig: add .md config
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
e4226011
|
2023-05-04T11:55:51
|
|
Use consistent indentation for map and CSS files
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
8b7c1850
|
2021-03-19T09:49:24
|
|
registry: remove a few asprintf/free() calls with snprintf
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
a50890b1
|
2021-03-19T09:46:15
|
|
registry: simplify strdup() error handling
strdup() is the least likely call to fail here, let's move it to the bottom so
we don't need to worry about the allocated string.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
46b7753f
|
2023-05-02T23:47:56
|
|
meson.build: register libxkbcommon.dylib link
meson needs to know that the executable tools
link against libxkbcommon.dylib so that the
@rpath references used during the build/test phases
can be rewritten to full path names on install
|
|
|
5b5b67f2
|
2023-05-01T22:30:41
|
|
Add support for modmap None (#291)
Unlike current xkbcommon, X11’s xkbcomp allows to remove entries in
the modifiers’ map using “modifier_map None { … }”.
“None” is translated to the special value “XkbNoModifier” defined in
“X11/extensions/XKB.h”. Then it relies on the fact that in "CopyModMapDef",
the following code:
1U << entry->modifier
ends up being zero when “entry->modifier” is “XkbNoModifier” (i.e. 0xFF).
Indeed, it relies on the overflow behaviour of the left shift, which in
practice resolves to use only the 5 low bits of the shift amount, i.e.
0x1F here. Then the result of “1U << 0xFF” is cast to “char”, i.e. 0.
This is a good trick but too magical, so in libxkbcommon we will use
an explicit test against our new constant XKB_MOD_NONE.
|
|
|
0e9c2ec9
|
2023-04-30T21:30:36
|
|
Improve the doc of the XKB keymap text format, V1 (#321)
- Add table of contents
- Add terminology section
- (WIP) Add Introduction to the format
- Improve the keycode section
- Improve the interpret section
- Add guide to create and use modifiers
- (WIP) Add actions documentation
- Add cross-references
- Add keysyms header to documentation
|
|
|
003fdee1
|
2023-04-11T22:49:58
|
|
keysyms: add new keysyms XF86EmojiPicker, XF86Dictate
Ref: https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/commit/914d8f5e0f469cd0416364dd008e9eea752bf703
Ref: https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/commit/a839f0c7fc5596d10e786394d3b0953eb8a1731b
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
bd79a960
|
2023-04-11T23:24:47
|
|
Possible fix for non-MSVC windows compilers
`_MSC_VER` is specific to MSVC, but there can be other compilers targeting
windows. Hopefully they do define `_WIN32`, so let's use that.
Refs: https://github.com/xkbcommon/libxkbcommon/issues/305
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
13d4b7f6
|
2023-03-29T08:29:15
|
|
keysym: replace deprecated Serbian_DZE with Cyrillic_DZHE
Same numeric value for both and the Serbian one has been listed as deprecated
for decades.
See https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/merge_requests/69#note_1843415
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
5b5ec0ee
|
2023-02-18T11:01:30
|
|
build: override dependency for use as subproject
This allows xkbcommon to be used as a subproject.
Signed-off-by: Simon Ser <contact@emersion.fr>
|
|
|
c6ff79d5
|
2023-01-02T21:36:03
|
|
NEWS: add "New API" section for last release
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
cecaa01d
|
2023-01-02T21:23:05
|
|
Bump version to 1.5.0
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
233617d0
|
2023-01-02T21:10:45
|
|
build: fix wayland-scanner deprecation code -> private-code
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
5ba075ab
|
2022-12-17T13:51:10
|
|
doc: clarify "server state" and "client state" distinction
Add a common page for the concept and link to there from the relevant
functions.
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
e5444f41
|
2022-12-16T21:24:57
|
|
build: require meson >= 0.51, fix meson deprecations
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
7428eb6e
|
2022-12-16T21:36:13
|
|
ci: don't run linux on push to non-master branches
It's redundant with the pull request run.
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
b4e81ca1
|
2022-12-16T01:26:25
|
|
context: add XKB_CONTEXT_NO_SECURE_GETENV flag (#312)
This flag is useful for clients that may have relatively benign capabilities
set, like CAP_SYS_NICE, that also want to use the xkb configuration from the
environment and user configs in XDG_CONFIG_HOME.
Fixes: https://github.com/xkbcommon/libxkbcommon/issues/308
Fixes: https://github.com/xkbcommon/libxkbcommon/issues/129
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
9d1043dc
|
2022-12-14T18:21:13
|
|
build: remove -fsanitize-undefined-trap-on-error
Meson complains; it's probably not that important anymore when using the
`-Db_sanitize` options.
meson.build:36: WARNING: Consider using the built-in option for sanitizers instead of using "-fsanitize-undefined-trap-on-error".
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
a005d06c
|
2022-12-07T09:41:11
|
|
CI: bump a few actions to newer versions
Node 12 is deprecated so let's bump the actions to newer versions that
use Node 16. See
https://github.blog/changelog/2022-09-22-github-actions-all-actions-will-begin-running-on-node16-instead-of-node12/
|
|
|
2530f644
|
2022-09-24T10:30:00
|
|
build: reenable test-context in MSVC
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
f9858bf5
|
2022-09-24T10:27:51
|
|
test: move mkdir & mkdtemp calls to common place and fix them on MSVC
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
4d829390
|
2022-09-24T10:37:06
|
|
utils: move some MSVC compat stuff to common place
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
b3095142
|
2022-07-15T13:01:52
|
|
ci/linux: store the test logs as artifacts on failure
This makes debugging a lot easier than having to reproduce locally.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
cc0e97e9
|
2022-07-15T13:07:26
|
|
ci/linux: split normal testing from valgrind testing
A test case failure usually also triggers valgrind leaks, sifting through those
to find the actual test failure is painful. So let's separate the tests and run
them separately.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
320f56d2
|
2022-09-04T00:51:07
|
|
interactive-wayland: Fix interface versioning
We need to request the lower version of the interface versions we
support and the server supports, not the higher version.
Using the higher version caused crashes due to unbound callbacks on
GNOME, which supports a higher version of `xdg_wm_base`.
|
|
|
57af9cb7
|
2022-05-21T22:55:10
|
|
Bump version to 1.4.1
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
4000a1bd
|
2022-05-15T10:41:53
|
|
keysym-utf: remove bogus currency sign entries
These ended up being mapping in the 0x100xxxx Unicode range, which are
handled automatically ; these special keysyms don't exist (except for
EuroSign).
#define XKB_KEY_EcuSign 0x10020a0 /* U+20A0 EURO-CURRENCY SIGN */
#define XKB_KEY_ColonSign 0x10020a1 /* U+20A1 COLON SIGN */
#define XKB_KEY_CruzeiroSign 0x10020a2 /* U+20A2 CRUZEIRO SIGN */
#define XKB_KEY_FFrancSign 0x10020a3 /* U+20A3 FRENCH FRANC SIGN */
#define XKB_KEY_LiraSign 0x10020a4 /* U+20A4 LIRA SIGN */
#define XKB_KEY_MillSign 0x10020a5 /* U+20A5 MILL SIGN */
#define XKB_KEY_NairaSign 0x10020a6 /* U+20A6 NAIRA SIGN */
#define XKB_KEY_PesetaSign 0x10020a7 /* U+20A7 PESETA SIGN */
#define XKB_KEY_RupeeSign 0x10020a8 /* U+20A8 RUPEE SIGN */
#define XKB_KEY_WonSign 0x10020a9 /* U+20A9 WON SIGN */
#define XKB_KEY_NewSheqelSign 0x10020aa /* U+20AA NEW SHEQEL SIGN */
#define XKB_KEY_DongSign 0x10020ab /* U+20AB DONG SIGN */
#define XKB_KEY_EuroSign 0x20ac /* U+20AC EURO SIGN */
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
49e8a2d8
|
2022-05-15T10:32:58
|
|
keysym-utf: remove bogus Korean Won sign entry
This entry maps a non existing special keysym 0x20a9.
The correct mapping for XKB_KEY_Korean_Won (0x0eff) already exists.
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
25367130
|
2022-04-27T18:45:54
|
|
Remove bogus euro sign entry from keysymtab
Not sure what it's doing here, but converting "€" to a keysym
doesn't work with this entry. 0x13a4 doesn't appear in
xkbcommon-keysyms.h. 0x20ac is the keysym documented in the
header (and it's the last entry in the table).
It's been in the table since it was introduced in e0524296d2e0
("Add API for getting unicode representation of a keysym").
Co-authored-by: Simon Ser <contact@emersion.fr>
|
|
b064b609
|
2022-05-14T01:11:32
|
|
Do not clear sibling entries when override.
lokid and hikid actually stores the sibling to current node, which
should not be cleared when override. This would break the sequence with
a common prefix when override another.
Fix #286
Signed-off-by: Weng Xuetian <wengxt@gmail.com>
|
|
|
3d56569a
|
2022-03-20T13:50:12
|
|
ci/linux: bring back `apt update` to fix `apt install` 404s
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
0b3d9092
|
2022-03-14T16:44:13
|
|
scanner: prefix functions with `scanner_` to avoid symbol conflicts
Particularly `eof()` in mingw-w64.
Fixes: https://github.com/xkbcommon/libxkbcommon/pull/285
Reported-by: Marko Lindqvist
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
a2507c08
|
2022-02-24T10:48:50
|
|
Improve misleading comments #270
|
|
|
9e7f3ba4
|
2022-02-04T12:59:18
|
|
ci: another possible fix for release workflow
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
ea6580cc
|
2022-02-04T12:41:50
|
|
Bump version to 1.4.0
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
1c8ef9e0
|
2022-01-24T11:13:06
|
|
test: add test for variant inheritance of ISO 639/3166 codes
See efa99624320f54e6e1ff24e4c4b1fcecdfba43d5
|
|
efa99624
|
2022-01-24T02:16:08
|
|
Variants should inherit iso639, iso3166 and brief from parent layout if omitted (#266)
|
|
|
9b05825e
|
2022-01-20T13:08:36
|
|
registry: skip over invalid ISO639 or ISO3166 entries
If the XML file is somehow off, don't load entries that are against the spec.
|
|
|
34ef11d9
|
2022-01-20T14:17:50
|
|
test: show the tool exit status on failure
We already do so for the non-successful cases, let's do this here too so we know
whether it was a signal or a normal exit.
|
|
|
0e3f72af
|
2022-01-17T13:51:48
|
|
registry: don't call xmlCleanupParser()
From the documentation:
> It does not clean up parser state, it cleans up memory allocated by the library
> itself. It is a cleanup function for the XML library. It tries to reclaim all
> related global memory allocated for the library processing. [...]
> One should call xmlCleanupParser() only when the process has finished using the library.
http://xmlsoft.org/html/libxml-parser.html#xmlCleanupParser
Since we're a library ourselves we cannot know if something else in the same
proces uses the parser, so we must not call this.
Reported-by: M Hickford
|
|
|
be68829a
|
2022-01-17T14:08:59
|
|
CI: always run the linux workflow
This makes it easier for contributors to check if their code runs correctly
without having to file a PR.
The Mac and Windows workflows are a bit more involved, so let's keep those on
pull requests only.
|
|
|
121cd377
|
2022-01-17T14:05:41
|
|
CI: split and rename the workflows to windows/macos/linux
"main" is a bit non-descriptive, let's name them after the platforms we run them
on. Splitting them up allows us to be less selective on how we run the various
workflows, e.g. always running the linux one.
|
|
|
9bbe629a
|
2021-12-23T12:58:06
|
|
Update README.md
Co-authored-by: Ran Benita <ran@unusedvar.com>
|
|
|
2e571b43
|
2021-10-11T18:30:31
|
|
Add instructions to run tests. Add build/ to .gitignore.
|
|
8531ea72
|
2021-10-08T09:51:10
|
|
build: add enable-tools option
this is mainly useful for multilib, but may be useful for other users as well
Signed-off-by: Alex Xu (Hello71) <alex_y_xu@yahoo.ca>
|
|
|
50a24569
|
2021-11-10T14:45:53
|
|
tools/list: print an empty string for null vendor strings
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
abb115c7
|
2021-11-08T14:33:29
|
|
tools/list: enclose the the various field names in quotes
Because otherwise the 'no' layout is treated as disagreement with whatever is to
be disagreed with. Fixed in YAML 1.2 but that's not universally supported.
Fixes #268
|
|
|
e8cb4311
|
2021-11-01T23:56:22
|
|
man: mention `xkbcli list` output is meant to be in YAML 1.2 format
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
ae3b010e
|
2021-09-17T00:00:11
|
|
ci: possible fix for release workflow
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
88222c8d
|
2021-09-10T22:51:34
|
|
Bump version to 1.3.1
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
4a576ab1
|
2021-08-31T21:50:52
|
|
x11: try to fix crash in xkb_x11_keymap_new_from_device error handling
In 1b3a1c277a033083fee669e92c8cad862716ebd1 we changed the error
handling in this code to not bail out immediately but only after
everything has been processed, to simplify the code. But I suspect the
code isn't prepared for this and that's what causing the crash reported
in the issue.
Bring back the short-circuit error handling which would hopefully fix
such crashes.
Fixes: https://github.com/xkbcommon/libxkbcommon/issues/252
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
4e361712
|
2021-08-31T22:03:03
|
|
x11: stylistic fixes
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
f8c430cf
|
2021-07-31T22:03:33
|
|
tools/how-to-type: add --keysym for how to type a keysym
Previously, could only check how to type a Unicode codepoint, but
searching for a keysym directly is also occasionally useful.
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
5419e577
|
2021-07-12T11:05:50
|
|
tools/interactive-x11: use keysym to look for Esc
Don't assume that keycode 9 means Escape. Instead, use the keymap
to check for Esc.
Logic copied from the Wayland version.
Signed-off-by: Simon Ser <contact@emersion.fr>
|
|
|
eb59a1c5
|
2021-06-10T17:13:57
|
|
bench/compose: fix compose file path
Forgotten in e2465c2.
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
1318bedb
|
2021-05-22T20:31:32
|
|
ci: some tweaks
- Reduce permissions
- Update some stuff
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
c4fdcba3
|
2021-05-22T20:22:56
|
|
ci: also link to tarball in github release
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
1f7ffde9
|
2021-05-22T20:17:35
|
|
ci: automatically create github release when tag is pushed
Fixes: https://github.com/xkbcommon/libxkbcommon/issues/233
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
8507af73
|
2021-05-22T20:11:10
|
|
test/tool-option-parsing: don't depend on build prefix
Fixes: https://github.com/xkbcommon/libxkbcommon/issues/244
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
98f07da8
|
2021-05-22T20:07:06
|
|
test/compose: add tests for xkb_compose_table_new_from_locale lookup
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
5b1b2f75
|
2021-05-22T20:00:24
|
|
test/compose: clean up after a setenv
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
e2465c2a
|
2021-05-22T19:55:04
|
|
tests/data: add files needed to fully test compose
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
09ac27f7
|
2021-05-22T19:51:02
|
|
ignore: remove no longer relevant gitignore files
These were relevant for the autoconf build but now we're meson only.
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
7062ab97
|
2021-05-22T19:36:22
|
|
xkbcommon: deprecate XK_approxeq and XK_notapproxeq
Sync xorg-proto commit
https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/commit/25f3278b85ec7d1c78bb150eaea52f9c98294ea4
Fixes: #82
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
8e9f943d
|
2021-05-14T08:36:59
|
|
scripts/update-keysyms: fix path to the include files after de1b6943d
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
b6aadd57
|
2021-05-08T21:30:52
|
|
tools: add compose tool for Compose debugging
Not very useful so not exposed in xkbcli.
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
1915632e
|
2021-05-08T21:08:37
|
|
compose: add mapped locale to Compose-file-not-found error log
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
13ba9135
|
2021-05-01T23:51:23
|
|
Bump version to 1.3.0
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
16fe837d
|
2019-11-02T16:19:32
|
|
atom: rewrite as a hash table
While the previous 1987-style[0] scheme was fun (and I reasonably
optimized it for a fair comparison), this task is more suited to a hash
table. Even a simple implementation beats the old one.
[0] Seems to have first appeared in X11R1, released September 1987.
See server/dix/atom.c here: https://www.x.org/releases/X11R1/X.V11R1.tar.gz
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
baf55226
|
2021-04-08T10:51:07
|
|
bench: add atom benchmark
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
5f8c2fa4
|
2021-04-27T12:31:37
|
|
bench/rulescomp: decrease benchmark iterations
No need for more, and easier to convert to milliseconds per iteration.
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
9d87f849
|
2021-04-27T10:53:36
|
|
build: fix missing includes
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
de1b6943
|
2021-04-27T10:10:26
|
|
Move include files to include/ subdirectory
This way we don't specify `include_directorories('.')` which brings in
more than needed.
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
8ff0232b
|
2021-04-27T10:02:00
|
|
build: move the subproject variables to a common section at the end
As suggested in:
https://github.com/xkbcommon/libxkbcommon/pull/240#discussion_r620784021
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
4238417b
|
2021-04-26T17:27:01
|
|
Meson: Allow building as subproject
Specify where to find the headers for libxkbcommon_dep,
libxkbcommon_x11_dep, and libxkbregistry_dep, which allows other
projects to correctly locate the headers when libxkbcommon is being
built as a Meson subproject.
The dep_libxkbregistry variable is renamed to libxkbregistry_dep,
to follow the usual convention for variables which hold declared
dependencies to be used from subproject builds.
|
|
|
5cd76a8d
|
2021-04-26T17:38:48
|
|
Windows: Pass list of symbols to export to MSVC
Arrange for passing .def files with the lists of symbols to export from
DLLs when building on Windows with MSVC. Without this no symbols were
being exported at all.
The .def files are generated from the .map files at build time using
scripts/map-to-def, which avoids needing to maintain two different sets
of files.
|
|
|
f434c690
|
2021-04-22T12:52:55
|
|
tools: change xkbcli list to output YAML
We have a lot of keyboard layouts and the current output format is virtually
useless at searching for a specific one to debug any issues with either the
layout list or the output from libxkbregistry.
Let's use YAML instead because that can easily be post-processed to extract the
specific layouts wanted, e.g. to get the list of all layouts:
xkbcli-list | yq -r ".layouts[].layout"
to get the list of all variants of the "us" layout:
xkbcli-list | yq -r '.layouts[] | select(.layout == "us") | .variant
and the number of option groups:
xkbcli-list | yq -r '.option_groups[] | length'
Note that the top-level nodes have been de-capitalized, so where it was "Models"
before it is now "models" and the "Options" node is now "option_groups".
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
693ffb07
|
2021-04-22T12:42:00
|
|
tools: change the list separator handling
Slightly easier to read than the "bool first" approach.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
68dddd41
|
2021-04-22T00:37:03
|
|
keysym: fix underflow in binary searches
This is hit when passing an empty string and XKB_KEYSYM_CASE_INSENSITIVE
to xkb_keysym_from_name currently if `(lo + hi) / 2` is 0 and `cmp < 0`,
causing mid to underflow and the the array access into name_to_keysym on
the next iteration of the loop to be out of bounds .
We *would* use ssize_t here as it is the appropriate type, but windows
unfortunately does not define it.
|
|
|
15576683
|
2021-04-21T09:02:40
|
|
test: allow skipping errors in certain conditions
Add a skipError test function that can analyse rc, stdout, stderr to skip a test
even when we expect an error. We use that to skip if we couldn't find a keyboard
in the interactive-evdev test.
Fixes #235
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
f60bdb16
|
2021-04-20T12:21:28
|
|
test: add extra info to the layout-tester --help output
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
be520ef9
|
2021-04-16T09:24:20
|
|
test: print the layout-tester progress bar to stdout by default
tqdm prints to stderr by default but we're using that for failed keymap
compiles (which are the ones that really matter). Plus, whether we're using tqdm
is dependent on isatty(sys.stdout) anyway.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
efa58050
|
2021-04-16T07:42:27
|
|
test: add an LVO argument to the XKB layout tester
Slightly easier to debug if we can have it only parse one single layout.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
a955dca3
|
2021-04-15T11:07:33
|
|
test: print the compiled keymaps to a given directory
With --keymap-output-dir, the given directory will contain a list of files named
after the layout + variant ('us', 'us(euro)', ...) that contain the keymaps for
each variant + option combination compiled.
This is still a lot, but better to sift through hundreds of keymaps than tens of
thousands.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
1cae2500
|
2021-04-15T10:39:05
|
|
test: rework the output for the xkeyboard-config layout tester
The previous output is largely unusable. The result in the CI test runs is a 6GB
file with every compiled keymap in it and while we can grep for ERROR, it's not
particularly useful.
Let's change this and print out YAML instead - that can be machine-processed.
This patch adds a new parent class that prints itself in YAML format,
the tool invocations are child classes of that class. The result looks like this:
Example output:
- rmlvo: ["evdev", "pc105", "us", "haw", "grp:rwin_switch"]
cmd: "xkbcli-compile-keymap --verbose --rules evdev --model pc105 --layout us --variant haw --options grp:rwin_switch"
status: 0
- rmlvo: ["evdev", "pc105", "us", "foo", ""]
cmd: "xkbcli-compile-keymap --verbose --rules evdev --model pc105 --layout us --variant foo"
status: 1
error: "failed to compile keymap"
Special status codes are: 99 for "unrecognized keysym" and 90 for "Cannot open
display" in the setxkbmap case.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
44e8d4b0
|
2021-04-15T08:57:51
|
|
test: add proper --verbose handling to the xkeyboard-config tester
Instead of defaulting to verbose on/off depending on isatty, make it an
argument instead.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
f04c7e93
|
2021-04-14T12:56:07
|
|
interactive-wayland: fallback to ftruncate() if needed
Fallback to ftruncate() if the underlying filesystem does not
support posix_fallocate().
Idea by: Jan Beich <jbeich@FreeBSD.org>, Niclas Zeising <zeising@FreeBSD.org>
Inspired by: Wayland cursor/os-compatibility.c
[ran: small adjustments]
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
8b603dbe
|
2021-04-10T23:28:06
|
|
doc: fix user-configuration sample file
Support copy-pasting from the docs to get something functional.
Signed-off-by: Jouke Witteveen <j.witteveen@gmail.com>
|
|
|
5d297c50
|
2021-04-08T10:13:27
|
|
scripts: update license note in perfect_hash.py
Ref: https://github.com/ilanschnell/perfect-hash/issues/5
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
097a0ca7
|
2021-04-07T19:23:55
|
|
Bump version to 1.2.1
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
29af25ea
|
2021-04-07T10:47:15
|
|
x11: fix xkb_x11_keymap_new_from_device failing when a level name is empty
The numpad:mac option doesn't specify a name for the first level:
// On Mac keypads, level 1 and 2 are swapped.
partial xkb_types "mac" {
type "KEYPAD" {
modifiers = None;
map[None] = Level2;
level_name[Level2] = "Number";
};
include "extra(keypad)"
};
This means the atom for level name is XCB_ATOM_NONE. We tried to get its
name, which fails. This regressed in 40c00b472144d1684d2fb97cafef39.
Instead, translate it to XKB_ATOM_NONE, same as the previous behavior.
Fixes: https://github.com/xkbcommon/libxkbcommon/issues/229
Signed-off-by: Ran Benita <ran@unusedvar.com>
|