Define our own None atom value

Since we define our own xkb_atom_t type, it makes sense not to use the
X11/X.h None value. This way we can also remove a lot of X11 includes.

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

Fix all -Wsign-compare warnings

i.e comparison of signed and unsigned values. These are mostly
harmless but fixing them allows to compile cleanly with -Wextra.

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

Silence -Wcast-qual warnings

There are some cases where we must free a string with a const qualifier.
Add a macro UNCONSTIFY to trick the compiler into silencing the warning
in the cases where we know what we're doing.

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

Use strcasecmp consistently instead of uStrCaseCmp

There's no use calling the same thing by a different name.

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

Move utility macro from XKBcommonint.h to utils.h

And merge all the similar ones into the same name.
The u* prefix is chosen over the _Xkb prefix because it has more uses
throughout the codebase. But It should now be simple to choose a nice
prefix and stay consistent.

Signed-off-by: Ran Benita <ran234@gmail.com>
[daniels: fixed for the case where we have strcasecmp]

Remove some more useless stuff

Some unused defines and geometry-removal leftovers (specifically the
file geom.c and the struct for the keyboard coordinates).

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

Rewrite recalloc to the correct type

The recalloc function should be expressed in terms of bytes to match its
name. However uTypedRecalloc retains its type so nothing is changed.

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

Remove useless stuff from utils

Signed-off-by: Ran Benita <ran234@gmail.com>
[daniels: fixed conflicts from strcasecmp, added includes to make
          filecomp build again]

Remove fallback strcasecmp/strncasecmp

Sorry if your libc doesn't have this, but it's not my problem.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reported-by: Ran Benita <ran234@gmail.com>

Add include/ to makekeys include path

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

Move utils.{c,h} to be used by the entire project

This is a first step for making consistent use of utils.h also outside
of xkbcomp/ .

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

Fix a scanf type mismatch

"%o" takes an unsigned int.

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

Remove a few remaining uses of the KeySym type

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

Add xkb test file to EXTRA_DIST

To appease make distcheck.

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

Fix incorrect usage of && instead of &

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

Update gitignore for 'state' test

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

Fix latin8 upper/lower case check

GCC complained:
misc.c:235:13: warning: logical 'and' of mutually exclusive tests is always false [-Wlogical-op]
misc.c:248:13: warning: logical 'and' of mutually exclusive tests is always false [-Wlogical-op]

Looking at keysymdef.h shows that the check is indeed wrong. This commit
updates the check to match the latin8 section of keysymdef exactly.

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

Properly free xkb_state's

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

Mention xkb_state_new can return NULL

in the header comments.

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

Move doxygen comment before enum item

Signed-off-by: Guillem Jover <guillem@hadrons.org>

Remove internal API from xkbcommon.h

And move it to XKBcomminint.h.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

Remove hardcoded legacy modifier masks

Use the xkb_state_mod_* and xkb_map_mod_* API instead.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

Remove unused changes structs

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

Remove unused members of xkb_state

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

Add enum xkb_key_direction instead of bool

Use XKB_KEY_UP instead of 0 and XKB_KEY_DOWN instead of 1.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reported-by: Ran Benita <ran234@gmail.com>

Add state serialisation API

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

Cosmetic coding style fixups

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

Rename keymap allocation API

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

Add LED state API

And also convert state.c to use the state API for mods and groups,
rather than testing the state members directly.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

LEDs: Fix string comparison bug

This resulted in duplicate sets of modifiers, since we were comparing
pointer equality of two strings, rather than string equality.  Oops.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

Check for invalid indices in mod/group state API

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

Fix documentation bugs with mod/group state API

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

Add a proper README

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

Round out new state API

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

Fix (correct, but harmless) const warning

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

Add new state API

Add new API to deal with xkb_state objects, including
xkb_state_update_key, which runs the XKB action machinery internally to
calculate what exactly happens to the state when a given key is pressed
or released.

The canonical way to deal with keys is now:
    struct xkb_state *state = xkb_state_new(xkb);
    xkb_keysym_t *syms;
    int num_syms;

    xkb_state_update_key(state, key, is_down);
    num_syms = xkb_key_get_syms(state, key, &syms);

More state handling API, including a way to get at or ignore preserved
modifiers, is on its way.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

Remove some rogue fprintfs

Oops.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

Don't clear real mods in action modmask

Previously, we would clear out the real modmask when updating the
modmask for action maps, if not using the key's modmask.  The correct
behaviour here is instead to use the key's modmask if using the modmap,
else use the real mods provided with the action originally.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

Remove unnecessary allocation in expr.c

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

Small constification

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

Also print group name in keysym error

Unfortunately we can't get the actual file it was defined in this far
down, but at least give the human-readable name rather than just a group
index.

Also, groups are not zero-indexed, such that index 0 is group 1; fix
that too.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

More useful errors for invalid keysyms

Instead of generating a fairly droll internal error, generate a warning
also telling us exactly where the bad definition was.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

Fix non-useModMapMods action masks

By ensuring their mask is only the vmods, rather than also potentially
including the key's modmap.  Also remove the unnecessary vmodmask
indirection.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

Add geometry test

Add the dump of my full current X11/XKB keymap as a test for filecomp,
being as it also includes geometry.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

Plug leaks in geometry parsing

When parsing a geometry file, don't leak the elements we've created.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

Remove more float support

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

Also update vmod -> indicator maps

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

Update modifiers after building keymap

The server used to have to go and do this on our own, but we can do
better than that: after we've compiled the keymap, go through and bind
virtual modifiers to everything that needs it.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

Convert interp action from xkb_any_action to xkb_action

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

Add xkb_get_syms_by_level

Which allows you to pass in a group and a level rather than a
fully-formed state.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

Fix leak in xkbcomp.c

Accidentally regressed this one briefly, oops.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

Remove component listing code

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

Remove unused control members

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

Add a tiny bit of documentation to xkbcommon.h

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

Add xkb_key_get_syms API

(And a slight cosmetic header reformatting.)

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

Revert "Use XKB_COMMON_* modifier defines in ExprResolveModMask"

Because indices and masks are not at all the same thing.

This reverts commit 645275406f47369c9a67d02173aedf89e9d2a33c.

Use XKB_COMMON_* modifier defines in ExprResolveModMask

Rather than the ones from XKB.h.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

Remove overlay support as well

Right now we just silently ignore overlay controls, which is probably
bad, but it's not the easiest to fix.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

Remove half-implemented radio groups

It looks like this could never have worked anyway, what with num_rg
always being 0 everywhere.  Remove it.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

Remove indirect XkbCM* and XkbSM* macros

The XkbKey* macros used to work through XkbCM* and XkbSM* variants, for
the xkb_map and xkb_server_map respectively; the latter versions weren't
used by anyone at all, so just bin them and make the macros work
directly.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

Handle XkbFiles without a name

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

Move allocation of xkb_desc into CompileKeymap

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

Clean up xkb_keysym_to_string message

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

Remove geometry even harder

Not the most elegant fix, but will do for now.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

Introduce xkb_atom_t type

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

Introduce xkb_keysym_t type

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

Remove atom functions from public API

They're no longer needed since we don't expose any atoms in the
published API anymore.  As a result, we don't need to support external
atom implementations either.  Result!

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

Stringify public name types

Ensure that all names under xkb_desc are strings, rather than atoms.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

Ensure we always have a complete keymap

Refuse to compile without keycodes + compat + types + symbols.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

filecomp: Fix xkbcomp warning

Ironically, the test for named.xkb included a call that relied on the
default keymap, without the file naming an explicit default.  Go figure.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

Convert CompileKeymap to early-return style

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

Use compile_keymap in xkb_compile_keymap_from_components

We already had this exact function sitting right next to us, so use it
rather than open-coding.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

Add explicit braces

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

xkbcomp: Turn an array into an anonymous struct

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

Remove geometry support, again

It still parses geometry, but happily throws it away.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

Remove KcCGST names from the map

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

Merge remote-tracking branch 'ran/fixes-cont'

Conflicts:
src/xkbcomp/expr.c

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

Merge remote-tracking branch 'ran/fixes'

Fix "Could not resolve keysym" errors

On many layouts, the following error appears:
Internal error:   Could not resolve keysym 10005b0
(Which is like the trademark of libxkbcommon now, and makes
unicode-heavy symbol files pretty useless).

This occurs when a keysym string (in this case, 10005b0) is passed to
xkb_string_to_keysym, but cannot be resolved.
This in turn happens because the parser passes on hexadecimal keysym
strings without the leading "0x", thus leaving the resolving function
without a way to disambiguate it as a number.

Therefore, make sure to pass on the "0x". The file symbols.c in xkbcomp
project does the same; it probably got lost in translation.

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

Refactor XkbFindFileInPath

Also fixes a bug, where the check (typeLen < 1) should have been
(pathLen < 1).

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

Free all atoms along with keymap

The code to do this is taken from xserver, dix/atom.c.

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

Free IncludePath when no longer needed

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

Free scanFile when no longer needed

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

Fix other misc leaks

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

Don't leak the scanner's buffer

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

Don't leak DoodadInfo's from GeometryInfo

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

Don't leak ActionInfo's

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

Don't leak KeyNamesInfo

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

Don't leak the "minimum"/"maximum" string

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

Don't leak the various *Info's names when overriding them

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

Free XkbFile's when no longer needed

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

Add function to free XkbFile's

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

Don't cache loaded rules files

This needlessly occupies memory for the lifetime of the library, and
does not make a noticeable difference otherwise.

This rules file won't be loaded more than once in most cases anyway, so
just load it again when it happens.

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

Don't cache parsed files

This needlessly occupies memory for the lifetime of the library, and
does not make a noticeable difference otherwise.

Instead, just parse the same file again when it happens.

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

Remove unneeded freeing mechanisms

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

Make the sections array local to the keymap compiling function

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

Remove unused global type tokens

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

Use global tables for action string handling

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

Constify some more text functions

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

Constify global tables

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