|
62a75dc1
|
2012-04-10T23:08:49
|
|
Remove unused stuff from XKBcommonint.h
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
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.]
|
|
|
793908a0
|
2012-04-11T19:58:03
|
|
Remove unused 'compiled' field in XkbFile
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
5fb494ec
|
2012-04-11T14:13:24
|
|
Remove unused debugging function
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
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>
|
|
|
522be162
|
2012-04-10T22:04:05
|
|
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>
|
|
|
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.]
|
|
|
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.]
|
|
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>
|
|
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>
|
|
|
4b49e0a1
|
2012-03-31T02:44:39
|
|
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.]
|
|
|
b1e49ff9
|
2012-04-06T04:33:43
|
|
Reformat actionHandler dispatch table
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
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>
|
|
|
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>
|
|
|
5df53e49
|
2012-04-05T10:52:47
|
|
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>
|
|
|
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.]
|
|
|
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>
|
|
|
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.]
|
|
|
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>
|
|
|
913e0740
|
2012-03-31T01:18:55
|
|
Constify a global table and function arguments
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
d116aaef
|
2012-04-06T05:02:35
|
|
Remove unused struct definition
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
28011e71
|
2012-04-06T04:20:35
|
|
Replace remaining use of Atom instead of xkb_atom_t
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
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>
|
|
|
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>
|
|
|
518debb3
|
2012-04-08T15:38:04
|
|
Set xorg-macros CFLAGS correctly
A previous commit messed up all warning flags. Oops.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
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.]
|
|
|
d007cd0a
|
2012-04-03T17:08:57
|
|
Unconstify xkb_rules_names
Since we never return an xkb_rules_names and it's all user-provided
strings, seems a bit harsh to have it const.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
ef88c7ef
|
2012-04-03T15: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>
|
|
|
bc872252
|
2012-04-03T14:29:57
|
|
Use xorg CFLAGS and fix AC_USE_SYSTEM_EXTENSIONS
autotools was warning that AC_USE_SYSTEM_EXTENSIONS was being called too
late, so move it earlier. Also shove BASE_CFLAGS into CFLAGS so we get
all the added warning flags from xorg.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
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>
|
|
|
495d87b0
|
2012-04-03T13:57:44
|
|
Don't parse nonsense Unicode/hex keycodes
If a keysym was specified as "U1039andsomeextrastuffontheend", return
NoSymbol rather than 0x10001039; similarly, return NoSymbol for
"0xdeadbeefhitherehowsyourdaybeen" rather than 0xdeadbeef.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
151fb4fc
|
2012-04-03T13:47:08
|
|
Remove unused device_spec
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
f249919e
|
2012-04-03T13: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.]
|
|
|
0002b852
|
2012-04-03T13:01:10
|
|
Add cscope output to .gitignore
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
69111405
|
2012-04-03T12:48:05
|
|
Properly document xkb_key_get_syms
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
aeaa623d
|
2012-03-31T01:18:55
|
|
Constify a global table
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
c83043b3
|
2012-03-31T01: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>
|
|
|
3c949379
|
2012-03-31T00:02:12
|
|
Fix bugs to allow multiple keymaps in one process
These were several initializations that were forgotten in the previous
memory leak fixes.
Now several xkb_desc's can coexist (relatively) peacefully.
Signed-off-by: Ran Benita <ran234@gmail.com>
[daniels: Only the atom.c is relevant with the new context API.]
|
|
|
ffb610c9
|
2012-03-31T02:26:24
|
|
Remove useless check from xkb_intern_atom
The "makeit" variable is always true. Remove it and de-indent.
(Also change the type of the "len" variable to size_t to avoid some
useless casting).
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
7a7ec9b1
|
2012-03-31T02: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.]
|
|
|
5c5f7fcb
|
2012-04-01T16:48:34
|
|
makekeys: use correct format strings
The new glibc (2.15) appear to cause trouble, particularly the sscanf
call, where makekeys will output empty hash tables. Using the appropriate
macros from inttypes.h makes it work again.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
84ec6b61
|
2012-04-01T16: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>
|
|
|
9813778e
|
2012-04-01T16:57:31
|
|
makekeys: free strings before exiting
Just to make valgrind happy.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
8f2c9597
|
2012-04-01T17:56:17
|
|
Use straight strtok_r instead of wrapper
strtok_r is POSIX-2001 and should be fine.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
fb606b06
|
2012-04-01T17: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-29T17: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>
|
|
|
9b14e0c3
|
2012-03-29T17:38:44
|
|
Tests: Release context on failure to build keymap
No practical effect since they exit(1) regardless, but it keeps valgrind
happy.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
93ce9c7d
|
2012-03-29T16: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-29T01: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-29T01:49:55
|
|
Don't leak strings in merge declarations
Introduced by the reentrant scanner commit.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
aa9f2bf9
|
2012-03-29T01:41:40
|
|
Don't leak include_paths in context
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
6628cf0b
|
2012-03-28T19:50:45
|
|
Remove unused rtrnValue declaration
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
bb6ca768
|
2012-03-27T22: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-27T17: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>
|
|
|
3e9dd751
|
2012-03-27T16:59:01
|
|
Add new context API
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
f0cb4ee2
|
2012-03-27T16:15:06
|
|
Update xkb_filter_group_lock_func for xkb_key_direction
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
21f1bff4
|
2012-03-27T15:51:28
|
|
Fix distcheck with non-recursive Makefiles
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
bc8bbf50
|
2012-03-27T15:50:59
|
|
Fix build for X11 modifier masks
Exposed by include path changes, oops.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
3fa7fdd0
|
2012-03-23T17:50:37
|
|
Handle group lock actions
The spec is simple here, as this action has no effect on key releases.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
b5efe41f
|
2012-03-24T04: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-24T13: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-24T12: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-24T02: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-24T00: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-24T00: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-24T00: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-23T23: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>
|
|
|
861b0c79
|
2012-03-23T23:47:26
|
|
Rewrite recalloc to the correct type
The recalloc function should be expressed in terms of bytes to match its
name. However uTypedRecalloc retains its type so nothing is changed.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
0480f427
|
2012-03-23T23: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]
|
|
|
2ac8610f
|
2012-03-27T14:06:56
|
|
Remove fallback strcasecmp/strncasecmp
Sorry if your libc doesn't have this, but it's not my problem.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reported-by: Ran Benita <ran234@gmail.com>
|
|
|
55b76a63
|
2012-03-27T14:05:14
|
|
Add include/ to makekeys include path
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
d22b8dbb
|
2012-03-23T22: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-23T23:39:12
|
|
Fix a scanf type mismatch
"%o" takes an unsigned int.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
f52671a4
|
2012-03-24T12:31:55
|
|
Remove a few remaining uses of the KeySym type
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
8b3e2b9b
|
2012-03-24T04:57:40
|
|
Add xkb test file to EXTRA_DIST
To appease make distcheck.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
1b17708c
|
2012-03-24T02:33:18
|
|
Fix incorrect usage of && instead of &
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
eeb0a214
|
2012-03-23T17:55:08
|
|
Update gitignore for 'state' test
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
6f7478d7
|
2012-03-24T02:56:38
|
|
Fix latin8 upper/lower case check
GCC complained:
misc.c:235:13: warning: logical 'and' of mutually exclusive tests is always false [-Wlogical-op]
misc.c:248:13: warning: logical 'and' of mutually exclusive tests is always false [-Wlogical-op]
Looking at keysymdef.h shows that the check is indeed wrong. This commit
updates the check to match the latin8 section of keysymdef exactly.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
3b22373f
|
2012-03-23T17:48:35
|
|
Properly free xkb_state's
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
d9f934ca
|
2012-03-23T16:52:23
|
|
Mention xkb_state_new can return NULL
in the header comments.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
087327d9
|
2012-03-27T14:41:44
|
|
Move doxygen comment before enum item
Signed-off-by: Guillem Jover <guillem@hadrons.org>
|
|
|
389c2db1
|
2012-03-27T13:44:48
|
|
Remove internal API from xkbcommon.h
And move it to XKBcomminint.h.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
3dcd7ae0
|
2012-03-27T12:20:42
|
|
Remove hardcoded legacy modifier masks
Use the xkb_state_mod_* and xkb_map_mod_* API instead.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
729ac12f
|
2012-03-27T12:19:42
|
|
Remove unused changes structs
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
f89b0a80
|
2012-03-27T12:18:50
|
|
Remove unused members of xkb_state
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
ede84734
|
2012-03-27T12:11:45
|
|
Add enum xkb_key_direction instead of bool
Use XKB_KEY_UP instead of 0 and XKB_KEY_DOWN instead of 1.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reported-by: Ran Benita <ran234@gmail.com>
|
|
|
7f471a70
|
2012-03-27T12:07:57
|
|
Add state serialisation API
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
83b8b4b5
|
2012-03-27T12:07:40
|
|
Cosmetic coding style fixups
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
d039622a
|
2012-03-22T17:39:12
|
|
Rename keymap allocation API
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
3d672fcf
|
2012-03-22T14:32:53
|
|
Add LED state API
And also convert state.c to use the state API for mods and groups,
rather than testing the state members directly.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
b6c79ad0
|
2012-03-22T14: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>
|
|
|
504cc0b8
|
2012-03-22T14:31:33
|
|
Check for invalid indices in mod/group state API
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
cfb07724
|
2012-03-22T14:30:58
|
|
Fix documentation bugs with mod/group state API
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
aaffcef3
|
2012-03-21T16:57:05
|
|
Add a proper README
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
edcaab65
|
2012-03-21T15:25:32
|
|
Round out new state API
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
9468d84a
|
2012-03-21T14:44:16
|
|
Fix (correct, but harmless) const warning
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
ecea0d71
|
2012-03-21T02:20:07
|
|
Add new state API
Add new API to deal with xkb_state objects, including
xkb_state_update_key, which runs the XKB action machinery internally to
calculate what exactly happens to the state when a given key is pressed
or released.
The canonical way to deal with keys is now:
struct xkb_state *state = xkb_state_new(xkb);
xkb_keysym_t *syms;
int num_syms;
xkb_state_update_key(state, key, is_down);
num_syms = xkb_key_get_syms(state, key, &syms);
More state handling API, including a way to get at or ignore preserved
modifiers, is on its way.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
272ccbf4
|
2012-03-21T02:19:44
|
|
Remove some rogue fprintfs
Oops.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
1afc6fca
|
2012-03-21T02: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-21T00:33:29
|
|
Remove unnecessary allocation in expr.c
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|