|
89723b7c
|
2012-07-24T19:54:14
|
|
utils: add/replace string equality macros
It's more tidy and less error prone, since we use strcasecmp == 0 a lot.
We replace strcmp == 0 by streq, strcasecmp == 0 by istreq,
uStrCasePrefix by istreq_prefix and uDupString by strdup_safe.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
4f843c81
|
2012-07-24T13:24:59
|
|
Drop Xkbc prefix of text functions
Not really needed and inconsistent.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
6cb98200
|
2012-07-24T13:15:40
|
|
Use xkb_mod_mask_t and xkb_mask_index_t throughout
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
74be1762
|
2012-07-23T21:30:28
|
|
Remove alloc.{c,h}
These functions are more appropriate elsewhere now.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
13eb9c35
|
2012-07-23T17:41:55
|
|
scanner: don't strdup key names
The key name is always XkbKeyNameLength (= 4) bytes, so we can maintain
it directly in YYSTYPE union and copy when needed, instead of treating
it like a full blown string and then copy. This means the scanner
checks the length itself.
rulescomp under valgrind, before:
==1038== total heap usage: 168,403 allocs, 168,403 frees, 9,732,648 bytes allocated
after:
==9377== total heap usage: 155,643 allocs, 155,643 frees, 9,672,788 bytes allocated
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
112cccb1
|
2012-07-23T16:03:34
|
|
Some atom related optimizations
We often get a strdup'd string, just to pass it over the atom_intern and
then immediately free it. But atom_intern then strdup's it again (if
it's not interned already); so instead we can have the interning "steal"
the memory instead of allocing a new one and freeing the old one. This
is done by a new xkb_atom_steal function.
It also turns out, that every time we strdup an atom, we don't actually
modify it afterwards. Since we are guaranteed that the atom table will
live as long as the context, we can just use xkb_atom_text instead. This
removes a some more dynamic allocations.
For this change we had to remove the ability to append two strings, e.g.
"foo" + "bar" -> "foobar"
which is only possible with string literals. This is unused and quite
useless for our purposes.
xkb_atom_strdup is left unused, as it may still be useful.
Running rulescomp in valgrind, Before:
==7907== total heap usage: 173,698 allocs, 173,698 frees, 9,775,973 bytes allocated
After:
==6348== total heap usage: 168,403 allocs, 168,403 frees, 9,732,648 bytes allocated
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
c6279b8b
|
2012-07-23T21:21:03
|
|
expr: don't divide by zero
Calculator parser 101.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
7662397f
|
2012-07-23T21:18:18
|
|
types: fix canonical types copying
Without the re-initialization, the copying fails. This wasn't noticed
because this code practically never gets executed with ordinary keymaps.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
3c580721
|
2012-07-23T16:22:20
|
|
keycodes: fix valgrind warnings
==7071== Conditional jump or move depends on uninitialised value(s)
==7071== at 0x40B6CB: AddIndicatorName (keycodes.c:148)
==7071== by 0x40C34F: MergeIncludedKeycodes (keycodes.c:420)
==7071== by 0x40C613: HandleIncludeKeycodes (keycodes.c:480)
==7071== by 0x40D022: HandleKeycodesFile (keycodes.c:733)
==7071== by 0x40D79F: CompileKeycodes (keycodes.c:881)
==7071== by 0x401E22: compile_keymap (xkbcomp.c:157)
==7071== by 0x402091: xkb_map_new_from_kccgst (xkbcomp.c:229)
==7071== by 0x40216A: xkb_map_new_from_names (xkbcomp.c:254)
==7071== by 0x4046F5: test_compile_rules (common.c:164)
==7071== by 0x4015C1: test_rmlvo (rulescomp.c:44)
==7071== by 0x40180D: main (rulescomp.c:98)
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
d4eee861
|
2012-07-23T11:25:32
|
|
parse: remove unused #define
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
2e245a9a
|
2012-07-23T11:42:22
|
|
expr: Remove ExprResolveFloat
Remnant from geometry.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
9bd55b55
|
2012-07-23T23:10:07
|
|
makekeys: Add top_srcdir to include path
Fixes distcheck with no /usr/include/xkbcommon.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
f48ee2d2
|
2012-07-21T15:44:48
|
|
parse: use new log functions
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
8e395803
|
2012-07-21T15:37:33
|
|
path: use new log functions
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
885f6c8c
|
2012-07-21T15:35:17
|
|
misc: use new log functions
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
544a83e6
|
2012-07-21T15:27:09
|
|
vmod: use new log functions
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
3bb3e9c3
|
2012-07-21T15:19:27
|
|
rules: use new log functions
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
d659f2b4
|
2012-07-21T15:12:31
|
|
expr: use new log functions
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
e037f518
|
2012-07-21T14:53:49
|
|
action: use new log functions
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
87444fb9
|
2012-07-21T02:08:14
|
|
types: use new log functions
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
3dc1252d
|
2012-07-22T19:38:14
|
|
Add test for logging functionality
Just to make sure everything works properly.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
2c30fa7a
|
2012-07-21T16:10:17
|
|
Remove old logging leftovers
Everything has been converted.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
70e3e7e5
|
2012-07-21T15:39:18
|
|
xkbcomp: use new log functions
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
71c2f2e0
|
2012-07-20T17:20:35
|
|
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>
|
|
|
58f8d2c1
|
2012-07-20T17:09:49
|
|
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>
|
|
|
8b0e9f92
|
2012-07-20T13:07:30
|
|
utils: remove uTypedAlloc/Calloc
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
5e164ff1
|
2012-07-23T00:41:27
|
|
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>
|
|
|
36df40c3
|
2012-07-21T02:03:25
|
|
types: add keymap to KeyTypesInfo
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
8e62b368
|
2012-07-21T01:35:46
|
|
compat: use new log functions
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
270ff8ad
|
2012-07-21T01:31:10
|
|
compat: add keymap to CompatInfo
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
7dc51ea8
|
2012-07-21T00:58:25
|
|
symbols: use new log functions
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
7ef64813
|
2012-07-21T00:50:18
|
|
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>
|
|
|
0ae1199a
|
2012-07-20T19:38:36
|
|
keycodes: use new log functions
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
37579ce9
|
2012-07-20T18:27:37
|
|
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>
|
|
|
70f35cfb
|
2012-07-20T13:10:13
|
|
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>
|
|
|
2fc0ad50
|
2012-07-20T12:48:13
|
|
Fix bison 2.6 and clang warnings
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
db98696d
|
2012-07-17T17:08:14
|
|
Remove CommonInfo
Not used by anything anymore.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
250c925c
|
2012-07-17T17:05:28
|
|
types: use list instead of CommonInfo for KeyTypeInfo
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
85826c3c
|
2012-07-18T17:53:27
|
|
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>
|
|
|
861e6a17
|
2012-07-18T16:30:55
|
|
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>
|
|
|
730c2bc3
|
2012-07-17T15:50:24
|
|
types: use list instead of CommonInfo in PreserveInfo
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
85abd36b
|
2012-07-17T15:39:27
|
|
types: move global static tok_ atoms into KeyTypesInfo
The atoms are context-dependent.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
119c952b
|
2012-07-17T00:53:07
|
|
compat: use list instead of CommonInfo in LEDInfo
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
50b25a12
|
2012-07-17T11:03:43
|
|
Use xkb_group_index_t for group variables throughout
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
8237e9c7
|
2012-07-17T11:56:00
|
|
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>
|
|
|
e21fc886
|
2012-07-17T00:43:59
|
|
compat: use list instead of CommonInfo in SymInterpInfo
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
ba4320f7
|
2012-07-16T22:45:16
|
|
Move indicators.c code into compat.c
It is only used there. Allows some refactoring.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
dfa0929c
|
2012-07-16T22:15:43
|
|
Convert macros to inline functions
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
3fbf4ce3
|
2012-07-16T21:28:25
|
|
keycodes: use list instead of CommonInfo in IndicatorNameInfo
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
4bf987e5
|
2012-07-16T21:25:00
|
|
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>
|
|
|
cc8b0682
|
2012-07-16T17:53:46
|
|
Move alias.c functions into keycodes.c
They are only used in this file.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
cf4f170b
|
2012-07-16T11:24:48
|
|
symbols: don't use CommonInfo in KeyInfo
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
ebb4d59c
|
2012-07-16T11:09:03
|
|
symbols: use list for ModMapEntry's
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
b6e2a56d
|
2012-07-16T11:06:33
|
|
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>
|
|
|
0a6f9ccd
|
2012-07-16T10:15:53
|
|
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>
|
|
|
d0097f4e
|
2012-07-15T15:55:34
|
|
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>
|
|
|
35a93b8e
|
2012-07-15T14:35:57
|
|
map: verifiy that the keycode is legal
In case someone passes in a bad keycode.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
091a0542
|
2012-07-15T14:24:54
|
|
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>
|
|
|
ad8875c5
|
2012-07-15T14:02:36
|
|
Remove GroupsWidth macro
Use key->width directly instead.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
c705a82d
|
2012-07-17T11:51:32
|
|
Remove unused 'groupInfo' in KeyTypeInfo
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
4ccb0ef5
|
2012-07-15T13:51:34
|
|
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>
|
|
|
4066fcc9
|
2012-07-15T13:15:33
|
|
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>
|
|
|
7d9f0313
|
2012-07-15T13:00:04
|
|
Get rid of struct xkb_key_name
Just embed it directly.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
e8a6a5f0
|
2012-07-15T10:38:05
|
|
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>
|
|
|
e668d009
|
2012-07-15T12:48:11
|
|
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>
|
|
|
81d029f5
|
2012-07-15T11:52:54
|
|
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>
|
|
|
a52fb7e2
|
2012-07-15T11:37:54
|
|
Convert indecipherable macros to inline functions
This was fun.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
c064b95c
|
2012-07-15T01:59:01
|
|
symbols: split initialization code from CompileSymbols
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
caca60f3
|
2012-07-15T01:45:34
|
|
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>
|
|
|
1313af8f
|
2012-07-15T01:31:34
|
|
Get rid of xkb_key_names
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
50fef8eb
|
2012-07-15T00:46:31
|
|
Get rid of xkb_indicator
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
ed082617
|
2012-07-15T00:39:15
|
|
Get rid of xkb_compat_map
Same as xkb_{client,server}_map which were already removed.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
3de9d874
|
2012-07-15T00:26:28
|
|
Get rid of xkb_server_map
Same as xkb_client_map which was removed before.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
219243fe
|
2012-07-15T00:06:11
|
|
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>
|
|
|
9308a460
|
2012-07-17T10:20:15
|
|
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>
|
|
|
c6c937ab
|
2012-07-15T17:35:35
|
|
Fix typo in out of range group calculation
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
7d400657
|
2012-07-14T19:53:13
|
|
Remove unused control num_groups
We have xkb_map_num_groups for that.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
6c3e0811
|
2012-07-14T15:14:44
|
|
Convert missed enum merge_mode variables
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
43bf4136
|
2012-07-14T15:19:12
|
|
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>
|
|
|
70683f7d
|
2012-07-14T12:37:25
|
|
path: fix error message
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
d705c5d9
|
2012-07-14T01:12:50
|
|
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>
|
|
|
fe4f9909
|
2012-07-14T00:27:19
|
|
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>
|
|
|
57374c32
|
2012-07-13T18:55:10
|
|
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>
|
|
|
0765064b
|
2012-07-13T18:34:11
|
|
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>
|
|
|
dd85790c
|
2012-07-13T17:51:26
|
|
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>
|
|
|
0aaa84d8
|
2012-07-13T17:37:31
|
|
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>
|
|
|
3e65531f
|
2012-07-13T17:31:30
|
|
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>
|
|
|
a3378338
|
2012-07-13T17:10:48
|
|
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>
|
|
|
b7c0737a
|
2012-07-13T14:40:14
|
|
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>
|
|
|
6e7d1678
|
2012-07-13T00:40:25
|
|
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>
|
|
|
3640e14d
|
2012-07-13T00:39:34
|
|
Add multiple-keysyms-per-level to test data
Make sure this keeps on working.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
a19abd26
|
2012-07-13T00:32:41
|
|
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>
|
|
|
a77e9a92
|
2012-07-13T00:12:57
|
|
tests: Update dump.data for recent fixes
Makes the test pass again.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
f0599675
|
2012-07-11T16:16:20
|
|
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>
|
|
|
2ec0a22d
|
2012-07-13T00:10:23
|
|
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>
|
|
|
fe5bfdf9
|
2012-07-11T16:35:43
|
|
dump: a few more tweaks to match xkbcomp output
Only uppercase / lowercase stuff.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
9e505225
|
2012-07-12T19:28:52
|
|
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>
|
|
|
fedcf370
|
2012-07-12T17:54:09
|
|
dump: use KeyNameText instead of copying
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
62deaeb5
|
2012-07-12T14:42:31
|
|
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>
|
|
|
3e86ebca
|
2012-07-12T14:15:08
|
|
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>
|