Ran Benita [Sat, 21 Jul 2012 11:53:49 +0000 (14:53 +0300)]
action: use new log functions
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 20 Jul 2012 23:08:14 +0000 (02:08 +0300)]
types: use new log functions
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 20 Jul 2012 23:03:25 +0000 (02:03 +0300)]
types: add keymap to KeyTypesInfo
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 20 Jul 2012 22:35:46 +0000 (01:35 +0300)]
compat: use new log functions
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 20 Jul 2012 22:31:10 +0000 (01:31 +0300)]
compat: add keymap to CompatInfo
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 20 Jul 2012 21:58:25 +0000 (00:58 +0300)]
symbols: use new log functions
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 20 Jul 2012 21:50:18 +0000 (00:50 +0300)]
symbols: add keymap to SymbolsInfo
and use it. Also make sure info is the first argument to the functions
in this file.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 20 Jul 2012 16:38:36 +0000 (19:38 +0300)]
keycodes: use new log functions
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 20 Jul 2012 15:27:37 +0000 (18:27 +0300)]
keycodes: add keymap to KeyNamesInfo
and let the info always be the first argument to the various functions,
just for consistency (and it acting as the contex for this file).
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 20 Jul 2012 10:10:13 +0000 (13:10 +0300)]
Add logging API
Add new public API to provide the library users with some options to
control and customize the logging output from the library. It is based
upon the skeleton from the libabc demo libray:
https://git.kernel.org/?p=linux/kernel/git/kay/libabc.git
which is public domain and works pretty well.
This requires passing in the context object in every logging call, and
thus the conversion is done file by file. We also remove the global
warningLevel variable in favor of a verbosity level in the context,
which can be set by the user and is silent by default.
One issue is the ACTION calls, which, while nice, do not play very well
with line- and priority-based logging, and would require some
line continuation handling or keeping state or some other compromise. So
instead remove these and just inline them with their respective
warning/error. So instead of:
ERROR("Memory allocation failed\n")
ACTION("Removing all files on hardisk\n")
its something like that:
log_err("Memory allocation failed; Removing all files on harddisk\n")
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 20 Jul 2012 14:20:35 +0000 (17:20 +0300)]
utils: replace FATAL by malloc_or_die
"Out of memory" is enough in this case. If we want to be OOM-safe this
makes it clear where to begin.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 20 Jul 2012 14:09:49 +0000 (17:09 +0300)]
utils: remove Xfuncproto.h and use our own macros
Add XKB_EXPORT to replace _X_EXPORT, and copy the definitions of
_X_ATTRIBUTE_FOO as ATTR_FOO.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 20 Jul 2012 10:07:30 +0000 (13:07 +0300)]
utils: remove uTypedAlloc/Calloc
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sun, 22 Jul 2012 21:41:27 +0000 (00:41 +0300)]
build: drop the include/ directory
The include/ dir is somewhat redundant and makes it just a bit harder to
handle the -I directives from out side of automake; without it the
default $(top_buildir) just works.
Here's also some further justifications I found:
http://smcv.pseudorandom.co.uk/2008/09/pc-uninstalled/
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 20 Jul 2012 09:48:13 +0000 (12:48 +0300)]
Fix bison 2.6 and clang warnings
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Tue, 17 Jul 2012 14:08:14 +0000 (17:08 +0300)]
Remove CommonInfo
Not used by anything anymore.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Tue, 17 Jul 2012 14:05:28 +0000 (17:05 +0300)]
types: use list instead of CommonInfo for KeyTypeInfo
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Wed, 18 Jul 2012 14:53:27 +0000 (17:53 +0300)]
Simplify HandleInclude functions
Instead of special casing the first include, process it inside the loop
as well. It works perfectly fine.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Wed, 18 Jul 2012 13:30:55 +0000 (16:30 +0300)]
Remove haveSelf include feature
When including a file from another file, its possible to do something
like this:
include "+some(other)+files"
with the "+" or "|" in the beginning. What will happen then is that
instead of processing the include files separately and then merging into
the existing info, we instead start with the existing info and merge
into it as we go, as if it was written explicitly before the first "+".
It's not particulary clear what this may be useful for. Since it's not
used by xkeyboard-config, not documented anywhere (and google doesn't
bring up anything), completely untested and kind of ugly, remove this
"feature". It most likely never been used.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Tue, 17 Jul 2012 12:50:24 +0000 (15:50 +0300)]
types: use list instead of CommonInfo in PreserveInfo
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Tue, 17 Jul 2012 12:39:27 +0000 (15:39 +0300)]
types: move global static tok_ atoms into KeyTypesInfo
The atoms are context-dependent.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Mon, 16 Jul 2012 21:53:07 +0000 (00:53 +0300)]
compat: use list instead of CommonInfo in LEDInfo
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Tue, 17 Jul 2012 08:03:43 +0000 (11:03 +0300)]
Use xkb_group_index_t for group variables throughout
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Tue, 17 Jul 2012 08:56:00 +0000 (11:56 +0300)]
Remove _X_EXPORT from xkb_key_get_group/level
We should add them to xkbcommon.h if they need to.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Mon, 16 Jul 2012 21:43:59 +0000 (00:43 +0300)]
compat: use list instead of CommonInfo in SymInterpInfo
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Mon, 16 Jul 2012 19:45:16 +0000 (22:45 +0300)]
Move indicators.c code into compat.c
It is only used there. Allows some refactoring.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Mon, 16 Jul 2012 19:15:43 +0000 (22:15 +0300)]
Convert macros to inline functions
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Mon, 16 Jul 2012 18:28:25 +0000 (21:28 +0300)]
keycodes: use list instead of CommonInfo in IndicatorNameInfo
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Mon, 16 Jul 2012 18:25:00 +0000 (21:25 +0300)]
keycodes: use list instead of CommonInfo in AliasInfo
Always pass around the KeyNamesInfo which contains the list head.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Mon, 16 Jul 2012 14:53:46 +0000 (17:53 +0300)]
Move alias.c functions into keycodes.c
They are only used in this file.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Mon, 16 Jul 2012 08:24:48 +0000 (11:24 +0300)]
symbols: don't use CommonInfo in KeyInfo
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Mon, 16 Jul 2012 08:09:03 +0000 (11:09 +0300)]
symbols: use list for ModMapEntry's
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Mon, 16 Jul 2012 08:06:33 +0000 (11:06 +0300)]
Add common linked list implementation
Taken from xserver/include/list.h. The changes made are:
* Drop the xorg_ prefix and some typedef from the end.
* Rename _for_each_entry macros to just _foreach (like darray).
* Rename list_is_empty to list_empty (like darray).
* Add a list_replace function which we use later.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Mon, 16 Jul 2012 07:15:53 +0000 (10:15 +0300)]
symbols: remove alias info
It's never used - all of the aliases are added in the keycodes section.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sun, 15 Jul 2012 12:55:34 +0000 (15:55 +0300)]
Pass around xkb_key's instead of keycodes
This way we don't need to look up the key every time. We now only deal
with keycodes in the public API and in keycodes.c.
Also adds an xkb_foreach_key macro, which is used a lot.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sun, 15 Jul 2012 11:35:57 +0000 (14:35 +0300)]
map: verifiy that the keycode is legal
In case someone passes in a bad keycode.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sun, 15 Jul 2012 11:24:54 +0000 (14:24 +0300)]
Remove redundant keymap->keys resizes
The size (i.e. max_keycode) is determined in the keycodes section, which
gets compiled first.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sun, 15 Jul 2012 11:02:36 +0000 (14:02 +0300)]
Remove GroupsWidth macro
Use key->width directly instead.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Tue, 17 Jul 2012 08:51:32 +0000 (11:51 +0300)]
Remove unused 'groupInfo' in KeyTypeInfo
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sun, 15 Jul 2012 10:51:34 +0000 (13:51 +0300)]
Get rid of group_info
This is 8 bits which hold how many groups the key has, what to do the
key group is out of bound and the group to redirect to if want to. This
may save a few bytes, but is really annoying. So instead, just lay out
the fields separately. We can optimize later in a sane way, with pahole,
bitfields, etc. if we want.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sun, 15 Jul 2012 10:15:33 +0000 (13:15 +0300)]
Get rid of struct xkb_sym_map
Past its usefulness; put the stuff directly in xkb_key.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sun, 15 Jul 2012 10:00:04 +0000 (13:00 +0300)]
Get rid of struct xkb_key_name
Just embed it directly.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sun, 15 Jul 2012 07:38:05 +0000 (10:38 +0300)]
Add common xkb_key struct
Instead of having a million arrays from the keycode to various
key-specific info in the keymap, add a single struct xkb_key to hold all
of the data for the key in one object. This way we can pass it around,
do some refactoring and make the code simpler. It's also nice to see
everything in one place.
The keys array is still indexed by keycode, which is suboptimal because
there may be a lot of holes (i.e. unused keycodes between min_key_code
and max_key_code). By the end of this series it would be abstracted
enough to replace it by a hash table or similar if there's ever a need.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sun, 15 Jul 2012 09:48:11 +0000 (12:48 +0300)]
Replace KeyInfo 'key' variable name by 'keyi'
We want to reserve the name 'key' for something else.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sun, 15 Jul 2012 08:52:54 +0000 (11:52 +0300)]
Replace xkb_keycode_t 'key' variable name by 'kc'
We want to reserve the name 'key' for something else.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sun, 15 Jul 2012 08:37:54 +0000 (11:37 +0300)]
Convert indecipherable macros to inline functions
This was fun.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sat, 14 Jul 2012 22:59:01 +0000 (01:59 +0300)]
symbols: split initialization code from CompileSymbols
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sat, 14 Jul 2012 22:45:34 +0000 (01:45 +0300)]
Move per_key_repeats and enabled_ctrls to keymap
All of the per-key data and global flags are now visible directly in the
keymap.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sat, 14 Jul 2012 22:31:34 +0000 (01:31 +0300)]
Get rid of xkb_key_names
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sat, 14 Jul 2012 21:46:31 +0000 (00:46 +0300)]
Get rid of xkb_indicator
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sat, 14 Jul 2012 21:39:15 +0000 (00:39 +0300)]
Get rid of xkb_compat_map
Same as xkb_{client,server}_map which were already removed.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sat, 14 Jul 2012 21:26:28 +0000 (00:26 +0300)]
Get rid of xkb_server_map
Same as xkb_client_map which was removed before.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sat, 14 Jul 2012 21:06:11 +0000 (00:06 +0300)]
Get rid of xkb_client_map
We don't make this distinction anymore, and the separate allocations
just make it harder to reason about. Since we require that all of
symbols, types, compat etc. be present, we should just put stuff
directly in the keymap struct.
Signed-off-by: Ran Benita <ran234@gmail.com>
Daniel Stone [Tue, 17 Jul 2012 09:20:15 +0000 (10:20 +0100)]
Run source tree through uncrustify
.uncrustify.cfg committed for future reference also, but had to manually
fix up a few things: it really likes justifying struct initialisers.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Ran Benita [Sun, 15 Jul 2012 14:35:35 +0000 (17:35 +0300)]
Fix typo in out of range group calculation
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sat, 14 Jul 2012 16:53:13 +0000 (19:53 +0300)]
Remove unused control num_groups
We have xkb_map_num_groups for that.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sat, 14 Jul 2012 12:14:44 +0000 (15:14 +0300)]
Convert missed enum merge_mode variables
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sat, 14 Jul 2012 12:19:12 +0000 (15:19 +0300)]
Fix fileID mess
A few problems here:
* In e.g. keycodes.c the fileID field of the Info struct was never
initialized to the id of the appropriate file, so it was always 0.
There's some code which uses it, mostly for warnings.
* Some of the fileID fields were unsigned char, which overflows several
times, seeing as the ID in some of our tests can get > 1000 (because
we reuse the context).
* Some sign mismatches.
* fileID vs file_id.
Hopefully this fixes everything. I doubt this stuff had ever worked as
intended, in xkbcomp or otherwise.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sat, 14 Jul 2012 09:37:25 +0000 (12:37 +0300)]
path: fix error message
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 13 Jul 2012 22:12:50 +0000 (01:12 +0300)]
Make compile_keymap a little nicer
Just using the fact that we must have all of the components, without
optional ones.
Also fixes a memleak on the way, by making the functions which allocate
the XkbFiles to free them, which is easier to get right.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 13 Jul 2012 21:27:19 +0000 (00:27 +0300)]
Move CompileKeymap into xkbcomp.c
It's nicer to see the code where its used. Removes keymap.c.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 13 Jul 2012 15:55:10 +0000 (18:55 +0300)]
Rename KSIsLower/Upper and move to keysym.c
Seems like a more natural place, and allows to remove the src/misc.c
file.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 13 Jul 2012 15:34:11 +0000 (18:34 +0300)]
Remove MERGE_ALT_FORM merge mode
The mode comes from the "alternate" keyword, which is unused in
xkeyboard-config and mostly undocumented. Its purpose is to allow to
assign the same key name to multiple key codes, which is not allowed
otherwise (and doesn't make much sense). The xkblib specification
implies that this was part of the overlay functionality, which we also
no longer support.
If we do encounter this keyword, we just treat it as MERGE_DEFAULT. The
keycodes.c code will detect a collision and will ignore all but the
first key code (and the error count is not incremented).
Some peripheral code is also removed as a result.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 13 Jul 2012 14:51:26 +0000 (17:51 +0300)]
Move InitCanonicalKeyTypes to keytypes.c
It's only got one call site and it's in keytypes.c, so move it there and
make it static.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 13 Jul 2012 14:37:31 +0000 (17:37 +0300)]
Remove xkb_kt_map_entry::active
Takes the advice of
acdad6058d52dc8a3e724dc95448300850d474f2 and removes
this field, since its not used anymore now.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 13 Jul 2012 14:31:30 +0000 (17:31 +0300)]
Move ComputeEffectiveMap code and avoid some duplication
The ComputeEffectiveMap function is only called from keytypes.c, with
the last argument NULL, so we can move it there and remove some code.
The function XkbcVirtualModsToRealMods, of which the above is the only
user, is already implemented more simply in compat.c, so make this one
non-static and use it. This leaves src/xkb.c empty, so remove it.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 13 Jul 2012 14:10:48 +0000 (17:10 +0300)]
remove unused function xkb_canonicalise_components
commit
46441b1184dfa8553409d493ae6336aabb900d79 removed this from the
public API, and we don't need it internally. So send it to the archives.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 13 Jul 2012 11:40:14 +0000 (14:40 +0300)]
compat: fix XkbSI_AllOf matching condition
To quote the spec:
XkbSI_AllOf
All of the bits that are on in mods must be set, but others may be
set as well.
Here "mods" refers to interp->mods. This matches xserver/libX11.
Signed-off-by: Ran Benita <ran234@gmail.com>
Daniel Stone [Thu, 12 Jul 2012 23:40:25 +0000 (00:40 +0100)]
FindAutomaticType: Add FIXME
It doesn't play well with multiple keysyms per level right now. But
that's OK, because no-one really uses them.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone [Thu, 12 Jul 2012 23:39:34 +0000 (00:39 +0100)]
Add multiple-keysyms-per-level to test data
Make sure this keeps on working.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone [Thu, 12 Jul 2012 23:32:41 +0000 (00:32 +0100)]
rulescomp: Fix benchmark runs
We'd accidentally inverted silent vs. non-silent compilation, which
would skew the benchmark pretty badly, but also forgot to change base to
evdev for the rules here.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone [Thu, 12 Jul 2012 23:12:57 +0000 (00:12 +0100)]
tests: Update dump.data for recent fixes
Makes the test pass again.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Ran Benita [Wed, 11 Jul 2012 13:16:20 +0000 (16:16 +0300)]
dump: add back kccgst names
Readd the component names to the keymap->names struct. This is used when
printing the component, e.g.
xkb_keymap {
xkb_keycodes "evdev+aliases(qwerty)" {
instead of
xkb_keymap {
xkb_keycodes {
This makes diffing against xkbcomp $DISPLAY a bit easier and is kind of
useful anyway.
Signed-off-by: Ran Benita <ran234@gmail.com>
Daniel Stone [Thu, 12 Jul 2012 23:10:23 +0000 (00:10 +0100)]
Add Cyrillic and Greek to case-checking
Evidently good to have on its own, but also fixes a regression from
xkbcomp where we'd identify implicitly-typed Cyrillic keys as TWO_LEVEL
rather than ALPHABETIC.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Ran Benita [Wed, 11 Jul 2012 13:35:43 +0000 (16:35 +0300)]
dump: a few more tweaks to match xkbcomp output
Only uppercase / lowercase stuff.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Thu, 12 Jul 2012 16:28:52 +0000 (19:28 +0300)]
symbols: fix bug in modifier_map handling
The code used to match a keysym to a keycode (see added comment)
differed in behavior from xkbcomp, always taking the first key it found.
This caused some incorrect interpretation of the xkeyboard-config data,
for example the one corrected in dump.data (see the diff): since the
de-neo layout sets the both_capslock option, the Left Shift key (LFSH)
has the Caps_Lock keysym in group 4 level 2; now since
keycode(Left Shift) = 50 < keycode(Caps Lock) = 64
the Left Shift one was picked, instead of the Caps Lock one which is
group 1 level 1. The correct behavior is to pick according to group,
level, keycode.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Thu, 12 Jul 2012 14:54:09 +0000 (17:54 +0300)]
dump: use KeyNameText instead of copying
Signed-off-by: Ran Benita <ran234@gmail.com>
Daniel Stone [Thu, 12 Jul 2012 13:42:31 +0000 (14:42 +0100)]
Import dataset into test/data/
Use a self-contained dataset instead of relying on a globally-installed
set. Data taken from xkeyboard-config 2.5.1.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone [Thu, 12 Jul 2012 13:15:08 +0000 (14:15 +0100)]
Add a library of common test functions
Including creating a context (will come in useful soon), opening and
reading files, and compiling keymaps.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone [Thu, 12 Jul 2012 11:02:19 +0000 (12:02 +0100)]
Move test data files to test/data/keymaps
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone [Tue, 3 Jul 2012 20:22:09 +0000 (21:22 +0100)]
Make BindIndicators static
Since BindIndicators was only ever called immediately after
CopyIndicatorMapDefs, move it up in the file and turn it into a static
function, which avoids the need to ever pass the unbound LEDs around.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone [Tue, 3 Jul 2012 20:17:11 +0000 (21:17 +0100)]
Change BindIndicators return to void
Since it could only ever return true, which avoids a totally unnecessary
cleanup path.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone [Tue, 3 Jul 2012 20:15:28 +0000 (21:15 +0100)]
Remove 'unboundRtrn' argument from BindIndicators
It was only ever passed as NULL from its single callsite, so just remove
it and be done with it.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone [Tue, 3 Jul 2012 20:13:11 +0000 (21:13 +0100)]
Remove 'force' argument from BindIndicators
It was always true in the one callsite, so just remove the other
branches.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Ran Benita [Wed, 11 Jul 2012 15:00:31 +0000 (18:00 +0300)]
Enlarge keysym name buffers and mention in comment
The longest keysym is 27 chars long.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Wed, 11 Jul 2012 13:23:35 +0000 (16:23 +0300)]
test/dump: output commentary to stderr
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Wed, 11 Jul 2012 18:37:59 +0000 (21:37 +0300)]
symbols: fix bug in symbol merging
When we merge two KeyInfo's (belonging to the same keycode), we may take
a shortcut from copying if we see that the merged keys will be exactly
like those in one of the two KeyInfo's. In the case where we take the
symbols from the KeyInfo we are *not* merging into, we need to copy
the three arrays:
syms[group], symsMapNumEntries[group], symsMapIndex[group]
The code currently only copies the first one, so if there's a merge
conflict some levels may seem to disappear (i.e. have a NoSymbol
keysym).
This fixes the failing test added in c8d6bba.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Wed, 11 Jul 2012 11:12:12 +0000 (14:12 +0300)]
keyseq: add a failing group-switching test
For some reason, with the grp:alt_shift_toggle option, the following
sequence switches a group:
< Left Shift down, Left Alt down >
While the reverse doesn't:
< Left Alt down, Left Shift down >
And it should.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Wed, 11 Jul 2012 11:08:28 +0000 (14:08 +0300)]
rules: fix parsing of multiple options
This was broken by commit
18d331b86b4942ba54fe087ca07e47c9383d768b
(where only the first option out of a comma-separated string was
matched). Do it correctly this time and add a test.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sat, 30 Jun 2012 21:45:20 +0000 (00:45 +0300)]
keymap: remove redundant check
This is handled above in the LEGAL_FILE_TYPES check.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 29 Jun 2012 21:07:09 +0000 (00:07 +0300)]
state: fix base mod set/clear behavior
This commit fixes the incorrect current behavior, where at the end of the
following key sequence
Left Shift down, Right Shift down, Left Shift up
the Shift modifier is cleared.
Clearly the code is not as nice as before, but it seems like some count
of the depressed modifiers must be kept.
The code is lifted mostly as is from xkbActions.c. [ There they also
assign to setMods and clearMods each time and not OR it. I assume its
correct, although I wouldn't have guessed... ]
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 29 Jun 2012 19:25:27 +0000 (22:25 +0300)]
Tiny reformatting
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 29 Jun 2012 21:49:41 +0000 (00:49 +0300)]
rules: remove support for keymap rule
This commit removes the ability to specify a keymap *in a rules file*,
e.g. in /usr/share/X11/xkb/rules/evdev or somesuch. This is unused in
xkeyboard-data, and the current code has never even supported it,
because xkb_map_new_from_kccgst (which is no longer exposed in the API)
checks to see that one of the usual components (e.g. symbols, types, ..)
has been filled, while the rules parser, on the other hand, doesn't
allow to specify a keymap and other stuff at the same time.
( The idea was to remove xkb_map_new_from_kccgst entirely, but it's used
by a test so it can stay. )
tl;dr: dead code. Of course passing a keymap file to
xkb_map_new_from_file still works.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 29 Jun 2012 21:37:12 +0000 (00:37 +0300)]
Remove _X_EXPORT from xkb_map_new_from_kccgst
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 29 Jun 2012 16:26:01 +0000 (19:26 +0300)]
xkbcomp: remove useless function XkbChooseMap
compile_keymap can only be passes a single keymap file now, from all
code paths leading to it. So this function doesn't do anything.
The remaining check is performed inside CompileKeymap, so we can remove
it as well; compile_keymap doesn't do much now.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 29 Jun 2012 14:45:47 +0000 (17:45 +0300)]
compat: move some unclear code where it belongs
It seems like at some point it was needed to break the abstraction and
perform this piece of code in the context above CompileCompatMap. The
extra argument and the typedef look strange now, and doesn't seem to be
needed any more, so move them back.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 29 Jun 2012 14:31:10 +0000 (17:31 +0300)]
Use enum for merge mode
The merge mode shows up in a lot of functions, so it's useful to give it
a distinct type.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 29 Jun 2012 14:05:33 +0000 (17:05 +0300)]
Use enum for file types
enums are nice for some type safety and readability. This one also
removes the distinction between file type mask / file type index and
some naming consistency.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 29 Jun 2012 13:04:55 +0000 (16:04 +0300)]
keymap: simplify legal/required logic a bit
Now that we've consolidated on the keymap file type, this code only
serves to confuse.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Tue, 26 Jun 2012 21:22:31 +0000 (00:22 +0300)]
Use void* instead of old style char* in CommonInfo functions
Removes some annoying casts.
Signed-off-by: Ran Benita <ran234@gmail.com>