Ran Benita [Fri, 25 Jul 2014 21:19:34 +0000 (00:19 +0300)]
Replace darray_mem with a new darray_steal
That's a more declarative interface.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 25 Jul 2014 21:13:54 +0000 (00:13 +0300)]
ast-build: use cast instead of ->common
Missed in
1b2bb204e0baa2246a6232aea762c1edb00cd44a.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 25 Jul 2014 20:40:40 +0000 (23:40 +0300)]
types: refactor CopyKeyTypesToKeymap
So it's OOM-safe and doesn't clobber keymap on failure.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 25 Jul 2014 20:24:46 +0000 (23:24 +0300)]
keycodes: split CopyKeyInfoToKeymap to several functions
It's a bit easier to read and self-documenting. Also handles OOM better.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Mon, 30 Jun 2014 11:52:30 +0000 (14:52 +0300)]
parser: don't shadow "str"
It's a name of a function in scanner-utils.h and also of some
parameters.
https://bugs.freedesktop.org/show_bug.cgi?id=79898
Reported-by: Bryce Harrington <b.harrington@samsung.com>
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sun, 15 Jun 2014 12:30:51 +0000 (15:30 +0300)]
x11: don't iterate on empty batches
If count % SIZE == 0 we did a useless iteration where start==stop. It's
harmless but strange, so don't do that.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sun, 1 Jun 2014 12:24:10 +0000 (15:24 +0300)]
Remove unnecessary !!(expressions)
_Bool already does that.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Wed, 28 May 2014 17:32:16 +0000 (20:32 +0300)]
rules: fix leak on failure
matcher_match() builds up the kccgst's, and we steal the memory on
success. But on error we didn't free it.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Thu, 15 May 2014 09:07:00 +0000 (12:07 +0300)]
Bump version to 0.4.2
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Thu, 15 May 2014 09:06:46 +0000 (12:06 +0300)]
Update NEWS
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Wed, 14 May 2014 08:44:29 +0000 (11:44 +0300)]
x11: fix out-of-bounds access in adopt_atoms() error handling
Two problems:
- `j` can be >= `SIZE`, and needs to be wrapped like in the rest of the
code.
- `cookies[j % SIZE]` is not initialized if there's no atom in `from[j]`.
The is manifested when:
- We've already gone through one batch (>= 128 atoms) (in fact this
cannot happen in call to `adopt_atoms` in the current code).
- An XCB request failed in the middle of a batch.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sun, 11 May 2014 06:47:56 +0000 (09:47 +0300)]
ast-build: don't leak on OOM in BoolVarCreate
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Wed, 30 Apr 2014 05:57:16 +0000 (08:57 +0300)]
parser: show the keysym in "unrecognized keysym" messages
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Thu, 24 Apr 2014 22:21:09 +0000 (01:21 +0300)]
doc: fix new doxygen version warnings
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Thu, 24 Apr 2014 22:14:31 +0000 (01:14 +0300)]
keycodes: fix uninitialized variable
Happened in one of the previous commits. For some reason, gcc doesn't
warn about this, but clang does...
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Tue, 22 Apr 2014 15:18:13 +0000 (18:18 +0300)]
xkbcomp: don't align enum values
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Tue, 22 Apr 2014 15:05:24 +0000 (18:05 +0300)]
xkbcomp: use straight assignment instead of CopyModSet
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Tue, 22 Apr 2014 10:15:21 +0000 (13:15 +0300)]
keymap, keycodes, compat: don't use darray for LEDs
Use a static array of size XKB_MAX_LEDS instead, as in xkb_mod_set.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Tue, 22 Apr 2014 09:23:36 +0000 (12:23 +0300)]
keymap: don't use darray in xkb_mod_set
Instead just statically allocate the mods array (of size MAX_MOD_SIZE =
32). The limit is not going anywhere, and static allocations are nicer
(nicer code, no OOM, etc.). It's also small and dense enough.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Tue, 22 Apr 2014 08:47:23 +0000 (11:47 +0300)]
keymap: add and use xkb_mods_{foreach,enumerate}()
To iterate over an xkb_mod_set. Slightly nicer interface and makes
transitioning from darray easier.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Tue, 22 Apr 2014 08:33:47 +0000 (11:33 +0300)]
keymap: rename xkb_foreach_key to xkb_keys_foreach
We'll use the format xkb_foos_foreach and xkb_foos_enumerate for the
various iterators.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Tue, 22 Apr 2014 08:22:22 +0000 (11:22 +0300)]
keymap: protect xkb_foreach_key macro params
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Tue, 22 Apr 2014 09:29:22 +0000 (12:29 +0300)]
darray: remove unused darray_foreach_reverse()
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Tue, 22 Apr 2014 11:34:57 +0000 (14:34 +0300)]
utils: detect overflow in memdup()
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sat, 9 Feb 2013 17:10:56 +0000 (19:10 +0200)]
symbols: use xkb_mod_set instead of entire keymap
The keymap is not removed entirely from the Info (just constified),
since it is still needed in AddKeySymbols() for looking up aliases. This
dependency will be removed in the future.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sat, 9 Feb 2013 16:25:12 +0000 (18:25 +0200)]
types: use xkb_mod_set instead of entire keymap
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 8 Feb 2013 13:12:35 +0000 (15:12 +0200)]
compat: use xkb_mod_set instead of entire keymap
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 8 Feb 2013 12:39:38 +0000 (14:39 +0200)]
vmod: take xkb_mod_set instead of the entire keymap
This is the only place where the modifier information is modified. We
will make it local to a given XKB file (after which it will be merged
into the keymap). Currently it changes the keymap directly, which
sidesteps the abstraction and leaves side-effects even if the XkbFile's
compilation fails.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 8 Feb 2013 12:32:47 +0000 (14:32 +0200)]
action: take xkb_mod_set instead of the entire keymap
A couple of modiifer actions need this information, but not the entire
keymap.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 8 Feb 2013 11:56:41 +0000 (13:56 +0200)]
expr: take xkb_mod_set instead of the entire keymap
The modifier-resolving functions only need the modifier information.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 8 Feb 2013 11:21:27 +0000 (13:21 +0200)]
text: take xkb_mod_set instead of the entire keymap
The modifier printing functions only need the modifier information, they
don't care about keys or leds, etc.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 8 Feb 2013 11:09:33 +0000 (13:09 +0200)]
Add struct xkb_mod_set
The only thing that the compilation phase needs the keymap for currently
is for access to the modifier information (it also modifies it in
place!). We want to only pass along the neccessary information, to make
it more tractable and testable, so instead of passing the entire keymap
we add a new 'mod_set' object and pass a (const) reference to that.
The new object is just the old array of 'struct xkb_mod'.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sat, 19 Apr 2014 13:15:05 +0000 (16:15 +0300)]
keymap: rename wrap_group_into_range -> XkbWrapGroupIntoRange
It better fits with the naming convention in keymap.h.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sat, 19 Apr 2014 12:56:27 +0000 (15:56 +0300)]
keymap: move ModNameToIndex from text.c and use it in keymap.c
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Thu, 7 Feb 2013 22:28:49 +0000 (00:28 +0200)]
symbols: separate ctx
Same as was done for compat and types.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Thu, 7 Feb 2013 22:22:38 +0000 (00:22 +0200)]
compat: separate ctx
Same as was done for types.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Thu, 7 Feb 2013 22:14:49 +0000 (00:14 +0200)]
types: separate ctx
Separate the ctx object to its own field in CompatInfo, instead of doing
keymap->ctx.
The compilation functions should not have direct access to the keymap;
instead they should process the files with their own independent state
(in the *Info structs) as much as possible, and only at the end should
they be copied (i.e. commited) to the keymap. If the compilation fails,
it leaves no by-products. It's also just good form.
This was seemingly the original author's intention, but I suppose he cut
a few corners (mostly with the handling of virtual modifiers, which are
threaded through types -> compat -> symbols).
This commit is the first step and may look artificial; however the
'keymap' field will be removed shortly.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Wed, 16 Apr 2014 19:43:30 +0000 (22:43 +0300)]
action: convert a few missed unsigned -> enum xkb_action_type
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Wed, 16 Apr 2014 18:25:40 +0000 (21:25 +0300)]
expr: fix handling of unknown integer binary operator
We can't reach the default branch but at least make it do something
sensible.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 11 Apr 2014 21:22:47 +0000 (00:22 +0300)]
doc: explain keysym/string transformation
The documentation should be clear about what is happening, even if it's
rather unlikely anyone will really dig into the details.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 11 Apr 2014 16:00:36 +0000 (19:00 +0300)]
doc: add @since annotations for API added since 0.3.0
And also add release dates to the NEWS.
We're adding API freely, so this can make life easier for anyone who
wants to stay compatible with an older version.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sun, 6 Apr 2014 13:37:04 +0000 (16:37 +0300)]
Add .travis.yml file
This CI service https://travis-ci.org/ builds the project in several
configurations, runs the tests, and if something fails it sends an email.
Testing on some other systems is always good, and there don't seem to
be any drawbacks to this, so why not.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Mon, 31 Mar 2014 15:01:35 +0000 (18:01 +0300)]
configure.ac: fix enable_x11 handling
Explicitly passing --enable-x11=yes would actually disable it.
Reported-by: Quentin Glidic
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Thu, 27 Mar 2014 18:12:02 +0000 (20:12 +0200)]
Bump version to 0.4.1
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Thu, 27 Mar 2014 18:11:13 +0000 (20:11 +0200)]
Update NEWS
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Thu, 27 Mar 2014 18:58:16 +0000 (20:58 +0200)]
build: trim down generated doxygen docs
Remove the huge verbatim copies of the header files.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Thu, 27 Mar 2014 18:37:21 +0000 (20:37 +0200)]
build: add docs to EXTRA_DIST
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Thu, 27 Mar 2014 15:42:20 +0000 (17:42 +0200)]
state: fix consumed modifier calculation
The current calculation is in short:
entry ? (entry->mask & ~entry->preserve) : 0
This changes it be
type->mask & ~(entry ? entry->preserve : 0)
This is what Xlib does. While less intuitive, it is actually more
correct, if you follow this deduction:
- The key group's type->mask defines which modifiers the key even cares
about. The others are completely irrelevant (and in fact they are
masked out from all sided in the level calculation). Example: NumLock
for an alphabetic key.
- The type->mask, the mods which are not masked out, are *all* relevant
(and in fact in the level calculation they must match *exactly* to the
state). These mods affect which level is chosen for the key, whether
they are active or not.
- Because the type->mask mods are all relevant, they must be considered
as consumed by the calculation *even if they are not active*.
Therefore we use type->mask instead of entry->mask.
The second change is what happens when no entry is found: return 0 or
just take preserve to be 0? Let's consider an example, the basic type
type "ALPHABETIC" {
modifiers = Shift+Lock;
map[Shift] = Level2;
map[Lock] = Level2;
level_name[Level1] = "Base";
level_name[Level2] = "Caps";
};
Suppose Shift+Lock is active - it doesn't match any entry, thus it gets
to level 0. The first interpretation would take them both to be
unconsumed, the second (new one) would take them both to be consumed.
This seems much better: Caps is active, and Shift disables it, they both
do something.
This change also fixes a pretty lousy bug (since 0.3.2), where Shift
appears to apparently *not* disable Caps. What actually happens is that
Caps is not consumed (see above) but active, thus the implicit
capitalization in get_one_sym() kicks in and capitalizes it anyway.
Reported-by: Davinder Pal Singh Bhamra
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sun, 23 Mar 2014 13:04:51 +0000 (15:04 +0200)]
Reformat README markdown
So that github displays it as markdown, and correctly.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sun, 23 Mar 2014 12:32:12 +0000 (14:32 +0200)]
doc: add a quick guide to the library
This is a nice intro to the documentation, and also preferably gently
pushes users to the "proper way" of using the library, which can be
confusing.
See also: http://fooishbar.org/tell-me-about/xkbcommon-intro/
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 21 Mar 2014 21:00:37 +0000 (23:00 +0200)]
state: apply control transformation on utf8/utf32 keysym strings
This is required by the specification:
http://www.x.org/releases/current/doc/kbproto/xkbproto.html#Interpreting_the_Control_Modifier
and clients expect this to happen.
https://bugs.freedesktop.org/show_bug.cgi?id=75892
Reported-by: Gatis Paeglis <gatis.paeglis@digia.com>
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 21 Mar 2014 21:00:17 +0000 (23:00 +0200)]
state: add xkb_state_key_get_{utf8,utf32}() API functions
These functions generally have the same effect as
xkb_state_key_get_syms() + xkb_keysym_to_utf{8,32}().
So why add them?
- They provide a slightly nicer interface, especially if the string is
the only interest.
- It makes the handling of multiple-keysyms-to-utf8 transparent. For the
designated use-case of multiple-keysyms (unicode combining
characters), this is a must. We also validate the UTF-8, which the
user might not otherwise do.
- We will need to apply some transformation on the resulting string
which depend on the xkb_state. This is not possible with the
xkb_keysym_* functions.
With these functions, the existing xkb_keysym_to_utf{8,32}() are not
expected to be used by a typical user; they are "raw" functions.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sun, 9 Feb 2014 11:50:21 +0000 (13:50 +0200)]
Add utf8.{c,h} for common UTF-8 util functions
We need to validate some UTF-8, so this adds an is_valid_utf8()
function, which is probably pretty slow but should work correctly.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 21 Mar 2014 17:54:30 +0000 (19:54 +0200)]
configure.ac: fix message when X11 support is disabled
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Thu, 6 Mar 2014 11:43:02 +0000 (13:43 +0200)]
x11: relax XkbGetNames requirements
It is valid for a keymap to not have key aliases, group names and
various other things. But the current test requires all of them to be
present in the reply, which causes us the fail on such keymaps (as the
XQuartz one).
Instead, require only what we really need. The virtual-mods names may
not be strictly required, but it seems safer to leave it in for now.
https://bugs.freedesktop.org/show_bug.cgi?id=75798
Reported-by: Gatis Paeglis <gatis.paeglis@digia.com>
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Tue, 4 Mar 2014 17:26:56 +0000 (19:26 +0200)]
doc: extend xkb_rule_names default-value description
Especially a mention of the XKB_DEFAULT_* envvars was missing.
Reported-by: Paeglis Gatis <Gatis.Paeglis@digia.com> (thanks!)
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Tue, 4 Mar 2014 16:24:11 +0000 (18:24 +0200)]
doc: remove possibly confusing comment
There are valid reasons to use the other keymap-creation functions, if
one needs them. On the other hand, if one is supposed to use RMLVO, it
is more or less the only choice, so the comment is not needed in this
case as well.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 28 Feb 2014 13:12:16 +0000 (15:12 +0200)]
interactive-x11: beef up select_events a bit
- Specify in detail which parts of the events we care about. In theory
the X server should not bother us with things we didn't ask for. In
practice it still does, but oh well.
- Use the _aux version of select_events. This is the correct one to use,
the non-aux version is useless.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Fri, 28 Feb 2014 12:50:48 +0000 (14:50 +0200)]
doc: add comments about update_key() and get_syms() order
I remember we had a comment about this, but I can't find it. So add it
again.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sat, 22 Feb 2014 21:43:19 +0000 (23:43 +0200)]
symbols, keycodes: fix int return type when bool is intended
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sat, 22 Feb 2014 21:37:37 +0000 (23:37 +0200)]
symbols: cleanup SetSymbolsField
Normalize the style and error message levels.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sat, 22 Feb 2014 21:20:04 +0000 (23:20 +0200)]
symbols: fix possible use of uninitialized value
Nothing bad can come out of it, but for some reason this error didn't
return early (inherited from xkbcomp).
Also promote the log message to an error, as it clearly is.
Signed-off-by: Ran Benita <ran234@gmail.com>
Jasper St. Pierre [Fri, 21 Feb 2014 23:09:00 +0000 (18:09 -0500)]
state: Add xkb_state_key_get_consumed_mods
This retrieves the mask of consumed modifiers for a given key and state,
which is helpful for toolkits without having them to do it one modifier
at a time, or pass in 0xFFFFFFFF to xkb_state_remove_consumed_mods to
"reverse-engineer" the consumed mods.
Ran Benita [Sun, 16 Feb 2014 16:32:44 +0000 (18:32 +0200)]
action: unify SetLatch and Lock handler functions
This is a little shorter and follows easier from the spec flag
description table.
Also a few were too permissive (like allowing LatchToLock in SetMods).
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sun, 16 Feb 2014 08:20:32 +0000 (10:20 +0200)]
action: add a common CheckBooleanFlag function
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sun, 16 Feb 2014 08:59:42 +0000 (10:59 +0200)]
keymap: change action flag NO_ACCEL -> ACCEL
It's easier to deal with, but we need to set it as "factory default".
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sun, 16 Feb 2014 08:22:32 +0000 (10:22 +0200)]
action: fix SwitchScreen "same" field handling
This used to *unset* a flag called "SwitchApplication"; we changed the
flag to "same" but forgot to switch the cases.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sat, 15 Feb 2014 21:50:21 +0000 (23:50 +0200)]
keymap-dump: add missing support for NoLock and NoUnlock flags
Based on a libxkbfile patch by Andreas Wettstein.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sat, 15 Feb 2014 21:27:23 +0000 (23:27 +0200)]
keymap-dump: don't print "affect=lock" in PtrLock
It's the same as no flags, so might as well not print it.
(In fact it is slightly harmful, because it actively *clears* the affect
flags, which might have been set in some other manner. But in practice
this cannot happen).
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sat, 15 Feb 2014 21:13:21 +0000 (23:13 +0200)]
keymap-dump: unbreak some complex lines
It's very hard to read as-is. Apologies for those reading over a VT100.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sat, 15 Feb 2014 20:59:12 +0000 (22:59 +0200)]
expr: simplify ExprResolveButton
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sat, 15 Feb 2014 20:28:41 +0000 (22:28 +0200)]
action: don't pass a keymap where a ctx is sufficient
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sat, 15 Feb 2014 20:16:41 +0000 (22:16 +0200)]
action: add missing array_ndx checks
Only the "data" field can have them, and every other field needs to
error out if it appears. But some didn't check.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sat, 15 Feb 2014 19:55:36 +0000 (21:55 +0200)]
action: move array_ndx errors into the Check functions
Makes more sense and flows more nicely this way.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sat, 15 Feb 2014 19:48:31 +0000 (21:48 +0200)]
action: fix missing support for "affect" field
Support for setting this field was missing from the LockMods and
LockControls actions.
Based on a xkbcomp patch by Andreas Wettstein.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Thu, 13 Feb 2014 21:57:22 +0000 (23:57 +0200)]
ast: cast to ParseCommon explictly instead of using ->common
Some tools were getting mighty confused with what we were doing.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Thu, 13 Feb 2014 21:11:31 +0000 (23:11 +0200)]
action: simplify Check* functions
Instead of using those t1 t2 variables, pass the final destinations
directly (while making sure they are not modified in case of error).
This also ensures the types are right, e.g. in CheckGroupField it should
be int32_t, not xkb_layout_index_t (and indeed it takes a negation!).
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Wed, 12 Feb 2014 09:07:39 +0000 (11:07 +0200)]
darray: fix indentation
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Tue, 27 Nov 2012 08:42:15 +0000 (10:42 +0200)]
vmod: bring back support for direct vmod -> real mod mapping
This brings back the functionality that was removed in
b9c87eb710ba4a86455601ca8c5a516b25e20366. Though it is not used in
xkeyboard-config, from our current perspective it can be quite useful to
be able to set the mappings directly, thus sidestepping the ugly and
legacy-ridden modifier_map statement.
Here's an example of how to get rid of modifier_map statements (though
that would break core-X11 applications, since they must have the
mappings through keysyms):
virtual_modifiers NumLock = Mod2;
virtual_modifiers Alt = Mod1;
// Would be nice to map these to Alt, but that would be
// incompatible with xkbcomp and somewhat complicated
virtual_modifiers LAlt = Mod1;
virtual_modifiers RAlt = Mod1;
virtual_modifiers LevelThree = Mod5;
virtual_modifiers RControl = Control;
virtual_modifiers LControl = Control;
virtual_modifiers Super = Mod4;
virtual_modifiers Meta = Mod1;
virtual_modifiers Hyper = Mod4;
virtual_modifiers AltGr = Mod5;
virtual_modifiers LShift = Shift;
virtual_modifiers RShift = Shift;
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Tue, 11 Feb 2014 15:44:11 +0000 (17:44 +0200)]
build: small fixes and formatting of Makefile.am
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Tue, 11 Feb 2014 15:16:40 +0000 (17:16 +0200)]
build: fix libtest AM_CLFLAGS typo
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sun, 27 Oct 2013 18:10:15 +0000 (20:10 +0200)]
Move src/xkbcomp/scanner-utils.h to src/
As we'll use it for things unrelated to xkbcomp.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Mon, 10 Feb 2014 18:50:58 +0000 (20:50 +0200)]
build: fix configure test for yacc
It only works if 'bison' or 'byacc' are provided, but sometimes byacc
is installed as plain 'yacc'. The check fails for that.
I broke this in bdd8c11, restore Daniel's retrospectively clever check.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Mon, 10 Feb 2014 18:33:34 +0000 (20:33 +0200)]
scanner: sort out scanner logging functions
First, make the rules and xkb scanners/parsers use the same logging
functions instead of rolling their own.
Second, use the gcc ##__VA_ARGS extension instead of dealing with C99
stupidity. I hope all relevant compilers support it.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Mon, 10 Feb 2014 13:18:22 +0000 (15:18 +0200)]
rules: always %-expand kccgst values
Previously the early-exit codepath might have left some values
unexpanded, and we'd go looking for e.g "%l%(v)".
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Mon, 10 Feb 2014 11:13:26 +0000 (13:13 +0200)]
test/rmlvo-to-kccgst: use default RMLVO values in translation
The tool's supposed to display exactly the same results as the library
code.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Mon, 10 Feb 2014 11:06:22 +0000 (13:06 +0200)]
context: add xkb_context_sanitize_rule_names()
We want all the default logic in a test, so encapsulate it in this
function, and make all the get_default_* functions static.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Mon, 10 Feb 2014 09:16:37 +0000 (11:16 +0200)]
rules: print full path in error messages
There can be multiple include paths. But it's nicer in any case.
This also makes scanner_error actually use log_err instead of log_warn -
oops.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Mon, 10 Feb 2014 09:11:27 +0000 (11:11 +0200)]
rules: include the path in failed-to-map error message
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Mon, 10 Feb 2014 10:24:50 +0000 (12:24 +0200)]
context: fix wrong VARIANT instead of LAYOUT getenv
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sun, 9 Feb 2014 21:21:19 +0000 (23:21 +0200)]
ast: remove unneeded 'ctx' param to XkbFileCreate
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sun, 9 Feb 2014 16:02:11 +0000 (18:02 +0200)]
x11: don't trust keycode before testing its range
The assert is not very useful access the key just before.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sun, 9 Feb 2014 15:49:30 +0000 (17:49 +0200)]
keymap: reduce padding in struct xkb_sym_interpret
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sun, 9 Feb 2014 15:18:08 +0000 (17:18 +0200)]
symbols: steal keys and modmaps when merging if possible
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sun, 9 Feb 2014 15:17:13 +0000 (17:17 +0200)]
compat: steal interps and leds when merging if possible
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sun, 9 Feb 2014 14:49:45 +0000 (16:49 +0200)]
types: steal types when merging if possible
Like we do everywhere else. Removes some unnecessary allocations and
copying.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sun, 9 Feb 2014 09:27:34 +0000 (11:27 +0200)]
doc: move some file comments into txt files in doc/
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sun, 9 Feb 2014 11:51:38 +0000 (13:51 +0200)]
state: check wrap_group_into_range() return value
It returns XKB_LAYOUT_INVALID in case num_groups == 0. So we shouldn't
just save it in the state.
Note, though, that this condition is generally impossible.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sun, 9 Feb 2014 08:27:45 +0000 (10:27 +0200)]
x11: add 0 < ctrls->numGroups <= 4 assertion
This only happens if something is wrong in the server; a valid keymap
cannot be had in any case.
Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita [Sat, 8 Feb 2014 16:30:41 +0000 (18:30 +0200)]
Remove m4/.gitkeep
Now there's a file in there.
Signed-off-by: Ran Benita <ran234@gmail.com>