a39ed85f56
Fix formatting in xkbcomp headers
...
Signed-off-by: Ran Benita <ran234@gmail.com>
[daniels: Fixed for xkb_desc -> xkb_keymap change.]
2012-04-30 17:00:47 +01:00
ef88c7efab
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>
2012-04-09 13:47:23 +01:00
bc8bbf50dc
Fix build for X11 modifier masks
...
Exposed by include path changes, oops.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-27 15:51:24 +01:00
602e87805b
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>
2012-03-27 14:16:36 +01:00
d3908b631c
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>
2012-03-27 14:16:11 +01:00
f08ce9b71b
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>
2012-03-27 14:13:24 +01:00
9468d84ad1
Fix (correct, but harmless) const warning
...
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-21 14:44:16 +00:00
f44eed3e9a
Remove unnecessary allocation in expr.c
...
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-21 00:33:29 +00:00
937d40492c
Remove more float support
...
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-15 09:33:56 +00:00
9dde0f3371
Revert "Use XKB_COMMON_* modifier defines in ExprResolveModMask"
...
Because indices and masks are not at all the same thing.
This reverts commit 645275406f
2012-03-13 12:46:37 +00:00
645275406f
Use XKB_COMMON_* modifier defines in ExprResolveModMask
...
Rather than the ones from XKB.h.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-10 14:42:30 +00:00
24c61d0f78
Remove half-implemented radio groups
...
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>
2012-03-10 14:27:06 +00:00
a0e756fd83
Introduce xkb_atom_t type
...
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-09 19:30:31 +00:00
0bb24c2d23
Introduce xkb_keysym_t type
...
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-09 19:30:31 +00:00
ed18e65eac
Merge remote-tracking branch 'ran/fixes-cont'
...
Conflicts:
src/xkbcomp/expr.c
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-03-05 15:07:28 +00:00
65e1ff2f0a
Merge remote-tracking branch 'ran/fixes'
2012-03-05 15:00:39 +00:00
d2c3dd0c21
Constify some more text functions
...
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-03-03 01:17:57 +02:00
eb738b13ce
Constify global tables
...
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-03-03 01:17:57 +02:00
266dfae589
Remove useless casts
...
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-03-03 01:17:57 +02:00
f3e4335fc6
Fix all constness warnings
...
These are all trivial/obvious fixes which clear a bunch of warnings.
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-02-25 12:00:10 +02:00
a0dd052644
Remove unused includes of "tokens.h"
...
Signed-off-by: Ran Benita <ran234@gmail.com>
2012-02-25 11:59:56 +02:00
90f04e042b
Perform bounds checking in ExprResolveLevel
...
Both callers perform the same bounds check, so move it into
ExprResolveLevel itself.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-02-20 18:07:29 +00:00
1ab058bbb3
Fix typo in ExprResolveKeyCode
...
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-02-20 17:47:46 +00:00
e209fe31df
Perform bounds checking in ExprResolveGroup
...
Every caller did the exact same check on the group bounds after calling
ExprResolveGroup, so might as well do it inside.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-02-20 17:33:39 +00:00
43ed3ff070
Switch expression resolution priv from char to void
...
Avoids a lot of really lame casts.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-02-20 17:14:04 +00:00
eb6d9a0528
Remove chaining support from LookupModMask
...
Turns out we never use it, so.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-02-20 17:09:06 +00:00
11ea079175
Invert LookupModMask/LookupVModMask order
...
We never want to solely lookup a virtual modifier without also looking
up core modifiers. So, rather than chaining the vmod lookup inside the
core modifier lookup, invert the ordering.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-02-20 17:07:48 +00:00
1a2f2556dd
Remove unused LookupPriv::priv
...
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-02-20 17:00:51 +00:00
55e058f856
Move some definitions from expr.h to expr.c
...
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-02-20 16:59:51 +00:00
90d86c360a
Remove field reference lookup support
...
None of the lookup functions anyone ever used supported field
references, so don't pretend we do in the API.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-02-20 16:54:54 +00:00
91b8985297
Turn ExprResolveInteger into a simple wrapper
...
Move the bulk of ExprResolveInteger into an internal function called
ExprResolveIntegerLookup, and introduce ExprResolveInteger as a simple
wrapper which doesn't take priv/lookup arguments.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-02-20 16:24:02 +00:00
e314931e8f
Add ExprResolveGroup helper
...
Just a dumb wrapper around ExprResolveInteger.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-02-20 15:49:38 +00:00
8b47dbbf61
Add ExprResolveButton helper
...
Just a dumb wrapper around ExprResolveInteger.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-02-20 15:47:38 +00:00
3431a089cf
Introduce ExprResolveLevel helper
...
Which returns an integer representing the level number represented by
the given expression.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-02-20 15:37:53 +00:00
193e9b3913
Introduce ExprResolveRadioGroup helper
...
Just a tiny special-cased version of ExprResolveInteger.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-02-20 15:33:40 +00:00
26285a7bd9
Remove priv arguments from ExprResolveString
...
They've never been used.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-02-20 14:15:08 +00:00
b7b49eb0f7
Remove priv arguments from ExprResolveKeySym
...
They've never been used by its one caller.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-02-20 14:10:41 +00:00
70033b132b
Remove priv arguments from ExprResolveKeyName
...
They've never been used.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-02-20 14:08:55 +00:00
482d4faaa1
Remove priv arguments from ExprResolveBoolean
...
They've never been used.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-02-20 13:44:27 +00:00
9404157571
Remove priv arguments from ExprResolveFloat
...
They've never been used.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-02-20 13:40:34 +00:00
3151ce36fa
Remove priv arguments from ExprResolveModMask
...
What with them now being unused and all.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-02-20 13:34:36 +00:00
67605d2c90
Introduce ExprResolveVModMask
...
Which is just a slightly more typesafe wrapper around the chained
ExprResolveModMask everyone was using earlier.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-02-20 13:32:09 +00:00
c45cdb0c67
Still more memory leak fixes
...
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-02-16 00:22:11 +00:00
4e22851141
Introduce xkb_keycode_t for keycodes
...
And use it consistently everywhere, including with a special long-safe
internal keycode type, to ease the transition to large keycodes.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-02-15 16:24:50 +00:00
73ca959d7b
Dead code removal and static markup
...
Signed-off-by: Adam Jackson <ajax@redhat.com>
2010-09-27 16:06:48 -04:00
3f0034a990
Rename public entry points to lowercase and underscore
2010-07-02 12:20:59 -04:00
e10e16ad2f
Constify XkbcAtomText()
...
Atoms aren't mutable and this lets us put tbGetBuffer() back in the box.
2010-06-30 17:30:42 -04:00
399d4bd678
Drop malloc wrappers
2010-06-28 06:58:01 -04:00
47d3b3969b
Drop CARD32 and Opaque types
2010-06-28 06:50:12 -04:00
7257d4c89e
Use CARD32 instead of Atom, move geom headers in
...
Use CARD32 instead of Atom/KeySym/et al to avoid type size confusion
between server and non-server code; relatedly, move the geometry headers
in from kbproto, so every non-simple type (i.e. structs containing
nothing more than basic types) is now copied into xkbcommon.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2010-06-22 15:57:16 +01:00
Ran Benita
Daniel Stone
Adam Jackson
Kristian Høgsberg