Branch :
| Author | Commit | Date | CI | Message |
|---|---|---|---|---|
| 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> | ||
| 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> | ||
| 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> | ||
| 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> | ||
| eb6d9a05 | 2012-02-20 17:09:06 | Remove chaining support from LookupModMask Turns out we never use it, so. Signed-off-by: Daniel Stone <daniel@fooishbar.org> | ||
| 11ea0791 | 2012-02-20 17:07:48 | Invert LookupModMask/LookupVModMask order We never want to solely lookup a virtual modifier without also looking up core modifiers. So, rather than chaining the vmod lookup inside the core modifier lookup, invert the ordering. Signed-off-by: Daniel Stone <daniel@fooishbar.org> | ||
| 1a2f2556 | 2012-02-20 17:00:51 | Remove unused LookupPriv::priv Signed-off-by: Daniel Stone <daniel@fooishbar.org> | ||
| 55e058f8 | 2012-02-20 16:59:51 | Move some definitions from expr.h to expr.c Signed-off-by: Daniel Stone <daniel@fooishbar.org> | ||
| 90d86c36 | 2012-02-20 16:54:54 | Remove field reference lookup support None of the lookup functions anyone ever used supported field references, so don't pretend we do in the API. Signed-off-by: Daniel Stone <daniel@fooishbar.org> | ||
| 590df28c | 2012-02-20 16:35:39 | Move groupNames mask definition to its user groupNames was declared in compat.c as a global to anything which included compat.h (for which groupNames was its sole reason to exist), but only ever used in indicators.c. Which is kind of fortunate, given that e314931e removed identical definitions of groupNames (as integers, not masks) from both action.c and symbols.c. Signed-off-by: Daniel Stone <daniel@fooishbar.org> | ||
| 91b89852 | 2012-02-20 16:24:02 | Turn ExprResolveInteger into a simple wrapper Move the bulk of ExprResolveInteger into an internal function called ExprResolveIntegerLookup, and introduce ExprResolveInteger as a simple wrapper which doesn't take priv/lookup arguments. Signed-off-by: Daniel Stone <daniel@fooishbar.org> | ||
| d32822e6 | 2012-02-20 16:04:37 | Open-code a radio group SimpleLookup Because, joke's on you, it wasn't actually looking up radio groups. Just checking to see if it was a string that was "none", or an integer. Lord give me strength. Signed-off-by: Daniel Stone <daniel@fooishbar.org> | ||
| e314931e | 2012-02-20 15:47:57 | Add ExprResolveGroup helper Just a dumb wrapper around ExprResolveInteger. Signed-off-by: Daniel Stone <daniel@fooishbar.org> | ||
| 8b47dbbf | 2012-02-20 15:47:38 | Add ExprResolveButton helper Just a dumb wrapper around ExprResolveInteger. Signed-off-by: Daniel Stone <daniel@fooishbar.org> | ||
| 3431a089 | 2012-02-20 15:37:53 | Introduce ExprResolveLevel helper Which returns an integer representing the level number represented by the given expression. Signed-off-by: Daniel Stone <daniel@fooishbar.org> | ||
| 193e9b39 | 2012-02-20 15:33:40 | Introduce ExprResolveRadioGroup helper Just a tiny special-cased version of ExprResolveInteger. Signed-off-by: Daniel Stone <daniel@fooishbar.org> | ||
| 26285a7b | 2012-02-20 14:15:08 | Remove priv arguments from ExprResolveString They've never been used. Signed-off-by: Daniel Stone <daniel@fooishbar.org> | ||
| b7b49eb0 | 2012-02-20 14:10:41 | Remove priv arguments from ExprResolveKeySym They've never been used by its one caller. Signed-off-by: Daniel Stone <daniel@fooishbar.org> | ||
| 70033b13 | 2012-02-20 14:08:55 | Remove priv arguments from ExprResolveKeyName They've never been used. Signed-off-by: Daniel Stone <daniel@fooishbar.org> | ||
| 482d4faa | 2012-02-20 13:44:27 | Remove priv arguments from ExprResolveBoolean They've never been used. Signed-off-by: Daniel Stone <daniel@fooishbar.org> | ||
| 94041575 | 2012-02-20 13:40:34 | Remove priv arguments from ExprResolveFloat They've never been used. Signed-off-by: Daniel Stone <daniel@fooishbar.org> | ||
| 3151ce36 | 2012-02-20 13:34:36 | Remove priv arguments from ExprResolveModMask What with them now being unused and all. Signed-off-by: Daniel Stone <daniel@fooishbar.org> | ||
| 67605d2c | 2012-02-20 13:32:09 | Introduce ExprResolveVModMask Which is just a slightly more typesafe wrapper around the chained ExprResolveModMask everyone was using earlier. Signed-off-by: Daniel Stone <daniel@fooishbar.org> | ||
| fbb82199 | 2012-02-16 11:18:49 | Respect explicit minimum/maximum keycodes Make sure we carry over an explicit minimum/maximum keycode setting, rather than just using the computed minimum/maximum; this got broken while changing the keycode range to be unsigned. Signed-off-by: Daniel Stone <daniel@fooishbar.org> Reported-by: Pekka Paalanen <ppaalanen@gmail.com> | ||
| c45cdb0c | 2012-02-16 00:22:11 | Still more memory leak fixes Signed-off-by: Daniel Stone <daniel@fooishbar.org> | ||
| 83f18b1c | 2012-02-15 19:39:33 | Fix xkbparse.y compilation Thanks to autotools happily building stale generated sources, I hadn't actually ever built my xkbparse.y changes. Fix that so it not only compiles, but works. This seems to parse long keycodes correctly, although I very much would not recommend testing this by declaring 0x1fffffff as your highest keycode. Signed-off-by: Daniel Stone <daniel@fooishbar.org> | ||
| eb8c96cb | 2012-02-15 16:42:45 | Don't leak SymbolsInfo Signed-off-by: Daniel Stone <daniel@fooishbar.org> | ||
| 67c874d7 | 2012-02-15 16:24:07 | Enable stderr debugging by default (If debugFlags is set to non-zero.) Signed-off-by: Daniel Stone <daniel@fooishbar.org> | ||
| 1a6c3807 | 2012-02-15 15:58:14 | vmod: Pass xkb_desc explicitly to vmod functions Some error paths don't set info->xkb correctly, so just do like most utility functions and pass the xkb_desc explicitly. Signed-off-by: Daniel Stone <daniel@fooishbar.org> | ||
| 4e228511 | 2012-02-15 14:34:08 | Introduce xkb_keycode_t for keycodes And use it consistently everywhere, including with a special long-safe internal keycode type, to ease the transition to large keycodes. Signed-off-by: Daniel Stone <daniel@fooishbar.org> | ||
| 8f01b144 | 2012-02-15 12:54:11 | xkbscan: Copy, rather than assign, file name For some reason, lex decided to reduce a strcpy into an assignment, leading to entirely justified valgrind warnings about invalid reads, when scanFile was set to a string which may have only ever lived on the stack of a now-exited function. Make it a strdup() instead. Signed-off-by: Daniel Stone <daniel@fooishbar.org> | ||
| ead9d0cb | 2012-02-15 11:49:10 | Move include path from X11/extensions/ to xkbcommon/ Signed-off-by: Daniel Stone <daniel@fooishbar.org> | ||
| 615291f1 | 2012-01-05 14:20:35 | xkbcomp: Silence warning of return of uninitialised value Some routes through HandleGeometryVar do not set a return value. Set a default value for the return variable to avoid returning an uninitialised value. | ||
| c19661b9 | 2011-12-16 12:52:00 | Add xkbc_free_keymap helper Which just calls XkbcFreeKeyboard with the only arguments you'd ever pass it. Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com> Signed-off-by: Daniel Stone <daniel@fooishbar.org> | ||
| 99e29de2 | 2011-10-27 14:30:21 | xkbcomp: Copy the string into the buffer rather than updating pointer Avoids assigning the global pointer to a value that may only have a stack lifetime: Fixes valgrind warnings such as: ==24795== Invalid read of size 1 ==24795== at 0x4A06E9A: strcpy (mc_replace_strmem.c:311) ==24795== by 0x4E54D68: ProcessIncludeFile (misc.c:73) ==24795== by 0x4E59726: HandleIncludeSymbols.constprop.3 (symbols.c:829) ==24795== by 0x4E59D8E: HandleSymbolsFile (symbols.c:1673) ==24795== by 0x4E5A068: CompileSymbols (symbols.c:2211) ==24795== by 0x4E51A61: CompileKeymap (keymap.c:155) ==24795== by 0x4E5B410: xkb_compile_keymap_from_components (xkbcomp.c:236) ==24795== by 0x4E5B587: xkb_compile_keymap_from_rules (xkbcomp.c:161) ==24795== by 0x405ED2: display_create (window.c:2007) ==24795== by 0x403732: main (desktop-shell.c:320) ==24795== Address 0x7fefff0a0 is just below the stack ptr. To suppress, use: --workaround-gcc296-bugs=yes ==24795== ==24795== Source and destination overlap in strcpy(0x7fefff430, 0x7fefff430) ==24795== at 0x4A06F3D: strcpy (mc_replace_strmem.c:311) ==24795== by 0x4E54D68: ProcessIncludeFile (misc.c:73) ==24795== by 0x4E59726: HandleIncludeSymbols.constprop.3 (symbols.c:829) ==24795== by 0x4E59D8E: HandleSymbolsFile (symbols.c:1673) ==24795== by 0x4E5A068: CompileSymbols (symbols.c:2211) ==24795== by 0x4E51A61: CompileKeymap (keymap.c:155) ==24795== by 0x4E5B410: xkb_compile_keymap_from_components (xkbcomp.c:236) ==24795== by 0x4E5B587: xkb_compile_keymap_from_rules (xkbcomp.c:161) ==24795== by 0x405ED2: display_create (window.c:2007) ==24795== by 0x403732: main (desktop-shell.c:320) | ||
| f91afe4f | 2011-06-03 17:19:09 | Add prototype for CheckDefaultMap(). Those warnings disappear accordingly: | CC parseutils.lo | parseutils.c:742: warning: no previous prototype for ‘CheckDefaultMap’ | CC xkbscan.lo | xkbscan.l: In function ‘XKBParseString’: | xkbscan.l:220: warning: implicit declaration of function ‘CheckDefaultMap’ | xkbscan.l:220: warning: nested extern declaration of ‘CheckDefaultMap’ Reviewed-by: Dirk Wallenstein <halsmit@t-online.de> Signed-off-by: Cyril Brulebois <kibi@debian.org> | ||
| 621c2a7a | 2011-01-29 14:24:46 | Get rid of unneeded <X11/Xlib.h> include. There's no need for this xlib include: | YACC xkbparse.c | CC xkbparse.lo | xkbparse.y:98:22: error: X11/Xlib.h: No such file or directory Signed-off-by: Cyril Brulebois <kibi@debian.org> Signed-off-by: Kristian Høgsberg <krh@bitplanet.net> | ||
| a63e82be | 2010-12-17 21:14:54 | Rename XkbcInternAtom() to xkb_intern_atom() and export Signed-off-by: Kristian Høgsberg <krh@bitplanet.net> | ||
| f5076604 | 2010-12-07 11:09:13 | config: let Automake handle Lex and Yacc dist and cleaning BUILT_SOURCES and MAINTAINERCLEAN are not needed for lex and yacc Note that xkbscan was missing on those lines. Automake generates all the rules to handle building, distribution and cleaning. Acked-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Kristian Høgsberg <krh@bitplanet.net> Signed-off-by: Gaetan Nadon <memsize@videotron.ca> | ||
| 63e2719a | 2010-12-07 10:33:23 | config: replace deprecated INCLUDES with AM_CPPFLAGS Fixes automake warning. Acked-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Kristian Høgsberg <krh@bitplanet.net> Signed-off-by: Gaetan Nadon <memsize@videotron.ca> |