kc3-lang/libxkbcommon/src/xkbcomp
Branch :
Log
| Author | Commit | Date | CI | Message |
|---|---|---|---|---|
 |
54bdfd05 | 2012-06-06 01:22:52 | symbols: use darray for KeyInfo acts Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
ce9c18a7 | 2012-06-06 00:57:42 | symbols: use darray for KeyInfo symsMapNumEntries Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
e82b9b14 | 2012-06-05 19: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-05 19: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> | |
|
920cc270 | 2012-06-06 00:39:23 | symbols: use darray for KeyInfo symsMapIndex Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
cb631c2d | 2012-06-08 09: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> | |
|
bc50cdd4 | 2012-06-05 18: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-30 15: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> | |
 |
2e009f69 | 2012-06-04 16: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> | |
|
dd1ae1e4 | 2012-05-23 21: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-04 13: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-04 12: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> | |
|
a3ae0e84 | 2012-05-29 16:12:54 | Pass merge down through indicator creation To avoid using potentially undefined memory. Signed-off-by: Daniel Stone <daniel@fooishbar.org> | |
|
89c5e886 | 2012-05-22 15:45:42 | keycodes: use darray in KeyNamesInfo Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
07c88b55 | 2012-05-22 15:20:47 | symbols: use darray for xkb_sym_map Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
4daa34b5 | 2012-05-22 14:18:48 | keytypes: use darray for level names Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
ee990d53 | 2012-05-22 14:00:16 | symbols: use darray for KeyInfo Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
dcdbd149 | 2012-05-22 12:24:54 | parser: use darray for keysym list Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
c65a3596 | 2012-05-22 10:59:46 | keytypes: use darray for xkb_kt_map_entry's Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
374b0c98 | 2012-05-22 08:39:09 | alloc: use darray in xkb_key_names Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
c2ac3a2b | 2012-05-22 08:07:52 | keytypes: use darray for key types in the client map Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
56150416 | 2012-05-22 00:52:28 | compat: use darray for sym_interprets Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
0c271e09 | 2012-05-22 00:14:34 | rules: use darray for input line Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
28bbb7dc | 2012-05-21 23:47:44 | rules: use darray for rules and groups Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
cb047bb0 | 2012-05-22 12:32:06 | Constify a static variable Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
68edd5f0 | 2012-05-19 12: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-19 01: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-19 00:53:57 | rules: reformat components_from_rules Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
7895eeb8 | 2012-05-18 19:39:25 | rules: reformat LoadRules and XkbRF_Free Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
d18cf315 | 2012-05-18 19: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-18 18:38:06 | rules: reformat AddRule and AddGroup Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
f790257f | 2012-05-18 18:34:47 | rules: reformat GetComponents Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
f7de6286 | 2012-05-18 02:20:14 | rules: use asprintf instead of _Concat function Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
5f54764d | 2012-05-17 16: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-17 14: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-17 13:55:38 | rules: rewrite get_index to use sscanf Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
ef76ba97 | 2012-05-16 10: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-16 09:49:32 | rules: reformat input line handling Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
72d1f2ed | 2012-05-16 09:39:01 | rules: don't use custom logging functions Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
b73bd676 | 2012-05-13 09: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> | |
|
52939d4b | 2012-05-18 18:25:59 | rules: reformat SubstituteVars Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
a9477b57 | 2012-05-18 12:02:29 | rules: reformat CheckApplyRules and ApplyPartialMatches Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
a47dd252 | 2012-05-18 10:43:24 | rules: reformat CheckGroup and CheckApplyRule Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
18d331b8 | 2012-05-18 11:01:20 | rules: rewrite MatchOneOf Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
c02c9ab2 | 2012-05-18 10:33:38 | rules: reformat ApplyRule Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
06205717 | 2012-05-18 02:53:29 | rules: reformat MakeMultiDefs Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
db3e8f2c | 2012-05-13 10: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-13 23: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-13 17: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-13 17:23:28 | Remove unused allowNone from KeyInfo Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
5200132f | 2012-05-13 23: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-13 18:45:43 | Various static analyzer fixes Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
7b00485a | 2012-05-11 15: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> | |
|
6433d72e | 2012-05-09 20: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-09 09:05:00 | Use our own keysyms | |
|
5e59ef3f | 2012-05-09 17: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-09 15: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-09 14: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.] | |
|
cdd2906d | 2012-05-09 13:50:05 | Make the context available for XkbcAtomText And rename the function to xkb_atom_text. Signed-off-by: Ran Benita <ran234@gmail.com> [daniels: Updated for xkb -> keymap.] | |
|
8d680e80 | 2012-05-09 12:01:03 | Make the context available for XkbcAtomGetString In preparation of contextualizing atom handling. Since we touch every function call, we also rename the function to xkb_atom_strdup to match xkb_atom_intern, and be more descriptive. Signed-off-by: Ran Benita <ran234@gmail.com> [daniels: Updated for xkb -> keymap.] | |
|
c117318f | 2012-05-09 11:47:20 | Make the context available to xkb_intern_atom In preparation of contextualizing the atom table. Since we touch every function call, also rename the function to xkb_atom_intern, to match better with the rest (which will also be renamed). Signed-off-by: Ran Benita <ran234@gmail.com> [daniels: Fixed for 'xkb' -> 'keymap'.] | |
|
4aef083e | 2012-05-09 11:29:04 | Contextualize XkbFile IDs Currently the IDs are assigned from a static variable inside CreateXKBFile. This can lead to some unpleasantness with threads, so maintain the counter in the context instead. Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
64aa5c95 | 2012-05-09 11:12:30 | Make the context available to the parser We will need the context to remove some global state. Also make the Parse* function just return bool while wer'e at it. Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
38cb6390 | 2012-05-09 15:15:30 | Change all 'xkb' xkb_keymap names to 'keymap' To make it a bit more clear what it actually is. Signed-off-by: Daniel Stone <daniel@fooishbar.org> | |
|
e1af48bc | 2012-05-09 13:22:34 | Rename keysym <-> string API Change them to refer to the string representation of the keysym's name as a name rather than a string, since we want to add API to get the Unicode printable representation as well. Signed-off-by: Daniel Stone <daniel@fooishbar.org> | |
|
b537b552 | 2012-05-08 17:48:29 | Add flags to keymap compilation entrypoints No use as yet, but might as well ... Signed-off-by: Daniel Stone <daniel@fooishbar.org> | |
|
b610b2b9 | 2012-05-08 14:52:23 | Rename XKBcommonint.h to xkb-priv.h and use it Make the files in the src/* directory use their own header or a consilidated private header. This makes the file dependencies clearer. Also drop the pointless "xkb" file name prefix, add split a few declarations to their own files (atom.h and text.h). Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
33273304 | 2012-05-08 13:57:07 | Rename xkbcomp/misc.h to xkbcomp-priv.h and use it The include dependencies were quite convoluted, where you change the order and get a ton of errors. Instead, change one file to act as the internal interface for the xkbcomp files, and make every file use it. Also drop the pointless "xkb" prefix to file names. Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
dccdf32c | 2012-05-08 01:08:07 | Refactor Compile<component> functions The error handling was not ideal, so unify it. Also makes the functions a bit easier to read. Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
70dfe166 | 2012-05-07 14:23:46 | Rename YYLTYPE to struct YYLTYPE Signed-off-by: Daniel Stone <daniel@fooishbar.org> | |
|
62a75dc1 | 2012-04-10 23:08:49 | Remove unused stuff from XKBcommonint.h Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
12b3495d | 2012-04-11 01:55:50 | Remove unused 'which' and 'merge' arguments Signed-off-by: Ran Benita <ran234@gmail.com> [daniels: Updated for xkb_desc -> xkb_keymap changes.] | |
|
793908a0 | 2012-04-11 19:58:03 | Remove unused 'compiled' field in XkbFile Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
5fb494ec | 2012-04-11 14:13:24 | Remove unused debugging function Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
a641a185 | 2012-04-06 03:38:55 | Use stdbool.h 'Cause defining your own True and False is so 1990's. Signed-off-by: Ran Benita <ran234@gmail.com> [daniels: Fixed for xkb_desc -> xkb_keymap changes.] | |
|
a39ed85f | 2012-04-05 11:24:39 | Fix formatting in xkbcomp headers Signed-off-by: Ran Benita <ran234@gmail.com> [daniels: Fixed for xkb_desc -> xkb_keymap change.] | |
|
1f81c0e1 | 2012-04-26 16:02:49 | Dump include paths when we can't find rules Since the most common failure mode here is a failure to properly set the XKB data path, dump the include path so people at least have a clue where to look. Signed-off-by: Daniel Stone <daniel@fooishbar.org> | |
|
b1e49ff9 | 2012-04-06 04:33:43 | Reformat actionHandler dispatch table Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
18e6a6a4 | 2012-04-05 10:47:43 | Remove Xfuncproto.h and XKB.h from xkbcommon/xkbcommon.h The kbproto header is already not needed here anymore. Move the _X_EXPORT's to the corresponding function definitions, and use straight extern "C" clauses instead of _XFUNCPROTOBEGIN/END. It also makes more sense to have the EXPORT's in the source files, as it provides some documentation to the reader, whereas in the header it's obvious. Signed-off-by: Ran Benita <ran234@gmail.com> [daniels: Updated for xkb_keymap changes.] | |
|
073a2107 | 2012-04-08 15:40:12 | Constify the syms_out argument to xkb_key_get_syms() The caller should not mess around with these as they come directly from our internal structs. Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
467d7bb6 | 2012-04-05 10:13:24 | Implement missing xkb_state_ref and add return value xkb_state_ref was missing. Also modify the _ref functions to return the object instead of being void. This is a useful idiom: struct my_object my_object_new(struct xkb_state *state) { [...] my_object->state = xkb_state_ref(state); [...] } Essentially "taking" a reference, such that you don't forget to increment it and it's one line less (see example in our own code). A case could also be made for _unref to return the object or NULL, but this is quite uncommon. Signed-off-by: Ran Benita <ran234@gmail.com> [daniels: Updated for xkb_keymap changes.] | |
|
b08629f9 | 2012-04-06 05:09:17 | Do not enable yacc trace facility unconditionally Define DEBUG and set yydebug if you want that. Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
913e0740 | 2012-03-31 01:18:55 | Constify a global table and function arguments Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
d116aaef | 2012-04-06 05:02:35 | Remove unused struct definition Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
28011e71 | 2012-04-06 04:20:35 | Replace remaining use of Atom instead of xkb_atom_t Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
e9537d50 | 2012-04-08 20:58:39 | Fix possible overflow in scanner Also reduce the size of scanBuf given that it's allocated on the stack, and 1024 is enough. Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
8feba630 | 2012-04-08 18:46:58 | Fix KeyInfo's syms array size calculation When merging group info from two KeyInfo's, the new size of the keysym array was off. Fix it to match how it is used a few lines below. There are also some peripheral fixes, and some comments (took me a few minutes to get what's going on). Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
2590b5a1 | 2012-04-08 15:37:36 | Fix compiler warnings (They were not reported, see next commit). The reset function declaration didn't match its name in the definition; the _defaults variant matches better with the rest. Signed-off-by: Ran Benita <ran234@gmail.com> [daniels: Updated to current master.] | |
|
ef88c7ef | 2012-04-03 15:14:16 | Rename xkb_desc to xkb_keymap struct xkb_desc was just a hangover from the old XkbDescRec, which isn't a very descriptive name. Signed-off-by: Daniel Stone <daniel@fooishbar.org> | |
|
632d9f03 | 2012-04-03 14:26:04 | Eliminate remaining gcc warnings Various one-liners (mostly removing unused variables) to make the code safe for the full set of warnings used by the xorg macros. On Debian-based systems, flex generates incorrect code resulting in two warnings about yy_getcolumn and yy_setcolumn having no previous declaration despite being non-static. Fedora carries a patch to fix this, and a bug has been filed on Debian's flex to add the patch: http://bugs.debian.org/667027 Aside from this, it's now safe for --enable-strict-compilation. Signed-off-by: Daniel Stone <daniel@fooishbar.org> | |
|
f249919e | 2012-04-03 13:44:21 | include resets group compatibility modifiers #43091 This change makes sure that include does not overwrite previous compatibility modifier settings when the included files does not explicitly specify them. Signed-off-by: Andreas Wettstein <wettstein509@solnet.ch> Reviewed-by: Daniel Stone <daniel@fooishbar.org> [Cross-picked from xkbcomp commit 14470719.] | |
|
c83043b3 | 2012-03-31 01:26:15 | Make temporary fix for stale xkb_atoms When xkb_free_keymap is called the atoms are all free'd, but action.c keeps a global copy of interned "true" and "false", which remains stale. The correct fix is to remove the need for the ActionsInit function entirely. Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
7a7ec9b1 | 2012-03-31 02:30:33 | Avoid leak in CompileKeymap error path The NULL check is unneeded, and prevented the atoms from being free'd. Signed-off-by: Ran Benita <ran234@gmail.com> [daniels: Updated for xkb_map_unref.] | |
|
84ec6b61 | 2012-04-01 16:51:48 | Add a NULL check before before strcmp'ing The names array can have NULL entries for some virtual modifier indexes. Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
fb606b06 | 2012-04-01 17:07:56 | Avoid use of partly initialized VModInfo in error path Such as: Compiling path: ./test/data/bad.xkb mapName: ==1300== Conditional jump or move depends on uninitialised value(s) ==1300== at 0x4E46166: HandleVModDef (vmod.c:90) ==1300== by 0x4E3FEC9: HandleKeyTypesFile (keytypes.c:1035) ==1300== by 0x4E3FBE1: HandleIncludeKeyTypes.constprop.11 (keytypes.c:387) ==1300== by 0x4E401DD: HandleKeyTypesFile (keytypes.c:1022) ==1300== by 0x4E3FBE1: HandleIncludeKeyTypes.constprop.11 (keytypes.c:387) ==1300== by 0x4E401DD: HandleKeyTypesFile (keytypes.c:1022) ==1300== by 0x4E4026F: CompileKeyTypes (keytypes.c:1150) ==1300== by 0x4E3DF9B: CompileKeymap (keymap.c:169) ==1300== by 0x4E465E9: compile_keymap (xkbcomp.c:205) ==1300== by 0x4E46BE4: xkb_compile_keymap_from_file (xkbcomp.c:290) ==1300== by 0x400B37: test_file (filecomp.c:47) ==1300== by 0x4008E3: main (filecomp.c:90) ==1300== Uninitialised value was created by a stack allocation ==1300== at 0x4E3FB3F: HandleIncludeKeyTypes.constprop.11 (keytypes.c:366) Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
cc5588c6 | 2012-03-29 17:39:11 | Fail gracefully on failure to find component include If we can't find the component of the include file we're looking for, make sure we don't return success when we meant failure, segfault, or spectacularly leak everything. Tested with incorrect component includes for keycodes, compat, symbols, and types. Signed-off-by: Daniel Stone <daniel@fooishbar.org> Reported-by: David Herrmann <dh.herrmann@googlemail.com> | |
|
93ce9c7d | 2012-03-29 16:31:09 | Full support for multiple keysyms per level Which also involved moving the global symbol map to be per-key instead; this should probably be split out into a separate commit. Signed-off-by: Daniel Stone <daniel@fooishbar.org> | |
|
9cdc1990 | 2012-03-29 01:57:06 | Parsing support for multiple keysyms per entry Instead of allowing only one keysym per level per group, do as the external API indicates and allow multiples. The existing syntax is: key <AD01> { [ q, Q ] }; where the new syntax is: key <AD01> { [ q, Q, { H, E, L, L, O }, { Y, E, S, space, T, H, I, S, space, I, S, space, D, O, G } }; to make the key in the extreme top left of the keyboard do pretty surprising things in levels 3 and 4. Signed-off-by: Daniel Stone <daniel@fooishbar.org> | |
|
36b8771e | 2012-03-29 01:49:55 | Don't leak strings in merge declarations Introduced by the reentrant scanner commit. Signed-off-by: Daniel Stone <daniel@fooishbar.org> | |
|
6628cf0b | 2012-03-28 19:50:45 | Remove unused rtrnValue declaration Signed-off-by: Daniel Stone <daniel@fooishbar.org> |