summaryrefslogtreecommitdiff
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Possible fix for non-MSVC windows compilersRan Benita2023-04-112-3/+3
| | | | | | | | `_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>
* interactive-wayland: Fix interface versioningJan Alexander Steffens (heftig)2022-09-241-5/+5
| | | | | | | | 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`.
* tools/list: print an empty string for null vendor stringsPeter Hutterer2021-11-111-1/+2
| | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* tools/list: enclose the the various field names in quotesPeter Hutterer2021-11-111-7/+7
| | | | | | | 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
* man: mention `xkbcli list` output is meant to be in YAML 1.2 formatRan Benita2021-11-011-4/+4
| | | | Signed-off-by: Ran Benita <ran@unusedvar.com>
* tools/how-to-type: add --keysym for how to type a keysymRan Benita2021-07-312-14/+32
| | | | | | | 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>
* tools/interactive-x11: use keysym to look for EscSimon Ser2021-07-121-1/+1
| | | | | | | | | 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>
* tools: add compose tool for Compose debuggingRan Benita2021-05-081-0/+126
| | | | | | Not very useful so not exposed in xkbcli. Signed-off-by: Ran Benita <ran@unusedvar.com>
* 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>
* 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>
* man: add missing pointer to xkbcli-compile-keymap(1)Ran Benita2021-03-291-0/+4
| | | | 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>
* tools: align `xkbcli how-to-type` output ourselvesRan Benita2020-09-092-8/+5
| | | | | | | Can possibly add a machine-parsable format if desired, but for now just have it work nicely. Signed-off-by: Ran Benita <ran@unusedvar.com>
* xkbcli: fix interactive-x11 not showing in helpRan Benita2020-09-051-1/+1
| | | | Signed-off-by: Ran Benita <ran@unusedvar.com>
* Revert: tools: add xkbcli-scaffold-new-layout as helper toolPeter Hutterer2020-09-031-326/+0
| | | | | | | | | | | | | | | While this tool is useful for users starting with a new keyboard layout, it is a somewhat bad fit for libxkbcommon. It's the only python tool, we don't even install it yet (because we're not sure yet what it's supposed to do) and there's a potential for it to expand into more corner cases. The only tie it has to libxkbcommon is that it templates the data files that libxkbcommon reads, but those files are effectively public API. Let's remove this tool from there and instead move it to a separate git repository where it can go its own way. This reverts commit d00cf64dbc586a1052e1f0d0e7f1a48bbff293ec
* meson.build: define PATH_MAX where it's missingPeter Hutterer2020-09-011-3/+0
| | | | | | | | | | | PATH_MAX is not POSIX and can be missing on some systems, notably Windows (which provides MAX_PATH instead tough) and Hurd. Let's define it to a sane value where missing, i.e. the one it's defined to in limits.h. Except on Windows where we're limited to 260. Fixes https://github.com/xkbcommon/libxkbcommon/issues/180 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* tools: convert man pages from man format to mdoc formatRan Benita2020-08-317-246/+235
| | | | | | The mdoc is more semantic and consistent. Signed-off-by: Ran Benita <ran@unusedvar.com>
* tools: add xkbcli-scaffold-new-layout as helper toolPeter Hutterer2020-08-301-0/+326
| | | | | | | | | | | | | | | This tool set ups the required directory structure and template files to add new keyboard layouts or options. For example, run like this: xkbcli-scaffold-new-layout --layout 'us(myvariant)' --option 'custom:foo' This will up the evdev rules file, the evdev.xml file, the symbols/us file and symbols/custom file in $XDG_CONFIG_HOME so that the user has everything in place and can start filling in the actual key mappings. This tool is currently uninstalled until we figure out whether it's useful. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* tools/interactive-evdev: fixup 64bff65Ran Benita2020-07-271-1/+1
| | | | Signed-off-by: Ran Benita <ran@unusedvar.com>
* tools/interactive-evdev: change --evdev-offset to --without-x11-offsetRan Benita2020-07-272-11/+10
| | | | | | There is no reason to give full control rather than just enable/disable. Signed-off-by: Ran Benita <ran@unusedvar.com>
* tools: run test-tool-option-parsing.py like a regular testRan Benita2020-07-251-300/+0
| | | | Signed-off-by: Ran Benita <ran@unusedvar.com>
* tools/compile-keymap: hide --kccgst comment on public buildRan Benita2020-07-251-2/+4
| | | | Signed-off-by: Ran Benita <ran@unusedvar.com>
* tools: fix strcmp mistake in 0066e38Ran Benita2020-07-251-1/+1
| | | | Signed-off-by: Ran Benita <ran@unusedvar.com>
* tools: make independent from src/Ran Benita2020-07-253-15/+31
| | | | Signed-off-by: Ran Benita <ran@unusedvar.com>
* tools: some minor changes to xkbcliRan Benita2020-07-259-85/+142
| | | | Signed-off-by: Ran Benita <ran@unusedvar.com>
* tools: link the tools against libxkbcommon.so onlyPeter Hutterer2020-07-252-4/+8
| | | | | | | | | | | The tools previously linked against a static version (by simply recompiling everythiong). This isn't necessary, we can link them against libxkbcommon.so. Only exception: The xbkcli-compile-keymap tool needs a private API for the --kccgst flag. Avoid this by disabling this flag in the installed tool and building the same tool, statically linked but not-installed. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* tools: avoid use of a private apiPeter Hutterer2020-07-251-4/+15
| | | | | | | This is merely to fill in some NULL pointers anyway, we can just use the #defines we have available at build time. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Drop use of ronn, switch to raw roff insteadPeter Hutterer2020-07-2515-307/+326
| | | | | | | | | | | | | Drop the ronn source files, check in the generated files instead. This gets rid of the ruby+gem+ronn toolchain requirement at the cost of having to edit raw man pages. ronn files are as-generated but with the preamble and generation date removed. The latter isn't important enough to keep, it'll just go stale for manually maintained files and it's not worth setting up a configure_file() just for that date. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* tools: don't mangle the path for tools, just exec directlyPeter Hutterer2020-07-251-24/+9
| | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* tools: don't assert on 64+ commandline arguments, just returnPeter Hutterer2020-07-252-1/+8
| | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* tools: add a test program to parse the commandline optionsPeter Hutterer2020-07-251-0/+296
| | | | | | | | | | | | | | A pytest wrapper around our xkbcli tool - copied from libinput. This calls our various xkbcli tools with varying options and check that they either succeed or return the right error code. The coverage is limited, it does not (and cannot) test for all possible combinations but it should provide a good red flag if we have inconsistent behavior or accidentally break some combination of flags. Meanwhile, we can at least assume that all our commandline arguments are parsed without segfaulting or worse. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* tools: drop getopt vs getopt_long differentiationPeter Hutterer2020-07-251-4/+0
| | | | | | | | | | | | | On all platforms we build on where getopt.h is available, getopt_long is also available. Only Windows doesn't have either but that's no reason for us to differentiate between the two. If we need to special-case getopt vs getopt_long, it's probably better to implement our own cross-platform version of it and use that. Fixes #161 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* tools: switch how-to-type to getopt_longPeter Hutterer2020-07-252-21/+46
| | | | | | | This provides consistency with the other tools that now all take long options. Plus, it's more obvious to have the arguments spelled out. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* tools: switch interactive-evdev to getopt_longPeter Hutterer2020-07-252-48/+84
| | | | | | | | | | | | | | | | | Requiring long options for this tool means it's immediately obvious what an invocation does, compare e.g. xkbcli interactive-evdev -gcd to the equivalent: xkbcli interactive-evdev --consumed-mode=gtk --enalbe-compose --report-state-changes This drops the evdev offset argument - that offset should never be anything other than 8, having this as argument here is more likely to confuse or produce misleading debugging logs. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* tools: consistently return 2 on invalid usagePeter Hutterer2020-07-256-12/+34
| | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* tools: install our tools as xkbcli subcommandsPeter Hutterer2020-07-259-1/+304
| | | | | | | The xkbcli tool usage help is ifdef'd out where the tool isn't built but the man page always includes all tools. Easier that way. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* tools: add a xkbcli tool as entry point for the various tools we havePeter Hutterer2020-07-254-0/+187
| | | | | | | | | | | | | | | | | | | | | | | | | | This is the base tool, no subtools are currently connected so you only get help and version for now. The goal here is to have a git-like infrastructure where /usr/bin/xkbcli is the main tool, anything else will hide in libexec. The infrastructure for this is copied from libinput. Tools themselves will will be installed in $prefix/libexec/xkbcommon and the xkbcli tool forks off whatever argv[1] is after modifying the PATH to include the libexec dir. libinput has additional code for checking whether we're running this from the builddir but it's a bit iffy and it's usefulness is limited - if you're in the builddir anyway you can just run ./builddir/xkbcli-<toolname> directly. So for this code here, running ./builddir/xkbcli <toolname> will execute the one in the prefix/libexecdir. Since we want that tool available everywhere even where some of the subtools aren't present, we need to ifdef the getopt handling. man page generation is handled via ronn which is a ruby program but allows markdown for the sources. It's hidden behind a meson option to disable where downloading ronn isn't an option. The setup is generic enough that we can add other man-pages by just appending to the array. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* tools: add option to print full RMLVO elements to rmlvo-to-keymapPeter Hutterer2020-07-081-1/+21
| | | | | | | | | | | Since the most common use-case is to provide only some elements of RMLVO, this makes it possible to show what is actually being used in the background based on the built-in defaults. Print this in a format that's mostly JSON-compatible or at least easy to parse, just in case. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* tools: add ability to compile from kccgst to rmlvo-to-keymapPeter Hutterer2020-07-082-128/+70
| | | | | | | This obsoletes the print-compiled-keymap tool though we now require that the kccgst components are passed via stdin, there is no file loading ability. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* tools: add include path handling to rmlvo-to-keymapPeter Hutterer2020-07-081-9/+41
| | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* tools: add ability to print the KcCGST components for rmlvo-to-keymapPeter Hutterer2020-07-082-119/+63
| | | | | | This makes the rmlvo-to-kccgst tool obsolete. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* tools: expand help output for rmlvo-to-keymapPeter Hutterer2020-07-081-3/+24
| | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* tools: add verbose logging to rmlvo-to-keymapPeter Hutterer2020-07-081-4/+17
| | | | | | | Since we want to log the include paths too we need to split the context init up, otherwise include paths are added before we can set the verbosity. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* tools: always print the rmlvo-to-keymap outcomePeter Hutterer2020-07-081-11/+3
| | | | | | | | The most common case for this tool is to check what the keymap is for a given RMLVO. Let's print that by default, the use-cases that just check for compilation success can discard stdout instead. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Add libxkbregistry to query available RMLVOPeter Hutterer2020-07-061-0/+223
| | | | | | | | | | | | | | | | | | | | | This library is the replacement for clients parsing evdev.xml directly. Instead, they should use the API here so that in the future we may even be able to swap evdev.xml for a more suitable data format. The library parses through evdev.xml (using libxml2) and - if requested - through evdev.extras.xml as well. The merge approach is optimised for the default case where we have a system-installed rules XML and another file in $XDG_CONFIG_DIR that adds a few entries. We load the system file first, then append any custom ones to that. It's not possible to overwrite the MLVO list provided by the system files - if you want to do that, get the change upstream. XML validation is handled through the DTD itself which means we only need to check for a nonempty name, everything else the DTD validation should complain about. The logging system is effectively identical to xkbcommon. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* tools: don't depend on src/utils.hRan Benita2020-06-285-9/+16
| | | | | | | The idea is to make the tools/demos as standalone as possible so that they may serve as examples as well. Signed-off-by: Ran Benita <ran@unusedvar.com>
* tools: allow stdin for compiling keymapsPeter Hutterer2020-06-251-4/+37
| | | | | | | | This connects two tools to be useful together: xkbcommon-rmlvo-to-kccgst | xkbcommon-print-compiled-keymap - which will result in the full keymap generated by the former tool. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* tools: print the kccgst format in a usable syntaxPeter Hutterer2020-06-251-4/+6
| | | | | | Might as well spit that out in the format that e.g. xkbcomp understands. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
View Lorry Controller Status