|
d5f725f6
|
2012-08-03T05:13:46
|
|
Rules: mmap() rules file instead of using getc()
Good for a small performance win on my system.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
3199ea73
|
2012-05-14T14:33:29
|
|
android: add build files
squashed: android: set xkb config path
Conflicts:
Makefile.am
|
|
|
93f6517c
|
2012-08-03T04:07:33
|
|
stringcomp: Make test more punishing
Recreate the old test/dump scenario, where we test the following map:
- rules: evdev
- model: pc104
- layout #1: us
- layout #2: ru
- layout #3: ca(multix)
- layout #4: de(neo)
This is ever so slightly altered from the xkbcomp output; running the
following:
setxkbmap -rules evdev -model pc105 -layout us,ru,ca,de -variant
,,multix,neo -print | xkbcomp -xkb - -
will give you a map with RCTL added to the modifier_map for both Control
and Mod3. Running the output through xkbcomp -xkb - - again, will give
you RCTL only added to Mod3.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
e756e9b5
|
2012-08-03T04:02:31
|
|
test/dump: Remove superfluous test
No longer necessary now we have stringcomp doing a full round-trip test
for us.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
28733c54
|
2012-08-03T05:34:58
|
|
IncludeStmt: Remove useless 'path' member
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
3e8370b0
|
2012-08-03T03:11:19
|
|
context: Maintain list of failed include paths
Keep around a list of paths we tried to add but couldn't.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
53e2db6b
|
2012-08-03T03:05:02
|
|
More useful error message on failing RMLVO -> KcCGST
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
4bb8b6b1
|
2012-08-03T05:19:50
|
|
Remove unused vmodmask calculation
This was basically an open-coded VModsToReal, which we were using in the
line immediately below.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
41d97df9
|
2012-08-03T03:00:20
|
|
Move more of xkb_map_new_from_rmlvo into compilation
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
5cf4f510
|
2012-08-03T02:57:02
|
|
Staticise xkb_map_new_from_kccgst
We didn't expose this to the outside world, and its only trivial user
was xkb_map_new_from_rules.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
fb4d3aef
|
2012-08-03T04:01:21
|
|
test/stringcomp: Perform full round-trip test
We now pass! \o/
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
6021a976
|
2012-08-03T03:45:14
|
|
test: Minimise includes
Mostly from functions which used to use file functions directly, but now
use test.h wrappers.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
39da9274
|
2012-08-03T03:38:46
|
|
stringcomp: Update input file for output changes
Bring the input file into line with recent changes to the dump output,
so we're as close as we can get to a round trip.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
6701fb5f
|
2012-08-03T03:54:44
|
|
stringcomp: Remove unnecessary Level1 mappings
As a map will implicitly go to level one unless explicitly mentioned
otherwise, remove all explicit =Level1 mappings, except for those with
preserve entries.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
ce2e4899
|
2012-08-03T03:34:53
|
|
test: Add extremely rudimentary include path test
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
8fe2a484
|
2012-08-03T03:32:30
|
|
Rename xkey test to keysym
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
5968c5e6
|
2012-08-08T13:55:04
|
|
Always have at least one level in types
The ONE_LEVEL definition from xkeyboard-config doesn't specify any
actual levels, but there's an implicit (anything unmatched) -> Level1
rule. Given this, each type actually has at least one level, whether or
not it specifies anything.
Fixes stringcomp.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
42b2c934
|
2012-08-03T03:22:48
|
|
Print failed include paths on failure to find rules
Thus giving a hint as to which directory we're trying to find.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
226cb22c
|
2012-08-03T03:12:52
|
|
Move xkb_context struct to xkb-priv.h
So we can print more intelligent debugging messages without needing
helper functions for the failed_includes array.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
1eda9e44
|
2012-08-03T02:51:40
|
|
test: Use test_compile_*() in interactive
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
04253fb2
|
2012-08-03T02:51:10
|
|
Add support for default rules/model/layout
Right now it just comes from build-time, but eventually this should be
sourced from configuration files at runtime too.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
055b3034
|
2012-08-03T02:37:09
|
|
tests: Fix uninitialised-use-of-'ret' warning
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
3f016942
|
2012-08-03T02:36:40
|
|
test: Use test_get_context() in interactive
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
26c01d3b
|
2012-08-08T13:30:05
|
|
Warning fixes
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
1a930bf2
|
2012-08-07T00:20:40
|
|
Add API to query whether a modifier is consumed
Currently the user has no way of knowing which of the active modifiers
have been used in the translation of a keycode to its keysyms. The use
case is described in the GTK docs: say there's a menu accelerator
activated by "<Alt>+". Some layouts have "+" shifted, and some have it
on the first level. So in keymaps where "+" is shifted, the Shift
modifier is consumed and must be ignored when the user is testing
for "<Alt>+". Otherwise, we may get "<Alt><Shift>+" and the accelerator
should not actually fire.
For this we also use the preserve[] information in the key types, which
can forces us to report modifiers as unconsumed even if they were used
in the translation. Until now we didn't do anything with this
information.
The API tries to match its surronding. It's not very efficient but this
can be fixed.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
262bf97f
|
2012-08-07T13:23:44
|
|
types: remove default type
The default type is copied over for each new key type to build on.
Further, it can be modified from within the xkb_types section itself,
with statements such as "type.modifiers = Lock" which affect all
subsequent type definitions.
The default type is (well, by default) just the simplest one level type
possible, with name "default". When no types are defined at all, it is
copied over to the keymap as the single type.
xkeyboard-config never changes the default type. There is also no sane
use case for doing so; changing any thing there doesn't make sense. So
instead of doing all the hard work of maintaining and copying this type,
which is practically never used, just remove it and initialize new types
appropriately.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
6b75dd2d
|
2012-08-05T19:38:31
|
|
Fix virtual modifiers mask extraction
The calculations were performed incorrectly in several places,
specifically shifting by 16 instead of 8 (= XkbNumModifiers) and masking
with 0xff instead of 0xffff.
More stuff that probably never worked as intended. This also makes these
more grep-able when we remove the vmods/real_mods separation.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
796dccab
|
2012-08-05T14:05:03
|
|
types: small changes
Just make things easier to follow, no functional changes.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
4c00278c
|
2012-08-02T01:09:41
|
|
Remove xproto build dependency
Very little left to do for this.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
b0b11c4e
|
2012-08-02T00:29:07
|
|
types: don't use canonical/required types
Xkb required every keymap to have at least the four following canonical
types: ONE_LEVEL, TWO_LEVEL, ALPHABETIC, KEYPAD. This is specified in
e.g. the kbproto spec and XkbKeyTypesForCoreSymbols(3) man page.
If these types are not specified in the keymap, the code specifically
checks for them and adds them to the 4 first places in the types array,
such that they exist in every keymap. These are also the types (along
with some non-required 4-level ones) that are automatically assigned to
keys which do not explicitly declare a type (see FindAutomaticType in
symbols.c, this commit doesn't touch these heuristics, whcih are also not
very nice but necessary).
The xkeyboard-config does not rely on the builtin xkbcomp definitions of
these types and does specify them explicitly, in types/basic and
types/numpad, which are virtually always included.
This commit removes the special behavior:
- The code is ugly and makes keytypes.c harder to read.
- The code practically never gets run - everyone who uses
xkeyboard-config or a keymap based upon it (i.e. everyone) doesn't need
it. So it doesn't get tested.
- It mixes policy with implementation for not very good reasons, it
seems mostly for default compatibility with X11 core.
- And of course we don't need to remain compatible with Xkb ABI neither.
Instead, if we read a keymap with no types specified at all, we simply
assign all keys a default one-level type (like ONE_LEVEL), and issue
plenty of warnings to make it clear (with verbosity >= 3). Note that
this default can actually be changed from within the keymap, by writing
something like
type.modifier = Shift
type.whatever_field = value
in the top level of the xkb_types section. (This functionality is
completely unused as well today, BTW, but makes some sense).
This change means that if someone writes a keymap from scratch and
doesn't add say ALPHABETIC, then something like <AE11> = { [ q Q ]; }; will
ignore the second level. But as stated above this should never happen.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
be82f082
|
2012-08-05T13:46:56
|
|
types: add a general overview
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
d327d3e2
|
2012-08-07T11:40:07
|
|
types: store atoms instead of strings for level and type names
We don't use these strings much, so storing them in the manner they
were compiled saves some copying and space.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
b2fba730
|
2012-08-07T08:52:23
|
|
types: use regular array for map entries
This array is only initialized once.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
8ccfee82
|
2012-08-07T08:38:20
|
|
types: use regular array for types
The current code doesn't resize it any more.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
a681c624
|
2012-08-07T08:17:26
|
|
types: remove DeleteLevel1MapEntries
If there is no map entry for some modifier combination, the default is
to use level 1. The removed code is an optimization to save some space
by removing these entries. But it doesn't actually save any space, and
did not in fact remove all level 1 entries (it walks the array while
modifying it so there's an off-by-one error).
We can instead keep them in the types but just not print them in
keymap-dump.c, to get about the same behavior.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
233d85c4
|
2012-08-06T21:31:17
|
|
types: move preserve directly into xkb_kt_map_entry
Currently each xkb_key_type has a preserve array, which is only allocated
if a preserve[] statement is specified in the type. In this case each map
entry has an element in the array.
The space savings are negligible; put this field where it logically
belongs.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
c1ea23da
|
2012-08-04T10:47:56
|
|
symbols: remove support for key behaviors
The possible key behaviors are:
KB_RadioGroup, KB_Overlay1, KB_Overlay2: already removed support for
these.
KB_Lock (with or without KB_Permanent): used to ignore key presses or
releases to simulate and deal with some legacy keyboard behaviors
(like keys that physically lock). Not used at all.
We already ignore them while processing key events in state.c, so make
it official.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
7c89f34e
|
2012-07-29T11:39:44
|
|
keycodes: small changes
to make it a bit nicer.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
b2c4331a
|
2012-07-28T22:15:59
|
|
Handle key names consistently
We treat the key names as fixed length, non NUL terminated strings of
length XkbKeyNameLength, and use the appropriate *Text functions to
print them. We also use strncpy everywhere instead of memcpy to copy
the names, because it does some NUL padding and we might as well.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
c548c815
|
2012-07-28T12:10:44
|
|
keycodes: add a general overview
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
15541766
|
2012-08-05T14:10:45
|
|
expr: make ResolveLevel return zero-based level
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
59d947c9
|
2012-08-05T19:24:44
|
|
Add and use xkb_level_index_t
Several types are used over the code for shift levels; better to use
just one.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
b804aec2
|
2012-08-03T00:20:07
|
|
action: drop global actionInitialized
The action.c needs to use two constant Expr values, constTrue and
constFalse. To do this is keeps to static globals Expr's of type boolean
and the values "true" and "false" which need to be interned (and thus
context specific). The interning means they can't be made static const,
so there's a global flag and initializer function.
Instead of using this unsafe global state, we can simply use an integer
boolean expression (1 and 0) instead of a string one ("true" and
"false") and make them const.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
6f08a2cf
|
2012-08-03T00:33:40
|
|
expr: constify function arguments
We need this for later.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
f2ecd665
|
2012-08-06T20:04:22
|
|
log: allow to resore default log function
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
18048cb7
|
2012-08-02T17:59:57
|
|
darray: fix formatting
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
9617b092
|
2012-08-05T12:03:51
|
|
filecomp: fix path and error message
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
1d570a6d
|
2012-08-02T09:54:38
|
|
interactive: add support to run from keymap file
This is useful for quickly testing a random keymap file. Use -k <PATH>.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
cfd978b8
|
2012-08-02T00:40:22
|
|
keyseq: use our own keysyms
Instead of <X11/keysym.h>
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
cead8527
|
2012-08-01T22:12:13
|
|
Replace more defines with enums
Mostly the ones used to track the fields of types/keys/leds which were
already defined.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
3bea189b
|
2012-08-01T18:46:01
|
|
Make top level Handle*File functions nicer
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
82ee45b3
|
2012-07-28T23:21:46
|
|
Use xkb_led_index_t throughout
And use XKB_LED_INVALID instead of _LED_Unbound, which served the same
purpose here.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
09dac54b
|
2012-08-01T21:31:36
|
|
vmod: remove unused fields
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
6eb5929d
|
2012-07-28T23:31:08
|
|
README: s/xkb_desc/xkb_keymap
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
7c7e4341
|
2012-08-01T11:25:34
|
|
Use only one set of core mod name-to-index functions
These were repeated 5 times.
Note that this changes the ABI slightly: XKB_MOD_NAME_CAPS is changed
from "Caps Lock" to "Lock", which is the ordinary legacy mod name for
it. Since its hidden behind a #define, it's best to stay compatible with
the old names (as I think was intended, given that "Mod1", etc. are the
same).
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
c6dee464
|
2012-08-01T11:12:18
|
|
map: fix incorrect return value
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
ae968f85
|
2012-08-01T11:01:21
|
|
map: fix virtual mod index calculation
The current code made us miss vmod index 0. Also look at the code in
vmod.c:LookupVModMask.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
80ab9f12
|
2012-08-02T23:40:31
|
|
keymap-dump: use ActionTypeText
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
d53fcf53
|
2012-08-02T21:36:30
|
|
keymap-dump: use SITextMatch
text.c has the exact same function.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
20bef734
|
2012-08-02T20:55:12
|
|
keymap-dump: clean up write_buf function
It would have been nice to use open_memstream here if it was portable
enough (maybe someday it will?).
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
4c212753
|
2012-04-08T02:20:39
|
|
Add an interactive evdev test
The program reads key events from evdev input devices, puts them through
the library and prints some information about them. It's nice for
experimenting, quick testing and trying to break it with random stuff
(already found some!).
It is called "interactive" for lack of a better name. It's a bit
hackish, but can easily be extended, made more portable etc, in the
future.
Signed-off-by: Ran Benita <ran234@gmail.com>
Conflicts:
Makefile.am
test/.gitignore
|
|
|
41d9afc5
|
2012-07-27T15:31:03
|
|
Remove ExprResult
Convert the IdentLookup typedef away from ExprResult, which drags along
everything else. This should also make all of the conversions explicit.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
6917901f
|
2012-07-27T14:15:39
|
|
expr: remove support for evaluating string as integer
As the comment nicely puts it, this is a bit weird. When you try to
evaluate an expression of type string into an integer, what it does is:
"" -> 0
"c" -> (ascii value, i.e. like a char literal)
more than one char -> error
The first one is obviously not very useful; why not just write 0?
The second one might be useful (though I don't see where in a keymap
it would be), but I don't think anyone would consider trying "X" for
that anyway.
A look through xkeyboard-config shows "" only used once as a string, and
"X" also only used as strings (and mostly in geometry which we don't
evaluate anyway). And I seriously doubt it's used (purposely) anywhere
else. So remove it.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
dd0f3c6d
|
2012-07-25T10:53:36
|
|
Don't create contexts with no include paths
Clean up the return code handling from
xkb_context_add_include_paths_default, and thus fail context creation if
we can't add any of the default include paths, but were asked to. If
this happens, dump the DFLT_XKB_CONFIG_ROOT out in the log message, so
at least we know what we aren't looking at.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
ca7927ae
|
2012-07-25T10:55:06
|
|
context test: Use test_get_context()
So we don't die if we haven't got a valid global include path.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
bd927abf
|
2012-07-24T19:39:59
|
|
expr: drop ExprResult from ResolveEnum
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
38614c88
|
2012-07-24T17:21:29
|
|
expr: drop ExprResult from ResolveMask
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
2e4933cd
|
2012-07-24T10:39:15
|
|
expr: drop ExprResult from ResolveInteger
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
d5682289
|
2012-07-24T01:22:26
|
|
expr: drop ExprResult from ResolveButton
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
6ec13570
|
2012-07-24T00:51:19
|
|
expr: drop ExprResult from ResolveLevel
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
000528dd
|
2012-07-24T00:23:34
|
|
expr: drop ExprResult from ResolveKeyCode
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
e258f9ee
|
2012-07-24T00:10:07
|
|
expr: drop ExprResult from ResolveGroup
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
70262292
|
2012-07-23T23:56:28
|
|
expr: drop ExprResult from ResolveKeysym
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
0d262fa1
|
2012-07-23T19:52:17
|
|
expr: drop ExprResult from ResolveBoolean
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
27f94929
|
2012-07-23T15:46:50
|
|
expr: drop ExprResult from ResolveString
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
025ca579
|
2012-07-23T12:20:05
|
|
expr: drop ExprResult from ResolveLhs
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
761b675c
|
2012-07-23T11:56:13
|
|
expr: drop ExprResult from ResolveKeyName
Explicit is better than implicit, and this union makes it hard to follow
what's what, particularly the confusion with ival/uval.
The other Resolve functions will follow.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
01c81fa6
|
2012-07-25T21:37:20
|
|
parser: untabify
Run vim's :%retab and some resulting indention fixes.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
724f62c8
|
2012-07-25T17:29:08
|
|
Convert defines to enums in xkbcomp.h
For statement / expression types.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
35fb8b94
|
2012-07-27T01:47:32
|
|
Fix incorrect comparison
ExprFieldRef goes into the ExprDef op field, not the type field.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
89723b7c
|
2012-07-24T19:54:14
|
|
utils: add/replace string equality macros
It's more tidy and less error prone, since we use strcasecmp == 0 a lot.
We replace strcmp == 0 by streq, strcasecmp == 0 by istreq,
uStrCasePrefix by istreq_prefix and uDupString by strdup_safe.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
4f843c81
|
2012-07-24T13:24:59
|
|
Drop Xkbc prefix of text functions
Not really needed and inconsistent.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
6cb98200
|
2012-07-24T13:15:40
|
|
Use xkb_mod_mask_t and xkb_mask_index_t throughout
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
74be1762
|
2012-07-23T21:30:28
|
|
Remove alloc.{c,h}
These functions are more appropriate elsewhere now.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
13eb9c35
|
2012-07-23T17:41:55
|
|
scanner: don't strdup key names
The key name is always XkbKeyNameLength (= 4) bytes, so we can maintain
it directly in YYSTYPE union and copy when needed, instead of treating
it like a full blown string and then copy. This means the scanner
checks the length itself.
rulescomp under valgrind, before:
==1038== total heap usage: 168,403 allocs, 168,403 frees, 9,732,648 bytes allocated
after:
==9377== total heap usage: 155,643 allocs, 155,643 frees, 9,672,788 bytes allocated
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
112cccb1
|
2012-07-23T16:03:34
|
|
Some atom related optimizations
We often get a strdup'd string, just to pass it over the atom_intern and
then immediately free it. But atom_intern then strdup's it again (if
it's not interned already); so instead we can have the interning "steal"
the memory instead of allocing a new one and freeing the old one. This
is done by a new xkb_atom_steal function.
It also turns out, that every time we strdup an atom, we don't actually
modify it afterwards. Since we are guaranteed that the atom table will
live as long as the context, we can just use xkb_atom_text instead. This
removes a some more dynamic allocations.
For this change we had to remove the ability to append two strings, e.g.
"foo" + "bar" -> "foobar"
which is only possible with string literals. This is unused and quite
useless for our purposes.
xkb_atom_strdup is left unused, as it may still be useful.
Running rulescomp in valgrind, Before:
==7907== total heap usage: 173,698 allocs, 173,698 frees, 9,775,973 bytes allocated
After:
==6348== total heap usage: 168,403 allocs, 168,403 frees, 9,732,648 bytes allocated
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
c6279b8b
|
2012-07-23T21:21:03
|
|
expr: don't divide by zero
Calculator parser 101.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
7662397f
|
2012-07-23T21:18:18
|
|
types: fix canonical types copying
Without the re-initialization, the copying fails. This wasn't noticed
because this code practically never gets executed with ordinary keymaps.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
3c580721
|
2012-07-23T16:22:20
|
|
keycodes: fix valgrind warnings
==7071== Conditional jump or move depends on uninitialised value(s)
==7071== at 0x40B6CB: AddIndicatorName (keycodes.c:148)
==7071== by 0x40C34F: MergeIncludedKeycodes (keycodes.c:420)
==7071== by 0x40C613: HandleIncludeKeycodes (keycodes.c:480)
==7071== by 0x40D022: HandleKeycodesFile (keycodes.c:733)
==7071== by 0x40D79F: CompileKeycodes (keycodes.c:881)
==7071== by 0x401E22: compile_keymap (xkbcomp.c:157)
==7071== by 0x402091: xkb_map_new_from_kccgst (xkbcomp.c:229)
==7071== by 0x40216A: xkb_map_new_from_names (xkbcomp.c:254)
==7071== by 0x4046F5: test_compile_rules (common.c:164)
==7071== by 0x4015C1: test_rmlvo (rulescomp.c:44)
==7071== by 0x40180D: main (rulescomp.c:98)
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
d4eee861
|
2012-07-23T11:25:32
|
|
parse: remove unused #define
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
2e245a9a
|
2012-07-23T11:42:22
|
|
expr: Remove ExprResolveFloat
Remnant from geometry.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
9bd55b55
|
2012-07-23T23:10:07
|
|
makekeys: Add top_srcdir to include path
Fixes distcheck with no /usr/include/xkbcommon.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
3dc1252d
|
2012-07-22T19:38:14
|
|
Add test for logging functionality
Just to make sure everything works properly.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
2c30fa7a
|
2012-07-21T16:10:17
|
|
Remove old logging leftovers
Everything has been converted.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
70e3e7e5
|
2012-07-21T15:39:18
|
|
xkbcomp: use new log functions
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
f48ee2d2
|
2012-07-21T15:44:48
|
|
parse: use new log functions
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
8e395803
|
2012-07-21T15:37:33
|
|
path: use new log functions
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
885f6c8c
|
2012-07-21T15:35:17
|
|
misc: use new log functions
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
544a83e6
|
2012-07-21T15:27:09
|
|
vmod: use new log functions
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
3bb3e9c3
|
2012-07-21T15:19:27
|
|
rules: use new log functions
Signed-off-by: Ran Benita <ran234@gmail.com>
|