Ran Benita [Thu, 25 Jul 2019 10:49:41 +0000 (13:49 +0300)]
test/symbols-leak-test: fix sed regex on macOS
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Thu, 25 Jul 2019 10:34:49 +0000 (13:34 +0300)]
build: fixup autotools build after 97f41fe
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Thu, 25 Jul 2019 10:24:00 +0000 (13:24 +0300)]
test/symbols-leak-test: make it work with macOS diff
The <() stuff fails with an error:
diff: extra operand `/dev/fd/61'
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Thu, 25 Jul 2019 08:59:07 +0000 (11:59 +0300)]
test/rmlvo-to-keymap: drop basename usage
It wants some libgen.h include which is POSIX only, let's just remove
it as it's hardly important.
Signed-off-by: Ran Benita <ran234@gmail.com>
worldofpeace [Fri, 19 Jul 2019 06:56:41 +0000 (02:56 -0400)]
test/rmlvo-to-keymap.c: fix compilation on Darwin (#101)
program_invocation_short_name isn't portable.
Daniel Stone [Tue, 2 Jul 2019 12:48:32 +0000 (13:48 +0100)]
interactive-wayland: Port to stable xdg-shell (#100)
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>
Ran Benita [Tue, 11 Jun 2019 16:59:25 +0000 (19:59 +0300)]
Merge pull request #98 from michaelforney/popcount
Use bitwise test for power-of-2 instead of popcount
Michael Forney [Tue, 4 Jun 2019 21:01:02 +0000 (14:01 -0700)]
Use bitwise test instead of popcount to check if one bit is set
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>
Ran Benita [Wed, 5 Jun 2019 06:49:04 +0000 (09:49 +0300)]
Merge pull request #96 from Jjagg/patch-1
Fix a few doc typos
Jesse [Tue, 4 Jun 2019 21:44:42 +0000 (23:44 +0200)]
Fix some doc typos
Ran Benita [Sun, 24 Mar 2019 12:05:17 +0000 (14:05 +0200)]
Merge pull request #95 from Hi-Angel/fix-lgtm-warnings
Fix some of LGTM warnings
Konstantin Kharlamov [Sat, 23 Mar 2019 20:29:29 +0000 (23:29 +0300)]
symbols: add a comment to suppress warning from code analyzers
Signed-off-by: Konstantin Kharlamov <Hi-Angel@yandex.ru>
Ran Benita [Tue, 12 Mar 2019 17:39:23 +0000 (19:39 +0200)]
Merge pull request #94 from milloni/milloni/m4
Makefile.am: add include dir for AC_CONFIG_MACRO_DIR to work
milloni [Tue, 12 Mar 2019 16:22:15 +0000 (16:22 +0000)]
Makefile.am: add include dir for AC_CONFIG_MACRO_DIR to work
With older versions of autotools, one needs to add this line to
Makefile.am. From the autoconf docs: "Note that if you use aclocal from
Automake to generate aclocal.m4, you must also set ACLOCAL_AMFLAGS = -I dir
in your top-level Makefile.am". [1]
I couldn't build with autoconf 2.68 without this.
[1] https://www.gnu.org/software/autoconf/manual/autoconf-2.65/html_node/Input.html
Signed-off-by: milloni <milloni@preemptable.org>
Ran Benita [Tue, 26 Feb 2019 16:27:53 +0000 (18:27 +0200)]
README: usage questions are alright
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Tue, 26 Feb 2019 16:26:01 +0000 (18:26 +0200)]
README: stop pointing at bugs.freedesktop.org
No-one filed bugs in there for a while, let's consolidate on the more
popular one.
Signed-off-by: Ran Benita <ran234@gmail.com>
maxice8 [Sat, 23 Feb 2019 08:55:00 +0000 (05:55 -0300)]
meson.build: use program from build machine not host or target.
We can't always execute binaries from the host or target machine,
as is the case in cross compilation.
closes #89
Ran Benita [Fri, 22 Feb 2019 20:26:49 +0000 (22:26 +0200)]
Bump version to 0.8.4
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 22 Feb 2019 20:26:11 +0000 (22:26 +0200)]
Update NEWS
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 22 Feb 2019 13:37:27 +0000 (15:37 +0200)]
build: fix meson build from tarball generated by autotools
These files are used by the meson build only. Previously, trying to
build with meson using the tarball generated by distcheck would fail.
Fixes https://github.com/xkbcommon/libxkbcommon/issues/87.
Reported-by: manesm52
Signed-off-by: Ran Benita <ran234@gmail.com>
Peter Hutterer [Sun, 10 Feb 2019 23:19:28 +0000 (09:19 +1000)]
meson.build: link the sources directly into libxkbcommon-x11
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>
Ran Benita [Fri, 8 Feb 2019 10:39:01 +0000 (12:39 +0200)]
Bump version to 0.8.3
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 8 Feb 2019 10:38:02 +0000 (12:38 +0200)]
Update NEWS
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 8 Feb 2019 10:29:27 +0000 (12:29 +0200)]
meson: make comment make sense now
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 8 Feb 2019 10:18:00 +0000 (12:18 +0200)]
Merge pull request #85 from whot/wip/static-lib-sources
meson.build: manually link all sources into the library
Peter Hutterer [Fri, 8 Feb 2019 02:15:48 +0000 (12:15 +1000)]
meson.build: manually link all sources into the library
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>
Ran Benita [Mon, 28 Jan 2019 14:29:09 +0000 (16:29 +0200)]
docs: fix a doxygen reference warning
Ran Benita [Fri, 25 Jan 2019 10:50:55 +0000 (12:50 +0200)]
Merge pull request #81 from whot/master
keysyms: fix comment for XKB_KEY_OCARON
Peter Hutterer [Thu, 24 Jan 2019 23:26:58 +0000 (09:26 +1000)]
keysyms: fix comment for XKB_KEY_OCARON
Reported-by: Keve Müller
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Ran Benita [Tue, 22 Jan 2019 07:48:23 +0000 (09:48 +0200)]
Merge pull request #79 from jwrdegoede/add-2-new-keysyms
Sync Keysyms with recent xproto additions
Hans de Goede [Tue, 22 Jan 2019 07:31:43 +0000 (08:31 +0100)]
Sync Keysyms with recent xproto additions
xproto recently has been extended with 2 new keysyms:
XF86XK_MonBrightnessCycle
XF86XK_RotationLockToggle
This commit is the result of running "scripts/update-keysyms" on a system
with the updated xproto installed.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Ran Benita [Mon, 1 Oct 2018 07:24:45 +0000 (10:24 +0300)]
Merge pull request #69 from alanc/master
Fix off-by-one error in index check in xkb_file_type_to_string
Alan Coopersmith [Sun, 30 Sep 2018 23:04:29 +0000 (16:04 -0700)]
Fix off-by-one error in index check in xkb_file_type_to_string
Found by Oracle's Parfait 2.2 static analyzer:
Error: Buffer overrun
Read outside array bounds [read-outside-array-bounds] (CWE 125):
In array dereference of xkb_file_type_strings[type] with index type
Array size is 56 bytes, index <= 56
at line 734 of src/xkbcomp/ast-build.c in function 'xkb_file_type_to_string'.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Ran Benita [Fri, 24 Aug 2018 06:14:14 +0000 (09:14 +0300)]
darray: fix unprotected macro argument
Reported-by: @msmeissn
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Tue, 21 Aug 2018 06:05:09 +0000 (09:05 +0300)]
Merge pull request #68 from whot/wip/xkeyboard-config-tester
xkeyboard-config combination tester
Peter Hutterer [Mon, 20 Aug 2018 06:46:19 +0000 (16:46 +1000)]
test: allow for absolute paths to be resolved
This makes it possible to check a keymap sitting elsewhere than in the test
directory.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Peter Hutterer [Mon, 20 Aug 2018 05:50:35 +0000 (15:50 +1000)]
test: drop the rmlvo ability from print-compiled-keymap
This is now handled by the rmlvo-to-keymap tool
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Peter Hutterer [Tue, 14 Aug 2018 01:16:30 +0000 (11:16 +1000)]
test: add a tool to test-compile all LVO combinations from xkeyboard-config
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>
Ran Benita [Sat, 18 Aug 2018 12:12:15 +0000 (15:12 +0300)]
build: turn off strict aliasing
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>
Ran Benita [Sat, 18 Aug 2018 11:28:15 +0000 (14:28 +0300)]
x11: fix undefined behavior when copying the coordinates of ptr movements 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>
Ran Benita [Sun, 5 Aug 2018 05:51:30 +0000 (08:51 +0300)]
Bump version to 0.8.2
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sun, 5 Aug 2018 05:49:36 +0000 (08:49 +0300)]
Update NEWS
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sun, 5 Aug 2018 05:45:19 +0000 (08:45 +0300)]
Merge pull request #67 from fooishbar/fix-more-fuzz
Fix more fuzz-testing fallout
Daniel Stone [Mon, 30 Oct 2017 11:21:55 +0000 (11:21 +0000)]
Fail expression lookup on invalid atoms
If we fail atom lookup, then we should not claim that we successfully
looked up the expression.
Signed-off-by: Daniel Stone <daniels@collabora.com>
Daniel Stone [Mon, 26 Jun 2017 20:52:27 +0000 (21:52 +0100)]
Fix signed vs. unsigned confusion in name sanitisation
Don't try to divide through a signed char when indexing an array, lest
ye try to index off the start of it.
Signed-off-by: Daniel Stone <daniels@collabora.com>
Daniel Stone [Mon, 26 Jun 2017 20:49:49 +0000 (21:49 +0100)]
darray: Don't call memcpy() on NULL
The only time we could ever hit this was with count == 0, which seems
unnecessarily pedantic. But OK.
Signed-off-by: Daniel Stone <daniels@collabora.com>
Daniel Stone [Mon, 26 Jun 2017 20:38:52 +0000 (21:38 +0100)]
text: NULL-terminate SI mask names
The list should have a NULL sentry. Add one.
testcase: 'interpret KP_Delete+AnyOfOrNaneo(ll)'
Signed-off-by: Daniel Stone <daniels@collabora.com>
Daniel Stone [Mon, 26 Jun 2017 16:21:45 +0000 (17:21 +0100)]
xkbcomp: Don't falsely promise from ExprResolveLhs
Every user of ExprReturnLhs goes on to unconditionally dereference the
field return, which can be NULL if xkb_intern_atom fails. Return false
if this is the case, so we fail safely.
testcase: splice geometry data into interp
Signed-off-by: Daniel Stone <daniels@collabora.com>
Daniel Stone [Mon, 26 Jun 2017 16:18:16 +0000 (17:18 +0100)]
xkbcomp: Don't explode on invalid virtual modifiers
testcase: 'virtualModifiers=LevelThreC'
Signed-off-by: Daniel Stone <daniels@collabora.com>
Daniel Stone [Mon, 26 Jun 2017 16:12:29 +0000 (17:12 +0100)]
xkbcomp: Don't crash on no-op modmask expressions
If we have an expression of the form 'l1' in an interp section, we
unconditionally try to dereference its args, even if it has none.
Signed-off-by: Daniel Stone <daniels@collabora.com>
Daniel Stone [Mon, 26 Jun 2017 15:45:16 +0000 (16:45 +0100)]
parser: Don't set more maps when we don't have any
If the scanner indicates that we might have something which looks like a
map, but the parser in fact fails to create that map, we will try to
access the map regardless. Stop doing that.
testcase: 'xkb_keymap {' -> '#kb_keymap'
Signed-off-by: Daniel Stone <daniels@collabora.com>
Ran Benita [Fri, 3 Aug 2018 10:55:52 +0000 (13:55 +0300)]
Bump version to 0.8.1
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 3 Aug 2018 10:55:17 +0000 (13:55 +0300)]
Update NEWS
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Wed, 1 Aug 2018 09:25:18 +0000 (12:25 +0300)]
Merge pull request #66 from whot/master
Coverity fixes (one real bug)
Peter Hutterer [Wed, 1 Aug 2018 08:47:24 +0000 (18:47 +1000)]
action: make a note that we may not null-terminate private strings
Coverity complains that a 7-byte string may not be null-terminated when copied
into act->data (size 7). This is fine, make a note of it.
All the strings in xkeyboard-config only use 6 bytes + null terminator so this
won't be an issue. The server (the only user of these) uses an 8-byte array
and forcibly null-terminates the string, see XkbDDXPrivate().
Everything else treats it as byte-array size 7 anyway so whether it's
null-terminated doesn't matter.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Peter Hutterer [Mon, 30 Jul 2018 04:11:46 +0000 (14:11 +1000)]
xkbcomp: fix pointer value for FreeStmt
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Peter Hutterer [Mon, 23 Jul 2018 01:48:35 +0000 (11:48 +1000)]
keycodes: don't try to copy zero key aliases
Move the aliases copy to within the (num_key_aliases > 0) block.
Passing info->aliases into this fuction with invalid aliases will
cause log messages but num_key_aliases stays on 0. The key_aliases array
is never allocated and remains NULL. We then loop through the aliases, causing
a null-pointer dereference.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Peter Hutterer [Mon, 23 Jul 2018 01:17:17 +0000 (11:17 +1000)]
text: init the target buffer to zero
There's a (theoretical?) path where we might end up strcpy() buf without ever
writing to it. This happens if the mask is nonzero but specifies a modifier
larger than the one in the xkb_mod_set.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Ran Benita [Mon, 12 Mar 2018 07:43:55 +0000 (09:43 +0200)]
compose: fix infinite loop in parser on some inputs
The parser would enter an infinite loop if an unterminated keysym
literal occurs at EOF.
Found with the afl fuzzer.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sun, 11 Mar 2018 15:07:06 +0000 (17:07 +0200)]
xkbcomp: fix crash when parsing an xkb_geometry section
xkb_geometry sections are ignored; previously the had done so by
returning NULL for the section's XkbFile, however some sections of the
code do not expect this. Instead, create an XkbFile for it, it will
never be processes and discarded later.
Caught with the afl fuzzer.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sat, 10 Mar 2018 21:32:12 +0000 (23:32 +0200)]
xkbcomp: fix crashes in the parser when geometry tokens appear
In the XKB format, floats and various keywords can only be used in the
xkb_geometry section. xkbcommon removed support xkb_geometry, but still
parses it for backward compatibility. As part of ignoring it, the float
AST node and various keywords were removed, and instead NULL was
returned by their parsing actions. However, the rest of the code does
not handle NULLs, and so when they appear crashes usually ensue.
To fix this, restore the float AST node and the ignored keywords. None
of the evaluating code expects them, so nice error are displayed.
Caught with the afl fuzzer.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sat, 10 Mar 2018 21:10:47 +0000 (23:10 +0200)]
xkbcomp: fix stack overflow when evaluating boolean negation
The expression evaluator would go into an infinite recursion when
evaluating something like this as a boolean: `!True`. Instead of
recursing to just `True` and negating, it recursed to `!True` itself
again.
Bug inherited from xkbcomp.
Caught with the afl fuzzer.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sat, 10 Mar 2018 22:04:05 +0000 (00:04 +0200)]
Add fuzzing infrastructure
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>
Ran Benita [Tue, 17 Jul 2018 16:06:12 +0000 (19:06 +0300)]
Merge pull request #65 from heftig/pc-fix2
meson: Fix xkbcommon-x11.pc Requires versioning
Jan Alexander Steffens (heftig) [Tue, 17 Jul 2018 15:21:02 +0000 (17:21 +0200)]
meson: Fix xkbcommon-x11.pc Requires versioning
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>
Jan Alexander Steffens (heftig) [Mon, 16 Jul 2018 23:15:30 +0000 (01:15 +0200)]
meson: Fix xkbcommon-x11.pc Requires
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>
Ran Benita [Thu, 5 Jul 2018 15:13:14 +0000 (18:13 +0300)]
bench: simplify the bench helpers
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>
Ran Benita [Sat, 23 Jun 2018 20:17:07 +0000 (23:17 +0300)]
travis: pin meson to an older version so it works with Python 3.4
The CI image only has Python 3.4. It's a bit of a hassle to change this,
so let's pin meson to the version before they bumped their requirement
instead.
I suppose it's not that bad in that it will guarantee compatibility with
older meson over time.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sat, 23 Jun 2018 19:00:19 +0000 (22:00 +0300)]
keysym-utf: reject out-of-range Unicode codepoints in xkb_keysym_to_utf{8,32}
It used to be UTF-8 was defined for inputs > 0x10FFFF, but nowadays
that's the maximum and a codepoint is encoded up to 4 bytes, not 6.
Fixes: https://github.com/xkbcommon/libxkbcommon/issues/58
Fixes: https://github.com/xkbcommon/libxkbcommon/issues/59
Reported-by: @andrecbarros
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Tue, 27 Feb 2018 18:24:57 +0000 (20:24 +0200)]
keysym-utf: replace the Unicode characters for leftanglebracket and rightanglebracket
Looking at leftanglebracket
- The standard[1] does not specify any Unicode value for it.
- The keysym list keysymdef.h in x11proto[2] says U+27E9 MATHEMATICAL
RIGHT ANGLE BRACKET in a comment.
- The keysym->unicode list in xkbcommon which comes from [3] has U+2329
LEFT-POINTING ANGLE BRACKET.
- The keysym->unicode list in Xlib[4] has U+2039 SINGLE LEFT-POINTING
ANGLE QUOTATION MARK.
[1] https://www.x.org/releases/X11R7.7/doc/xproto/x11protocol.html#Legacy_KEYSYMs
[2] https://cgit.freedesktop.org/xorg/proto/x11proto/tree/keysymdef.h
[3] https://www.cl.cam.ac.uk/%7Emgk25/ucs/keysym2ucs.c
[4] https://cgit.freedesktop.org/xorg/lib/libX11/tree/src/xlibi18n/imKStoUCS.c
The symbols we are using, {LEFT,RIGHT}-POINTING ANGLE BRACKET, are
deprecated according to Unicode[5]:
These characters are deprecated and are strongly discouraged for
mathematical use because of their canonical equivalence to CJK
punctuation.
[5] https://www.unicode.org/charts/PDF/U2300.pdf
Hence, switch to the MATHEMATICAL codepoints which seem to be the best
fit.
Fixes: https://github.com/xkbcommon/libxkbcommon/issues/47
Reported-by: @bytensky
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Tue, 27 Feb 2018 10:32:40 +0000 (12:32 +0200)]
build/autotools: remove redundant ACLOCAL_AMFLAGS
Will be deprecated in automake 2.0.
Replaced by AC_CONFIG_MACRO_DIR (already present) which is available
since autoconf 2.63.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sun, 25 Feb 2018 09:51:05 +0000 (11:51 +0200)]
build/meson: fix x11 test/demo compilation with non-standard xcb
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>
Ran Benita [Wed, 14 Feb 2018 13:07:46 +0000 (15:07 +0200)]
build/meson: fix the -Wl,--version-script configure check
Hopefully this fixes compilation on darwin, which doesn't support
version scripts.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sat, 27 Jan 2018 18:42:44 +0000 (20:42 +0200)]
test/interactive-wayland: replace tabs with spaces
Match the style of all other files.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 26 Jan 2018 11:09:39 +0000 (13:09 +0200)]
doc: improve the description of the consumed modifier modes
Hopefully it is more understandable now.
https://bugs.freedesktop.org/show_bug.cgi?id=104768
Reported-by: Gatis Paeglis <gatis.paeglis@qt.io>
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Thu, 21 Dec 2017 12:18:07 +0000 (14:18 +0200)]
Convert http:// -> https:// where possible
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Mon, 18 Dec 2017 14:41:21 +0000 (16:41 +0200)]
x11: check and document the correct range of device IDs
The actual value is 127, not 255.
https://bugs.freedesktop.org/show_bug.cgi?id=104321
Reported-by: Gatis Paeglis <gatis.paeglis@qt.io>
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 15 Dec 2017 19:41:51 +0000 (21:41 +0200)]
Bump version to 0.8.0
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 15 Dec 2017 19:40:30 +0000 (21:40 +0200)]
Update NEWS
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 15 Dec 2017 14:17:45 +0000 (16:17 +0200)]
README,PACKAGING: use the new meson unified command format
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Thu, 14 Dec 2017 15:12:52 +0000 (17:12 +0200)]
build: disable -Wdocumentation-deprecated-sync
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>
Ran Benita [Tue, 12 Dec 2017 12:53:25 +0000 (14:53 +0200)]
travis: ensure all tests are valgrind-clean
The tests will fail if they have any memory leaks or perform invalid
accesses.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Tue, 12 Dec 2017 13:57:58 +0000 (15:57 +0200)]
test/x11: properly clean up also when skipping test
To make valgrind happy.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Tue, 12 Dec 2017 13:44:52 +0000 (15:44 +0200)]
compose/parser: be more careful when checking if sequence overrides or duplicates another
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Tue, 12 Dec 2017 12:43:24 +0000 (14:43 +0200)]
xkbcomp/ast-build: fix memory leak when appending multi-keysyms
`syms` was not freed.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Tue, 12 Dec 2017 12:30:21 +0000 (14:30 +0200)]
keymap: fix NULL dereference when dumping the default fallback type
The default fallback type uses
type->level_names = NULL
but the keymap-dump code was not checking this case.
Instead of adding more workarounds and possible bugs (e.g. previous
commit), let's just keep the number of level names separately. This has
the additional advantage retains extraneous level name if someone adds
them for some reason.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Tue, 12 Dec 2017 12:02:17 +0000 (14:02 +0200)]
xkbcomp/types: fix types being assigned the wrong number of levels in some circumstances
The buggy code assigned the number of levels based on the number of
level names in the definition, instead of the actual number of levels!
This would completely break type definitions which do not give names to
levels.
This was not noticed for so long because xkeyboard-config always gives
names to all levels.
This regressed in
61fed8dab9b8e27981f36ffc96666d7376546e30.
Reported-by: Gatis Paeglis <gatis.paeglis@qt.io>
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Mon, 11 Dec 2017 20:41:55 +0000 (22:41 +0200)]
keysym: add xkb_keysym_to_{lower,upper} to public API
These can be useful in some odd cases.
There is already an implementation (+ tests) for internal use, so all
that's needed is to export them.
If xkbcommon were to provide a way to convert a Unicode codepoint to a
keysym, this could have been implemented externally as follows:
uint32_t codepoint = xkb_keysym_to_utf32(keysym);
uint32_t upper_codepoint = my_unicode_library_to_upper(codepoint);
xkb_keysym_t upper_keysym = theoretical_xkb_keysym_from_utf32(upper_codepoint);
However keysym -> codepoint is not injective so such a function is not
possible strictly speaking.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sun, 3 Dec 2017 11:04:35 +0000 (13:04 +0200)]
test/data: sync with xkeyboard-config 2.22
Some tweaks to the de(neo) keyseq tests were required. It seems to have
improved.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Tue, 3 Oct 2017 10:28:32 +0000 (13:28 +0300)]
Merge pull request #53 from whitslack/missing-ucs-codes
keysym-utf: Add missing codes for signifblank and permille keysyms
Matt Whitlock [Fri, 29 Sep 2017 01:31:28 +0000 (21:31 -0400)]
keysym-utf: Add missing codes for signifblank and permille keysyms
Ran Benita [Sun, 10 Sep 2017 06:18:54 +0000 (09:18 +0300)]
build/meson: require meson >= 0.41.0
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>
Ran Benita [Fri, 8 Sep 2017 09:16:13 +0000 (12:16 +0300)]
expr: paper over a maybe-uninitialized warning
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Wed, 16 Aug 2017 17:24:27 +0000 (20:24 +0300)]
test/interactive-wayland: avoid unused function warning due to configuration
test/interactive-wayland.c:95:1: warning: ‘set_cloexec_or_close’ defined but not used [-Wunused-function]
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Wed, 16 Aug 2017 17:23:54 +0000 (20:23 +0300)]
build: add missing configure function checks for test/interactive-wayland
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sun, 13 Aug 2017 14:55:45 +0000 (17:55 +0300)]
xkbcommon-compose.h: change recommended locale fallback code to treat empty string same as unset
The previous code would cause failures to find the Compose file if one
of the environment variables LC_ALL, LC_CTYPE or LANG are set to the
empty string.
The description of the fallback procedure in loclale(7) talks about
"non-null environment variable"; I interpreted this to mean the
environment variable is unset, but it actually means unset or empty (I
verified this by looking at what glibc and musl do).
A recent bug in systemd https://github.com/systemd/systemd/issues/6407
exposed this issue. It causes these these variables to be set to the
empty string in TTY sessions.
Reported by "doodoo" in https://bbs.archlinux.org/viewtopic.php?id=228658
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 4 Aug 2017 13:28:36 +0000 (16:28 +0300)]
Bump version to 0.7.2
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 4 Aug 2017 13:17:27 +0000 (16:17 +0300)]
Update NEWS
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 4 Aug 2017 12:31:06 +0000 (15:31 +0300)]
build/autotools: fix doc installation
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Thu, 3 Aug 2017 10:38:14 +0000 (13:38 +0300)]
test/symbols-leak-test.bash: make it easier to read
Signed-off-by: Ran Benita <ran234@gmail.com>