summaryrefslogtreecommitdiff
path: root/meson.build
Commit message (Collapse)AuthorAgeFilesLines
...
* tools: move the remaining tools from test to herePeter Hutterer2020-06-251-3/+3
| | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* test: disentangle interactive-wayland from the test headersPeter Hutterer2020-06-251-1/+4
| | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* test: untangle interactive-x11 from the test headersPeter Hutterer2020-06-251-1/+9
| | | | | | Use the new tools headers and create a custom internal lib for the x11 tool. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* test: untangle interactive-evdev from the test headersPeter Hutterer2020-06-251-2/+4
| | | | | | | | | Move (sometimes duplicate) the required bits into new shared files tools-common.(c|h) that are compiled into the internal tools library. Rename the test_foo() functions to tools_foo() and in one case just copy the code of the keymap compile function to the tool. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Use a custom internal library for the toolsPeter Hutterer2020-06-251-4/+14
| | | | | | | This is currently identical to the internal test library, but it's a start to disentangle the two. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Move the various tools to a tools/ directoryPeter Hutterer2020-06-251-4/+4
| | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* doc: add documentation for user configurationPeter Hutterer2020-06-151-0/+1
| | | | | | | Most of this is currently hidden in the commit message for ca033a29d2ca, let's make it a bit more public so we have a link to point users to. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* doc: add the rules-format file (as markdown)Peter Hutterer2020-06-151-0/+1
| | | | | | | | | | | Useful to have this as part of the documentation. The rendering isn't great but at least not any worse than pure text. Markdown escapes % so explaining our use of %S and %H would require a double % - not idea. Let's just wrap it as a code block and done. Includes two typo fixes too, yay. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Fix building X11 tests on PE targetsJon Turney2020-04-181-10/+10
| | | | | | | | | | Link libxkbcommon_x11_internal with libxkbcommon_test_internal, rather than libxkbcommon. This avoids some tests linking with both libxkbcommon_test_internal and libxkbcommon, which causes duplicate symbol problems on PE targets (e.g. Cygwin) (as all the symbols from libxkbcommon are pulled in at link time, which clash with libxkbcommon_test_internal)
* test: add "how to type" demo programRan Benita2020-03-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The program takes a unicode codepoint and an RMLVO and prints out all key + modifier combinations that would result in that codepoint. The program was written to exercise the new xkb_keymap_key_get_mods_for_level() function. It's handy and can be extended in several ways, but enough for now. Example: $ ./build/how-to-type -l us,il,ru 0x41 | column -ts $'\t' keysym: A (0x41) KEYCODE KEY NAME LAYOUT# LAYOUT NAME LEVEL# MODIFIERS 38 AC01 1 English (US) 2 [ Shift ] 38 AC01 1 English (US) 2 [ Lock ] 38 AC01 2 Hebrew 2 [ Shift ] 38 AC01 2 Hebrew 2 [ Lock ] $ ./build/how-to-type -l de -v neo 0x3b6 | column -ts $'\t' keysym: Greek_zeta (0x7e6) KEYCODE KEY NAME LAYOUT# LAYOUT NAME LEVEL# MODIFIERS 56 AB05 1 German (Neo 2) 4 [ Shift Mod5 ] 56 AB05 1 German (Neo 2) 4 [ Shift Mod2 Mod3 Mod5 ] 56 AB05 1 German (Neo 2) 4 [ Shift Lock Mod5 ] 56 AB05 1 German (Neo 2) 4 [ Lock Mod2 Mod3 Mod5 ] Signed-off-by: Ran Benita <ran@unusedvar.com>
* build: fix build with byaccRan Benita2020-02-181-7/+20
| | | | | | | | | | We apparently broke byacc support in the switch to meson. byacc only supports short option names. And to make things fun, bison only supports long option for `--defines`. Fixes: https://github.com/xkbcommon/libxkbcommon/issues/133 Signed-off-by: Ran Benita <ran@unusedvar.com>
* Bump version to 0.10.0xkbcommon-0.10.0Ran Benita2020-01-181-1/+1
| | | | Signed-off-by: Ran Benita <ran@unusedvar.com>
* build: Skip building some tests on MSVC for nowAdrian Perez de Castro2019-12-281-8/+13
| | | | | | This is a stopgap measure to quickly get tests building with MSVC for now, at some point the tests could be rewritten to avoid using getopt() and mkdtemp() or to ship an implementation.
* build: add some defines for MSVC to allow it to be unixyAdrian Perez de Castro2019-12-281-0/+8
| | | | [ran: combined some commits]
* meson.build: Take win_bison as a possible variant for BisonAdrian Perez de Castro2019-12-271-1/+1
| | | | Signed-off-by: Ran Benita <ran@unusedvar.com>
* build: include config.h manuallyRan Benita2019-12-271-1/+0
| | | | | | | | | Previously we included it with an `-include` compiler directive. But that's not portable. And it's better to be explicit anyway. Every .c file should have `include "config.h"` first thing. Signed-off-by: Ran Benita <ran@unusedvar.com>
* Provide a fallback implementation of [v]asprintf()Adrian Perez de Castro2019-12-271-0/+5
| | | | | | Some environments (e.g. Windows + MSVC) do not provide asprintf() or vasprintf(). This tries to detect their presence, and provides suitable fallback implementations when not available.
* Provide a fallback implementation of strndup()Adrian Perez de Castro2019-12-271-0/+3
| | | | | | | | Some environments (e.g. Windows + MSVC) do not provide strndup(), this tries to detect its presence and provide a fallback implementation when not available. [ran: some tweaks]
* rules: add include statements to rules filesPeter Hutterer2019-12-241-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The majority use-case for extending XKB on a machine is to override one or a few keys with custom keycodes, not to define whole layouts. Previously, we relied on the rules file to be a single file, making it hard to extend. libxkbcommon parses $XDG_CONFIG_HOME/xkb/ but that only works as long as there is a rule that matches the user-specified RMLVO. This works for MLV but not for options which don't have a wildcard defined. Users have to copy the whole rules file and then work from there - not something easy to extend and maintain. This patch adds a new ! include directive to rules files that allows including another file. The file path must be without quotes and may not start with the literal "include". Two directives are supported, %H to $HOME and %S for the system-installed rules directory (usually /usr/share/X11/xkb/rules). A user would typically use a custom rules file like this: ! option = symbols custom:foo = +custom(foo) custom:bar = +custom(baz) ! include %S/evdev Where the above defines the two options and then includes the system-installed evdev rule. Since most current implementations default to loading the "evdev" ruleset, it's best to name this $XDG_CONFIG_HOME/xkb/rules/evdev, but any valid name is allowed. The include functionally replaces the line with the content of the included file which means the behavior of rules files is maintained. Specifically, custom options must be defined before including another file because the first match usually wins. In other words, the following ruleset will not assign my_model as one would expect: ! include %S/evdev ! model = symbols my_model = +custom(foo) The default evdev ruleset has wildcards for model and those match before the my_model is hit. The actual resolved components need only be in one of the XKB lookup directories, e.g. for the example above: $ cat $XDG_CONFIG_HOME/xkb/symbols/custom partial alphanumeric_keys xkb_symbols "foo" { key <TLDE> { [ VoidSymbol ] }; }; partial alphanumeric_keys xkb_symbols "baz" { key <AB01> { [ k, K ] }; }; This can then be loaded with the XKB option "custom:foo,custom:bar". The use of "custom" is just as an example, there are no naming requirements beyond avoiding already-used ones. Also note the bar/baz above - the option names don't have to match the component names. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* meson: remove redundant malloc scribblingRan Benita2019-12-141-3/+0
| | | | | | | Turns out meson already sets this (at least MALLOC_PERTURB) on its own for the `test` target. Signed-off-by: Ran Benita <ran@unusedvar.com>
* Bump version to 0.9.1xkbcommon-0.9.1Ran Benita2019-10-201-1/+1
| | | | Signed-off-by: Ran Benita <ran@unusedvar.com>
* Bump version to 0.9.0xkbcommon-0.9.0Ran Benita2019-10-191-1/+1
| | | | Signed-off-by: Ran Benita <ran@unusedvar.com>
* build: Solaris needs __EXTENSIONS__ instead of _GNU_SOURCEAlan Coopersmith2019-09-111-7/+15
| | | | | | | | | Fix meson build on Solaris by using __EXTENSIONS__ where Linux & other platforms use _GNU_SOURCE. Without this the build fails due to missing prototypes for functions like strdup & getopt not defined in the C99 standard. (In autoconf, this was handled by AC_USE_SYSTEM_EXTENSIONS.) Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* test/symbols-leak-test: make it work with macOS diffRan Benita2019-07-251-0/+1
| | | | | | | The <() stuff fails with an error: diff: extra operand `/dev/fd/61' Signed-off-by: Ran Benita <ran234@gmail.com>
* interactive-wayland: Port to stable xdg-shell (#100)Daniel Stone2019-07-021-2/+2
| | | | | | | | | xdg_shell v6 was pretty close to the finalised stable version of xdg-shell. We can now just use the stable version, which is supported everywhere (Enlightenment, KWin, Mutter, Weston, wlroots). This requires bumping the wayland-protocols dependency. Signed-off-by: Daniel Stone <daniels@collabora.com>
* Use bitwise test instead of popcount to check if one bit is setMichael Forney2019-06-101-3/+0
| | | | | | | | | | | We don't need to determine the total number of bits set to determine if exactly one is set. Additionally, on x86_64 without any -march=* flag, __builtin_popcount will get compiled to a function call to the compiler runtime (on gcc), or a long sequence of bit operations (on clang). Signed-off-by: Michael Forney <mforney@mforney.org>
* meson.build: use program from build machine not host or target.maxice82019-02-231-1/+1
| | | | | | | We can't always execute binaries from the host or target machine, as is the case in cross compilation. closes #89
* Bump version to 0.8.4xkbcommon-0.8.4Ran Benita2019-02-221-1/+1
| | | | Signed-off-by: Ran Benita <ran234@gmail.com>
* meson.build: link the sources directly into libxkbcommon-x11Peter Hutterer2019-02-111-3/+12
| | | | | | | | | | | | | | | Similar to 75ce741ab97e3d17a0c9b06dd4bdf57c00d5538e, just for the -x11 sublibrary. This works around meson bug 3937, 'link_whole' arguments don't get added into the final static library and we end up with a virtually empty 8-byte libxkbcommon-x11.a file, see https://github.com/mesonbuild/meson/issues/3937 The internal lib is still built for the one test case that requires it. Fixes #86 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Bump version to 0.8.3xkbcommon-0.8.3Ran Benita2019-02-081-1/+1
| | | | Signed-off-by: Ran Benita <ran234@gmail.com>
* meson: make comment make sense nowRan Benita2019-02-081-1/+1
| | | | Signed-off-by: Ran Benita <ran234@gmail.com>
* meson.build: manually link all sources into the libraryPeter Hutterer2019-02-081-6/+5
| | | | | | | | | | | | | | This works around meson bug 3937, 'link_whole' arguments don't get added into the final static library and we end up with a virtually empty 8-byte libxkbcommon.a file, see https://github.com/mesonbuild/meson/issues/3937 Workaround is simply to add all sources to both libraries we need them in. This obviously compiles them twice but this year's winter was cold and bit of extra warmth will be appreciated. Fixes #84 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Merge pull request #68 from whot/wip/xkeyboard-config-testerRan Benita2018-08-211-0/+10
|\ | | | | xkeyboard-config combination tester
| * test: add a tool to test-compile all LVO combinations from xkeyboard-configPeter Hutterer2018-08-211-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test contains of two parts: - a simple program to convert RMLVO commandline arguments into a keymap (and print that keymap if requested). - a python script that runs through rules/evdev.xml, and tries to compile a keymap for sort-of every layout/variant/option combination. Sort-of, because we can have multiple options and it really only does one per layout(variant) combination. Same thing can be done using xkbcomp, but right now it doesn't take that as argument, it's hard-coded. This takes quite a while, installing python-tqdm is recommended to see fancy progress bars instead of just miles of dumps. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* | build: turn off strict aliasingRan Benita2018-08-181-1/+2
| | | | | | | | | | | | | | | | The benchmarks don't show any effect, so turn it off to have one less thing to worry about. The parser does a lot of casting between AST nodes. Signed-off-by: Ran Benita <ran234@gmail.com>
* | x11: fix undefined behavior when copying the coordinates of ptr movements ↵Ran Benita2018-08-181-0/+1
|/ | | | | | | | | | actions Left shift of a negative integer. For some reason the protocol representation here got really botched (in the spec it is just a nice and simple INT16). Signed-off-by: Ran Benita <ran234@gmail.com>
* Bump version to 0.8.2xkbcommon-0.8.2Ran Benita2018-08-051-1/+1
| | | | Signed-off-by: Ran Benita <ran234@gmail.com>
* Bump version to 0.8.1xkbcommon-0.8.1Ran Benita2018-08-031-1/+1
| | | | Signed-off-by: Ran Benita <ran234@gmail.com>
* Add fuzzing infrastructureRan Benita2018-07-301-0/+5
| | | | | | | | | | | | | | | | | | | Though text formats aren't exactly fuzzer's strong suit, fuzzers can catch many surface-level bugs. The fuzz/ directory contains target programs, testcases and dictionaries to drive the afl fuzzer. This commit adds a fuzzer for the XKB keymap text format and the Compose text format. On my slow machine, using a single core, a full cycle of the XKB fuzzer takes 5 hours. For Compose, it takes a few minutes. Fuzzing for the other file formats (rules files mostly) will be added later. To do some fuzzing, run `./fuzz/fuzz.sh`. Signed-off-by: Ran Benita <ran234@gmail.com>
* meson: Fix xkbcommon-x11.pc Requires versioningJan Alexander Steffens (heftig)2018-07-171-2/+2
| | | | | | | | | | | | | | | | | | Old meson expects an array with one dependency per element. Providing a string containing multiple deps results in only the first dep getting its whitespace properly applied. As a result, the output was: Requires.private: xcb >= 1.10 xcb-xkb>=1.10 And downstream projects failed to find a package named 'xcb-xkb>=1.10'. Specifying an array of versioned deps results in correct output: Requires.private: xcb >= 1.10, xcb-xkb >= 1.10 Fixes #64. Signed-off-by: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
* meson: Fix xkbcommon-x11.pc RequiresJan Alexander Steffens (heftig)2018-07-171-0/+2
| | | | | | | | | | The meson-generated pkgconfig file was missing Requires and Requires.private. [ran: adjust for older Meson versions.] Signed-off-by: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> Signed-off-by: Ran Benita <ran234@gmail.com>
* bench: simplify the bench helpersRan Benita2018-07-051-3/+0
| | | | | | | | | Trim the API a bit. Also, just always use gettimeofday(), which is portable. Hopefully the system clock doesn't change while a benchmark is running. Signed-off-by: Ran Benita <ran234@gmail.com>
* build/meson: fix x11 test/demo compilation with non-standard xcbRan Benita2018-02-251-3/+13
| | | | | | | | | | | | | | | | The x11 tests/demos did not depend on xcb and xcb-xkb directly, only indirectly through link_with: libxkbcommon_x11_internal. So linking worked, but the xcb and xcb-xkb cflags were *not* included when compiling them. So when using xcb installed in a non-standard location, what would happen is: - Library will link with custom xcb and compile with custom xcb headers. - Test will link with custom xcb and compile with system xcb headers (if exist, otherwise fail). Fixes: https://github.com/xkbcommon/libxkbcommon/issues/57 Reported-by: @remexre Signed-off-by: Ran Benita <ran234@gmail.com>
* build/meson: fix the -Wl,--version-script configure checkRan Benita2018-02-141-1/+1
| | | | | | | Hopefully this fixes compilation on darwin, which doesn't support version scripts. Signed-off-by: Ran Benita <ran234@gmail.com>
* Bump version to 0.8.0xkbcommon-0.8.0Ran Benita2017-12-151-1/+1
| | | | Signed-off-by: Ran Benita <ran234@gmail.com>
* build: disable -Wdocumentation-deprecated-syncRan Benita2017-12-141-0/+1
| | | | | | | | | | We will never remove the deprecated functions and there is no real reason to annoy users into stop using them. If there *will* be a reason, *then* we will add the attribute. Fixes: https://github.com/xkbcommon/libxkbcommon/issues/56 Signed-off-by: Ran Benita <ran234@gmail.com>
* build/meson: require meson >= 0.41.0Ran Benita2017-09-101-0/+1
| | | | | | | | With previous versions, the compilation fails with linker errors. Fixes https://github.com/xkbcommon/libxkbcommon/issues/52 Reported-by: @rezso Signed-off-by: Ran Benita <ran234@gmail.com>
* build: add missing configure function checks for test/interactive-waylandRan Benita2017-08-161-0/+6
| | | | Signed-off-by: Ran Benita <ran234@gmail.com>
* Bump version to 0.7.2xkbcommon-0.7.2Ran Benita2017-08-041-1/+1
| | | | Signed-off-by: Ran Benita <ran234@gmail.com>
* build: make doxygen run from the source treeRan Benita2017-08-011-12/+11
| | | | | | I couldn't find any other way to make this work! Signed-off-by: Ran Benita <ran234@gmail.com>
View Lorry Controller Status