|
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>
|
|
|
086353b3
|
2021-04-02T22:12:00
|
|
Bump version to 1.2.0
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
7e6d942a
|
2021-04-02T15:00:46
|
|
compose: fix max compose nodes check
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
45b1ca22
|
2021-04-01T22:46:56
|
|
keysym: speed up the perfect hash function
Make it use a bit operation instead of an expensive modulo.
perf diff:
Baseline Delta Abs Shared Object Symbol
........ ......... ................. ...................................
28.15% -6.57% bench-compose [.] xkb_keysym_from_name
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
8cd688c0
|
2021-04-01T22:07:28
|
|
keysym: avoid strtoul in xkb_keysym_from_name
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
68e69b7d
|
2021-03-28T20:22:54
|
|
keysym: use a perfect hash function for case sensitive xkb_keysym_from_name
In 7d84809fdccbb5898d0838849ec7c321410182d5 I added a fast path for the
case-sensitive case, but it is still slowing down Compose parsing.
Instead of the binary search, use a perfect hash function, computed with
a simple python module I found (vendored).
It is faster -- perf diff is:
Baseline Delta Abs Shared Object Symbol
........ ......... ................. ...................................
22.35% -14.04% libc-2.33.so [.] __strcmp_avx2
16.75% +10.28% bench-compose [.] xkb_keysym_from_name
20.72% +2.40% bench-compose [.] parse.constprop.0
2.29% -1.97% bench-compose [.] strcmp@plt
2.56% +1.81% bench-compose [.] resolve_name
2.37% +0.92% libc-2.33.so [.] __GI_____strtoull_l_internal
26.19% -0.63% bench-compose [.] lex
1.45% +0.56% libc-2.33.so [.] __memchr_avx2
1.13% -0.31% libc-2.33.so [.] __strcpy_avx2
Also reduces the binary size:
Before:
text data bss dec hex filename
341111 5064 8 346183 54847 build/libxkbcommon.so.0.0.0
After:
text data bss dec hex filename
330215 5064 8 335287 51db7 build/libxkbcommon.so.0.0.0
Note however that it's still larger than before 7d84809fdccbb5898d08388:
text data bss dec hex filename
320617 5168 8 325793 4f8a1 build/libxkbcommon.so.0.0.0
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
02b9cabf
|
2021-03-29T16:05:14
|
|
compose: use a ternary tree instead of a regular trie
Previously we used a simple trie with a linked list for each chain.
Unfortunately most compose files have very long chains which means the
constructions performs an almost quadratic number of comparisons.
Switch to using a ternary search tree instead. This is very similar to a
trie, only the linked list is essentially replaced with a binary tree.
On the en_US/Compose file, the perf diff is the following (the modified
function is `parse`):
Event 'cycles:u'
Baseline Delta Abs Shared Object Symbol
........ ......... ................ .................................
39.91% -17.62% bench-compose [.] parse.constprop.0
20.54% +6.47% bench-compose [.] lex
17.28% +5.55% libc-2.33.so [.] __strcmp_avx2
12.78% +4.01% bench-compose [.] xkb_keysym_from_name
2.30% +0.83% libc-2.33.so [.] __GI_____strtoull_l_internal
3.36% +0.78% bench-compose [.] strcmp@plt
Thanks to some careful packing, the memory usage is pretty much the
same.
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
3a6c3b2c
|
2021-03-30T20:34:11
|
|
ast: remove comment re. anonymous struct
C11 is not sufficient for this, needs `--ms-extensions` which we don't
want to enable.
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
8b09e177
|
2021-03-30T20:12:08
|
|
compose: use anonymous union
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
90e2d5ee
|
2021-03-30T20:08:42
|
|
build: require C11
I'd really like to use anonymous unions/structs. Supposedly even MSVC
supports it now. Let's try and see.
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
1c0e28ad
|
2021-03-30T19:11:59
|
|
keysym: properly handle overflow in 0x keysym names
Relatedly, strtoul allows a lot of unwanted stuff (spaces, +/- sign,
thousand seperators), we really ought not use it. But that's for another
time.
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
1638409b
|
2021-03-30T17:52:36
|
|
compose: add a limit of 65535 sequences
Fits in uint16_t, which enables some future optimizations. But also a
good idea to have some limit. Not aware of any compose files which come
close.
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
127f8c97
|
2021-03-30T08:09:37
|
|
utils: assert on streq for NULL pointers
We have streq_null for that purpose
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
d1726527
|
2021-03-30T08:08:58
|
|
test: move an assert up to before the strlen() use
../../../test/keysym.c:80:24: warning: Null pointer passed to 1st parameter
expecting 'nonnull' [core.NonNullParamChecker]
(unsigned) strlen(expected));
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
fa86433e
|
2021-03-30T07:56:09
|
|
xkbcomp: remove useless assignment
../../../src/xkbcomp/compat.c:693:16: warning: Although the value stored to
'merge' is used in the enclosing expression, the value is never actually read
from 'merge' [deadcode.DeadStores]
si.merge = merge = (def->merge == MERGE_DEFAULT ? merge : def->merge);
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
20f7f80c
|
2021-03-29T16:23:28
|
|
xkbcomp: use memcpy over strncpy to avoid analyzer warnings
The target buffer is 7 bytes long, null-termination is optional (as the comment
already suggests). Coverity is unhappy about this though so let's use memset and
memcpy instead.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
cda2eaf1
|
2021-03-29T20:59:12
|
|
man: add missing pointer to xkbcli-compile-keymap(1)
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
c14910a0
|
2021-03-28T16:10:52
|
|
interactive-evdev: fix missing initialization
Accidentally got lost in 6b65be4.
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
7d84809f
|
2021-03-28T15:51:01
|
|
keysym: fast path for case sensitive xkb_keysym_from_name
xkb_keysym_from_name() is called a lot in Compose file parsing. The
lower case handling slows things down a lot (particularly given we can't
use the optimized strcasecmp() due to locale issues). So add separate
handling for the non-case-sensitive case which is used by Compose.
To do this we need to add another version of the ks_tables table. This
adds ~20kb to the shared library binary. We can probably do something
better here but I think it's fine.
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
3b506497
|
2021-03-28T15:21:47
|
|
keysym: inline find_sym function
It's easier when everything is in one place.
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
2d87ab08
|
2021-03-28T15:23:40
|
|
keysym: use a more descriptive argument name
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
a717549e
|
2021-03-28T15:03:31
|
|
keysym: open-code bsearch
We want to optimize things here which requires messing with the binary
search some.
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
6b65be4c
|
2021-03-28T12:55:08
|
|
interactive-evdev: switch from epoll(2) to poll(2)
Turns out FreeBSD supports evdev, so this toll can work on it; however
it does not support epoll, so switch to poll, which is portable.
Reported-by: Evgeniy Khramtsov <evgeniy@khramtsov.org>
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
62b5b4a1
|
2021-03-28T13:01:57
|
|
x11: fix comparison of integer expressions of different signedness
src/x11/keymap.c:980:26: warning: comparison of integer expressions of different signedness: ‘size_t’ {aka ‘long unsigned int’} and ‘int’ [-Wsign-compare]
980 | for (size_t i = 0; i < length; i++) {
| ^
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
95e29079
|
2021-03-18T12:22:34
|
|
xkbcomp: plug a potential memory leak
libxkbcommon-1.0.3/src/xkbcomp/ast-build.c:526: leaked_storage: Variable "file"
going out of scope leaks the storage it points to.
Where we exit the loop early, we don't release the various allocated memory.
Make this patch more obvious my moving the declaration for those into the loop
as well, this way we know that they aren't used outside the loop anywhere.
Found by coverity
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
01aa2222
|
2021-03-18T11:22:38
|
|
registry: plug a potential memleak for invalid rules files
If the name is missing in a configItem, we'd fail and leak the memory for
description, brief and vendor.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
694b8f71
|
2021-03-18T11:13:43
|
|
test: fix missing va_end in case of test failures
Found by coverity
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
7a205e25
|
2021-03-18T11:08:16
|
|
bench: silence coverity complaint about a double free
False positive because we rely on xkb_components_from_rules() to initalize this
struct, but let's localize the variable anyway to shut coverity up.
libxkbcommon-1.0.3/bench/rules.c:59:9: warning[-Wanalyzer-double-free]:
double-free of kccgst.symbols
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
21c864cc
|
2021-03-09T09:44:25
|
|
Inline x11_atom_interner_adopt_atoms() into callers
Signed-off-by: Uli Schlachter <psychon@znc.in>
|
|
|
c0339701
|
2021-03-07T09:24:40
|
|
Save another GetAtomName round trip
Both get_atom_name() and the new atom interner required a round trip. Move
get_atom_name() into the atom interner to save one more round trip. This brings
xkb_x11_keymap_new_from_device() down to two round trips, which is the minimum
possible number.
(Also, I think the new code in keymap.c is more readable than the mess I
previously created)
With this last commit in the series, this definitely:
Fixes: https://github.com/xkbcommon/libxkbcommon/pull/217
Signed-off-by: Uli Schlachter <psychon@znc.in>
|
|
|
c8efc3d6
|
2021-03-07T08:48:34
|
|
Also batch the XKB GetNames request
This gets rid of another round trip.
Signed-off-by: Uli Schlachter <psychon@znc.in>
|
|
|
599064cf
|
2021-03-07T08:46:19
|
|
Also batch the XKB-GetMapMap request
This gets rid of one more round trip.
Signed-off-by: Uli Schlachter <psychon@znc.in>
|
|
|
1b3a1c27
|
2021-03-07T08:42:54
|
|
Remove three more round trips
There are a number of XKB requests needed to request all the information from
the X11 server. So far, the code was sending one request and waiting for the
reply. This commit starts batching the request so that we get multiple replies
with one round trip.
This removes three round trips.
Only the simple requests are converted. get_map() and get_names() use some
bitmasks that are needed for both the request and the reply. These will be dealt
with separately.
Signed-off-by: Uli Schlachter <psychon@znc.in>
|
|
|
b9707c1d
|
2021-03-07T08:01:49
|
|
Save three more round trips in xkb_x11_keymap_new_from_device()
Instead of asking for an atom name and waiting for the reply four times, this
now sends four GetAtomName requests and waits for all the replies at once. Thus,
this saves three round trips.
Signed-off-by: Uli Schlachter <psychon@znc.in>
|
|
|
40c00b47
|
2021-03-07T07:42:28
|
|
xkb_x11_keymap_new_from_device: Less X11 round-trips
On my system, calling xkb_x11_keymap_new_from_device() did 78 round trips to the
X11 server, which seems excessive. This commit brings this number down to about
9 to 10 round trips.
The existing functions adopt_atom() and adopt_atoms() guarantee that the atom
was adopted by the time they return. Thus, each call to these functions must do
a round-trip. However, none of the callers need this guarantee.
This commit makes "atom adopting" asynchronous: Only some time later is the atom
actually adopted. Until then, it is in some pending "limbo" state.
This actually fixes a TODO in the comments.
Fixes: https://github.com/xkbcommon/libxkbcommon/issues/216
Signed-off-by: Uli Schlachter <psychon@znc.in>
|
|
|
82a5bdc4
|
2021-02-27T22:48:12
|
|
Bump version to 1.1.0
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
83e3a53d
|
2021-02-27T22:38:21
|
|
doc: add keymap-format-text-v1.md to the HTML documentation
It's incomplete but might be helpful for someone.
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
afc5370c
|
2021-02-27T22:12:08
|
|
doc: add note on variants in rule names
Fixes: https://github.com/xkbcommon/libxkbcommon/issues/208
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
30ce6c04
|
2021-02-26T10:54:31
|
|
Fix a few keysymtab entries to match their comment in xkbcommon-keysyms.h
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
2dd391b6
|
2021-02-27T21:38:02
|
|
scripts: remove meson-junit-report.py
Not used since ed5a0b4fede69b8e6dc4db53d97ea4ae0a73956d.
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
d1ba81c4
|
2021-02-22T20:07:45
|
|
meson.build: replace the remaining join_paths() with the nicer / syntax
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
0abd430e
|
2021-02-22T12:54:15
|
|
test: add a keysym tester
A simple script that creates a new layout with the given keysym replacing TLDE.
Then we compile a keymap and search for the keysym being assigned to TLDE and
bail if that fails.
The list of keysyms is manually maintained but we only need to add one or two to
spot-check whenever the xorgproto is updated.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
b4802b06
|
2021-02-22T12:33:35
|
|
Fix documentation for XKB_CONFIG_EXTRA_PATH
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
0bfc71e7
|
2021-02-22T08:20:40
|
|
Update keysym definitions to latest xorgproto
As of xorgproto commit e5d8af9711516385f8346c9e077692b29c914478
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
3852106a
|
2021-02-17T09:06:57
|
|
scripts: update makeheader script for the _EVDEVK keysym defines
As of xorgproto commit 5dbb5b76597f [1], the 0x10081XXX keycode range is defined
for direct evdev kernel keycode mapping. For example, KEY_MACRO1 (0x290) is
mapped to 0x10081290. The format of the #define lines for these keys is
stable to allow for parsing:
#define XF86XK_FooBar _EVDEVK(0x123) /* optional comment */
Update our script so we detect these new lines. Our keysym generation is a
two-step process: makeheader and then makekeys. Replacing the key with its full
value in the makeheader script means we don't have to update makekeys to handle
the _EVDEVK macro and our header file is fully resolved.
[1] https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/merge_requests/23
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
5c1f4f0d
|
2021-02-22T08:17:58
|
|
Update imported comments in xkbcommon-keysyms.h
Matches xorgproto commits 39eb5974 and 09602b213.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
069777f4
|
2021-01-22T08:18:13
|
|
test: fix interactive evdev test invocation
rmlvos is the parent list which then fails during a list join because, well,
it's a list of lists.
Fixes #206
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
d5e3695e
|
2021-01-22T08:05:09
|
|
test: fill in srcdir/builddir when not set in the environment
Makes this test easier to run from the commandline. Where either of top_srcdir
or top_builddir isn't set, fill them in from the CWD or fail otherwise.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
44df69c9
|
2020-12-27T09:47:08
|
|
doc/keymap: some slight editing
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
7420521f
|
2020-12-27T02:48:39
|
|
doc/keymap: add documentation for xkb_symbols (#205)
|
|
|
c60b77ea
|
2020-11-23T20:30:13
|
|
Bump version to 1.0.3
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
fbf087ea
|
2020-11-23T19:51:04
|
|
keymap-dump: follow xkbcomp in printing affect=both in pointer actions
It is equivalent to nothing but good to match up.
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
ac6cd20c
|
2020-11-23T18:49:49
|
|
x11: fix type level names missing
When reading the keymap, the level names would get discarded.
Regressed in 26453b84732da870f5695ee347970b337cfea9c1.
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
95f8ff83
|
2020-11-23T18:35:27
|
|
test/data: update host.xkb to match keymap-dump style
This is needed for fixing the x11comp test.
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
4aed3c68
|
2020-11-23T18:24:52
|
|
x11/keymap: fix case with no actions
Possible regression in f41e609bbea8447fc82849a1a6ea0d116189f2f8 (not
confirmed yet).
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
13e6543e
|
2020-11-20T21:01:56
|
|
Bump version to 1.0.2
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
1bd3b3c7
|
2020-11-19T00:28:37
|
|
x11: cache X11 atoms
On every keymap notify event, the keymap should be refreshed, which
fetches the required X11 atoms. A big keymap might have a few hundred of
atoms.
A profile by a user has shown this *might* be slow when some intensive
amount of keymap activity is occurring. It might also be slow on a
remote X server.
While I'm not really sure this is the actual bottleneck, caching the
atoms is easy enough and only needs a couple kb of memory, so do that.
On the added bench-x11:
Before: retrieved 2500 keymaps from X in 11.233237s
After : retrieved 2500 keymaps from X in 1.592339s
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
f41e609b
|
2020-11-20T12:45:42
|
|
x11: eliminate slow divisions
Signed-off-by: Ran Benita <ran@unusedvar.com>
|