Ran Benita [Fri, 18 May 2012 16:37:01 +0000 (19:37 +0300)]
rules: remove unused struct describe_vars
It's not actually used for anything.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 18 May 2012 15:38:06 +0000 (18:38 +0300)]
rules: reformat AddRule and AddGroup
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 18 May 2012 15:34:47 +0000 (18:34 +0300)]
rules: reformat GetComponents
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 18 May 2012 15:25:59 +0000 (18:25 +0300)]
rules: reformat SubstituteVars
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 18 May 2012 09:02:29 +0000 (12:02 +0300)]
rules: reformat CheckApplyRules and ApplyPartialMatches
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 18 May 2012 07:43:24 +0000 (10:43 +0300)]
rules: reformat CheckGroup and CheckApplyRule
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 18 May 2012 08:01:20 +0000 (11:01 +0300)]
rules: rewrite MatchOneOf
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 18 May 2012 07:33:38 +0000 (10:33 +0300)]
rules: reformat ApplyRule
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Thu, 17 May 2012 23:53:29 +0000 (02:53 +0300)]
rules: reformat MakeMultiDefs
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Thu, 17 May 2012 23:20:14 +0000 (02:20 +0300)]
rules: use asprintf instead of _Concat function
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Thu, 17 May 2012 13:15:46 +0000 (16:15 +0300)]
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 [Thu, 17 May 2012 11:18:31 +0000 (14:18 +0300)]
rules: reformat SetUpRemap and struct remap_spec
Rename to more descriptive names and reformat.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Thu, 17 May 2012 10:55:38 +0000 (13:55 +0300)]
rules: rewrite get_index to use sscanf
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Wed, 16 May 2012 07:09:03 +0000 (10:09 +0300)]
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 [Wed, 16 May 2012 06:49:32 +0000 (09:49 +0300)]
rules: reformat input line handling
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Wed, 16 May 2012 06:39:01 +0000 (09:39 +0300)]
rules: don't use custom logging functions
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sun, 13 May 2012 06:49:08 +0000 (09:49 +0300)]
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 [Fri, 11 May 2012 07:04:26 +0000 (10:04 +0300)]
rules: remove unused struct fields and use size_t
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 18 May 2012 15:09:50 +0000 (18:09 +0300)]
Don't run the benchmark by default
For people running 'make check' on every compilation, this can be
a nuisance.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sun, 13 May 2012 07:14:10 +0000 (10:14 +0300)]
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 [Sun, 13 May 2012 20:31:59 +0000 (23:31 +0300)]
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 [Sun, 13 May 2012 14:21:02 +0000 (17:21 +0300)]
Remove FileHandler callback argument
It's unneeded; the same function is always passed.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sun, 13 May 2012 14:23:28 +0000 (17:23 +0300)]
Remove unused allowNone from KeyInfo
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sun, 13 May 2012 20:13:10 +0000 (23:13 +0300)]
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 [Sun, 13 May 2012 15:45:43 +0000 (18:45 +0300)]
Various static analyzer fixes
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sun, 13 May 2012 07:38:51 +0000 (10:38 +0300)]
Fix a memleak
Introduced in
38cb639082ec4b31725d4ce4e35af63938691631.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Wed, 9 May 2012 22:02:29 +0000 (01:02 +0300)]
Fix configure check for xkbparse.c instead of parser.c
This obscure test is easy to miss.
Signed-off-by: Ran Benita <ran234@gmail.com>
Pekka Paalanen [Tue, 15 May 2012 12:23:42 +0000 (15:23 +0300)]
Add xkbcommon-uninstalled.pc
Pekka Paalanen [Tue, 15 May 2012 12:23:41 +0000 (15:23 +0300)]
Use eaccess() only if available
Fixes build on Android.
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
Pekka Paalanen [Tue, 15 May 2012 12:23:40 +0000 (15:23 +0300)]
Fix out-of-tree build for config.h
config.h appreas in the build dir, not src dir.
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
Daniel Stone [Thu, 17 May 2012 23:56:36 +0000 (00:56 +0100)]
Add benchmarking test to rulescomp
Apparently it only takes us 8ms to build keymaps. Nice!
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Kristian Høgsberg [Fri, 11 May 2012 15:14:27 +0000 (16:14 +0100)]
Use $(AM_V_GEN) to prettyfi makekeys step
Daniel Stone [Fri, 11 May 2012 14:03:43 +0000 (15:03 +0100)]
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 [Fri, 11 May 2012 13:28:54 +0000 (14:28 +0100)]
Add xkbcommon-keysyms.h to Makefile.am
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone [Wed, 9 May 2012 19:52:33 +0000 (20:52 +0100)]
Document that xkb_state_get_map doesn't take a ref
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone [Wed, 9 May 2012 19:51:37 +0000 (20:51 +0100)]
Change xkb_key_get_syms to just return a bare int
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone [Wed, 9 May 2012 19:49:04 +0000 (20:49 +0100)]
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 [Wed, 9 May 2012 19:20:12 +0000 (20:20 +0100)]
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 [Wed, 9 May 2012 19:18:30 +0000 (20:18 +0100)]
Add common LED names to xkbcommon-names.h
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone [Wed, 9 May 2012 19:17:13 +0000 (20:17 +0100)]
Include xkbcommon-names.h from xkbcommon.h
So clients only have one file to include.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone [Wed, 9 May 2012 19:12:18 +0000 (20:12 +0100)]
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 [Wed, 9 May 2012 19:12:12 +0000 (20:12 +0100)]
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 [Wed, 9 May 2012 13:05:00 +0000 (09:05 -0400)]
Use our own keysyms
Kristian Høgsberg [Wed, 9 May 2012 12:33:04 +0000 (08:33 -0400)]
Add XKB version of X11 keysyms
With this we're now completely standalone.
add vendor keysyms
Ran Benita [Wed, 9 May 2012 14:54:37 +0000 (17:54 +0300)]
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 [Wed, 9 May 2012 12:03:11 +0000 (15:03 +0300)]
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 [Wed, 9 May 2012 11:02:26 +0000 (14:02 +0300)]
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 [Wed, 9 May 2012 10:50:05 +0000 (13:50 +0300)]
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 [Wed, 9 May 2012 09:01:03 +0000 (12:01 +0300)]
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 [Wed, 9 May 2012 08:47:20 +0000 (11:47 +0300)]
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 [Wed, 9 May 2012 08:29:04 +0000 (11:29 +0300)]
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 [Wed, 9 May 2012 08:12:30 +0000 (11:12 +0300)]
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>
Pekka Paalanen [Tue, 8 May 2012 08:46:58 +0000 (11:46 +0300)]
makekeys: fix cross-compilation
makekeys must be built with the build-native compiler, not with $(CC)
which is the cross-compiler. The only sane way to achieve this seems to
be to use a separate Makefile.am for it.
This patch fixes the problem apparently caused by:
commit
b5efe41f190cbb76eb1ca8ddf0c96990ddb83704
Author: Ran Benita <ran234@gmail.com>
Date: Sat Mar 24 04:48:31 2012 +0200
Make build non-recursive
There is no such thing as makekeys_makekeys_CC in automake.
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
Daniel Stone [Wed, 9 May 2012 14:23:44 +0000 (15:23 +0100)]
Make build directory includes more explicit
We depend on parser.h which is generated by flex during the build, so
use an explicit $(top_builddir) rather than a relative path.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone [Wed, 9 May 2012 14:15:30 +0000 (15:15 +0100)]
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 [Wed, 9 May 2012 12:22:34 +0000 (13:22 +0100)]
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 [Wed, 9 May 2012 00:06:10 +0000 (01:06 +0100)]
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 [Tue, 8 May 2012 16:59:35 +0000 (17:59 +0100)]
Add pre-defined names database
xkbcommon-names.h right now just contains a set of hardcoded modifier
strings that are most commonly used for the usual modifiers. Provide
definitions of these so people don't have to worry about typoing a
string or mixing up Mod1 and Mod4.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone [Tue, 8 May 2012 16:52:45 +0000 (17:52 +0100)]
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 [Tue, 8 May 2012 16:51:16 +0000 (17:51 +0100)]
Add flags to context creation
None defined as yet, but why not.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone [Tue, 8 May 2012 16:48:29 +0000 (17:48 +0100)]
Add flags to keymap compilation entrypoints
No use as yet, but might as well ...
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone [Tue, 8 May 2012 16:47:54 +0000 (17:47 +0100)]
Reintroduce $(builddir)/src/xkbcomp include
This is required for parser.h, which is autogenerated and thus only in
the build directory.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Ran Benita [Tue, 8 May 2012 11:52:23 +0000 (14:52 +0300)]
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 [Tue, 8 May 2012 10:57:07 +0000 (13:57 +0300)]
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 [Mon, 7 May 2012 22:08:07 +0000 (01:08 +0300)]
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 [Mon, 7 May 2012 11:44:30 +0000 (14:44 +0300)]
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>
Ran Benita [Mon, 7 May 2012 11:08:34 +0000 (14:08 +0300)]
Remove left over filecomp.sh file
Should have removed it in a previous commit.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Mon, 7 May 2012 11:23:08 +0000 (14:23 +0300)]
Update .gitignore for automake 1.12
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Mon, 7 May 2012 12:07:41 +0000 (15:07 +0300)]
Uncomment sections of test/rulescomp.c
Fixes an 'unused' warning. There seems to be nothing wrong with these
sections though, all the tests pass.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Mon, 7 May 2012 11:54:12 +0000 (14:54 +0300)]
Revert "Unconstify xkb_rules_names"
This reverts commit
d007cd0a1f3f4b9c927175771ff79aae6fe4ab8b.
This is in fact more restrictive, because it breaks the (common) case
where the strings are const themselved, e.g. "evdev", "us", etc. As is
you must either duplicate the strings or suppress the warnings.
If the user needs to retain the non-const strings, he should instead
just keep them in some other struct and use xkb_rules_names just as
a temporary parameter for xkb_map_new_from_names. Mildly annoying but
acceptable.
Daniel Stone [Mon, 7 May 2012 16:30:47 +0000 (17:30 +0100)]
Use AC_ARG_VAR for X11 header and XKB paths
And don't call pkg-config unless we need to.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone [Mon, 7 May 2012 13:23:46 +0000 (14:23 +0100)]
Rename YYLTYPE to struct YYLTYPE
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Ran Benita [Tue, 10 Apr 2012 23:02:45 +0000 (02:02 +0300)]
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 [Tue, 10 Apr 2012 23:28:57 +0000 (02:28 +0300)]
Remove unused stuff from xkbrules.h
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Tue, 10 Apr 2012 20:08:49 +0000 (23:08 +0300)]
Remove unused stuff from XKBcommonint.h
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Tue, 10 Apr 2012 22:55:50 +0000 (01:55 +0300)]
Remove unused 'which' and 'merge' arguments
Signed-off-by: Ran Benita <ran234@gmail.com>
[daniels: Updated for xkb_desc -> xkb_keymap changes.]
Ran Benita [Wed, 11 Apr 2012 16:58:03 +0000 (19:58 +0300)]
Remove unused 'compiled' field in XkbFile
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Wed, 11 Apr 2012 11:13:24 +0000 (14:13 +0300)]
Remove unused debugging function
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Tue, 10 Apr 2012 23:10:35 +0000 (02:10 +0300)]
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 [Tue, 10 Apr 2012 19:04:05 +0000 (22:04 +0300)]
Use LT_INIT instead of deprecated AC_PROG_LIBTOOL
And add some warnings to the autoreconf step, for the developers to
see.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 6 Apr 2012 00:38:55 +0000 (03:38 +0300)]
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 [Thu, 5 Apr 2012 08:24:39 +0000 (11:24 +0300)]
Fix formatting in xkbcomp headers
Signed-off-by: Ran Benita <ran234@gmail.com>
[daniels: Fixed for xkb_desc -> xkb_keymap change.]
Daniel Stone [Thu, 26 Apr 2012 14:02:49 +0000 (16:02 +0200)]
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 [Thu, 26 Apr 2012 11:49:00 +0000 (13:49 +0200)]
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 [Fri, 30 Mar 2012 23:44:39 +0000 (02:44 +0300)]
Overhaul test suite
Rewrite all of the current tests in the following ways:
- Instead of the current mix of C and shell, just use single-process
pure C file per test. All of the .sh files are removed, but everything
that was tested is ported.
- Instead of handling the test logs ourselves, use Automake's
"parallel-test" mechanism. This will create a single log file for each
test with it's stdout+stderr, and a top level "test-suite.log" file
for all the failed tests.
- The "parallel-tests" directive also makes the test run in parallel,
so "make check" runs faster.
- Also use the "color-tests" directive to have the "make check" output
colorized. Who doesn't like to see PASS in green?
- All of the test data files are moved into the test/data subdirectory.
That way we can just put the directory in EXTRA_DIST and forget about
it.
- The test/Makefile.am file is consolidated into the main Makefile.am,
for a completely non-recursive build.
Right now the tests are completely independent and just use simple
assert()'s. More sophistication can be added as needed.
It should also be noted that it's still possible to use shell, python,
etc. if a test wants more flexibility than C can provide, just do as
before.
Signed-off-by: Ran Benita <ran234@gmail.com>
[daniels: Updated for xkb_keymap changes.]
Ran Benita [Fri, 6 Apr 2012 01:33:43 +0000 (04:33 +0300)]
Reformat actionHandler dispatch table
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sat, 7 Apr 2012 23:08:37 +0000 (02:08 +0300)]
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 [Fri, 6 Apr 2012 00:12:50 +0000 (03:12 +0300)]
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 [Thu, 5 Apr 2012 07:52:47 +0000 (10:52 +0300)]
Remove xproto and kbproto from pkg-config file
These are no longer needed for using the library, only building it. Most
users would still want xproto though, for the keysym definitions.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Thu, 5 Apr 2012 07:47:43 +0000 (10:47 +0300)]
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 [Sun, 8 Apr 2012 12:40:12 +0000 (15:40 +0300)]
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 [Thu, 5 Apr 2012 07:13:24 +0000 (10:13 +0300)]
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 [Fri, 6 Apr 2012 02:09:17 +0000 (05:09 +0300)]
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 [Fri, 30 Mar 2012 22:18:55 +0000 (01:18 +0300)]
Constify a global table and function arguments
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 6 Apr 2012 02:02:35 +0000 (05:02 +0300)]
Remove unused struct definition
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 6 Apr 2012 01:20:35 +0000 (04:20 +0300)]
Replace remaining use of Atom instead of xkb_atom_t
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sun, 8 Apr 2012 17:58:39 +0000 (20:58 +0300)]
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 [Sun, 8 Apr 2012 15:46:58 +0000 (18:46 +0300)]
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 [Sun, 8 Apr 2012 12:38:04 +0000 (15:38 +0300)]
Set xorg-macros CFLAGS correctly
A previous commit messed up all warning flags. Oops.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sun, 8 Apr 2012 12:37:36 +0000 (15:37 +0300)]
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.]