|
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>
|
|
|
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>
|
|
|
e21fc886
|
2012-07-17T00:43:59
|
|
compat: use list instead of CommonInfo in SymInterpInfo
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>
|
|
|
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>
|
|
|
ebb4d59c
|
2012-07-16T11:09:03
|
|
symbols: use list for ModMapEntry's
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>
|
|
|
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>
|
|
|
059c1842
|
2012-07-12T12:02:19
|
|
Move test data files to test/data/keymaps
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
cfed7960
|
2012-07-03T21:13:11
|
|
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>
|
|
|
b10f924b
|
2012-07-03T21:22:09
|
|
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>
|
|
|
d38d16e1
|
2012-07-03T21:17:11
|
|
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>
|
|
|
9116e02d
|
2012-07-03T21:15:28
|
|
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>
|
|
|
1f492901
|
2012-07-11T18:00:31
|
|
Enlarge keysym name buffers and mention in comment
The longest keysym is 27 chars long.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
01024259
|
2012-07-11T16:23:35
|
|
test/dump: output commentary to stderr
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
e4d4de8c
|
2012-07-11T21:37:59
|
|
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>
|
|
|
09d1445b
|
2012-07-11T14:12:12
|
|
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>
|
|
|
19f814f9
|
2012-07-11T14:08:28
|
|
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>
|
|
|
8ff98487
|
2012-07-01T00:45:20
|
|
keymap: remove redundant check
This is handled above in the LEGAL_FILE_TYPES check.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
e201c165
|
2012-06-30T00:07:09
|
|
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>
|
|
|
13f030ba
|
2012-06-29T22:25:27
|
|
Tiny reformatting
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
37f43849
|
2012-06-30T00:49:41
|
|
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>
|
|
|
337c3007
|
2012-06-30T00:37:12
|
|
Remove _X_EXPORT from xkb_map_new_from_kccgst
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
ddb0ff9d
|
2012-06-29T19:26:01
|
|
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>
|
|
|
7111eb8e
|
2012-06-29T17:45:47
|
|
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>
|
|
|
213dcf68
|
2012-06-29T17:31:10
|
|
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>
|
|
|
48b4d30a
|
2012-06-29T17:05:33
|
|
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>
|
|
|
8f257397
|
2012-06-29T16:04:55
|
|
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>
|
|
|
f637d35a
|
2012-06-27T00:22:31
|
|
Use void* instead of old style char* in CommonInfo functions
Removes some annoying casts.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
2cb6c35b
|
2012-06-22T16:08:05
|
|
Don't set explicit repeat masks when derived
If we've only derived that a key should repeat, rather than had it
explicitly specified, don't set the explicit member. Fixes the dump
test.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
acdad605
|
2012-06-22T16:03:17
|
|
Don't ignore inactive type entries
An entry for a type will only get marked as active if a virtual modifier
can be directly mapped to it, and not if an action indirectly leads to
it (e.g. LevelThree). We don't really need this test since entries which
can never be triggered ... won't be triggered.
The entire map->active thing should probably just go away.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
6d606d10
|
2012-06-22T15:29:47
|
|
state: Add more comprehensive repeating test
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
8e2c66e9
|
2012-06-22T15:27:05
|
|
Add xkb_key_repeats
Does what it says on the box.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
fe89d031
|
2012-06-22T15:26:07
|
|
Work out a default repeat for all keys
Our early exit in ApplyInterpsToKey meant we weren't hitting the code
that's supposed to set a sensible default autorepeat value for most
keys.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
0015604a
|
2012-04-10T21:20:27
|
|
Add a test for the results of key sequences
This test verifies the core purpose of this library, which is to
translate the user's keypresses into keysyms according to the keymap and
the XKB specification.
The tests emulate a series of key presses, and checks that the resulting
keysyms are what we expect.
Several of the tests currently fail, and plenty more should be added and
maybe split up.
It also currently uses an RMLVO keymap, which comes from the
xkeyboard-config data set, and whose behaviour may change in the future.
So it should probably be changed to use several files of our own, but
it's OK for now.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
cd5a8274
|
2012-06-06T10:44:22
|
|
utils: remove unused recalloc and related macros
Their use is superseded by darray everywhere now.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
955ed8c4
|
2012-06-06T10:38:45
|
|
state: use darray for filters
For the darray we need to specify the explicit struct xkb_filter type
instead of void*, so we move the definition of struct xkb_state into
state.c thus making it opaque even from the rest of the files. It has
enough getters to get going and is otherwise good style.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
a1f8440d
|
2012-06-06T10:01:43
|
|
symbols: use darray in struct xkb_sym_map
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
54bdfd05
|
2012-06-06T01:22:52
|
|
symbols: use darray for KeyInfo acts
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
ce9c18a7
|
2012-06-06T00:57:42
|
|
symbols: use darray for KeyInfo symsMapNumEntries
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
920cc270
|
2012-06-06T00:39:23
|
|
symbols: use darray for KeyInfo symsMapIndex
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
e82b9b14
|
2012-06-05T19:25:23
|
|
symbols: remove sizeSyms array from KeyInfo
This information is kept inside the darray now.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
4237a204
|
2012-06-05T19:09:01
|
|
symbols: use darray for KeyInfo syms array
The arrays found in KeyInfo are by far the most complicated, so this is
taken one member at a time so as not to break anything.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
bc50cdd4
|
2012-06-05T18:46:24
|
|
darray: some changes for convenience
- Make darray_free also initialize the array back to an empty state, and
stop worrying about it everywhere.
- Add darray_mem, to access the underlying memory, which we do manually
now using &darray_item(arr, 0). This makes a bit more clear when we
actually mean to take the address of a specific item.
- Add darray_copy, to make a deep copy of a darray.
- Add darray_same, to test whether two darrays have the same underlying
memory (e.g. if the struct itself was value copied). This should used
where previously two arrays were compared for pointer equality.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
57f184e2
|
2012-05-30T15:55:21
|
|
darray: tweak parameters a bit for better memory usage
Here are some quick numbers from valgrind, running rulescomp only with a
simple, common "us,de" rule set:
before darray: cb047bb
total heap usage: 44,924 allocs, 44,924 frees, 3,162,342 bytes allocated
after darray: c87468e
total heap usage: 52,670 allocs, 52,670 frees, 2,844,517 bytes allocated
tweaking specific inital allocation sizes:
total heap usage: 52,652 allocs, 52,652 frees, 2,841,814 bytes allocated
changing initial alloc = 2 globally
total heap usage: 47,802 allocs, 47,802 frees, 2,833,614 bytes allocated
changing initial alloc = 3 globally
total heap usage: 47,346 allocs, 47,346 frees, 3,307,110 bytes allocated
changing initial alloc = 4 globally
total heap usage: 44,643 allocs, 44,643 frees, 2,853,646 bytes allocated
[ Changing the geometric progression constant from 2 only made things
worse. I tried the golden ratio - not so golden :) ]
The last one is obviously the best, so it was chosen, with the specific
tweaks thrown in as well (these were there before but don't make much
difference). Overall it seems to do better than the previous manual
allocations which is a bit surprising.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
93ef2560
|
2012-06-08T09:54:08
|
|
Comment out unused fields in xkb_controls
Until (if) we implement/use them the should take up any (mental) space.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
cb631c2d
|
2012-06-08T09:25:38
|
|
Unconstify a few string struct fields
These were made const when the structs were exposed in the API. Now they
are private and we shouldn't mess around with the UNCONSTIFY business.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
d0718e98
|
2012-06-05T17:48:08
|
|
test/dump: allow to run manually
Without the srcdir envvar (and a couple trivial changes).
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
9baf62f3
|
2012-05-20T20:51:50
|
|
Remove configure check for X11 keysym files
Since every user building the library, even from git, doesn't need these
files anymore, there's no need to check for them (this goes for makekeys
as well).
The only remaining user is the update-keysyms target, but whoever will
run it again (if ever) will probably know what he's doing (at least
enough to run git diff before git commit). And the defaults should be
fine too.
Signed-off-by: Ran Benita <ran234@gmail.com>
|