platform/upstream/libxkbcommon.git
11 years agoReplace flex scanner with a hand-written one
Ran Benita [Sun, 12 Aug 2012 08:40:02 +0000 (11:40 +0300)]
Replace flex scanner with a hand-written one

The scanner is very similar in structure to the one in xkbcomp/rules.c.
It avoids copying and has nicer error reporting.

It uses gperf to generate a hashtable for the keywords, which gives a
nice speed boost (compared to the naive strcasecmp method at least). But
since there's hardly a reason to regenerate it every time and require
people to install gperf, the output (keywords.c) is added here as well.

Here are some stats from test/rulescomp:

Before:
compiled 1000 keymaps in 4.052939625s
==22063==   total heap usage: 101,101 allocs, 101,101 frees, 11,840,834 bytes allocated

After:
compiled 1000 keymaps in 3.519665434s
==26505==   total heap usage: 99,945 allocs, 99,945 frees, 7,033,608 bytes allocated

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agoutils: add {un,}map_file to read an entire file
Ran Benita [Thu, 14 Mar 2013 12:33:40 +0000 (14:33 +0200)]
utils: add {un,}map_file to read an entire file

This wraps the current mmap call and adds a fallback implementation for
systems which do not have mmap (e.g. mingw).

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agoAdd scanner-utils.h for common scanner functions
Ran Benita [Thu, 14 Mar 2013 12:31:55 +0000 (14:31 +0200)]
Add scanner-utils.h for common scanner functions

We want to share the same functions for another scanner.

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agoBump version to 0.3.0 xkbcommon-0.3.0
Daniel Stone [Mon, 1 Apr 2013 16:50:20 +0000 (17:50 +0100)]
Bump version to 0.3.0

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
11 years agokeymap: add xkb_keymap_new_from_buffer()
David Herrmann [Mon, 11 Mar 2013 11:53:39 +0000 (12:53 +0100)]
keymap: add xkb_keymap_new_from_buffer()

The current API doesn't allow the caller to create keymaps from mmap()'ed
files. The problem is, xkb_keymap_new_from_string() requires a terminating
0 byte. However, there is no way to guarantee that when using mmap() so a
user currently has to copy the whole file just to get the terminating zero
byte (assuming they cannot use xkb_keymap_new_from_file()).

This adds a new entry xkb_keymap_new_from_buffer() which takes a memory
location and the buffer size in bytes.

Internally, we depend on yy_scan_{string,byte}() helpers. According to
flex documentation these already copy the input string because they are
wrappers around yy_scan_buffer().
yy_scan_buffer() on the other hand has some insane requirements. The
buffer must be writeable and the last two bytes must be ASCII-NUL. But the
buffer may contain other 0 bytes just fine.

Because we don't want these constraints in our public API,
xkb_keymap_new_from_buffer() needs to create a copy of the input memory.
But it then calls yy_scan_buffer() directly. Hence, we have the same
number of buffer-copies as with *_from_string() but without the
terminating 0 requirement.
The explicit yy_scan_buffer() call is preferred over yy_scan_byte() so the
buffer-copy operation is not hidden somewhere in flex.

Maybe some day we no longer depend on flex and can have a zero-copy API. A
user could mmap() a file and it would get parsed right from this buffer.
But until then, we shouldn't expose this limitation in the API but instead
provide an API that some day can work with zero-copy.

Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
[ran: rebased on top of my branch]
Conflicts:
Makefile.am
src/xkbcomp/xkbcomp.c

11 years agoxkbcomp/keymap: silence a gcc warning
Ran Benita [Sat, 30 Mar 2013 16:19:01 +0000 (19:19 +0300)]
xkbcomp/keymap: silence a gcc warning

src/xkbcomp/keymap.c:127:12: error: 'found' may be used uninitialized in this function [-Werror=maybe-uninitialized]

Not really, but why not.

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agoAdd key-sequence checking to rulescomp
Daniel Stone [Wed, 27 Mar 2013 22:40:58 +0000 (22:40 +0000)]
Add key-sequence checking to rulescomp

Make sure we're actually getting the keymaps we're hoping to
compile.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
11 years agotest: Add va_list variant of test_key_seq
Daniel Stone [Tue, 19 Mar 2013 10:59:38 +0000 (10:59 +0000)]
test: Add va_list variant of test_key_seq

For use when chaining tests.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
11 years agoAllow NULL rmlvo for xkb_keymap_new_from_names
Daniel Stone [Sat, 2 Mar 2013 07:47:59 +0000 (23:47 -0800)]
Allow NULL rmlvo for xkb_keymap_new_from_names

Previously we allowed you to pass a names struct with five NULL members,
but not just pass NULL for the struct itself.  This was pretty dumb. :(

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
11 years agotest: Add environment checking to rulescomp
Daniel Stone [Mon, 18 Mar 2013 22:15:20 +0000 (22:15 +0000)]
test: Add environment checking to rulescomp

To ensure that overriding RMLVO from the environment works.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
11 years agotest: Suppress RMLVO environment inheritance by default
Daniel Stone [Tue, 19 Mar 2013 10:29:49 +0000 (10:29 +0000)]
test: Suppress RMLVO environment inheritance by default

But add a flag to allow it for later usage.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
11 years agoAdd environment overrides for default RMLVO
Daniel Stone [Thu, 28 Feb 2013 18:48:40 +0000 (10:48 -0800)]
Add environment overrides for default RMLVO

You can now set default values in the environment, as well as a context
option to ignore the environment, e.g. for tests.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
11 years agotest: Use test_get_context() in log.c
Daniel Stone [Mon, 18 Mar 2013 21:03:00 +0000 (21:03 +0000)]
test: Use test_get_context() in log.c

Since the only behavioural change is overriding default includes.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
11 years agotest: Add flags argument to test_get_context()
Daniel Stone [Mon, 18 Mar 2013 21:02:35 +0000 (21:02 +0000)]
test: Add flags argument to test_get_context()

Allowing overriding of environment suppression, at first.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
11 years agotest: Move test_key_seq to common.c
Daniel Stone [Mon, 18 Mar 2013 20:55:18 +0000 (20:55 +0000)]
test: Move test_key_seq to common.c

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
11 years agorules: be more paranoid in scanner
Ran Benita [Thu, 14 Mar 2013 10:45:34 +0000 (12:45 +0200)]
rules: be more paranoid in scanner

This can't happen, but better safe than sorry. The optimizations were
noticeable but negligible.

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agorules: quiet a gcc warning
Ran Benita [Wed, 13 Mar 2013 11:55:11 +0000 (13:55 +0200)]
rules: quiet a gcc warning

src/xkbcomp/rules.c:620:36: error: 'idx' may be used uninitialized in this function [-Werror=maybe-uninitialized]

Can't happen but no harm done.

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agokeyseq: add a couple of tests
Ran Benita [Fri, 8 Mar 2013 14:31:33 +0000 (16:31 +0200)]
keyseq: add a couple of tests

Tests the filter refcounting.

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agostate: use stdbool in filters
Ran Benita [Wed, 6 Mar 2013 23:15:21 +0000 (01:15 +0200)]
state: use stdbool in filters

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agodoc: use README as doxygen main page overview
Ran Benita [Tue, 5 Mar 2013 11:16:30 +0000 (13:16 +0200)]
doc: use README as doxygen main page overview

The doxygen page looked a bit dead, the README fills it nicely, and is
already written in the markdown format which doxygen uses (I think?).

Unfortunately the USE_MDFILE_AS_MAINPAGE doxygen config doesn't seem to
do anything.. So we just add a {#mainpage} tag at the top of the README
which isn't so bad. BUT we still need some config option (the
no_extension=md part) so that doxygen will accept README instead of
README.md or somesuch. And that requires an even newer release, 1.8.3.1,
released 2013-01. But if an older version is used, it doesn't spew out
warnings but just skips the README, which is fine.

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agodoc: update Doxyfile template to one from newer version
Ran Benita [Tue, 5 Mar 2013 10:01:48 +0000 (12:01 +0200)]
doc: update Doxyfile template to one from newer version

We want to use the USE_MDFILE_AS_MAINPAGE option which was introduced in
doxygen 1.8.3 (released 2012-12).

Right now the new options are commented, otherwise older doxygen spews
these these warnings, which can be ignored:

warning: ignoring unsupported tag `USE_MDFILE_AS_MAINPAGE =' at line 794, file doc/Doxyfile
warning: ignoring unsupported tag `MATHJAX_FORMAT         =' at line 1210, file doc/Doxyfile
warning: ignoring unsupported tag `EXTERNAL_SEARCH        =' at line 1257, file doc/Doxyfile
warning: ignoring unsupported tag `SEARCHENGINE_URL       =' at line 1265, file doc/Doxyfile
warning: ignoring unsupported tag `SEARCHDATA_FILE        =' at line 1271, file doc/Doxyfile
warning: ignoring unsupported tag `EXTERNAL_SEARCH_ID     =' at line 1278, file doc/Doxyfile
warning: ignoring unsupported tag `EXTRA_SEARCH_MAPPINGS  =' at line 1287, file doc/Doxyfile

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agodoc: some improvements
Ran Benita [Tue, 5 Mar 2013 09:48:43 +0000 (11:48 +0200)]
doc: some improvements

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agokeymap: rename xkb_kt_map_entry to xkb_key_type_entry
Ran Benita [Mon, 4 Mar 2013 16:41:13 +0000 (18:41 +0200)]
keymap: rename xkb_kt_map_entry to xkb_key_type_entry

That's a better name and fits more nicely.
Also change type->map to type->entries.

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agoFix pointer style nit
Ran Benita [Mon, 4 Mar 2013 16:35:56 +0000 (18:35 +0200)]
Fix pointer style nit

(I really dislike this one for some reason..)

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agoRemove file_id entirely
Ran Benita [Mon, 4 Mar 2013 12:16:36 +0000 (14:16 +0200)]
Remove file_id entirely

It is not used anymore.

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agosymbols: remove file_id
Ran Benita [Mon, 4 Mar 2013 12:15:32 +0000 (14:15 +0200)]
symbols: remove file_id

See previous commits.

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agocompat: remove file_id
Ran Benita [Mon, 4 Mar 2013 12:11:13 +0000 (14:11 +0200)]
compat: remove file_id

See previous commit.

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agotypes: remove file_id
Ran Benita [Mon, 4 Mar 2013 12:04:49 +0000 (14:04 +0200)]
types: remove file_id

See previous commit.

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agotypes: put all copy-to-keymap code in one function
Ran Benita [Mon, 4 Mar 2013 12:00:44 +0000 (14:00 +0200)]
types: put all copy-to-keymap code in one function

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agokeycodes: remove KeyNamesInfo::merge
Ran Benita [Mon, 4 Mar 2013 11:21:42 +0000 (13:21 +0200)]
keycodes: remove KeyNamesInfo::merge

Not used.

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agokeycodes: unwrap KeyNameInfo
Ran Benita [Mon, 4 Mar 2013 11:06:38 +0000 (13:06 +0200)]
keycodes: unwrap KeyNameInfo

We don't need the struct any more, it only contains one field now.

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agokeycodes: remove file_id
Ran Benita [Mon, 4 Mar 2013 10:53:32 +0000 (12:53 +0200)]
keycodes: remove file_id

The file_id thing is used to identify the XkbFile some statement
originally came from. This is needed to avoid spurious warnings; for
example, if you write the same alias twice in a file, that's redundant,
and you'd want a warning about it. However if intentionally override it
from another file, that's fine, and you shouldn't get a warning. So by
comparing the file_id's the needed log verbosity is changed.

However, the file_id mechanism is really not needed, because we already
have that info! Each KeyNamesInfo corresponds to one XkbFile, so if the
conflict occurred while handling that one file -> same_file = true, and
if it occurs while merging two Info's -> same_file = false.

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agokeymap: don't use darray for key aliases
Ran Benita [Mon, 4 Mar 2013 10:27:06 +0000 (12:27 +0200)]
keymap: don't use darray for key aliases

With a little tweak to the copy-to-keymap routine in keycodes.c we can
use a normal array.

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agokeycodes: don't do unnecessary copies while merging
Ran Benita [Mon, 4 Mar 2013 08:33:18 +0000 (10:33 +0200)]
keycodes: don't do unnecessary copies while merging

If 'into' in empty we can just steal 'from'.

Also move the alias-merging into the big function, it's nicer this way.

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agostate: small style fix
Ran Benita [Mon, 4 Mar 2013 00:12:00 +0000 (02:12 +0200)]
state: small style fix

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agoMove a couple of general keymap functions from keycodes.c
Ran Benita [Sun, 3 Mar 2013 19:35:43 +0000 (21:35 +0200)]
Move a couple of general keymap functions from keycodes.c

To get a key by name and resolve an alias - this makes sense for
everyone.

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agokeycodes: remove unneeded alias conflict check
Ran Benita [Sun, 3 Mar 2013 13:10:45 +0000 (15:10 +0200)]
keycodes: remove unneeded alias conflict check

This is already checked when adding a new alias and merging aliases, so
it can never happen when we get to copying to the keymap.

Also the log verbosity decision there is quite useless, we should just
warn always and be done with it. So we can remove the file_id from
AliasInfo, and collapse the alias functions together.

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agoxkbcomp: handle XKB file include's better
Ran Benita [Sat, 2 Mar 2013 22:11:27 +0000 (00:11 +0200)]
xkbcomp: handle XKB file include's better

The 'merge_mode' situation is quite messy, and we've introduced a
regression compared to original xkbcomp: when handling a composite
include statement, such as
    replace "foo(bar)+baz(bla)|doo:dee"
and merging the entire resulting *Info back into the including *Info,
we actually use the merge mode that is set by the last part (here it is
"augment" because of the '|'), when we should be using the one set for
the whole statement (here "replace").

We also take the opportunity to clean up a bit.

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agoBuild cleanly with clang
Ran Benita [Sat, 2 Mar 2013 18:43:57 +0000 (20:43 +0200)]
Build cleanly with clang

clang doesn't like the use of typeof with out default flags, so just
don't use it.

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agoDon't try to build linux-specific tests on non-linux
Ran Benita [Sat, 2 Mar 2013 17:01:18 +0000 (19:01 +0200)]
Don't try to build linux-specific tests on non-linux

Some tests use linux/input.h (and epoll), but we're building on some
other kernels (e.g. debian freebsd). We could just copy the file but
it's GPL. We could also skip the tests (exit code 77) but it doesn't
really matter.

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agokeymap: abstract a bit over the keymap format
Ran Benita [Fri, 1 Mar 2013 19:48:02 +0000 (21:48 +0200)]
keymap: abstract a bit over the keymap format

Make it a bit easier to experiment with other formats.

Add a struct xkb_keymap_format_operations, which currently contains the
keymap compilation and _get_as_string functions. Each format can
implement whatever it wants from these.

The current public entry points become wrappers which do some error
reporting, allocation etc., and calling to the specific format. The
wrappers are all moved to src/keymap.c, so there are no XKB_EXPORT's
under src/xkbcomp/ anymore.

The only format available now is normal text_v1.

This is all not very KISS, and adds some indirection, but it is helpful
and somewhat cleaner.

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agotext: some style changes
Ran Benita [Fri, 1 Mar 2013 19:31:08 +0000 (21:31 +0200)]
text: some style changes

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agotext: clean up and fix the *MaskText functions
Ran Benita [Fri, 1 Mar 2013 16:33:40 +0000 (18:33 +0200)]
text: clean up and fix the *MaskText functions

The snprintf trick that LedStateText and ControlMaskText do cannot work,
because you can't use the buffer as an argument to write to itself!
(posix at least has 'restrict' there). So those two actually never
worked for more than one value (i.e. with a +).

Fix that, and do the same cleanup to ModMaskText. Now we have 3
functions which look exactly the same, oh well.

Also increase the context text buffer size, you never know.

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agoMore spelling errors
Ran Benita [Fri, 1 Mar 2013 11:51:13 +0000 (13:51 +0200)]
More spelling errors

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agotest/rmlvo-to-kccgst: free memory before exit
Ran Benita [Thu, 28 Feb 2013 19:06:35 +0000 (21:06 +0200)]
test/rmlvo-to-kccgst: free memory before exit

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agoparser: also skip 'section' ELEMENT
Ran Benita [Mon, 25 Feb 2013 15:00:53 +0000 (17:00 +0200)]
parser: also skip 'section' ELEMENT

It's for geometry only.

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agoast-build: remove malloc_or_die
Ran Benita [Mon, 25 Feb 2013 14:38:56 +0000 (16:38 +0200)]
ast-build: remove malloc_or_die

This should be fixed properly.

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agokeycodes: fix spelling in error message
Ran Benita [Mon, 25 Feb 2013 14:08:08 +0000 (16:08 +0200)]
keycodes: fix spelling in error message

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agoRemove list.h
Ran Benita [Mon, 25 Feb 2013 10:37:28 +0000 (12:37 +0200)]
Remove list.h

We don't use it anymore and it's easy to add back if needed.

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agoMakefile.am: don't create INSTALL and ChangeLog
Ran Benita [Mon, 25 Feb 2013 10:27:24 +0000 (12:27 +0200)]
Makefile.am: don't create INSTALL and ChangeLog

It may be xorg standard but it's completely useless and clutter the
directory.

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agokeymap-dump: move writing 'key {}' in symbols to its own function
Ran Benita [Mon, 25 Feb 2013 10:17:27 +0000 (12:17 +0200)]
keymap-dump: move writing 'key {}' in symbols to its own function

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agokeymap-dump: remove some ugly empty lines
Ran Benita [Mon, 25 Feb 2013 10:09:17 +0000 (12:09 +0200)]
keymap-dump: remove some ugly empty lines

xkbcomp prints them too, but that's just annoying. Also xkb_keycodes
doesn't have it already.

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agokeymap-dump: don't indent after xkb_keymap {
Ran Benita [Mon, 25 Feb 2013 10:03:06 +0000 (12:03 +0200)]
keymap-dump: don't indent after xkb_keymap {

xkbcomp doesn't indent there, so it's easier to diff.
Also saves some horizontal space which is sorely needed when looking at
these files (especially the xkb_symbols).

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agokeymap-dump: style cleanups
Ran Benita [Mon, 25 Feb 2013 09:50:26 +0000 (11:50 +0200)]
keymap-dump: style cleanups

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agoast: add error handling to XkbFileFromComponents
Ran Benita [Sun, 24 Feb 2013 23:12:38 +0000 (01:12 +0200)]
ast: add error handling to XkbFileFromComponents

And try to not repeat ourselves.

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agoFix dead assignments
Ran Benita [Sun, 24 Feb 2013 22:19:51 +0000 (00:19 +0200)]
Fix dead assignments

"Value stored to 'stmt' is never read"
"Value stored to 'grp_to_use' is never read"

And change 'grp' to 'group' if we're here.

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agokeysym: print unicode keysyms uppercase and 0-padded
Ran Benita [Tue, 19 Feb 2013 13:57:14 +0000 (15:57 +0200)]
keysym: print unicode keysyms uppercase and 0-padded

Use the same format as XKeysymToString.

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agoChange some log functions to take ctx instead of keymap
Ran Benita [Thu, 7 Feb 2013 22:07:28 +0000 (00:07 +0200)]
Change some log functions to take ctx instead of keymap

They don't need the keymap, only the context.

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agokeycodes: some minor style
Ran Benita [Sat, 9 Feb 2013 19:46:09 +0000 (21:46 +0200)]
keycodes: some minor style

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agoaction: s/hndlrType/handler_type
Ran Benita [Fri, 8 Feb 2013 12:03:36 +0000 (14:03 +0200)]
action: s/hndlrType/handler_type

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agocompat: make it clear which 'dflt' is meant
Ran Benita [Fri, 8 Feb 2013 14:06:35 +0000 (16:06 +0200)]
compat: make it clear which 'dflt' is meant

Also s/dflt/default.

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agosymbols: make it clear which 'dflt' is meant
Ran Benita [Thu, 7 Feb 2013 21:28:18 +0000 (23:28 +0200)]
symbols: make it clear which 'dflt' is meant

A bit easier at a glance. Also, vowels are cool, so just say 'default'.

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agoast: constify argument
Ran Benita [Thu, 7 Feb 2013 22:02:49 +0000 (00:02 +0200)]
ast: constify argument

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agosymbols: fix bad 'merge' assignment
Ran Benita [Tue, 19 Feb 2013 09:10:23 +0000 (11:10 +0200)]
symbols: fix bad 'merge' assignment

Bug introduced in 2a5b0c9dc1ad1488ecc6b139fd70e464eb687da6, was causing
some keys to be merged incorrectly.

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agoChange 'indicator' to 'led' everywhere possible
Ran Benita [Sun, 17 Feb 2013 20:18:57 +0000 (22:18 +0200)]
Change 'indicator' to 'led' everywhere possible

The code currently uses the two names interchangeably.
Settle on 'led', because it is shorter, more recognizable, and what we
use in our API (though of course the parser still uses 'indicator').

In camel case we make it 'Led'.
We change 'xkb_indicator_map' to just 'xkb_led' and the variables of
this type are 'led'. This mimics 'xkb_key' and 'key'.
IndicatorNameInfo and LEDInfo are changed to 'LedNameInfo' and
'LedInfo', and the variables are 'ledi' (like 'keyi' etc.). This is
instead of 'ii' and 'im'.

This might make a few places a bit confusing, but less than before I
think. It's also shorter.

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agotest/interactive: change variable name for 'xkb' to 'keymap'
Ran Benita [Sun, 17 Feb 2013 20:50:12 +0000 (22:50 +0200)]
test/interactive: change variable name for 'xkb' to 'keymap'

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agostate: fix unbound virtual modifier bug
Ran Benita [Sun, 17 Feb 2013 12:59:50 +0000 (14:59 +0200)]
state: fix unbound virtual modifier bug

Recent xkeyboard-config introduced the following line in symbols/level3:
    vmods = LevelThree,
However, the XKM format which xkbcomp produces for the X server can't
handle explicit virtual modifiers such as this:
https://bugs.freedesktop.org/show_bug.cgi?id=4927

So by doing the following, for example:

setxkbmap -layout de (or another 3-level layouts)
xkbcomp $DISPLAY out.xkb
xkbcomp out.xkb $DISPLAY

The modifier is lost and can't be used for switching to Level3 (see the
included test).

We, however, are affected worse by this bug when we load the out.xkb
keymap. First, the FOUR_LEVEL_ALPHABETIC key type has these entries:
    map[None] = Level1;
    map[Shift] = Level2;
    map[Lock]  = Level2;
    map[LevelThree] = Level3;
    [...]
Now, because the LevelThree virtual modifier is not bound to anything,
the effective mask of the "map[LevelThree]" entry is just 0. So when
the modifier state is empty (initial state), this entry is chosen, and
we get Level3, instead of failing to match any entry and getting the
default Level1.

The difference in behavior from the xserver stems from this commit:
acdad6058d52dc8a3e724dc95448300850d474f2
Which removed the entry->active field. Without bugs, this would be
correct; however, it seems in this case we should just follow the
server's behavior.

The server sets the entry->active field like so in XKBMisc.c:
    /* entry is active if vmods are bound */
    entry->active = (mask != 0);
The xkblib spec explains this field, but does not specify how to
initialize it. This commit does the same as above but more directly.

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agotest/interactive: also print the level
Ran Benita [Sun, 17 Feb 2013 12:32:36 +0000 (14:32 +0200)]
test/interactive: also print the level

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agotest/keyseq: re-add de(neo) level5 test
Ran Benita [Sun, 17 Feb 2013 11:39:41 +0000 (13:39 +0200)]
test/keyseq: re-add de(neo) level5 test

See:
https://bugs.freedesktop.org/show_bug.cgi?id=50935
This works now after syncing with recent xkeyboard-config.

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agoSync test data from xkeyboard-config
Ran Benita [Sun, 17 Feb 2013 09:22:41 +0000 (11:22 +0200)]
Sync test data from xkeyboard-config

Sync the files again from xkeyboard-config 2.8, since there have been
some changes we should test against.

Also added a script test/data/sync.sh if we want to do it again in the
future.

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agoconfigure.ac: add xkbcommon.com url to AC_INIT
Ran Benita [Mon, 10 Dec 2012 20:29:26 +0000 (22:29 +0200)]
configure.ac: add xkbcommon.com url to AC_INIT

Why not.
Also forgot to update the xorg-utils error message when bumping the
requirement.

Signed-off-by: Ran Benita <ran234@gmail.com>
[daniels: Changed to xkbcommon.org.]

11 years agoParser: Initialise geometry elements for VarDecl
Daniel Stone [Thu, 6 Dec 2012 04:04:15 +0000 (15:04 +1100)]
Parser: Initialise geometry elements for VarDecl

We were using uninitialised memory whilst parsing geometry, leaving
random contents as the return for shape/overlay/etc sections.  Somehow
this actually worked everywhere but under Java.

https://bugs.freedesktop.org/show_bug.cgi?id=57913

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
11 years agostate: rename state->cur to state->components
Ran Benita [Sun, 11 Nov 2012 14:14:30 +0000 (16:14 +0200)]
state: rename state->cur to state->components

'cur' doesn't make sense anymore. 'components' is a bit long for this,
but not too bad, and nothing better comes to mind.

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agostate: don't keep the previous state components in xkb_state
Ran Benita [Sun, 11 Nov 2012 14:06:54 +0000 (16:06 +0200)]
state: don't keep the previous state components in xkb_state

There is really no need to keep this in the struct, we can just allocate
it on the stack when we need to.
Don't know why I did it this way.

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agokeymap: wrap the layout parameter if it is out of range for the key
Ran Benita [Sat, 10 Nov 2012 22:22:46 +0000 (00:22 +0200)]
keymap: wrap the layout parameter if it is out of range for the key

The functions num_levels_for_key() and get_syms_by_level() have a
'layout' parameter. Currently it is expected that this value is always
legal for the key, as determined by num_layouts_for_key(). However,
there are legitimate use cases for passing an out-of-range layout there,
most probably passing the effective layout, and expecting to get the
keysyms/levels for just this layout. So we wrap it just as we do in the
xkb_state_* functions.

This is also useful for stuff like this:
http://developer.gnome.org/gdk/stable/gdk-Keyboard-Handling.html#gdk-keymap-lookup-key

If this behavior is not desired, the user has the option to check
against num_layouts_for_key herself.

https://bugs.freedesktop.org/show_bug.cgi?id=56866

Reported-by: Gatis Paeglis <gatis.paeglis@digia.com>
Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agoOnly distribute .tar.xz archives
Daniel Stone [Fri, 9 Nov 2012 03:26:49 +0000 (14:26 +1100)]
Only distribute .tar.xz archives

We definitely don't need .gz anymore, and .bz2 seems on its way out.
Mirror what Wayland does, and move to .xz exclusively.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
11 years agoDon't use trailing enum comma in public headers
Ran Benita [Tue, 6 Nov 2012 22:41:06 +0000 (00:41 +0200)]
Don't use trailing enum comma in public headers

Pretty annoying, but C89 doesn't support that (officially), and it might
cause warning with -pedantic, etc. (though you need -Wsystem-headers to
see them usually). Removing them is not a big deal.

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agotest/keysym: '\e' is non-standard
Ran Benita [Wed, 7 Nov 2012 16:58:18 +0000 (18:58 +0200)]
test/keysym: '\e' is non-standard

test/keysym.c:139:43: warning: non-ISO-standard escape sequence, '\e'
Didn't warn about it before..

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agodoc: clarify that keysym_to_utf8 returns size including '\0'
Ran Benita [Tue, 6 Nov 2012 21:00:55 +0000 (23:00 +0200)]
doc: clarify that keysym_to_utf8 returns size including '\0'

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agokeysym-utf: mark keysymtab array as static
Ran Benita [Mon, 5 Nov 2012 19:50:38 +0000 (21:50 +0200)]
keysym-utf: mark keysymtab array as static

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agokeysym-utf: also translate special keysyms like Tab and Return
Ran Benita [Mon, 5 Nov 2012 19:34:59 +0000 (21:34 +0200)]
keysym-utf: also translate special keysyms like Tab and Return

The keysym2ucs.c file apparently leaves out some keysyms, which libX11
deals with separately (like in _XkbHandleSpecialSym()).
The problematic keysyms are the keypad ones (for which we already added
some support) and keysyms which use 0xff** instead of 0x00** < 0x20.
This code should fix them properly, as much as I could gather from
libX11 and http://www.cl.cam.ac.uk/~mgk25/ucs/keysym2ucs.c and other
sources (which are not aware of locale).

https://bugs.freedesktop.org/show_bug.cgi?id=56780

Reported-by: Gatis Paeglis <gatis.paeglis@digia.com>
Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agoAdd some explanations on consumed modifiers
Ran Benita [Sun, 4 Nov 2012 14:07:30 +0000 (16:07 +0200)]
Add some explanations on consumed modifiers

This should hopefully clarify this somewhat subtle point to the
uninitiated users.

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agoaction: don't allow private actions with a known type
Ran Benita [Tue, 30 Oct 2012 16:21:56 +0000 (18:21 +0200)]
action: don't allow private actions with a known type

Some obscure bug having to do with Private actions; see the comments.
This was prompted by:
https://bugs.freedesktop.org/show_bug.cgi?id=56491

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agobuild: Require xorg macros 1.16
Damien Lespiau [Thu, 25 Oct 2012 23:51:56 +0000 (00:51 +0100)]
build: Require xorg macros 1.16

For XORG_TESTSET_CFLAG and XORG_MEMORY_CHECK_FLAGS.

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Cc: Daniel Stone <daniel@fooishbar.org>
11 years agobuild: Make autoreconf honour ACLOCAL_FLAGS
Damien Lespiau [Thu, 25 Oct 2012 23:51:46 +0000 (00:51 +0100)]
build: Make autoreconf honour ACLOCAL_FLAGS

When running autoreconf, it's possible to give flags to the underlying
aclocal by declaring a ACLOCAL_AMFLAGS variable in the top level
Makefile.am.

Putting ${ACLOCAL_FLAGS} there allows the user to set an environment
variable up before running autogen.sh and pull in the right directories
to look for m4 macros, say an up-to-date version of the xorg-util macros.

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Cc: Daniel Stone <daniel@fooishbar.org>
11 years agotest/keyseq: add test for setting depressed group
Ran Benita [Mon, 29 Oct 2012 18:20:51 +0000 (20:20 +0200)]
test/keyseq: add test for setting depressed group

Tests the SetGroup action is working properly.

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agostate, context: allow passing NULL to *_unref()
Ran Benita [Sun, 28 Oct 2012 23:00:27 +0000 (01:00 +0200)]
state, context: allow passing NULL to *_unref()

For error handling code, it's nice to be able to pass NULL to these
function without worrying about segfaults ensuing. free() sets the
precedent here.

Also document this fact.

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agostate: don't use xkb_keymap_num_layouts internally
Ran Benita [Fri, 26 Oct 2012 14:24:11 +0000 (16:24 +0200)]
state: don't use xkb_keymap_num_layouts internally

Clearer and more greppable this way.

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agodoc: fix wrong comment
Ran Benita [Fri, 26 Oct 2012 14:15:27 +0000 (16:15 +0200)]
doc: fix wrong comment

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agostate: don't use xkb_state_serialize_* internally
Ran Benita [Fri, 26 Oct 2012 14:12:28 +0000 (16:12 +0200)]
state: don't use xkb_state_serialize_* internally

The code in these cases is clearer when done directly.

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agoMakefile.am: move test.h to libtest_la_SOURCES
Ran Benita [Fri, 26 Oct 2012 13:05:04 +0000 (15:05 +0200)]
Makefile.am: move test.h to libtest_la_SOURCES

Rather than EXTRA_DIST, where it doesn't belong.

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agoMakefile.am: split sed script into multiple lines
Ran Benita [Fri, 26 Oct 2012 13:00:33 +0000 (15:00 +0200)]
Makefile.am: split sed script into multiple lines

To make it visible on one screen.

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agoconfigure.ac: don't tramp on user's CFLAGS
Ran Benita [Fri, 26 Oct 2012 12:43:15 +0000 (14:43 +0200)]
configure.ac: don't tramp on user's CFLAGS

The configure test shouldn't touch CFLAGS, because they come last on the
command line and allow to users to override settings if needed.

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agoconfigure.ac: add explicit PKG_PROG_PKG_CONFIG
Ran Benita [Fri, 26 Oct 2012 12:23:07 +0000 (14:23 +0200)]
configure.ac: add explicit PKG_PROG_PKG_CONFIG

We still use pkg-config to get the xkb_base variable from
xkeyboard-config, but we removed all of the other PKG_ macro calls. This
still works now, because XORG_DEFAULT_OPTIONS runs it somehow. But we
shouldn't rely on it.

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agotest: add key processing benchmark
Ran Benita [Wed, 24 Oct 2012 21:27:40 +0000 (23:27 +0200)]
test: add key processing benchmark

This runs a bunch of random keys against xkb_state_update_key() and
xkb_state_key_get_one_sym(), in a fairly unintelligent way.

It might be nice to check when modifying this code path, or changing it,
to see things haven't slowed down considerably. However, given the
numbers this benchmark gives, it is pretty clear that we are not going
to be the bottleneck for anything. So this can more-or-less be ignored.

Incidentally, this also turned out to be a poor man's fuzzer, because it
turned up the fix in the previous commit. Maybe we should consider
beefing it up with an actual 'break stuff' intention and running it as
part of 'make check'.

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agostate: fix possible index-out-of-bounds in action dispatch table
Ran Benita [Wed, 24 Oct 2012 21:09:26 +0000 (23:09 +0200)]
state: fix possible index-out-of-bounds in action dispatch table

The current code assumes that action->type always falls in the range of
the xkb_action_type enum. But keymaps can also have Private actions,
which are allowed to set their own type number.

So with a default xkeyboard-config keymap, keycode 86 at level 4, which
triggers such an action, causes us to crash.

Fix it by always checking the bounds.

Signed-off-by: Ran Benita <ran234@gmail.com>
11 years agoMore README
Daniel Stone [Wed, 24 Oct 2012 06:38:28 +0000 (17:38 +1100)]
More README

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
11 years agoREADME updates
Daniel Stone [Wed, 24 Oct 2012 06:00:24 +0000 (17:00 +1100)]
README updates

Good thing I didn't check this before I made a release.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
11 years agoBump to 0.2.0 xkbcommon-0.2.0
Daniel Stone [Tue, 23 Oct 2012 13:34:07 +0000 (00:34 +1100)]
Bump to 0.2.0

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
11 years agodoc: various fixes
Ran Benita [Mon, 22 Oct 2012 16:14:39 +0000 (18:14 +0200)]
doc: various fixes

Just moving around / fixing syntax / grammar.

Signed-off-by: Ran Benita <ran234@gmail.com>