summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* Windows: Pass list of symbols to export to MSVCAdrian Perez de Castro2021-04-272-3/+64
| | | | | | | | | | 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.
* tools: change xkbcli list to output YAMLPeter Hutterer2021-04-271-18/+26
| | | | | | | | | | | | | | | | | | | 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>
* tools: change the list separator handlingPeter Hutterer2021-04-271-13/+14
| | | | | | Slightly easier to read than the "bool first" approach. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* keysym: fix underflow in binary searchesIsaac Freund2021-04-252-4/+7
| | | | | | | | | | 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.
* test: allow skipping errors in certain conditionsPeter Hutterer2021-04-221-2/+11
| | | | | | | | | | 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>
* test: add extra info to the layout-tester --help outputPeter Hutterer2021-04-201-1/+6
| | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* test: print the layout-tester progress bar to stdout by defaultPeter Hutterer2021-04-201-2/+2
| | | | | | | | 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>
* test: add an LVO argument to the XKB layout testerPeter Hutterer2021-04-201-1/+15
| | | | | | Slightly easier to debug if we can have it only parse one single layout. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* test: print the compiled keymaps to a given directoryPeter Hutterer2021-04-201-2/+35
| | | | | | | | | | | 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>
* test: rework the output for the xkeyboard-config layout testerPeter Hutterer2021-04-201-74/+111
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* test: add proper --verbose handling to the xkeyboard-config testerPeter Hutterer2021-04-201-11/+22
| | | | | | | 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>
* interactive-wayland: fallback to ftruncate() if neededEvgeniy Khramtsov2021-04-141-11/+24
| | | | | | | | | | 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>
* doc: fix user-configuration sample fileJouke Witteveen2021-04-111-1/+3
| | | | | | Support copy-pasting from the docs to get something functional. Signed-off-by: Jouke Witteveen <j.witteveen@gmail.com>
* scripts: update license note in perfect_hash.pyRan Benita2021-04-081-4/+4
| | | | | | Ref: https://github.com/ilanschnell/perfect-hash/issues/5 Signed-off-by: Ran Benita <ran@unusedvar.com>
* Bump version to 1.2.1xkbcommon-1.2.1Ran Benita2021-04-072-1/+8
| | | | Signed-off-by: Ran Benita <ran@unusedvar.com>
* x11: fix xkb_x11_keymap_new_from_device failing when a level name is emptyRan Benita2021-04-071-1/+4
| | | | | | | | | | | | | | | | | | | | | | 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>
* Bump version to 1.2.0xkbcommon-1.2.0Ran Benita2021-04-032-1/+27
| | | | Signed-off-by: Ran Benita <ran@unusedvar.com>
* compose: fix max compose nodes checkRan Benita2021-04-021-2/+3
| | | | Signed-off-by: Ran Benita <ran@unusedvar.com>
* keysym: speed up the perfect hash functionRan Benita2021-04-012-298/+301
| | | | | | | | | | | | | 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>
* keysym: avoid strtoul in xkb_keysym_from_nameRan Benita2021-04-012-10/+39
| | | | Signed-off-by: Ran Benita <ran@unusedvar.com>
* keysym: use a perfect hash function for case sensitive xkb_keysym_from_nameRan Benita2021-04-014-2577/+1036
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* compose: use a ternary tree instead of a regular trieRan Benita2021-03-314-128/+139
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* ast: remove comment re. anonymous structRan Benita2021-03-301-1/+0
| | | | | | | C11 is not sufficient for this, needs `--ms-extensions` which we don't want to enable. Signed-off-by: Ran Benita <ran@unusedvar.com>
* compose: use anonymous unionRan Benita2021-03-304-25/+27
| | | | Signed-off-by: Ran Benita <ran@unusedvar.com>
* build: require C11Ran Benita2021-03-301-1/+1
| | | | | | | 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>
* keysym: properly handle overflow in 0x keysym namesRan Benita2021-03-302-6/+14
| | | | | | | | 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>
* compose: add a limit of 65535 sequencesRan Benita2021-03-303-10/+18
| | | | | | | | 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>
* utils: assert on streq for NULL pointersPeter Hutterer2021-03-301-0/+1
| | | | | | We have streq_null for that purpose Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* test: move an assert up to before the strlen() usePeter Hutterer2021-03-301-1/+2
| | | | | | | | ../../../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>
* xkbcomp: remove useless assignmentPeter Hutterer2021-03-301-1/+1
| | | | | | | | | ../../../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>
* xkbcomp: use memcpy over strncpy to avoid analyzer warningsPeter Hutterer2021-03-301-4/+5
| | | | | | | | 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>
* man: add missing pointer to xkbcli-compile-keymap(1)Ran Benita2021-03-291-0/+4
| | | | Signed-off-by: Ran Benita <ran@unusedvar.com>
* keysym: fast path for case sensitive xkb_keysym_from_nameRan Benita2021-03-283-52/+2621
| | | | | | | | | | | | | 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>
* keysym: inline find_sym functionRan Benita2021-03-281-56/+46
| | | | | | It's easier when everything is in one place. Signed-off-by: Ran Benita <ran@unusedvar.com>
* keysym: use a more descriptive argument nameRan Benita2021-03-281-11/+11
| | | | Signed-off-by: Ran Benita <ran@unusedvar.com>
* keysym: open-code bsearchRan Benita2021-03-281-34/+26
| | | | | | | We want to optimize things here which requires messing with the binary search some. Signed-off-by: Ran Benita <ran@unusedvar.com>
* interactive-evdev: fix missing initializationRan Benita2021-03-281-1/+1
| | | | | | Accidentally got lost in 6b65be4. Signed-off-by: Ran Benita <ran@unusedvar.com>
* interactive-evdev: switch from epoll(2) to poll(2)Ran Benita2021-03-284-29/+22
| | | | | | | | 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>
* x11: fix comparison of integer expressions of different signednessRan Benita2021-03-281-1/+1
| | | | | | | | 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>
* xkbcomp: plug a potential memory leakPeter Hutterer2021-03-191-3/+8
| | | | | | | | | | | | | | 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>
* registry: plug a potential memleak for invalid rules filesPeter Hutterer2021-03-191-0/+4
| | | | | | | 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>
* test: fix missing va_end in case of test failuresPeter Hutterer2021-03-191-6/+15
| | | | | | Found by coverity Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* bench: silence coverity complaint about a double freePeter Hutterer2021-03-191-1/+2
| | | | | | | | | | 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>
* Inline x11_atom_interner_adopt_atoms() into callersUli Schlachter2021-03-093-19/+8
| | | | Signed-off-by: Uli Schlachter <psychon@znc.in>
* Save another GetAtomName round tripUli Schlachter2021-03-093-76/+66
| | | | | | | | | | | | | | | 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>
* Also batch the XKB GetNames requestUli Schlachter2021-03-091-23/+24
| | | | | | This gets rid of another round trip. Signed-off-by: Uli Schlachter <psychon@znc.in>
* Also batch the XKB-GetMapMap requestUli Schlachter2021-03-091-15/+15
| | | | | | This gets rid of one more round trip. Signed-off-by: Uli Schlachter <psychon@znc.in>
* Remove three more round tripsUli Schlachter2021-03-091-18/+18
| | | | | | | | | | | | | | | 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>
* Save three more round trips in xkb_x11_keymap_new_from_device()Uli Schlachter2021-03-093-8/+39
| | | | | | | | 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>
* xkb_x11_keymap_new_from_device: Less X11 round-tripsUli Schlachter2021-03-093-104/+157
| | | | | | | | | | | | | | | | | | 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>
View Lorry Controller Status