platform/upstream/libxkbcommon.git
12 years agoUse xkb_contexts in keymap compilation
Daniel Stone [Tue, 27 Mar 2012 16:22:35 +0000 (17:22 +0100)]
Use xkb_contexts in keymap compilation

Primarily for the include path, but also for the logging in future.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
12 years agoAdd new context API
Daniel Stone [Tue, 27 Mar 2012 15:59:01 +0000 (16:59 +0100)]
Add new context API

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
12 years agoUpdate xkb_filter_group_lock_func for xkb_key_direction
Daniel Stone [Tue, 27 Mar 2012 15:15:06 +0000 (16:15 +0100)]
Update xkb_filter_group_lock_func for xkb_key_direction

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
12 years agoFix distcheck with non-recursive Makefiles
Daniel Stone [Tue, 27 Mar 2012 14:51:28 +0000 (15:51 +0100)]
Fix distcheck with non-recursive Makefiles

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
12 years agoFix build for X11 modifier masks
Daniel Stone [Tue, 27 Mar 2012 14:50:59 +0000 (15:50 +0100)]
Fix build for X11 modifier masks

Exposed by include path changes, oops.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
12 years agoHandle group lock actions
Ran Benita [Fri, 23 Mar 2012 15:50:37 +0000 (17:50 +0200)]
Handle group lock actions

The spec is simple here, as this action has no effect on key releases.

Signed-off-by: Ran Benita <ran234@gmail.com>
12 years agoMake build non-recursive
Ran Benita [Sat, 24 Mar 2012 02:48:31 +0000 (04:48 +0200)]
Make build non-recursive

Unify all the different Makefile.am into a single short top level one
(the test/Makefile.am file is left intact though).

This makes the build system simpler to look and should encourage
unifying more currently-disparate code.

Some further motivation can be found in this page:
http://www.flameeyes.eu/autotools-mythbuster/automake/nonrecursive.html

Signed-off-by: Ran Benita <ran234@gmail.com>
12 years agoDefine our own NoSymbol value and use it
Ran Benita [Sat, 24 Mar 2012 11:27:48 +0000 (13:27 +0200)]
Define our own NoSymbol value and use it

Since we have our own xkb_keysym_t type, it makes sense to have our own
NoSymbol value instead of the one from X11/X.h.

Signed-off-by: Ran Benita <ran234@gmail.com>
12 years agoDefine our own None atom value
Ran Benita [Sat, 24 Mar 2012 10:33:28 +0000 (12:33 +0200)]
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>
12 years agoFix all -Wsign-compare warnings
Ran Benita [Sat, 24 Mar 2012 00:36:11 +0000 (02:36 +0200)]
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>
12 years agoSilence -Wcast-qual warnings
Ran Benita [Fri, 23 Mar 2012 22:29:33 +0000 (00:29 +0200)]
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>
12 years agoUse strcasecmp consistently instead of uStrCaseCmp
Ran Benita [Fri, 23 Mar 2012 22:26:12 +0000 (00:26 +0200)]
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>
12 years agoMove utility macro from XKBcommonint.h to utils.h
Ran Benita [Fri, 23 Mar 2012 22:12:08 +0000 (00:12 +0200)]
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]

12 years agoRemove some more useless stuff
Ran Benita [Fri, 23 Mar 2012 21:56:44 +0000 (23:56 +0200)]
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>
12 years agoRewrite recalloc to the correct type
Ran Benita [Fri, 23 Mar 2012 21:47:26 +0000 (23:47 +0200)]
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>
12 years agoRemove useless stuff from utils
Ran Benita [Fri, 23 Mar 2012 21:28:24 +0000 (23:28 +0200)]
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]

12 years agoRemove fallback strcasecmp/strncasecmp
Daniel Stone [Tue, 27 Mar 2012 13:06:56 +0000 (14:06 +0100)]
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>
12 years agoAdd include/ to makekeys include path
Daniel Stone [Tue, 27 Mar 2012 13:05:14 +0000 (14:05 +0100)]
Add include/ to makekeys include path

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
12 years agoMove utils.{c,h} to be used by the entire project
Ran Benita [Fri, 23 Mar 2012 20:25:47 +0000 (22:25 +0200)]
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>
12 years agoFix a scanf type mismatch
Ran Benita [Fri, 23 Mar 2012 21:39:12 +0000 (23:39 +0200)]
Fix a scanf type mismatch

"%o" takes an unsigned int.

Signed-off-by: Ran Benita <ran234@gmail.com>
12 years agoRemove a few remaining uses of the KeySym type
Ran Benita [Sat, 24 Mar 2012 10:31:55 +0000 (12:31 +0200)]
Remove a few remaining uses of the KeySym type

Signed-off-by: Ran Benita <ran234@gmail.com>
12 years agoAdd xkb test file to EXTRA_DIST
Ran Benita [Sat, 24 Mar 2012 02:57:40 +0000 (04:57 +0200)]
Add xkb test file to EXTRA_DIST

To appease make distcheck.

Signed-off-by: Ran Benita <ran234@gmail.com>
12 years agoFix incorrect usage of && instead of &
Ran Benita [Sat, 24 Mar 2012 00:33:18 +0000 (02:33 +0200)]
Fix incorrect usage of && instead of &

Signed-off-by: Ran Benita <ran234@gmail.com>
12 years agoUpdate gitignore for 'state' test
Ran Benita [Fri, 23 Mar 2012 15:55:08 +0000 (17:55 +0200)]
Update gitignore for 'state' test

Signed-off-by: Ran Benita <ran234@gmail.com>
12 years agoFix latin8 upper/lower case check
Ran Benita [Sat, 24 Mar 2012 00:56:38 +0000 (02:56 +0200)]
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>
12 years agoProperly free xkb_state's
Ran Benita [Fri, 23 Mar 2012 15:48:35 +0000 (17:48 +0200)]
Properly free xkb_state's

Signed-off-by: Ran Benita <ran234@gmail.com>
12 years agoMention xkb_state_new can return NULL
Ran Benita [Fri, 23 Mar 2012 14:52:23 +0000 (16:52 +0200)]
Mention xkb_state_new can return NULL

in the header comments.

Signed-off-by: Ran Benita <ran234@gmail.com>
12 years agoMove doxygen comment before enum item
Guillem Jover [Tue, 27 Mar 2012 12:41:44 +0000 (14:41 +0200)]
Move doxygen comment before enum item

Signed-off-by: Guillem Jover <guillem@hadrons.org>
12 years agoRemove internal API from xkbcommon.h
Daniel Stone [Tue, 27 Mar 2012 12:44:48 +0000 (13:44 +0100)]
Remove internal API from xkbcommon.h

And move it to XKBcomminint.h.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
12 years agoRemove hardcoded legacy modifier masks
Daniel Stone [Tue, 27 Mar 2012 11:20:42 +0000 (12:20 +0100)]
Remove hardcoded legacy modifier masks

Use the xkb_state_mod_* and xkb_map_mod_* API instead.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
12 years agoRemove unused changes structs
Daniel Stone [Tue, 27 Mar 2012 11:19:42 +0000 (12:19 +0100)]
Remove unused changes structs

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
12 years agoRemove unused members of xkb_state
Daniel Stone [Tue, 27 Mar 2012 11:18:50 +0000 (12:18 +0100)]
Remove unused members of xkb_state

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
12 years agoAdd enum xkb_key_direction instead of bool
Daniel Stone [Tue, 27 Mar 2012 11:11:45 +0000 (12:11 +0100)]
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>
12 years agoAdd state serialisation API
Daniel Stone [Tue, 27 Mar 2012 11:07:57 +0000 (12:07 +0100)]
Add state serialisation API

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
12 years agoCosmetic coding style fixups
Daniel Stone [Tue, 27 Mar 2012 11:07:40 +0000 (12:07 +0100)]
Cosmetic coding style fixups

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
12 years agoRename keymap allocation API
Daniel Stone [Thu, 22 Mar 2012 17:39:12 +0000 (17:39 +0000)]
Rename keymap allocation API

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
12 years agoAdd LED state API
Daniel Stone [Thu, 22 Mar 2012 14:32:53 +0000 (14:32 +0000)]
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>
12 years agoLEDs: Fix string comparison bug
Daniel Stone [Thu, 22 Mar 2012 14:32:23 +0000 (14:32 +0000)]
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>
12 years agoCheck for invalid indices in mod/group state API
Daniel Stone [Thu, 22 Mar 2012 14:31:33 +0000 (14:31 +0000)]
Check for invalid indices in mod/group state API

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
12 years agoFix documentation bugs with mod/group state API
Daniel Stone [Thu, 22 Mar 2012 14:30:58 +0000 (14:30 +0000)]
Fix documentation bugs with mod/group state API

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
12 years agoAdd a proper README
Daniel Stone [Wed, 21 Mar 2012 16:57:05 +0000 (16:57 +0000)]
Add a proper README

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
12 years agoRound out new state API
Daniel Stone [Wed, 21 Mar 2012 15:25:32 +0000 (15:25 +0000)]
Round out new state API

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
12 years agoFix (correct, but harmless) const warning
Daniel Stone [Wed, 21 Mar 2012 14:44:16 +0000 (14:44 +0000)]
Fix (correct, but harmless) const warning

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
12 years agoAdd new state API
Daniel Stone [Wed, 21 Mar 2012 02:20:07 +0000 (02:20 +0000)]
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>
12 years agoRemove some rogue fprintfs
Daniel Stone [Wed, 21 Mar 2012 02:19:44 +0000 (02:19 +0000)]
Remove some rogue fprintfs

Oops.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
12 years agoDon't clear real mods in action modmask
Daniel Stone [Wed, 21 Mar 2012 02:17:58 +0000 (02:17 +0000)]
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>
12 years agoRemove unnecessary allocation in expr.c
Daniel Stone [Wed, 21 Mar 2012 00:33:29 +0000 (00:33 +0000)]
Remove unnecessary allocation in expr.c

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
12 years agoSmall constification
Daniel Stone [Tue, 20 Mar 2012 17:24:09 +0000 (17:24 +0000)]
Small constification

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
12 years agoAlso print group name in keysym error
Daniel Stone [Fri, 16 Mar 2012 14:27:39 +0000 (14:27 +0000)]
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>
12 years agoMore useful errors for invalid keysyms
Daniel Stone [Fri, 16 Mar 2012 14:22:04 +0000 (14:22 +0000)]
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>
12 years agoFix non-useModMapMods action masks
Daniel Stone [Fri, 16 Mar 2012 13:59:24 +0000 (13:59 +0000)]
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>
12 years agoAdd geometry test
Daniel Stone [Thu, 15 Mar 2012 09:35:42 +0000 (09:35 +0000)]
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>
12 years agoPlug leaks in geometry parsing
Daniel Stone [Thu, 15 Mar 2012 09:34:20 +0000 (09:34 +0000)]
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>
12 years agoRemove more float support
Daniel Stone [Thu, 15 Mar 2012 09:33:56 +0000 (09:33 +0000)]
Remove more float support

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
12 years agoAlso update vmod -> indicator maps
Daniel Stone [Thu, 15 Mar 2012 08:36:09 +0000 (08:36 +0000)]
Also update vmod -> indicator maps

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
12 years agoUpdate modifiers after building keymap
Daniel Stone [Wed, 14 Mar 2012 18:24:37 +0000 (18:24 +0000)]
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>
12 years agoConvert interp action from xkb_any_action to xkb_action
Daniel Stone [Wed, 14 Mar 2012 17:06:09 +0000 (17:06 +0000)]
Convert interp action from xkb_any_action to xkb_action

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
12 years agoAdd xkb_get_syms_by_level
Daniel Stone [Wed, 14 Mar 2012 17:05:09 +0000 (17:05 +0000)]
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>
12 years agoFix leak in xkbcomp.c
Daniel Stone [Wed, 14 Mar 2012 17:04:36 +0000 (17:04 +0000)]
Fix leak in xkbcomp.c

Accidentally regressed this one briefly, oops.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
12 years agoRemove component listing code
Daniel Stone [Wed, 14 Mar 2012 11:59:52 +0000 (11:59 +0000)]
Remove component listing code

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
12 years agoRemove unused control members
Daniel Stone [Wed, 14 Mar 2012 11:58:24 +0000 (11:58 +0000)]
Remove unused control members

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
12 years agoAdd a tiny bit of documentation to xkbcommon.h
Daniel Stone [Wed, 14 Mar 2012 11:56:59 +0000 (11:56 +0000)]
Add a tiny bit of documentation to xkbcommon.h

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
12 years agoAdd xkb_key_get_syms API
Daniel Stone [Tue, 13 Mar 2012 19:06:05 +0000 (19:06 +0000)]
Add xkb_key_get_syms API

(And a slight cosmetic header reformatting.)

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
12 years agoRevert "Use XKB_COMMON_* modifier defines in ExprResolveModMask"
Daniel Stone [Tue, 13 Mar 2012 12:46:37 +0000 (12:46 +0000)]
Revert "Use XKB_COMMON_* modifier defines in ExprResolveModMask"

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

This reverts commit 645275406f47369c9a67d02173aedf89e9d2a33c.

12 years agoUse XKB_COMMON_* modifier defines in ExprResolveModMask
Daniel Stone [Sat, 10 Mar 2012 14:42:30 +0000 (14:42 +0000)]
Use XKB_COMMON_* modifier defines in ExprResolveModMask

Rather than the ones from XKB.h.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
12 years agoRemove overlay support as well
Daniel Stone [Sat, 10 Mar 2012 14:36:30 +0000 (14:36 +0000)]
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>
12 years agoRemove half-implemented radio groups
Daniel Stone [Sat, 10 Mar 2012 14:27:06 +0000 (14:27 +0000)]
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>
12 years agoRemove indirect XkbCM* and XkbSM* macros
Daniel Stone [Sat, 10 Mar 2012 14:08:43 +0000 (14:08 +0000)]
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>
12 years agoHandle XkbFiles without a name
Daniel Stone [Sat, 10 Mar 2012 13:54:03 +0000 (13:54 +0000)]
Handle XkbFiles without a name

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
12 years agoMove allocation of xkb_desc into CompileKeymap
Daniel Stone [Sat, 10 Mar 2012 13:48:13 +0000 (13:48 +0000)]
Move allocation of xkb_desc into CompileKeymap

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
12 years agoClean up xkb_keysym_to_string message
Daniel Stone [Fri, 9 Mar 2012 20:01:33 +0000 (20:01 +0000)]
Clean up xkb_keysym_to_string message

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
12 years agoRemove geometry even harder
Daniel Stone [Fri, 9 Mar 2012 19:29:29 +0000 (19:29 +0000)]
Remove geometry even harder

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

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
12 years agoIntroduce xkb_atom_t type
Daniel Stone [Fri, 9 Mar 2012 19:09:25 +0000 (19:09 +0000)]
Introduce xkb_atom_t type

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
12 years agoIntroduce xkb_keysym_t type
Daniel Stone [Fri, 9 Mar 2012 19:03:59 +0000 (19:03 +0000)]
Introduce xkb_keysym_t type

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
12 years agoRemove atom functions from public API
Daniel Stone [Fri, 9 Mar 2012 18:57:14 +0000 (18:57 +0000)]
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>
12 years agoStringify public name types
Daniel Stone [Fri, 9 Mar 2012 18:53:47 +0000 (18:53 +0000)]
Stringify public name types

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

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
12 years agoEnsure we always have a complete keymap
Daniel Stone [Fri, 9 Mar 2012 18:46:46 +0000 (18:46 +0000)]
Ensure we always have a complete keymap

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

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
12 years agofilecomp: Fix xkbcomp warning
Daniel Stone [Fri, 9 Mar 2012 16:57:09 +0000 (16:57 +0000)]
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>
12 years agoConvert CompileKeymap to early-return style
Daniel Stone [Fri, 9 Mar 2012 16:55:37 +0000 (16:55 +0000)]
Convert CompileKeymap to early-return style

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
12 years agoUse compile_keymap in xkb_compile_keymap_from_components
Daniel Stone [Fri, 9 Mar 2012 16:54:47 +0000 (16:54 +0000)]
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>
12 years agoAdd explicit braces
Daniel Stone [Fri, 9 Mar 2012 16:32:45 +0000 (16:32 +0000)]
Add explicit braces

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
12 years agoxkbcomp: Turn an array into an anonymous struct
Daniel Stone [Fri, 9 Mar 2012 16:31:48 +0000 (16:31 +0000)]
xkbcomp: Turn an array into an anonymous struct

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
12 years agoRemove geometry support, again
Daniel Stone [Fri, 9 Mar 2012 16:26:34 +0000 (16:26 +0000)]
Remove geometry support, again

It still parses geometry, but happily throws it away.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
12 years agoRemove KcCGST names from the map
Daniel Stone [Fri, 9 Mar 2012 16:04:00 +0000 (16:04 +0000)]
Remove KcCGST names from the map

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
12 years agoMerge remote-tracking branch 'ran/fixes-cont'
Daniel Stone [Mon, 5 Mar 2012 15:07:28 +0000 (15:07 +0000)]
Merge remote-tracking branch 'ran/fixes-cont'

Conflicts:
src/xkbcomp/expr.c

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
12 years agoMerge remote-tracking branch 'ran/fixes'
Daniel Stone [Mon, 5 Mar 2012 15:00:39 +0000 (15:00 +0000)]
Merge remote-tracking branch 'ran/fixes'

12 years agoFix "Could not resolve keysym" errors
Ran Benita [Sat, 3 Mar 2012 21:42:44 +0000 (23:42 +0200)]
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>
12 years agoRefactor XkbFindFileInPath
Ran Benita [Sat, 3 Mar 2012 20:43:50 +0000 (22:43 +0200)]
Refactor XkbFindFileInPath

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

Signed-off-by: Ran Benita <ran234@gmail.com>
12 years agoFree all atoms along with keymap
Ran Benita [Thu, 1 Mar 2012 18:41:34 +0000 (20:41 +0200)]
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>
12 years agoFree IncludePath when no longer needed
Ran Benita [Thu, 1 Mar 2012 19:03:37 +0000 (21:03 +0200)]
Free IncludePath when no longer needed

Signed-off-by: Ran Benita <ran234@gmail.com>
12 years agoFree scanFile when no longer needed
Ran Benita [Thu, 1 Mar 2012 19:03:13 +0000 (21:03 +0200)]
Free scanFile when no longer needed

Signed-off-by: Ran Benita <ran234@gmail.com>
12 years agoFix other misc leaks
Ran Benita [Fri, 2 Mar 2012 23:17:21 +0000 (01:17 +0200)]
Fix other misc leaks

Signed-off-by: Ran Benita <ran234@gmail.com>
12 years agoDon't leak the scanner's buffer
Ran Benita [Thu, 1 Mar 2012 18:44:42 +0000 (20:44 +0200)]
Don't leak the scanner's buffer

Signed-off-by: Ran Benita <ran234@gmail.com>
12 years agoDon't leak DoodadInfo's from GeometryInfo
Ran Benita [Thu, 1 Mar 2012 17:45:37 +0000 (19:45 +0200)]
Don't leak DoodadInfo's from GeometryInfo

Signed-off-by: Ran Benita <ran234@gmail.com>
12 years agoDon't leak ActionInfo's
Ran Benita [Thu, 1 Mar 2012 17:25:37 +0000 (19:25 +0200)]
Don't leak ActionInfo's

Signed-off-by: Ran Benita <ran234@gmail.com>
12 years agoDon't leak KeyNamesInfo
Ran Benita [Wed, 29 Feb 2012 22:10:37 +0000 (00:10 +0200)]
Don't leak KeyNamesInfo

Signed-off-by: Ran Benita <ran234@gmail.com>
12 years agoDon't leak the "minimum"/"maximum" string
Ran Benita [Wed, 29 Feb 2012 19:57:15 +0000 (21:57 +0200)]
Don't leak the "minimum"/"maximum" string

Signed-off-by: Ran Benita <ran234@gmail.com>
12 years agoDon't leak the various *Info's names when overriding them
Ran Benita [Thu, 1 Mar 2012 19:26:25 +0000 (21:26 +0200)]
Don't leak the various *Info's names when overriding them

Signed-off-by: Ran Benita <ran234@gmail.com>
12 years agoFree XkbFile's when no longer needed
Ran Benita [Fri, 2 Mar 2012 12:49:36 +0000 (14:49 +0200)]
Free XkbFile's when no longer needed

Signed-off-by: Ran Benita <ran234@gmail.com>
12 years agoAdd function to free XkbFile's
Ran Benita [Thu, 1 Mar 2012 19:20:45 +0000 (21:20 +0200)]
Add function to free XkbFile's

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