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>

Use limits.h to find min/max short value

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

Remove useless casts

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

Use strchr instead of index

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

Use memset instead of bzero

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

Remove return's at the end of void functions

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

Remove all uses of the register keyword

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

Use strdup instead of strlen + malloc + strcpy

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

Don't check for NULL before free()

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

Use yacc-generated header instead of tokens.h

The yacc implementation can generate all the necessary token
definitions itself; there is no need to maintain a hand written
file for that.

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

makekeys: update to match the rest of libX11 makekeys

This integrates two commits from libX11:

ebd6ef0a4db0ddef0ae17ad14571518ccdeea5ba
   XStringToKeysym: Special case for XF86 keysyms

    Some XFree86 keysyms were in XKeysymDB as XF86_foo, despite really being
    XF86foo.  So, if we get to the bottom of XStringToKeysym and haven't
    found our XF86_foo, try it again as XF86foo.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
00175397480b76d32bf82b0c7c94c91a2a95954e
    makekeys: Scan vendor keysyms as well as core

    Since we can't really live without vendor keysyms, scan them all in to
    generate ks_tables.h, rather than only doing the core ones, and leaving
    the vendor syms to be manually synchronised with XKeysymDB.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Notice that the xkey.sh test is changed to match libX11 behavior, i.e.
XKeysymToString(0x1008FE20) -> "XF86Ungrab" as opposed to "XF86_Ungrab".

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

makekeys: Receive the keysym files as arguments

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

When makekeys fails to find a good hash, print error instead of divide-by-zero

This matches commit 78a894231ae8ec4959007b6d9b8d2a15d6333a1e from
libX11:
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Ran Benita <ran234@gmail.com>

makekeys: Fix build/target word size mismatch when cross-compiling

This matches commit 24283d40b1e4314c6647dda49d2a159833341a8b from
libX11:

    Since makekeys is built using build environment's compiler and
    runs natively, we have to make sure that the size of the
    Signature type is the same on both the native environment
    and the target, otherwise we get mismatches upon running X,
    and some LSB test failures (xts5).

    Use an unsigned 32-bit integer on all platforms.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Ran Benita <ran234@gmail.com>

Fix remaining warnings

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

Fix warnings in scanner and parser

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

Fix an incorrect sizeof

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

Fix all constness warnings

These are all trivial/obvious fixes which clear a bunch of warnings.

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

Fix possible null dereferences

Fix all reported null dereferences from clang-analyzer.
There seems to be one false negative (in file indicators.c), but it is
fixed anyway.

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

Remove unneeded assignments and variables

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

makekeys: clear const and shadow warnings

The name 'index' is used by the standard library, so use 'ndx' like some
other files.

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

makekeys: make buf local to main()

All the functions already accept it as a parameter. This clears -Wshadow
warnings.

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

Remove ancient compatibility check

Other headers include malloc just fine.

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

Remove unused includes of "tokens.h"

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

Remove unused debug #defines

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

Perform bounds checking in ExprResolveLevel

Both callers perform the same bounds check, so move it into
ExprResolveLevel itself.

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

Fix typo in ExprResolveKeyCode

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

Perform bounds checking in ExprResolveGroup

Every caller did the exact same check on the group bounds after calling
ExprResolveGroup, so might as well do it inside.

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

Switch expression resolution priv from char to void

Avoids a lot of really lame casts.

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

Remove chaining support from LookupModMask

Turns out we never use it, so.

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

Invert LookupModMask/LookupVModMask order

We never want to solely lookup a virtual modifier without also looking
up core modifiers.  So, rather than chaining the vmod lookup inside the
core modifier lookup, invert the ordering.

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

Remove unused LookupPriv::priv

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

Move some definitions from expr.h to expr.c

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

Remove field reference lookup support

None of the lookup functions anyone ever used supported field
references, so don't pretend we do in the API.

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

Move groupNames mask definition to its user

groupNames was declared in compat.c as a global to anything which
included compat.h (for which groupNames was its sole reason to exist),
but only ever used in indicators.c.

Which is kind of fortunate, given that e314931e removed identical
definitions of groupNames (as integers, not masks) from both action.c
and symbols.c.

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

Turn ExprResolveInteger into a simple wrapper

Move the bulk of ExprResolveInteger into an internal function called
ExprResolveIntegerLookup, and introduce ExprResolveInteger as a simple
wrapper which doesn't take priv/lookup arguments.

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

Open-code a radio group SimpleLookup

Because, joke's on you, it wasn't actually looking up radio groups.
Just checking to see if it was a string that was "none", or an integer.

Lord give me strength.

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