|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
58b030bb
|
2012-05-20T20:39:35
|
|
Move XKB_KEY_NoSymbol to xkbcommon-keysyms.h
This avoids a couple of special cases in the code, and is more
consistent. Since anyone who includes xkbcommon.h also gets
xkbcommon-keysyms.h, and anyone who include xkbcommon-keysyms.h would
want NoSymbol anyway, there's no down side.
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>
|
|
6992de40
|
2012-06-08T14:54:31
|
|
Add keypad sequences to UTF-8 keysym printing
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
e0524296
|
2012-06-08T13:10:28
|
|
Add API for getting unicode representation of a keysym
This code uses a table and code derived from
http://www.cl.cam.ac.uk/~mgk25/ucs/keysym2ucs.c
The added API calls are:
xkb_keysym_to_utf32
xkb_keysym_to_utf8
[daniels: Changed API to be more in line with keysym_get_name, added
test, changed formatting to 4-space.]
|
|
2e009f69
|
2012-06-04T16:15:10
|
|
Avoid duplicating keysyms for merge if possible
If we can merge cleanly (i.e. use the entirety of one entry rather than
having to go level by level), then just reuse the existing symbols array
and skip the entire merge process.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
e6ca6fc5
|
2012-06-04T14:04:04
|
|
Fix action= NoAction() printing
Print it explicitly, rather than type=0x00, with all the private data
too.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
dd1ae1e4
|
2012-05-23T21:24:50
|
|
Remove fake support for global group range settings
A symbols file may contain a global, non key specific setting for
the group out-of-range handling method (wrap, clamp, redirect). Only
that:
* Its parsed and kept in the SymbolsInfo, but is not otherwise used in
any way (it's the same in the real xkbcomp).
* It's not used in any of xkeyboard-config files.
* It's not mentioned in the xkb specs (only the per-key ones).
* It doesn't make much sense anyway.
So remove the struct field, and emit an "unsupported, ignored" warning.
We don't increment the error count because of it, just continue (the
radio group warning just below is changed to do the same - there's no
reason to possibly abort the entire thing for it).
Signed-off-by: Ran Benita <ran234@gmail.com>
Conflicts:
src/xkbcomp/symbols.c
|
|
98b155c8
|
2012-06-04T13:01:33
|
|
Symbols: Don't include NoSymbols in the map
Instead of using NoSymbol in the map, we use num_syms == 0 to signify
the non-presence of a symbol. So instead of adding NoSymbol mappings
to the list regardless, detect them and set num_syms == 0.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
28e66a70
|
2012-06-04T12:54:54
|
|
Fix multiple errors when merging symbol definitions
We were getting the size calculation wrong, as well as inconsistently
picking a merge strategy.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
f531d1e1
|
2012-06-02T15:25:36
|
|
keymap-dump: Print NoAction actions too
The failure mode here is a little irritating:
- server loads map with ISO_Lock action
- server dumps keymap to string, including:
interpret ISO_Lock+AnyOfOrAll(None) {
action= NoAction();
};
as we don't (yet) print ISO_Lock actions
- client parses keymap from string
- client dumps keymap to string, including:
interpret ISO_Lock+AnyOfOrAll(None) {
};
- this results in a syntax error
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
a3ae0e84
|
2012-05-29T16:12:54
|
|
Pass merge down through indicator creation
To avoid using potentially undefined memory.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
ebd397e1
|
2012-05-25T17:05:39
|
|
Add xkb_map_get_as_string
Returns a newly-allocated string representing the specified keymap.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
208d9578
|
2012-05-25T17:58:32
|
|
Fix signed vs. unsigned confusion in actions
Some actions could also take relative rather than absolute parameters,
so they really needed to be signed instead of explicitly unsigned.
Oops.
Fixes, e.g., action= MovePtr(x=-1,y=+1), which was reported as
(x=+65535,y=+1).
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
ccc047c4
|
2012-05-22T18:00:56
|
|
compat: use darray for acts and key_acts in the server map
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
89c5e886
|
2012-05-22T15:45:42
|
|
keycodes: use darray in KeyNamesInfo
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
07c88b55
|
2012-05-22T15:20:47
|
|
symbols: use darray for xkb_sym_map
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
c65a3596
|
2012-05-22T10:59:46
|
|
keytypes: use darray for xkb_kt_map_entry's
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
374b0c98
|
2012-05-22T08:39:09
|
|
alloc: use darray in xkb_key_names
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
4daa34b5
|
2012-05-22T14:18:48
|
|
keytypes: use darray for level names
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
ee990d53
|
2012-05-22T14:00:16
|
|
symbols: use darray for KeyInfo
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
dcdbd149
|
2012-05-22T12:24:54
|
|
parser: use darray for keysym list
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
c2ac3a2b
|
2012-05-22T08:07:52
|
|
keytypes: use darray for key types in the client map
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
56150416
|
2012-05-22T00:52:28
|
|
compat: use darray for sym_interprets
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
d0288bb2
|
2012-05-22T00:37:53
|
|
context: use darray for include paths
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
ef51b572
|
2012-05-22T00:26:58
|
|
atom: use darray for the node_table
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
0c271e09
|
2012-05-22T00:14:34
|
|
rules: use darray for input line
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
28bbb7dc
|
2012-05-21T23:47:44
|
|
rules: use darray for rules and groups
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
c815ff96
|
2012-05-21T23:33:56
|
|
Import darray.h for common dynamic array code
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
cb047bb0
|
2012-05-22T12:32:06
|
|
Constify a static variable
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
9e72a6a7
|
2012-05-22T08:04:59
|
|
Fix incorrect indexing while freeing
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
68edd5f0
|
2012-05-19T12:50:47
|
|
rules: allow wildcard match against "" layout/varaint
Currently, if you pass in an rmlvo with an empty string for layout or
variant, it would not match layout and variant rules even with
wildcards. But if the rules file had set an appropriate default, and someone
passes in the empty string, than he should get the default.
NULL in this case signifies not wanting to match against the layout or
variant at all, and so the rule should still fail to match NULLs.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
c900c417
|
2012-05-19T01:00:52
|
|
rules: remove struct var_defs
We can just use struct xkb_rule_names which we already receive as an
argument.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
3d28b6d1
|
2012-05-19T00:53:57
|
|
rules: reformat components_from_rules
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
7895eeb8
|
2012-05-18T19:39:25
|
|
rules: reformat LoadRules and XkbRF_Free
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
d18cf315
|
2012-05-18T19:37:01
|
|
rules: remove unused struct describe_vars
It's not actually used for anything.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
56b125fc
|
2012-05-18T18:38:06
|
|
rules: reformat AddRule and AddGroup
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
f790257f
|
2012-05-18T18:34:47
|
|
rules: reformat GetComponents
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
52939d4b
|
2012-05-18T18:25:59
|
|
rules: reformat SubstituteVars
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
a9477b57
|
2012-05-18T12:02:29
|
|
rules: reformat CheckApplyRules and ApplyPartialMatches
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
a47dd252
|
2012-05-18T10:43:24
|
|
rules: reformat CheckGroup and CheckApplyRule
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
18d331b8
|
2012-05-18T11:01:20
|
|
rules: rewrite MatchOneOf
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
c02c9ab2
|
2012-05-18T10:33:38
|
|
rules: reformat ApplyRule
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
06205717
|
2012-05-18T02:53:29
|
|
rules: reformat MakeMultiDefs
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
f7de6286
|
2012-05-18T02:20:14
|
|
rules: use asprintf instead of _Concat function
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
5f54764d
|
2012-05-17T16:15:46
|
|
rules: reformat CheckLine and break into several functions
And remove struct file_spec which is really unneeded. Should be
slightly more clear now.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
2df35895
|
2012-05-17T14:18:31
|
|
rules: reformat SetUpRemap and struct remap_spec
Rename to more descriptive names and reformat.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
b8ae68c2
|
2012-05-17T13:55:38
|
|
rules: rewrite get_index to use sscanf
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
ef76ba97
|
2012-05-16T10:09:03
|
|
rules: don't typedef the structs and rename them
The long prefix is unnecessary now that they are all private.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
478a6a31
|
2012-05-16T09:49:32
|
|
rules: reformat input line handling
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
72d1f2ed
|
2012-05-16T09:39:01
|
|
rules: don't use custom logging functions
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
b73bd676
|
2012-05-13T09:49:08
|
|
rules: only export a single function
Really all we need from this file is a way to get xkb_component_names
from an xkb_rule_names, which is now the only thing being exposed. This
should allow for some much needed refactoring of this code.
Since this is only used by xkbcomp.c and uses xkbcomp functions, also
move rules.{c,h} under the xkbcomp dir.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
0c25ebf3
|
2012-05-11T10:04:26
|
|
rules: remove unused struct fields and use size_t
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
db3e8f2c
|
2012-05-13T10:14:10
|
|
Create path.h for the path.c functions
No need to stash them in xkbcomp-priv.h; files which need the functions
should explicitly include them.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
b89b8e70
|
2012-05-13T23:31:59
|
|
Change xkb_map_new_from_fd to use FILE*
i.e. xkb_map_new_from_file. The reason is that flex only works with
FILE's, so we must use fdopen on the file descriptor; but to avoid a
memory leak, we must also fclose() it, which, in turn, closes the file
descriptor itself.
Either way is not acceptable, so we can either:
* dup() the fd and use fdopen on that, or
* have the user call fdopen on his own, and accept a FILE* instead of an
fd.
The second one seems better, and is standard C, so why not. We must add
stdio.h to xkbcommon.h though, which is regrettable, but not a big deal.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
d15fa57a
|
2012-05-13T17:21:02
|
|
Remove FileHandler callback argument
It's unneeded; the same function is always passed.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
e82bb5c0
|
2012-05-13T17:23:28
|
|
Remove unused allowNone from KeyInfo
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
5200132f
|
2012-05-13T23:13:10
|
|
Revert "Fix KeyInfo's syms array size calculation"
This partly reverts commit 8feba630fa7a4b720c42a9b5b4e4280b0e17a500.
This seems to fix valgrind errors:
==9581== Invalid read of size 4
==9581== at 0x4E50928: MergeKeyGroups (symbols.c:544)
==9581== by 0x4E510F3: MergeKeys (symbols.c:644)
==9581== by 0x4E514C6: AddKeySymbols (symbols.c:722)
==9581== by 0x4E51A3F: MergeIncludedSymbols (symbols.c:854)
==9581== by 0x4E51E97: HandleIncludeSymbols (symbols.c:952)
==9581== by 0x4E53D75: HandleSymbolsFile (symbols.c:1619)
==9581== by 0x4E55A0B: CompileSymbols (symbols.c:2187)
==9581== by 0x4E4056C: CompileKeymap (keymap.c:160)
==9581== by 0x4E56953: compile_keymap (xkbcomp.c:149)
==9581== by 0x4E56AC5: xkb_map_new_from_kccgst (xkbcomp.c:195)
==9581== by 0x4009D7: test_names (namescomp.c:56)
==9581== by 0x400A55: main (namescomp.c:75)
==9581== Address 0x5729b04 is 0 bytes after a block of size 4 alloc'd
==9581== at 0x4C29024: calloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
==9581== by 0x4E5C37B: recalloc (utils.c:41)
==9581== by 0x4E4FF50: ResizeKeyGroup (symbols.c:356)
==9581== by 0x4E5229E: AddSymbolsToKey (symbols.c:1058)
==9581== by 0x4E52ABB: SetSymbolsField (symbols.c:1214)
==9581== by 0x4E536C7: HandleSymbolsBody (symbols.c:1481)
==9581== by 0x4E53A63: HandleSymbolsDef (symbols.c:1543)
==9581== by 0x4E53DAD: HandleSymbolsFile (symbols.c:1623)
==9581== by 0x4E51CA4: HandleIncludeSymbols (symbols.c:909)
==9581== by 0x4E53D75: HandleSymbolsFile (symbols.c:1619)
==9581== by 0x4E51E74: HandleIncludeSymbols (symbols.c:951)
==9581== by 0x4E53D75: HandleSymbolsFile (symbols.c:1619)
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
75ff2cef
|
2012-05-13T18:45:43
|
|
Various static analyzer fixes
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
b571b834
|
2012-05-13T10:38:51
|
|
Fix a memleak
Introduced in 38cb639082ec4b31725d4ce4e35af63938691631.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
8bdef139
|
2012-05-15T15:23:41
|
|
Use eaccess() only if available
Fixes build on Android.
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
|
|
7b00485a
|
2012-05-11T15:03:43
|
|
Rename 'ctx' back to 'context' in external API
Still keep things as 'ctx' internally so we don't have to worry about
typing it too often, but rename the user-visible API back as it was
kinda ugly.
This partially reverts e7bb1e5f.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
7a1201bd
|
2012-05-09T20:51:37
|
|
Change xkb_key_get_syms to just return a bare int
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
46441b11
|
2012-05-09T20:49:04
|
|
Move KcCGST API to internal-only
And don't export it. We don't need it for X11 support, let alone
anything else.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
2761b1a3
|
2012-05-09T20:20:12
|
|
Rename serialise to serialize
Yes, British English is correct, but unfortunately we've lost that
battle.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
3e3ddd43
|
2012-05-09T20:12:18
|
|
Remove keycode_range_is_legal
It was a pretty pointless check. Also sanitise the _x11 variant to
actually do what it says on the box.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
6433d72e
|
2012-05-09T20:12:12
|
|
Merge remote-tracking branch 'krh/keysyms'
Conflicts:
src/keysym.c
src/misc.c
src/text.h
src/xkbcomp/expr.c
src/xkbcomp/parser.y
src/xkbcomp/parseutils.c
src/xkbcomp/symbols.c
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
ace1e5df
|
2012-05-09T09:05:00
|
|
Use our own keysyms
|
|
5e59ef3f
|
2012-05-09T17:54:37
|
|
Remove support for xkb_layout and xkb_semantics file types
These are two aggregate file types which are not used anywhere. We
maintain useful-enough backward compatibility in the parser, by treating
them as xkb_keymap. The keymap type allows for all types of components,
so they will still compile fine if they ever come up.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
e7bb1e5f
|
2012-05-09T15:03:11
|
|
Shorten context to ctx
(This breaks the API.)
"context" is really annoying to type all the time (and we're going to
type it a lot more :). "ctx" is clear, concise and common in many other
libraries. Use it!
Signed-off-by: Ran Benita <ran234@gmail.com>
[daniels: Fix for xkb -> keymap change.]
|
|
699a0b84
|
2012-05-09T14:02:26
|
|
Contextualize the atom table
Each context gets its own table, i.e. interning a string in one context
does not affect any other context.
The existing xkb_atom_* functions are turned into wrappers around a new
standalone atom_table object.
Signed-off-by: Ran Benita <ran234@gmail.com>
[daniels: Updated for xkb -> keymap.]
|