kc3-lang/libxkbcommon/src/xkbcomp
Branch :
Log
| Author | Commit | Date | CI | Message |
|---|---|---|---|---|
 |
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> | |
|
bb6ca768 | 2012-03-27 22:41:22 | Make parser and scanner reentrant All global state is removed from the parser and scanner. This makes use of the standard facilities in Bison and Flex for reentrant/pure scanner/lexer and location tracking. Signed-off-by: Ran Benita <ran234@gmail.com> [daniels: Updated to current sources.] | |
|
034ffce6 | 2012-03-27 17:22:35 | Use xkb_contexts in keymap compilation Primarily for the include path, but also for the logging in future. Signed-off-by: Daniel Stone <daniel@fooishbar.org> | |
|
bc8bbf50 | 2012-03-27 15:50:59 | Fix build for X11 modifier masks Exposed by include path changes, oops. Signed-off-by: Daniel Stone <daniel@fooishbar.org> | |
|
b5efe41f | 2012-03-24 04:48:31 | Make build non-recursive Unify all the different Makefile.am into a single short top level one (the test/Makefile.am file is left intact though). This makes the build system simpler to look and should encourage unifying more currently-disparate code. Some further motivation can be found in this page: http://www.flameeyes.eu/autotools-mythbuster/automake/nonrecursive.html Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
602e8780 | 2012-03-24 13:27:48 | Define our own NoSymbol value and use it Since we have our own xkb_keysym_t type, it makes sense to have our own NoSymbol value instead of the one from X11/X.h. Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
d3908b63 | 2012-03-24 12:33:28 | Define our own None atom value Since we define our own xkb_atom_t type, it makes sense not to use the X11/X.h None value. This way we can also remove a lot of X11 includes. Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
2165e16e | 2012-03-24 02:36:11 | Fix all -Wsign-compare warnings i.e comparison of signed and unsigned values. These are mostly harmless but fixing them allows to compile cleanly with -Wextra. Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
813ddf25 | 2012-03-24 00:29:33 | Silence -Wcast-qual warnings There are some cases where we must free a string with a const qualifier. Add a macro UNCONSTIFY to trick the compiler into silencing the warning in the cases where we know what we're doing. Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
f08ce9b7 | 2012-03-24 00:26:12 | Use strcasecmp consistently instead of uStrCaseCmp There's no use calling the same thing by a different name. Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
3104a8ef | 2012-03-24 00:12:08 | Move utility macro from XKBcommonint.h to utils.h And merge all the similar ones into the same name. The u* prefix is chosen over the _Xkb prefix because it has more uses throughout the codebase. But It should now be simple to choose a nice prefix and stay consistent. Signed-off-by: Ran Benita <ran234@gmail.com> [daniels: fixed for the case where we have strcasecmp] | |
|
2a5f6416 | 2012-03-23 23:56:44 | Remove some more useless stuff Some unused defines and geometry-removal leftovers (specifically the file geom.c and the struct for the keyboard coordinates). Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
0480f427 | 2012-03-23 23:28:24 | Remove useless stuff from utils Signed-off-by: Ran Benita <ran234@gmail.com> [daniels: fixed conflicts from strcasecmp, added includes to make filecomp build again] | |
|
d22b8dbb | 2012-03-23 22:25:47 | Move utils.{c,h} to be used by the entire project This is a first step for making consistent use of utils.h also outside of xkbcomp/ . Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
7cc17ec5 | 2012-03-23 23:39:12 | Fix a scanf type mismatch "%o" takes an unsigned int. Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
1b17708c | 2012-03-24 02:33:18 | Fix incorrect usage of && instead of & Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
d039622a | 2012-03-22 17:39:12 | Rename keymap allocation API Signed-off-by: Daniel Stone <daniel@fooishbar.org> | |
|
b6c79ad0 | 2012-03-22 14:32:23 | LEDs: Fix string comparison bug This resulted in duplicate sets of modifiers, since we were comparing pointer equality of two strings, rather than string equality. Oops. Signed-off-by: Daniel Stone <daniel@fooishbar.org> | |
|
9468d84a | 2012-03-21 14:44:16 | Fix (correct, but harmless) const warning Signed-off-by: Daniel Stone <daniel@fooishbar.org> | |
|
1afc6fca | 2012-03-21 02:17:58 | Don't clear real mods in action modmask Previously, we would clear out the real modmask when updating the modmask for action maps, if not using the key's modmask. The correct behaviour here is instead to use the key's modmask if using the modmap, else use the real mods provided with the action originally. Signed-off-by: Daniel Stone <daniel@fooishbar.org> | |
|
f44eed3e | 2012-03-21 00:33:29 | Remove unnecessary allocation in expr.c Signed-off-by: Daniel Stone <daniel@fooishbar.org> | |
|
bcd811ce | 2012-03-20 17:24:09 | Small constification Signed-off-by: Daniel Stone <daniel@fooishbar.org> | |
|
3d31be5f | 2012-03-16 14:27:39 | Also print group name in keysym error Unfortunately we can't get the actual file it was defined in this far down, but at least give the human-readable name rather than just a group index. Also, groups are not zero-indexed, such that index 0 is group 1; fix that too. Signed-off-by: Daniel Stone <daniel@fooishbar.org> | |
|
7dbd3040 | 2012-03-16 14:22:04 | More useful errors for invalid keysyms Instead of generating a fairly droll internal error, generate a warning also telling us exactly where the bad definition was. Signed-off-by: Daniel Stone <daniel@fooishbar.org> | |
|
f40e0790 | 2012-03-16 13:59:24 | Fix non-useModMapMods action masks By ensuring their mask is only the vmods, rather than also potentially including the key's modmap. Also remove the unnecessary vmodmask indirection. Signed-off-by: Daniel Stone <daniel@fooishbar.org> | |
|
94521658 | 2012-03-15 09:34:20 | Plug leaks in geometry parsing When parsing a geometry file, don't leak the elements we've created. Signed-off-by: Daniel Stone <daniel@fooishbar.org> | |
|
937d4049 | 2012-03-15 09:33:56 | Remove more float support Signed-off-by: Daniel Stone <daniel@fooishbar.org> | |
|
3560bf7b | 2012-03-15 08:36:09 | Also update vmod -> indicator maps Signed-off-by: Daniel Stone <daniel@fooishbar.org> | |
|
0e0b5b00 | 2012-03-14 18:24:37 | Update modifiers after building keymap The server used to have to go and do this on our own, but we can do better than that: after we've compiled the keymap, go through and bind virtual modifiers to everything that needs it. Signed-off-by: Daniel Stone <daniel@fooishbar.org> | |
|
62444a11 | 2012-03-14 17:06:09 | Convert interp action from xkb_any_action to xkb_action Signed-off-by: Daniel Stone <daniel@fooishbar.org> | |
|
3d38da0c | 2012-03-14 17:04:36 | Fix leak in xkbcomp.c Accidentally regressed this one briefly, oops. Signed-off-by: Daniel Stone <daniel@fooishbar.org> | |
|
54aa839c | 2012-03-14 11:59:52 | Remove component listing code Signed-off-by: Daniel Stone <daniel@fooishbar.org> | |
|
9dde0f33 | 2012-03-13 12:46:37 | Revert "Use XKB_COMMON_* modifier defines in ExprResolveModMask" Because indices and masks are not at all the same thing. This reverts commit 645275406f47369c9a67d02173aedf89e9d2a33c. | |
|
64527540 | 2012-03-10 14:42:30 | Use XKB_COMMON_* modifier defines in ExprResolveModMask Rather than the ones from XKB.h. Signed-off-by: Daniel Stone <daniel@fooishbar.org> | |
|
f9b3a14e | 2012-03-10 14:36:30 | Remove overlay support as well Right now we just silently ignore overlay controls, which is probably bad, but it's not the easiest to fix. Signed-off-by: Daniel Stone <daniel@fooishbar.org> | |
|
24c61d0f | 2012-03-10 14:27:06 | Remove half-implemented radio groups It looks like this could never have worked anyway, what with num_rg always being 0 everywhere. Remove it. Signed-off-by: Daniel Stone <daniel@fooishbar.org> | |
|
671ab1bf | 2012-03-10 13:54:03 | Handle XkbFiles without a name Signed-off-by: Daniel Stone <daniel@fooishbar.org> | |
|
c8fd3ea4 | 2012-03-10 13:48:13 | Move allocation of xkb_desc into CompileKeymap Signed-off-by: Daniel Stone <daniel@fooishbar.org> | |
|
17bcc4c1 | 2012-03-09 19:29:29 | Remove geometry even harder Not the most elegant fix, but will do for now. Signed-off-by: Daniel Stone <daniel@fooishbar.org> | |
|
a0e756fd | 2012-03-09 19:09:25 | Introduce xkb_atom_t type Signed-off-by: Daniel Stone <daniel@fooishbar.org> | |
|
0bb24c2d | 2012-03-09 19:03:59 | Introduce xkb_keysym_t type Signed-off-by: Daniel Stone <daniel@fooishbar.org> | |
|
731e5c40 | 2012-03-09 18:53:47 | Stringify public name types Ensure that all names under xkb_desc are strings, rather than atoms. Signed-off-by: Daniel Stone <daniel@fooishbar.org> | |
|
57b551a4 | 2012-03-09 18:46:46 | Ensure we always have a complete keymap Refuse to compile without keycodes + compat + types + symbols. Signed-off-by: Daniel Stone <daniel@fooishbar.org> | |
|
4bc451bf | 2012-03-09 16:55:37 | Convert CompileKeymap to early-return style Signed-off-by: Daniel Stone <daniel@fooishbar.org> | |
|
59e03bf5 | 2012-03-09 16:54:47 | Use compile_keymap in xkb_compile_keymap_from_components We already had this exact function sitting right next to us, so use it rather than open-coding. Signed-off-by: Daniel Stone <daniel@fooishbar.org> | |
|
73919568 | 2012-03-09 16:32:45 | Add explicit braces Signed-off-by: Daniel Stone <daniel@fooishbar.org> | |
|
aa41ab29 | 2012-03-09 16:31:48 | xkbcomp: Turn an array into an anonymous struct Signed-off-by: Daniel Stone <daniel@fooishbar.org> | |
|
ed5c6c17 | 2012-03-09 16:26:34 | Remove geometry support, again It still parses geometry, but happily throws it away. Signed-off-by: Daniel Stone <daniel@fooishbar.org> | |
|
b28823cc | 2012-03-09 16:04:00 | Remove KcCGST names from the map Signed-off-by: Daniel Stone <daniel@fooishbar.org> | |
|
ed18e65e | 2012-03-05 15:07:28 | Merge remote-tracking branch 'ran/fixes-cont' Conflicts: src/xkbcomp/expr.c Signed-off-by: Daniel Stone <daniel@fooishbar.org> | |
|
65e1ff2f | 2012-03-05 15:00:39 | Merge remote-tracking branch 'ran/fixes' | |
|
e4b4d6b0 | 2012-03-03 23:42:44 | Fix "Could not resolve keysym" errors On many layouts, the following error appears: Internal error: Could not resolve keysym 10005b0 (Which is like the trademark of libxkbcommon now, and makes unicode-heavy symbol files pretty useless). This occurs when a keysym string (in this case, 10005b0) is passed to xkb_string_to_keysym, but cannot be resolved. This in turn happens because the parser passes on hexadecimal keysym strings without the leading "0x", thus leaving the resolving function without a way to disambiguate it as a number. Therefore, make sure to pass on the "0x". The file symbols.c in xkbcomp project does the same; it probably got lost in translation. Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
2473444f | 2012-03-03 22:43:50 | Refactor XkbFindFileInPath Also fixes a bug, where the check (typeLen < 1) should have been (pathLen < 1). Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
19e99bb2 | 2012-03-01 20:41:34 | Free all atoms along with keymap The code to do this is taken from xserver, dix/atom.c. Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
d94d9b45 | 2012-03-01 21:03:37 | Free IncludePath when no longer needed Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
1e6f956e | 2012-03-01 21:03:13 | Free scanFile when no longer needed Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
e4447f81 | 2012-03-03 01:17:21 | Fix other misc leaks Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
30d88b93 | 2012-03-01 20:44:42 | Don't leak the scanner's buffer Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
c24d97e4 | 2012-03-01 19:45:37 | Don't leak DoodadInfo's from GeometryInfo Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
c800c60a | 2012-03-01 19:25:37 | Don't leak ActionInfo's Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
d67e73bd | 2012-03-01 00:10:37 | Don't leak KeyNamesInfo Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
5c40bee6 | 2012-02-29 21:57:15 | Don't leak the "minimum"/"maximum" string Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
c50c87bc | 2012-03-01 21:26:25 | Don't leak the various *Info's names when overriding them Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
889a299e | 2012-03-02 14:49:36 | Free XkbFile's when no longer needed Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
c357a11a | 2012-03-01 21:20:45 | Add function to free XkbFile's Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
3216ecc0 | 2012-02-24 10:46:41 | Don't cache loaded rules files This needlessly occupies memory for the lifetime of the library, and does not make a noticeable difference otherwise. This rules file won't be loaded more than once in most cases anyway, so just load it again when it happens. Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
ca9829ea | 2012-02-24 09:59:25 | Don't cache parsed files This needlessly occupies memory for the lifetime of the library, and does not make a noticeable difference otherwise. Instead, just parse the same file again when it happens. Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
baf6a677 | 2012-03-02 22:34:14 | Remove unused global type tokens Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
f549ce07 | 2012-03-02 17:25:58 | Use global tables for action string handling Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
d2c3dd0c | 2012-03-02 22:31:29 | Constify some more text functions Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
eb738b13 | 2012-03-02 17:40:19 | Constify global tables Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
266dfae5 | 2012-02-29 21:26:28 | Remove useless casts Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
a64e9708 | 2012-03-02 15:56:03 | Remove unneeded freeing mechanisms Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
c7bf3687 | 2012-03-02 22:36:32 | Make the sections array local to the keymap compiling function Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
4bc839ab | 2012-02-29 20:50:17 | Use memset instead of bzero Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
a3e40917 | 2012-03-01 23:43:51 | Remove return's at the end of void functions Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
f278cea1 | 2012-02-29 20:25:11 | Remove all uses of the register keyword Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
6a34e4e1 | 2012-02-29 19:56:39 | Don't check for NULL before free() Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
c41061a0 | 2012-02-23 19:26:33 | Use yacc-generated header instead of tokens.h The yacc implementation can generate all the necessary token definitions itself; there is no need to maintain a hand written file for that. Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
744527e9 | 2012-02-24 16:10:06 | Fix remaining warnings Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
eff72fab | 2012-02-25 11:53:01 | Fix warnings in scanner and parser Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
1d969c5c | 2012-02-24 16:08:55 | Fix an incorrect sizeof Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
f3e4335f | 2012-02-24 16:07:17 | Fix all constness warnings These are all trivial/obvious fixes which clear a bunch of warnings. Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
cca1c050 | 2012-02-24 16:03:44 | Fix possible null dereferences Fix all reported null dereferences from clang-analyzer. There seems to be one false negative (in file indicators.c), but it is fixed anyway. Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
9005624f | 2012-02-24 16:00:10 | Remove unneeded assignments and variables Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
a0dd0526 | 2012-02-25 11:46:12 | Remove unused includes of "tokens.h" Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
9ad0be33 | 2012-02-24 10:04:16 | Remove unused debug #defines Signed-off-by: Ran Benita <ran234@gmail.com> | |
|
90f04e04 | 2012-02-20 18:07:29 | Perform bounds checking in ExprResolveLevel Both callers perform the same bounds check, so move it into ExprResolveLevel itself. Signed-off-by: Daniel Stone <daniel@fooishbar.org> | |
|
1ab058bb | 2012-02-20 17:47:46 | Fix typo in ExprResolveKeyCode Signed-off-by: Daniel Stone <daniel@fooishbar.org> | |
|
e209fe31 | 2012-02-20 17:33:39 | Perform bounds checking in ExprResolveGroup Every caller did the exact same check on the group bounds after calling ExprResolveGroup, so might as well do it inside. Signed-off-by: Daniel Stone <daniel@fooishbar.org> | |
|
43ed3ff0 | 2012-02-20 17:14:04 | Switch expression resolution priv from char to void Avoids a lot of really lame casts. Signed-off-by: Daniel Stone <daniel@fooishbar.org> |