| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
|
| |
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
Yes, British English is correct, but unfortunately we've lost that
battle.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
|
| |
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
|
|
|
| |
So clients only have one file to include.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
|
|
|
|
| |
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>
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| | |
|
| |
| |
| |
| |
| |
| | |
With this we're now completely standalone.
add vendor keysyms
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
(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.]
|
| |
| |
| |
| |
| |
| | |
To make it a bit more clear what it actually is.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| | |
Which will make the context start with no include paths at all.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
| |
| |
| |
| |
| |
| | |
None defined as yet, but why not.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
| |
| |
| |
| |
| |
| | |
No use as yet, but might as well ...
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|/
|
|
|
|
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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.]
|
|
|
|
|
|
|
| |
The caller should not mess around with these as they come directly from
our internal structs.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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.]
|
|
|
|
|
|
|
|
|
|
| |
(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.]
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
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>
|
|
|
|
| |
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
|
|
|
| |
Primarily for the include path, but also for the logging in future.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
|
| |
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
| |
in the header comments.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
|
| |
Signed-off-by: Guillem Jover <guillem@hadrons.org>
|
|
|
|
|
|
| |
And move it to XKBcomminint.h.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
|
|
|
| |
Use the xkb_state_mod_* and xkb_map_mod_* API instead.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
|
| |
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
|
| |
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
|
|
|
|
| |
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>
|
|
|
|
| |
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
|
| |
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
|
|
|
|
| |
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>
|
|
|
|
| |
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
|
| |
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
| |
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
|
| |
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
|
| |
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
|
| |
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
|
|
|
| |
(And a slight cosmetic header reformatting.)
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
|
|
|
|
| |
It looks like this could never have worked anyway, what with num_rg
always being 0 everywhere. Remove it.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|