summaryrefslogtreecommitdiff
path: root/meson.build
Commit message (Collapse)AuthorAgeFilesLines
* Bump version to 1.2.1xkbcommon-1.2.1Ran Benita2021-04-071-1/+1
| | | | Signed-off-by: Ran Benita <ran@unusedvar.com>
* Bump version to 1.2.0xkbcommon-1.2.0Ran Benita2021-04-031-1/+1
| | | | 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>
* Bump version to 1.1.0xkbcommon-1.1.0Ran Benita2021-02-271-1/+1
| | | | Signed-off-by: Ran Benita <ran@unusedvar.com>
* doc: add keymap-format-text-v1.md to the HTML documentationRan Benita2021-02-271-0/+1
| | | | | | It's incomplete but might be helpful for someone. Signed-off-by: Ran Benita <ran@unusedvar.com>
* meson.build: replace the remaining join_paths() with the nicer / syntaxPeter Hutterer2021-02-221-1/+1
| | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* test: add a keysym testerPeter Hutterer2021-02-221-5/+21
| | | | | | | | | | | 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>
* Bump version to 1.0.3xkbcommon-1.0.3Ran Benita2020-11-231-1/+1
| | | | Signed-off-by: Ran Benita <ran@unusedvar.com>
* Bump version to 1.0.2xkbcommon-1.0.2Ran Benita2020-11-201-1/+1
| | | | Signed-off-by: Ran Benita <ran@unusedvar.com>
* x11: cache X11 atomsRan Benita2020-11-201-0/+7
| | | | | | | | | | | | | | | | | | | | 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>
* build: combine test & bench internal depsRan Benita2020-11-191-14/+6
| | | | | | No need to duplicate this really. Signed-off-by: Ran Benita <ran@unusedvar.com>
* Bump version to 1.0.1xkbcommon-1.0.1Ran Benita2020-09-111-1/+1
| | | | Signed-off-by: Ran Benita <ran@unusedvar.com>
* test/tool-option-parsing: skip testing of disabled toolsRan Benita2020-09-081-0/+4
| | | | Signed-off-by: Ran Benita <ran@unusedvar.com>
* build: move tests to after toolsRan Benita2020-09-071-129/+130
| | | | | | So tests can refer to stuff set by the tools section. Signed-off-by: Ran Benita <ran@unusedvar.com>
* test: include unstd.h in the registry test to cut down the MacOS warningsPeter Hutterer2020-09-071-0/+3
| | | | | | | mkdtmp, rmdir and unlink are in unstd.h on MacOS. Since including that it doesn't hurt us on Linux, let's do it without ifdefs. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Bump version to 1.0.0xkbcommon-1.0.0Ran Benita2020-09-061-1/+1
| | | | Signed-off-by: Ran Benita <ran@unusedvar.com>
* Revert: tools: add xkbcli-scaffold-new-layout as helper toolPeter Hutterer2020-09-031-7/+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-0/+8
| | | | | | | | | | | 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>
* build: fix meson "uses features which were added in newer versions" warningRan Benita2020-08-301-2/+1
| | | | Signed-off-by: Ran Benita <ran@unusedvar.com>
* tools: add xkbcli-scaffold-new-layout as helper toolPeter Hutterer2020-08-301-0/+8
| | | | | | | | | | | | | | | 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>
* Add /etc/xkb as extra lookup path for system data filesPeter Hutterer2020-08-301-0/+5
| | | | | | | | | | | | | | | This completes the usual triplet of configuration locations available for most processes: - vendor-provided data files in /usr/share/X11/xkb - system-specific data files in /etc/xkb - user-specific data files in $XDG_CONFIG_HOME/xkb The default lookup order user, system, vendor, just like everything else that uses these conventions. For include directives in rules files, the '%E' resolves to that path. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* build: fix byacc invocationRan Benita2020-08-081-2/+2
| | | | | | Fixes: https://github.com/xkbcommon/libxkbcommon/issues/133#issuecomment-670902025 Reported-by: Edward-0 Signed-off-by: Ran Benita <ran@unusedvar.com>
* tools: run test-tool-option-parsing.py like a regular testRan Benita2020-07-251-10/+3
| | | | Signed-off-by: Ran Benita <ran@unusedvar.com>
* build: use gnu_symbol_visibility instead of explicit -fvisibilityRan Benita2020-07-251-1/+3
| | | | Signed-off-by: Ran Benita <ran@unusedvar.com>
* build: use nicer / syntax instead of join_paths()Ran Benita2020-07-251-11/+11
| | | | Signed-off-by: Ran Benita <ran@unusedvar.com>
* tools: make independent from src/Ran Benita2020-07-251-2/+2
| | | | Signed-off-by: Ran Benita <ran@unusedvar.com>
* build: use cc.get_supported_arguments()Ran Benita2020-07-251-5/+2
| | | | Signed-off-by: Ran Benita <ran@unusedvar.com>
* build: remove explicit -WextraRan Benita2020-07-251-1/+0
| | | | | | Implied by `warning_level=2`. Signed-off-by: Ran Benita <ran@unusedvar.com>
* tools: some minor changes to xkbcliRan Benita2020-07-251-6/+7
| | | | Signed-off-by: Ran Benita <ran@unusedvar.com>
* tools: link the tools against libxkbcommon.so onlyPeter Hutterer2020-07-251-1/+11
| | | | | | | | | | | 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>
* Drop use of ronn, switch to raw roff insteadPeter Hutterer2020-07-251-24/+7
| | | | | | | | | | | | | 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: add a test program to parse the commandline optionsPeter Hutterer2020-07-251-0/+12
| | | | | | | | | | | | | | 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-27/+21
| | | | | | | | | | | | | 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 interactive-evdev to getopt_longPeter Hutterer2020-07-251-9/+9
| | | | | | | | | | | | | | | | | 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: install our tools as xkbcli subcommandsPeter Hutterer2020-07-251-8/+41
| | | | | | | 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-251-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* meson.build: move registry-list tool down to the tools sectionPeter Hutterer2020-07-251-6/+7
| | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* meson.build: only build the tools where getopt.h is availablePeter Hutterer2020-07-251-58/+62
| | | | | | | | | | Windows doesn't have getopt.h. This would prevent building the tools but they are behind other checks that cause them to be disabled. The only tools that don't need getopt.h are interactive-wayland and interactive-x11 but neither is particularly useful on Windows. Just hide all tools behind the getopt check in preparation for the upcoming tool consolidation work. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* meson.build: move the config.h generation to the bottomPeter Hutterer2020-07-251-2/+2
| | | | | | We cannot add to configh_data after this command so let's generate this last. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* meson.build: registry list is dependent on getopt_longPeter Hutterer2020-07-251-5/+10
| | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* meson.build: drop install:false from configure_filePeter Hutterer2020-07-251-2/+1
| | | | | | | meson complains because this requires 0.50.0 and we don't require that. But since it defaults to false anyway, let's just omit it. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* meson.build: add the valgrind test setup, exclude python testsPeter Hutterer2020-07-251-0/+15
| | | | | | | | | | | This way we can invoke the expected setup with meson test --setup=valgrind And because we don't care about valgrinding python script, mark that test as part of the "python-tests" suite and skip it during our CI valgrind run. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Ran Benita <ran@unusedvar.com>
* meson.build: fix pkgconfig deprecation warningPeter Hutterer2020-07-231-4/+4
| | | | | | | | | | | | ../meson.build:239: DEPRECATION: Library xkbcommon was passed to the "libraries" keyword argument of a previous call to generate() method instead of first positional argument. Adding xkbcommon to "Requires" field, but this is a deprecated behaviour that will change in a future version of Meson. Please report the issue if this warning cannot be avoided in your case. This was introduced in meson 0.49.0 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* test: fix Windows CI by rewriting symbols-leak-test from bash to pythonRan Benita2020-07-221-1/+1
| | | | | | | | | | | | | | | | The CI started installing some wrapper instead of a real bash which is what gets found. See: https://github.com/actions/virtual-environments/pull/1081 Given meson is written in python, it should always be available hopefully. Disabled valgrind wrapper for now because it now also applies to the python interpreter which leaks like a sieve. Signed-off-by: Ran Benita <ran@unusedvar.com>
* tools: add ability to compile from kccgst to rmlvo-to-keymapPeter Hutterer2020-07-081-1/+0
| | | | | | | 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 ability to print the KcCGST components for rmlvo-to-keymapPeter Hutterer2020-07-081-1/+0
| | | | | | This makes the rmlvo-to-kccgst tool obsolete. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* meson.build: always set the default variants/optionsPeter Hutterer2020-07-081-0/+4
| | | | | | | Make this more balanced with the rules/layouts so we can rely on that #define to exist. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Add libxkbregistry to query available RMLVOPeter Hutterer2020-07-061-1/+57
| | | | | | | | | | | | | | | | | | | | | 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>
* Add a snprintf_safe() helper functionPeter Hutterer2020-07-061-0/+5
| | | | | | | Returns true on success or false on error _or_ truncation. Since truncation is almost always an error anyway, we might as well make this easier to check. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* meson.build: prefix all tools with xkbcommon-Peter Hutterer2020-06-251-7/+7
| | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
View Lorry Controller Status