src


Log

Author Commit Date CI Message
Daniel Stone 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>
Daniel Stone 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>
Ran Benita 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>
Ran Benita 89c5e886 2012-05-22T15:45:42 keycodes: use darray in KeyNamesInfo Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita 07c88b55 2012-05-22T15:20:47 symbols: use darray for xkb_sym_map Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita dcdbd149 2012-05-22T12:24:54 parser: use darray for keysym list Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita c65a3596 2012-05-22T10:59:46 keytypes: use darray for xkb_kt_map_entry's Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita 374b0c98 2012-05-22T08:39:09 alloc: use darray in xkb_key_names Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita 4daa34b5 2012-05-22T14:18:48 keytypes: use darray for level names Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita ee990d53 2012-05-22T14:00:16 symbols: use darray for KeyInfo Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita 28bbb7dc 2012-05-21T23:47:44 rules: use darray for rules and groups Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita c815ff96 2012-05-21T23:33:56 Import darray.h for common dynamic array code Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita cb047bb0 2012-05-22T12:32:06 Constify a static variable Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita c2ac3a2b 2012-05-22T08:07:52 keytypes: use darray for key types in the client map Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita 56150416 2012-05-22T00:52:28 compat: use darray for sym_interprets Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita d0288bb2 2012-05-22T00:37:53 context: use darray for include paths Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita ef51b572 2012-05-22T00:26:58 atom: use darray for the node_table Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita 0c271e09 2012-05-22T00:14:34 rules: use darray for input line Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita 9e72a6a7 2012-05-22T08:04:59 Fix incorrect indexing while freeing Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita 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>
Ran Benita 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>
Ran Benita 3d28b6d1 2012-05-19T00:53:57 rules: reformat components_from_rules Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita 7895eeb8 2012-05-18T19:39:25 rules: reformat LoadRules and XkbRF_Free Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita 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>
Ran Benita 56b125fc 2012-05-18T18:38:06 rules: reformat AddRule and AddGroup Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita f790257f 2012-05-18T18:34:47 rules: reformat GetComponents Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita c02c9ab2 2012-05-18T10:33:38 rules: reformat ApplyRule Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita 06205717 2012-05-18T02:53:29 rules: reformat MakeMultiDefs Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita f7de6286 2012-05-18T02:20:14 rules: use asprintf instead of _Concat function Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita 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>
Ran Benita 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>
Ran Benita b8ae68c2 2012-05-17T13:55:38 rules: rewrite get_index to use sscanf Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita 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>
Ran Benita 478a6a31 2012-05-16T09:49:32 rules: reformat input line handling Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita 72d1f2ed 2012-05-16T09:39:01 rules: don't use custom logging functions Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita 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>
Ran Benita 0c25ebf3 2012-05-11T10:04:26 rules: remove unused struct fields and use size_t Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita 52939d4b 2012-05-18T18:25:59 rules: reformat SubstituteVars Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita a9477b57 2012-05-18T12:02:29 rules: reformat CheckApplyRules and ApplyPartialMatches Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita a47dd252 2012-05-18T10:43:24 rules: reformat CheckGroup and CheckApplyRule Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita 18d331b8 2012-05-18T11:01:20 rules: rewrite MatchOneOf Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita 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>
Ran Benita 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>
Ran Benita 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>
Ran Benita e82bb5c0 2012-05-13T17:23:28 Remove unused allowNone from KeyInfo Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita 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>
Ran Benita 75ff2cef 2012-05-13T18:45:43 Various static analyzer fixes Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita b571b834 2012-05-13T10:38:51 Fix a memleak Introduced in 38cb639082ec4b31725d4ce4e35af63938691631. Signed-off-by: Ran Benita <ran234@gmail.com>
Pekka Paalanen 8bdef139 2012-05-15T15:23:41 Use eaccess() only if available Fixes build on Android. Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
Daniel Stone 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>
Daniel Stone 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>
Daniel Stone 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>
Daniel Stone 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>
Daniel Stone 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>
Daniel Stone 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>
Kristian Høgsberg ace1e5df 2012-05-09T09:05:00 Use our own keysyms
Ran Benita 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>
Ran Benita 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.]
Ran Benita 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.]
Ran Benita cdd2906d 2012-05-09T13: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.]
Ran Benita 8d680e80 2012-05-09T12: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.]
Ran Benita c117318f 2012-05-09T11: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'.]
Ran Benita 4aef083e 2012-05-09T11: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>
Ran Benita 64aa5c95 2012-05-09T11: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>
Daniel Stone 38cb6390 2012-05-09T15: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>
Daniel Stone e1af48bc 2012-05-09T13: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>
Daniel Stone 124e62e4 2012-05-09T01:06:10 Add multiple modifier state matching API Two new calls allow users to test the exact modifier state, including verifying that no other modifiers but the ones you wanted are down. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone 2a0f1780 2012-05-08T17:52:45 Add context flag to inhibit default include paths Which will make the context start with no include paths at all. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone c3584280 2012-05-08T17:51:16 Add flags to context creation None defined as yet, but why not. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone b537b552 2012-05-08T17:48:29 Add flags to keymap compilation entrypoints No use as yet, but might as well ... Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Ran Benita b610b2b9 2012-05-08T14: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>
Ran Benita 33273304 2012-05-08T13: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>
Ran Benita dccdf32c 2012-05-08T01: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>
Ran Benita 5eb0a70e 2012-05-07T14:44:30 Don't use typeof clang complains with the xorg-macros warning flags: src/context.c:58:36: error: extension used [-Werror,-pedantic,-Wlanguage-extension-token] typeof(new_paths)); This was not entirely correct, too. So bring back the casts to the results of the allocation macros; might as well make them a bit more type safe. Signed-off-by: Ran Benita <ran234@gmail.com>
Daniel Stone 70dfe166 2012-05-07T14:23:46 Rename YYLTYPE to struct YYLTYPE Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Ran Benita 409ec8a1 2012-04-11T02:02:45 Merge src/alloc.c and src/malloc.c The two files do exactly the same sort of things, without any discernible reason for splitting them. Signed-off-by: Ran Benita <ran234@gmail.com> [daniels: Updated for xkb_desc -> xkb_keymap changes.]
Ran Benita aff531fb 2012-04-11T02:28:57 Remove unused stuff from xkbrules.h Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita 62a75dc1 2012-04-10T23:08:49 Remove unused stuff from XKBcommonint.h Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita 12b3495d 2012-04-11T01:55:50 Remove unused 'which' and 'merge' arguments Signed-off-by: Ran Benita <ran234@gmail.com> [daniels: Updated for xkb_desc -> xkb_keymap changes.]
Ran Benita 793908a0 2012-04-11T19:58:03 Remove unused 'compiled' field in XkbFile Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita 5fb494ec 2012-04-11T14:13:24 Remove unused debugging function Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita afa34f3d 2012-04-11T02:10:35 Remove unused function XkbcNameMatchesPattern Because the function is recursive, the compiler didn't say anything, eh. Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita a641a185 2012-04-06T03: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.]
Ran Benita a39ed85f 2012-04-05T11:24:39 Fix formatting in xkbcomp headers Signed-off-by: Ran Benita <ran234@gmail.com> [daniels: Fixed for xkb_desc -> xkb_keymap change.]
Daniel Stone 1f81c0e1 2012-04-26T16: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>
Alan Coopersmith a1c08536 2012-04-26T13:49:00 Include strings.h in XKBcommonint.h for strcasecmp etc POSIX specifies that these functions require <strings.h>, but we were only including <string.h>. It did work, but still. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Ran Benita b1e49ff9 2012-04-06T04:33:43 Reformat actionHandler dispatch table Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita 1b9635df 2012-04-08T02:08:37 Add xkb_state_get_map() This is very useful because it avoids redundent pointers in structs and/or parameter passing in the application. Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita 8fbd44fd 2012-04-06T03:12:50 Implicitly include config.h in all files The definitions in config.h should be available in all files an implementation detail; it can be included through the build system instead of having each file pull it every time. This is especially helpful with AC_USE_SYSTEM_EXTENSIONS, as _GNU_SOURCE and friends can have an effect by merely being defined, which can lead to some confusion if its effective for only half the files. And we don't really support a build _without_ config.h; so, one less thing to worry about. Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita 18e6a6a4 2012-04-05T10: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.]
Ran Benita 073a2107 2012-04-08T15: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>
Ran Benita 467d7bb6 2012-04-05T10: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.]
Ran Benita b08629f9 2012-04-06T05: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>
Ran Benita 913e0740 2012-03-31T01:18:55 Constify a global table and function arguments Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita d116aaef 2012-04-06T05:02:35 Remove unused struct definition Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita 28011e71 2012-04-06T04:20:35 Replace remaining use of Atom instead of xkb_atom_t Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita e9537d50 2012-04-08T20: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>
Ran Benita 8feba630 2012-04-08T18: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>
Ran Benita 2590b5a1 2012-04-08T15: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.]
Daniel Stone 632d9f03 2012-04-03T14: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>