|
c09bf363
|
2020-06-23T14:01:48
|
|
test: untangle interactive-evdev from the test headers
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>
|
|
|
2eb5d2c8
|
2020-06-23T16:06:10
|
|
test: simplify error handling in interactive-evdev
Passing -errno around and having separate labels depending on failure types is
superfluous here. All the unref calls can handle NULL and nothing cares about
errno once we're out of the immediate scope. So let's simplify this and deal
with 0 and 1 only.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
ec2bbe59
|
2020-06-22T13:07:46
|
|
Move the various tools to a tools/ directory
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
7d1aefdd
|
2020-06-22T13:01:41
|
|
test: simplify an exit path
The unref() functions take NULL as argument, so we don't need different labels
for every possible exit path.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
725a3198
|
2020-06-22T13:08:51
|
|
test: how-to-type: prefer local headers over system ones
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
6c629a10
|
2020-06-23T15:56:16
|
|
Use a custom internal library for the tools
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>
|
|
|
928771ed
|
2020-06-22T13:17:47
|
|
test: untangle rmlvo-to-kccgst from the test headers
Using test helpers to init the context gives it fairly specific behavior; unless
the user sets the right environment variables and/or calls it from the right
PWD, it may or may not include the test data.
Let's drop this behavior, make it a default tool to compile a keymap. If there
is a specific need to modify the include paths, we can add this later.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
e5d4056e
|
2020-06-22T13:04:43
|
|
test: untangle print-compiled-keymap from the test headers
Commit 16c84cdd819db516fff089c76b99248fb7dd4e8c removed the getopt handling for
RMLVO arguments, so now this tool only takes a keymap file and compiles it.
Using test helpers to init the context gives it fairly specific behavior; unless
the user sets the right environment variables and/or calls it from the right
PWD, it may or may not include the test data.
Let's drop this behavior, make it a default tool to compile a keymap. If there
is a specific need to modify the include paths, we can add this later.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
bdbf1a19
|
2020-06-22T13:12:49
|
|
Remove the gitignore file
This contained three groups entries:
- autotools stuff which no longer needed
- entries to ignore built artifacts, no longer needed with meson as everyting is
in the builddir
- special files like cscope.out, etc. These should be handled by a user in their
global gitignore file since they're fairly specific to a user's setup.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
4e544e27
|
2020-06-16T10:44:48
|
|
doc: correct the include path list
XKB_CONFIG_ROOT (if defined) replaces the built-in system directories.
Fixes 5fb2c6769b7259ba647781bc800d6a46d90cf1a9
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
5fb2c676
|
2020-06-02T16:18:47
|
|
doc: add documentation for user configuration
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>
|
|
|
a2657874
|
2020-06-02T16:11:33
|
|
doc: add the rules-format file (as markdown)
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>
|
|
|
fef179cf
|
2020-05-25T10:29:20
|
|
Add an editorconfig file
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
892cfef8
|
2020-05-20T20:42:02
|
|
keysyms: add XKB_KEY_XF86FullScreen
Updated using ./scripts/update-keysyms using latest xorgproto.
Fixes: https://github.com/xkbcommon/libxkbcommon/issues/147
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
860cfc03
|
2020-04-05T00:07:57
|
|
keymap: don't forget about fallback mappings in xkb_keymap_key_get_mods_for_level()
If the active set of modifiers doesn't match any explicit entry of the
key type, the resulting level is 0 (i.e. Level 1). Some key types don't
explicitly map Level 1, taking advantage of this fallback.
Previously, xkb_keymap_key_get_mods_for_level didn't consider this, and
only reported masks for explicit mappings. But this causes some glaring
omissions, like matching "a" in the "us" keymap returning not results.
Since every mask which isn't explicitly mapped falls back to 0, we can't
return the all. Almost always the best choice for this is the empty
mask, so return that, when applicable.
Fixes https://github.com/xkbcommon/libxkbcommon/issues/140.
Reported-by: https://github.com/AliKet
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
908e014f
|
2020-04-10T16:32:13
|
|
Fix building X11 tests on PE targets
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)
|
|
|
ed5a0b4f
|
2020-04-18T20:57:51
|
|
ci: remove azure pipelines build
Broken, replaced with github actions.
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
8dfece0c
|
2020-04-18T20:52:17
|
|
ci: add github actions build
We currently use Azure Pipelines. But it became out of date. Also it
requires a different account and setup than github account itself.
The configuration here is probably not very good and is less featureful
than the Azure one but it's what I managed.
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
0f1cae0c
|
2020-03-25T08:43:41
|
|
test: use flag instead of hardcoded value in examples
|
|
|
8a1709a4
|
2020-03-21T12:56:13
|
|
test/how-to-type: some code fixes/improvements
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
188a1c79
|
2020-03-20T18:29:03
|
|
test: add "how to type" demo program
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>
|
|
|
90e5aa8b
|
2020-03-20T19:15:48
|
|
doc: add missing `@since` tags
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
d92a248c
|
2020-02-05T17:42:06
|
|
API to query modifier set required to type a keysym
The new API is useful to implement features like auto-type and
desktop automation. Since the inputs for these features is usually
specified in terms of the symbols that need to be typed, the
implementation needs to be able to invert the keycode->keysym
transformation and produce a sequence of keycodes that can be used
to type the requested character(s).
|
|
|
0345aba0
|
2020-02-12T23:44:42
|
|
Support translation Unicode codepoints to keysyms
In order to support features like auto-type and UI automation, the
relevant tools need to be able to invert the keycode->keysym->text
transformation. In order to facilitate that, a new API was added.
It allows querying the keysyms that correspond to particular Unicode
codepoints. For all practical purposes, it can be thought of as an
inverse of xkb_keysym_to_utf32().
|
|
|
1b23a650
|
2020-02-18T14:12:20
|
|
build: fix build with byacc
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>
|
|
|
c9070326
|
2020-02-16T13:32:09
|
|
doc: must -> should
Using an out-of-range is not an error, just useless.
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
e3c3420a
|
2020-01-18T23:08:28
|
|
Bump version to 0.10.0
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
517464eb
|
2020-01-18T23:06:58
|
|
doc/rules-format.txt: document include support
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
335ebcad
|
2020-01-18T22:59:58
|
|
docs: add missing reference to $XDG_CONFIG_HOME
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
f1186acf
|
2019-08-05T15:53:04
|
|
MSVC: Provide implementations of [un]setenv()
Reference:
https://docs.microsoft.com/en-us/cpp/c-runtime-library/reference/putenv-s-wputenv-s
|
|
|
abb2f9d9
|
2019-08-05T15:44:33
|
|
MSVC: Provide implementations of test_{dis,en}able_stdin_echo
This provides implementations of the test_enable_stdin_echo and
test_disable_stdin_echo which do not require <termios.h>, which is
not available on Windows.
|
|
|
5354dee2
|
2019-08-05T13:52:18
|
|
MSVC: Use <io.h> as an alternative for <unistd.h>
Only the input/output functions from <unistd.h> options are used, so
using <io.h> when building with MSVC should be enough. The inclusion
of the header in context-priv.c does not seem to be needed (tested
on GNU/Linux) and so it is removed.
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
f09ae987
|
2019-08-05T13:51:09
|
|
build: Skip building some tests on MSVC for now
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.
|
|
|
578aeac6
|
2019-08-05T13:37:23
|
|
build: add some defines for MSVC to allow it to be unixy
[ran: combined some commits]
|
|
|
d2f2e6fd
|
2019-08-12T23:14:25
|
|
CI: Add build instructions for Windows
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
9e3045c7
|
2019-08-05T16:57:45
|
|
MSVC: Provide an implementation of gettimeofday()
|
|
|
92a7aba6
|
2019-12-28T16:05:04
|
|
ci: use consistent python for all jobs
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
faac4ba7
|
2019-12-28T15:52:20
|
|
test/data: ensure files are checked out with LF, not CRLF
The tests stringcomp and buffercomp do binary comparison on some files;
if the files are changed to CRLF on checkout, the tests fail.
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
b30bf21c
|
2019-08-12T23:14:25
|
|
CI: some tweaks
[ran: extracted generic bits from Windows commit.]
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
fadfb13c
|
2019-12-28T14:19:22
|
|
xkbcomp/rules: support \r\n line endings
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
d1e39c11
|
2019-12-28T14:11:27
|
|
test/atom: use correct format specifier for size_t
From MSVC:
test\atom.c(98): note: consider using '%zu' in the format string
test\atom.c(98): warning C4477: 'fprintf' : format string '%lu' requires an argument of type 'unsigned long', but variadic argument 1 has type 'size_t'
test\atom.c(100): note: consider using '%zu' in the format string
test\atom.c(100): warning C4477: 'fprintf' : format string '%lu' requires an argument of type 'unsigned long', but variadic argument 1 has type 'size_t'
test\atom.c(114): note: consider using '%zu' in the format string
test\atom.c(114): warning C4477: 'fprintf' : format string '%lu' requires an argument of type 'unsigned long', but variadic argument 1 has type 'size_t'
test\atom.c(128): note: consider using '%zu' in the format string
test\atom.c(128): warning C4477: 'fprintf' : format string '%lu' requires an argument of type 'unsigned long', but variadic argument 1 has type 'size_t'
test\atom.c(130): note: consider using '%zu' in the format string
test\atom.c(130): warning C4477: 'fprintf' : format string '%lu' requires an argument of type 'unsigned long', but variadic argument 1 has type 'size_t'
test\atom.c(137): note: consider using '%zu' in the format string
test\atom.c(137): warning C4477: 'fprintf' : format string '%lu' requires an argument of type 'unsigned long', but variadic argument 2 has type 'size_t'
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
da4a90c1
|
2019-12-28T13:49:40
|
|
Open files in binary mode
This turns off some misfeatures on Windows, and does nothing on POSIX.
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
fe417d84
|
2019-12-28T13:40:38
|
|
test/common: avoid double // in path
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
eb23982c
|
2019-12-28T13:32:02
|
|
test/common: simplify test_get_path()
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
521bb498
|
2019-12-27T22:08:57
|
|
xkbcomp: remove cast which triggers warning on gcc
Will need some other way to take care of the warning on MSVC.
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
fbd0e643
|
2019-12-27T21:51:34
|
|
xkbcomp: make a couple of casts explicit to mark them as checked
This acknowledges some "possible loss of data cast" warnings from MSVC.
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
f967d46b
|
2019-12-27T15:47:15
|
|
test/context: use a more portable directory-exists check
MSVC doesn't have opendir/closedir.
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
1849158a
|
2019-12-27T15:10:10
|
|
xkbcomp/keywords: regenerate with newer gperf
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
823708b7
|
2019-12-27T14:51:31
|
|
parser: fix format string for int64_t
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
670566f0
|
2019-12-27T15:03:10
|
|
Only add GCC diagnostic pragmas when compiler is GCC compatible
Avoid "unknown pragma" warnings on other compilers.
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
40bea8e9
|
2019-12-27T14:52:49
|
|
xkbcomp: fix wrong return type
Detected by MSVC:
xkbcomp\xkbcomp.c(111): warning C4047: 'return': 'bool' differs in levels of indirection from 'void *'
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
6ca1a0c9
|
2019-12-27T14:17:55
|
|
parser: use int64_t for all numbers
Don't use int which can have different size on different machines.
Also avoid some warnings from MSVC:
xkbcomp/parser.y(760): warning C4244: '=': conversion from 'int64_t' to 'int', possible loss of data
xkbcomp/parser.y(761): warning C4244: '=': conversion from 'int64_t' to 'int', possible loss of data
xkbcomp/parser.y(767): warning C4244: '=': conversion from 'int64_t' to 'int', possible loss of data
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
c3ac58a9
|
2019-12-27T14:06:47
|
|
scanner-utils: avoid possible implicit truncating of line/column
This increases the size of the struct a bit but it's not very important.
Fixes these MSVC warnings:
src\scanner-utils.h(112): warning C4267: '+=': conversion from 'size_t' to 'unsigned int', possible loss of data
src\scanner-utils.h(147): warning C4267: '+=': conversion from 'size_t' to 'unsigned int', possible loss of data
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
0fdd29bb
|
2019-12-27T13:55:24
|
|
utils: move macro defines to before they're used
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
64137a4a
|
2019-12-27T13:52:51
|
|
utils: fix typo in strndup fallback
Fixup 93a1305 - we will have CI for this soon.
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
d59ff39d
|
2019-08-13T01:17:51
|
|
meson.build: Take win_bison as a possible variant for Bison
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
40aab05e
|
2019-12-27T13:03:20
|
|
build: include config.h manually
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>
|
|
|
bdff8ebe
|
2019-08-05T16:18:05
|
|
Provide a fallback implementation of [v]asprintf()
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.
|
|
|
93a13050
|
2019-08-05T16:07:57
|
|
Provide a fallback implementation of strndup()
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]
|
|
|
a8acc2ff
|
2019-08-05T15:59:20
|
|
Use built-in istr[n]cmp() instead of strcase[n]cmp()
This avoids the problem that MSVC does not provide strcasecmp() nor
strncasecmp(), and at the same time avoids potential problems due to
locale configuration by using istrcmp() and istrncmp() which are
already in the source tree and written to cover only ASCII.
|
|
|
34122f9f
|
2019-12-27T12:34:49
|
|
utils: use MIN/MAX instead of min/max
min/max symbols conflict on some systems (msvc), so just use the macros.
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
ade13130
|
2019-12-27T12:22:37
|
|
xkbcomp: downgrade "Symbol added to modifier map for multiple modifiers" log to a warning
This condition happens in xkeyboard-config keymaps and seems hard to
fix. Currently it incessantly spams people's logs who have no idea what
to do about it. So downgrade to "warning" level, so it doesn't show up
by default.
When working on keymaps, set `XKB_LOG_LEVEL=debug XKB_LOG_VERBOSITY=10`
to see all possible messages.
Refs https://github.com/xkbcommon/libxkbcommon/issues/111
Fixes https://github.com/xkbcommon/libxkbcommon/issues/128
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
ca033a29
|
2019-09-03T11:23:14
|
|
rules: add include statements to rules files
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>
|
|
|
67b538dd
|
2019-09-30T15:39:08
|
|
context: add a helper function to return the default system include path
No functional changes but we'll need that same lookup in the rules file
include handling in a future patch.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
3c57b328
|
2019-11-12T15:27:22
|
|
rules: move the matcher result handling to the caller
This shouldn't be processed in the matcher itself, especially in the glorious
future when we can have nested matchers. Only handle this once in the caller
to the original parsed file.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
2ec07b62
|
2019-11-12T14:19:55
|
|
rules: put the scanner on the stack
This allows nesting the scanner for the future !include directive.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
bb7551a6
|
2019-11-12T15:25:16
|
|
rules: simplify an error path
Initialize to NULL so we don't have to care about whether the cleanups can be
called or not.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
d9b98856
|
2019-11-12T14:39:47
|
|
rules: rename a variable from 's' to 'str'
To avoid name conflicts with a future patch.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
2a578a60
|
2019-11-12T14:17:44
|
|
rules: drop the matcher_err() macro and use scanner_err directly
No functional changes, this is what the macro expanded to anyway. Prep work
for putting the scanner on the stack and removing it from the matcher struct.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
f57c13ea
|
2019-09-03T10:56:01
|
|
rules: factor out the function to parse a rules file
No functional changes, this just makes the part to parse a single rules file
re-usable.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
00f31e0d
|
2019-11-13T11:38:39
|
|
rules: eliminate an extra fopen/fclose cycle
FindXkbFileInPath() opens the file so we're guaranteed that the file not only
exists, but that we can read it. Changing that would alter behavior so instead
let's just pass that file handle along and do the same for include files.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
13b30f4f
|
2019-12-13T13:35:25
|
|
keysym: handle ssharp in XConvertCase()
lowercase: LATIN SMALL LETTER SHARP S (U+00DF)
uppercase: LATIN CAPITAL LETTER SHARP S (U+1E9E)
The uppercase sharp s (XK_ssharp) is a relatively recent addition to unicode
but was added to the relevant keyboard layouts in xkeyboard-config-2.25
(d1411e5e95c)
https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/issues/144
Alas, the CapsLock behavior was broken on the finnish layout (maybe others).
This was due XConvertCase() never returning the uppercase characters.
Let's make this function return the right lower/upper symbols for the sharp s
and hope that the world won't get any worse because of it.
Corresponding Xlib issue:
https://gitlab.freedesktop.org/xorg/lib/libx11/issues/110
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
068e38ed
|
2019-12-14T13:45:35
|
|
meson: remove redundant malloc scribbling
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>
|
|
|
a237f4f6
|
2019-12-14T13:44:33
|
|
parser: fix the remaining pointer chasing
Fix the TODO added in 7c42945.
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
1de2f174
|
2019-11-13T13:42:11
|
|
test: let rmlvo-to-kccgst take long options like rmlvo-to-keymap
The short options were left for backwards compatibility.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
7c42945e
|
2019-11-13T22:41:38
|
|
parser: fix quadratic pointer chasing
In the AST, lists (e.g. the list of statements in a file) are kept in
singly-linked lists -- each AST node has a `next` pointer available for
this purpose.
Previously, a node was added to the list by starting from the head,
chasing to the last, and appending. So creating a list of length N would
take ~N^2/2 pointer dereferences.
Now, we always (temporarily) keep the last as well, so appending is O(1)
instead of O(N).
Given a keymap
xkb_keymap {
xkb_keycodes {
minimum = 8;
minimum = 8;
minimum = 8;
minimum = 8;
minimum = 8;
[... repeated N times ...]
};
xkb_types {};
xkb_compat {};
xkb_symbols {};
};
The compilation times are
N | Before | After
--------|----------|-------
10,000 | 0.407s | 0.006s
20,000 | 1.851s | 0.015s
30,000 | 5.737s | 0.021s
40,000 | 12.759s | 0.023s
50,000 | 21.489s | 0.035s
60,000 | 40.473s | 0.041s
70,000 | 53.336s | 0.039s
80,000 | 72.485s | 0.044s
90,000 | 94.703s | 0.048s
100,000 | 118.390s | 0.057s
Another option is to ditch the linked lists and use arrays instead. I
got it to work, but its more involved and allocation heavy so turns out
to be worse without further optimizations.
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
f9b95c06
|
2019-11-13T23:37:47
|
|
parser: remove an unneeded check
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
59d2a713
|
2019-11-14T09:52:21
|
|
docs: update the include path documentation
Missing from e23f1061b2b9c8d40ba7797a5ffbd6d474d604e0 and
3a91788d9254b4571ff883439931f497d8a0663f.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
3d43f480
|
2019-11-12T22:31:46
|
|
compat: reject interpret modifier predicate with more than one value
Given
interpret ISO_Level3_Shift+AnyOf(all,extraneous) { ... };
Previously, extraneous (and further) was ignored. Now it's rejected.
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
7d44c7a9
|
2019-11-12T22:09:19
|
|
expr: fix log message on some unexpected expression types
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
406beeca
|
2019-11-12T22:06:02
|
|
Replace some tabs that sneaked in with spaces
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
322cd856
|
2019-11-12T20:34:31
|
|
parser: fix merge mode only applied to first vmod in a virtual_modifiers statement
Given
augment virtual_modifiers NumLock,Alt,LevelThree
Previously it was expanded (directly in the parser) to
augment virtual_modifiers NumLock;
virtual_modifiers Alt;
virtual_modifiers LevelThree;
Now it expands to
augment virtual_modifiers NumLock;
augment virtual_modifiers Alt;
augment virtual_modifiers LevelThree;
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
400cc849
|
2019-11-12T20:04:13
|
|
ast: use a separate expr struct for action list
Currently it's under UnaryExpr, which just doesn't make sense.
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
8c62d48c
|
2019-11-12T19:16:08
|
|
ast-build: get rid of unhelpful macro
Straightforward code is better here.
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
4849bc19
|
2019-11-09T22:07:15
|
|
atom: a string is greater than its prefix
Bug accidentally introduced in 9a92b46.
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
c79c8033
|
2019-11-09T21:25:01
|
|
atom: combine atom_intern() and atom_lookup()
Use an "add" bool parameter instead. This simplifies the code a bit.
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
adbd9c6f
|
2019-11-09T13:47:16
|
|
atom: correct iteration count in hash function
Fixup of ccab349 - unlike the commit message, hash a byte twice instead
of zero times, which is probably better. This is how it was before.
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
9ebf97d7
|
2019-11-09T13:12:02
|
|
atom: describe how this odd data structure works
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
ccab349c
|
2019-11-09T12:43:04
|
|
atom: use a better hash function
FNV-1a instead of the djb2-like one from before.
Keep the unrolling since it seems quite beneficial, even though it loses
one byte if the length is odd...
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
9a92b464
|
2019-11-09T11:49:25
|
|
atom: style changes
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
1fe1b653
|
2019-11-09T11:39:17
|
|
atom: remove handling of garbage input
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
a5f95c2b
|
2019-11-09T11:33:45
|
|
atom: use explicit size for fingerprint
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
8ea4a001
|
2019-11-09T00:20:45
|
|
atom: replace an avoidable strlen
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
6f8bb5ee
|
2019-11-09T00:05:59
|
|
atom: remove redundant field
The field is redundant.
Due to alignment, this will only save memory on 32bit architectures.
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
2a615593
|
2019-11-08T22:40:13
|
|
test/atom: increase iteration count and print random seed on failure
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
2af474e8
|
2019-11-02T13:31:44
|
|
parser: get rid of "stealing" atoms
This requires (well, at least implemented by) casting away `const` which
is undefined behavior, and clang started to warn about it.
The micro optimization didn't save too many allocations, anyway.
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
31e561fc
|
2019-11-05T13:33:11
|
|
test: remove a superfluous string-is-null check
A few lines above we check path_rel[0], so any null pointer will blow up
before we get here.
Found by coverity
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
96ef14ac
|
2019-11-05T13:22:49
|
|
test: fix a potential memory leak
Found by coverity
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
3515ba19
|
2019-11-01T10:45:43
|
|
test: xkeyboard-config: bring back the progress bar
Signed-off-by: Ran Benita <ran@unusedvar.com>
|
|
|
8f93e22a
|
2019-11-01T18:41:16
|
|
test: xkeyboard-config: invoke the python3 command (#120)
python3 is always python3, but python could be python2 in some cases. Or just
missing (e.g. RHEL8).
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|