Ran Benita [Fri, 30 Mar 2012 23:30:33 +0000 (02:30 +0300)]
Avoid leak in CompileKeymap error path
The NULL check is unneeded, and prevented the atoms from being free'd.
Signed-off-by: Ran Benita <ran234@gmail.com>
[daniels: Updated for xkb_map_unref.]
Ran Benita [Sun, 1 Apr 2012 13:48:34 +0000 (16:48 +0300)]
makekeys: use correct format strings
The new glibc (2.15) appear to cause trouble, particularly the sscanf
call, where makekeys will output empty hash tables. Using the appropriate
macros from inttypes.h makes it work again.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sun, 1 Apr 2012 13:51:48 +0000 (16:51 +0300)]
Add a NULL check before before strcmp'ing
The names array can have NULL entries for some virtual modifier indexes.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sun, 1 Apr 2012 13:57:31 +0000 (16:57 +0300)]
makekeys: free strings before exiting
Just to make valgrind happy.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sun, 1 Apr 2012 14:56:17 +0000 (17:56 +0300)]
Use straight strtok_r instead of wrapper
strtok_r is POSIX-2001 and should be fine.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sun, 1 Apr 2012 14:07:56 +0000 (17:07 +0300)]
Avoid use of partly initialized VModInfo in error path
Such as:
Compiling path: ./test/data/bad.xkb mapName:
==1300== Conditional jump or move depends on uninitialised value(s)
==1300== at 0x4E46166: HandleVModDef (vmod.c:90)
==1300== by 0x4E3FEC9: HandleKeyTypesFile (keytypes.c:1035)
==1300== by 0x4E3FBE1: HandleIncludeKeyTypes.constprop.11 (keytypes.c:387)
==1300== by 0x4E401DD: HandleKeyTypesFile (keytypes.c:1022)
==1300== by 0x4E3FBE1: HandleIncludeKeyTypes.constprop.11 (keytypes.c:387)
==1300== by 0x4E401DD: HandleKeyTypesFile (keytypes.c:1022)
==1300== by 0x4E4026F: CompileKeyTypes (keytypes.c:1150)
==1300== by 0x4E3DF9B: CompileKeymap (keymap.c:169)
==1300== by 0x4E465E9: compile_keymap (xkbcomp.c:205)
==1300== by 0x4E46BE4: xkb_compile_keymap_from_file (xkbcomp.c:290)
==1300== by 0x400B37: test_file (filecomp.c:47)
==1300== by 0x4008E3: main (filecomp.c:90)
==1300== Uninitialised value was created by a stack allocation
==1300== at 0x4E3FB3F: HandleIncludeKeyTypes.constprop.11 (keytypes.c:366)
Signed-off-by: Ran Benita <ran234@gmail.com>
Daniel Stone [Thu, 29 Mar 2012 16:39:11 +0000 (17:39 +0100)]
Fail gracefully on failure to find component include
If we can't find the component of the include file we're looking for,
make sure we don't return success when we meant failure, segfault, or
spectacularly leak everything.
Tested with incorrect component includes for keycodes, compat, symbols,
and types.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reported-by: David Herrmann <dh.herrmann@googlemail.com>
Daniel Stone [Thu, 29 Mar 2012 16:38:44 +0000 (17:38 +0100)]
Tests: Release context on failure to build keymap
No practical effect since they exit(1) regardless, but it keeps valgrind
happy.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone [Thu, 29 Mar 2012 15:31:09 +0000 (16:31 +0100)]
Full support for multiple keysyms per level
Which also involved moving the global symbol map to be per-key instead;
this should probably be split out into a separate commit.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone [Thu, 29 Mar 2012 00:57:06 +0000 (01:57 +0100)]
Parsing support for multiple keysyms per entry
Instead of allowing only one keysym per level per group, do as the
external API indicates and allow multiples. The existing syntax is:
key <AD01> { [ q, Q ] };
where the new syntax is:
key <AD01> { [ q, Q, { H, E, L, L, O },
{ Y, E, S, space, T, H, I, S, space, I, S, space, D, O, G } };
to make the key in the extreme top left of the keyboard do pretty
surprising things in levels 3 and 4.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone [Thu, 29 Mar 2012 00:49:55 +0000 (01:49 +0100)]
Don't leak strings in merge declarations
Introduced by the reentrant scanner commit.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone [Thu, 29 Mar 2012 00:41:40 +0000 (01:41 +0100)]
Don't leak include_paths in context
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone [Wed, 28 Mar 2012 18:50:45 +0000 (19:50 +0100)]
Remove unused rtrnValue declaration
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Ran Benita [Tue, 27 Mar 2012 21:41:22 +0000 (22:41 +0100)]
Make parser and scanner reentrant
All global state is removed from the parser and scanner.
This makes use of the standard facilities in Bison and Flex for
reentrant/pure scanner/lexer and location tracking.
Signed-off-by: Ran Benita <ran234@gmail.com>
[daniels: Updated to current sources.]
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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]
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>
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>
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]
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Daniel Stone [Tue, 20 Mar 2012 17:24:09 +0000 (17:24 +0000)]
Small constification
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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.
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Daniel Stone [Fri, 9 Mar 2012 16:32:45 +0000 (16:32 +0000)]
Add explicit braces
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
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>
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>
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>
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>
Daniel Stone [Mon, 5 Mar 2012 15:00:39 +0000 (15:00 +0000)]
Merge remote-tracking branch 'ran/fixes'